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

27
third_party/nix/src/libexpr/eval.cc vendored
View file

@ -1096,7 +1096,7 @@ void EvalState::callFunction(Value& fun, Value& arg, Value& v, const Pos& pos) {
// prevents tail-call optimisation.
void EvalState::incrFunctionCall(ExprLambda* fun) { functionCalls[fun]++; }
void EvalState::autoCallFunction(Bindings& args, Value& fun, Value& res) {
void EvalState::autoCallFunction(Bindings* args, Value& fun, Value& res) {
forceValue(fun);
if (fun.type == tAttrs) {
@ -1118,8 +1118,8 @@ void EvalState::autoCallFunction(Bindings& args, Value& fun, Value& res) {
mkAttrs(*actualArgs, fun.lambda.fun->formals->formals.size());
for (auto& i : fun.lambda.fun->formals->formals) {
Bindings::iterator j = args.find(i.name);
if (j != args.end()) {
Bindings::iterator j = args->find(i.name);
if (j != args->end()) {
actualArgs->attrs->push_back(j->second);
} else if (i.def == nullptr) {
throwTypeError(
@ -1615,22 +1615,7 @@ bool EvalState::eqValues(Value& v1, Value& v2) {
}
}
if (v1.attrs->size() != v2.attrs->size()) {
return false;
}
/* Otherwise, compare the attributes one by one. */
Bindings::iterator i;
Bindings::iterator j;
for (i = v1.attrs->begin(), j = v2.attrs->begin(); i != v1.attrs->end();
++i, ++j) {
if (i->second.name != j->second.name ||
!eqValues(*i->second.value, *j->second.value)) {
return false;
}
}
return true;
return v1.attrs->Equal(v2.attrs.get(), *this);
}
/* Functions are incomparable. */
@ -1811,8 +1796,8 @@ size_t valueSize(const Value& v) {
sz += doString(v.path);
break;
case tAttrs:
if (seenBindings.find(v.attrs) == seenBindings.end()) {
seenBindings.insert(v.attrs);
if (seenBindings.find(v.attrs.get()) == seenBindings.end()) {
seenBindings.insert(v.attrs.get());
sz += sizeof(Bindings);
for (const auto& i : *v.attrs) {
sz += doValue(*i.second.value);