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

30
third_party/nix/src/tests/attr-set.cc vendored
View file

@ -121,14 +121,8 @@ class AttrSetTest : public ::testing::Test {
symbol_table = &eval_state_->symbols;
}
void assert_bindings_equal(nix::Bindings& lhs, nix::Bindings& rhs) {
Value lhs_val;
Value rhs_val;
lhs_val.type = rhs_val.type = ValueType::tAttrs;
lhs_val.attrs = &lhs;
rhs_val.attrs = &lhs;
RC_ASSERT(eval_state_->eqValues(lhs_val, rhs_val));
void assert_bindings_equal(nix::Bindings* lhs, nix::Bindings* rhs) {
RC_ASSERT(lhs->Equal(rhs, *eval_state_));
}
};
@ -136,24 +130,26 @@ class AttrSetMonoidTest : public AttrSetTest {};
RC_GTEST_FIXTURE_PROP(AttrSetMonoidTest, mergeLeftIdentity,
(nix::Bindings && bindings)) {
auto empty_bindings = nix::Bindings::NewGC();
auto result = *Bindings::Merge(*empty_bindings, bindings);
assert_bindings_equal(result, bindings);
auto empty_bindings = nix::Bindings::New();
auto result = Bindings::Merge(*empty_bindings, bindings);
assert_bindings_equal(result.get(), &bindings);
}
RC_GTEST_FIXTURE_PROP(AttrSetMonoidTest, mergeRightIdentity,
(nix::Bindings && bindings)) {
auto empty_bindings = nix::Bindings::NewGC();
auto result = *Bindings::Merge(bindings, *empty_bindings);
assert_bindings_equal(result, bindings);
auto empty_bindings = nix::Bindings::New();
auto result = Bindings::Merge(bindings, *empty_bindings);
assert_bindings_equal(result.get(), &bindings);
}
RC_GTEST_FIXTURE_PROP(AttrSetMonoidTest, mergeAssociative,
(nix::Bindings && bindings_1, nix::Bindings&& bindings_2,
nix::Bindings&& bindings_3)) {
assert_bindings_equal(
*Bindings::Merge(bindings_1, *Bindings::Merge(bindings_2, bindings_3)),
*Bindings::Merge(*Bindings::Merge(bindings_1, bindings_2), bindings_3));
auto b231 =
Bindings::Merge(bindings_1, *Bindings::Merge(bindings_2, bindings_3));
auto b123 =
Bindings::Merge(*Bindings::Merge(bindings_1, bindings_2), bindings_3);
assert_bindings_equal(b231.get(), b123.get());
}
} // namespace nix