Move attribute set data structures into their own header file.
This modification moves Attr and Bindings structures into their own header file which is dedicated to the attribute set representation. The goal of to isolate pieces of code which are related to the attribute set representation. Thus future modifications of the attribute set representation will only have to modify these files, and not every other file across the evaluator.
This commit is contained in:
		
							parent
							
								
									467977f203
								
							
						
					
					
						commit
						db21cfa688
					
				
					 4 changed files with 142 additions and 94 deletions
				
			
		|  | @ -1,5 +1,6 @@ | |||
| #pragma once | ||||
| 
 | ||||
| #include "attr-set.hh" | ||||
| #include "value.hh" | ||||
| #include "nixexpr.hh" | ||||
| #include "symbol-table.hh" | ||||
|  | @ -18,70 +19,6 @@ namespace nix { | |||
| class EvalState; | ||||
| 
 | ||||
| 
 | ||||
| struct Attr | ||||
| { | ||||
|     Symbol name; | ||||
|     Value * value; | ||||
|     Pos * pos; | ||||
|     Attr(Symbol name, Value * value, Pos * pos = &noPos) | ||||
|         : name(name), value(value), pos(pos) { }; | ||||
|     Attr() : pos(&noPos) { }; | ||||
|     bool operator < (const Attr & a) const | ||||
|     { | ||||
|         return name < a.name; | ||||
|     } | ||||
| }; | ||||
| 
 | ||||
| 
 | ||||
| class Bindings | ||||
| { | ||||
| public: | ||||
|     typedef uint32_t size_t; | ||||
| 
 | ||||
| private: | ||||
|     size_t size_, capacity_; | ||||
|     Attr attrs[0]; | ||||
| 
 | ||||
|     Bindings(size_t capacity) : size_(0), capacity_(capacity) { } | ||||
|     Bindings(const Bindings & bindings) = delete; | ||||
| 
 | ||||
| public: | ||||
|     size_t size() const { return size_; } | ||||
| 
 | ||||
|     bool empty() const { return !size_; } | ||||
| 
 | ||||
|     typedef Attr * iterator; | ||||
| 
 | ||||
|     void push_back(const Attr & attr) | ||||
|     { | ||||
|         assert(size_ < capacity_); | ||||
|         attrs[size_++] = attr; | ||||
|     } | ||||
| 
 | ||||
|     iterator find(const Symbol & name) | ||||
|     { | ||||
|         Attr key(name, 0); | ||||
|         iterator i = std::lower_bound(begin(), end(), key); | ||||
|         if (i != end() && i->name == name) return i; | ||||
|         return end(); | ||||
|     } | ||||
| 
 | ||||
|     iterator begin() { return &attrs[0]; } | ||||
|     iterator end() { return &attrs[size_]; } | ||||
| 
 | ||||
|     Attr & operator[](size_t pos) | ||||
|     { | ||||
|         return attrs[pos]; | ||||
|     } | ||||
| 
 | ||||
|     void sort(); | ||||
| 
 | ||||
|     size_t capacity() { return capacity_; } | ||||
| 
 | ||||
|     friend class EvalState; | ||||
| }; | ||||
| 
 | ||||
| 
 | ||||
| typedef void (* PrimOpFun) (EvalState & state, const Pos & pos, Value * * args, Value & v); | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue