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

* Implemented inherit.

Browse source
This commit is contained in:
Eelco Dolstra 2010-04-14 23:25:05 +00:00
parent 267dc693d2
commit d39d3c6264
4 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/libexpr/eval.cc
View file

@ -338,7 +338,7 @@ void EvalState::eval(Env & env, Expr * e, Value & v)
char x;
if (&x < deepestStack) deepestStack = &x;
debug(format("eval: %1%") % *e);
//debug(format("eval: %1%") % *e);
checkInterrupt();
@ -390,14 +390,13 @@ void ExprPath::eval(EvalState & state, Env & env, Value & v)
void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
{
state.mkAttrs(v);
if (recursive) {
/* Create a new environment that contains the attributes in
this `rec'. */
Env & env2(state.allocEnv(attrs.size() + inherited.size()));
env2.up = &env;
v.type = tAttrs;
v.attrs = new Bindings;
unsigned int displ = 0;
@ -409,26 +408,25 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
mkThunk(env2.values[displ++], env2, i->second);
}
#if 0
/* The inherited attributes, on the other hand, are
evaluated in the original environment. */
foreach (list<Symbol>::iterator, i, inherited) {
Value & v2 = env2.bindings[*i];
mkCopy(v2, *state.lookupVar(&env, *i));
foreach (list<VarRef>::iterator, i, inherited) {
Value & v2 = (*v.attrs)[i->name];
Value * v3 = state.lookupVar(&env, *i);
mkCopy(v2, *v3);
mkCopy(env2.values[displ++], *v3);
}
#endif
}
else {
state.mkAttrs(v);
foreach (Attrs::iterator, i, attrs) {
Value & v2 = (*v.attrs)[i->first];
mkThunk(v2, env, i->second);
}
foreach (list<Symbol>::iterator, i, inherited) {
Value & v2 = (*v.attrs)[*i];
foreach (list<VarRef>::iterator, i, inherited) {
Value & v2 = (*v.attrs)[i->name];
mkCopy(v2, *state.lookupVar(&env, *i));
}
}
@ -449,14 +447,10 @@ void ExprLet::eval(EvalState & state, Env & env, Value & v)
foreach (ExprAttrs::Attrs::iterator, i, attrs->attrs)
mkThunk(env2.values[displ++], env2, i->second);
#if 0
/* The inherited attributes, on the other hand, are evaluated in
the original environment. */
foreach (list<Symbol>::iterator, i, attrs->inherited) {
Value & v2 = env2.bindings[*i];
mkCopy(v2, *state.lookupVar(&env, *i));
}
#endif
foreach (list<VarRef>::iterator, i, attrs->inherited)
mkCopy(env2.values[displ++], *state.lookupVar(&env, *i));
state.eval(env2, body, v);
}