maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): always pass Bindings by ptr, use shared/unique_ptr

Browse source 
Value now carries a shared_ptr<Bindings>, and all Bindings constructors return a unique_ptr<Bindings>.

The test that wanted to compare two Bindings by putting them into Values has been modified to use the new Equal() method on Bindings (extracted from EvalState).

Change-Id: I8dfb60e65fdabb717e3b3e5d56d5b3fc82f70883
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1744
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-08-13 16:40:27 -07:00 • committed by kanepyork
parent 38f2ea34f4
commit 1fc9ba4885
22 changed files with 129 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

15
third_party/nix/src/libexpr/attr-set.hh vendored
View file

@ -25,15 +25,17 @@ using AttributeMap = absl::btree_map<Symbol, Attr>;
class Bindings {
public:
typedef AttributeMap::iterator iterator;
using iterator = AttributeMap::iterator;
using const_iterator = AttributeMap::const_iterator;
// Allocate a new attribute set that is visible to the garbage
// collector.
static Bindings* NewGC(size_t capacity = 0);
static std::unique_ptr<Bindings> New(size_t capacity = 0);
// Create a new attribute set by merging two others. This is used to
// implement the `//` operator in Nix.
static Bindings* Merge(const Bindings& lhs, const Bindings& rhs);
static std::unique_ptr<Bindings> Merge(const Bindings& lhs,
const Bindings& rhs);
// Return the number of contained elements.
size_t size() const;
@ -44,11 +46,18 @@ class Bindings {
// Insert, but do not replace, values in the attribute set.
void push_back(const Attr& attr);
// Are these two attribute sets deeply equal?
// Note: Does not special-case derivations. Use state.eqValues() to check
// attrsets that may be derivations.
bool Equal(const Bindings* other, EvalState& state) const;
// Look up a specific element of the attribute set.
iterator find(const Symbol& name);
iterator begin();
const_iterator cbegin() const;
iterator end();
const_iterator cend() const;
// Returns the elements of the attribute set as a vector, sorted
// lexicographically by keys.