wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 15:51:15 +02:00
Code Activity

* Store position info for inherited attributes.

Browse source
This commit is contained in:
Eelco Dolstra 2010-05-07 12:43:57 +00:00
parent 83d7b89660
commit 01e58adce0
4 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libexpr/eval.cc
View file

@ -430,11 +430,12 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
/* The inherited attributes, on the other hand, are
evaluated in the original environment. */
foreach (list<VarRef>::iterator, i, inherited) {
Value & v2 = (*v.attrs)[i->name].value;
Value * v3 = state.lookupVar(&env, *i);
mkCopy(v2, *v3);
mkCopy(env2.values[displ++], *v3);
foreach (list<Inherited>::iterator, i, inherited) {
nix::Attr & a = (*v.attrs)[i->first.name];
Value * v2 = state.lookupVar(&env, i->first);
mkCopy(a.value, *v2);
mkCopy(env2.values[displ++], *v2);
a.pos = &i->second;
}
}
@ -446,9 +447,10 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
a.pos = &i->second.second;
}
foreach (list<VarRef>::iterator, i, inherited) {
Value & v2 = (*v.attrs)[i->name].value;
mkCopy(v2, *state.lookupVar(&env, *i));
foreach (list<Inherited>::iterator, i, inherited) {
nix::Attr & a = (*v.attrs)[i->first.name];
mkCopy(a.value, *state.lookupVar(&env, i->first));
a.pos = &i->second;
}
}
}
@ -470,8 +472,8 @@ void ExprLet::eval(EvalState & state, Env & env, Value & v)
/* The inherited attributes, on the other hand, are evaluated in
the original environment. */
foreach (list<VarRef>::iterator, i, attrs->inherited)
mkCopy(env2.values[displ++], *state.lookupVar(&env, *i));
foreach (list<ExprAttrs::Inherited>::iterator, i, attrs->inherited)
mkCopy(env2.values[displ++], *state.lookupVar(&env, i->first));
state.eval(env2, body, v);
}