lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Improve sharing a bit.

Browse source
This commit is contained in:
Eelco Dolstra 2010-04-16 14:03:26 +00:00
parent 497e4ad126
commit 8ca4a001cb
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/eval.cc
View file

@ -652,15 +652,18 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
/* Because the first `with' may be a shallow copy of another /* Because the first `with' may be a shallow copy of another
attribute set (through a tCopy node), we need to clone its attribute set (through a tCopy node), we need to clone its
`attrs' before modifying them. */ `attrs' before modifying them. */
env2.values[0].attrs = new Bindings(*env2.values[0].attrs); Bindings * old(env2.values[0].attrs);
state.mkAttrs(env2.values[0]);
foreach (Bindings::iterator, i, *old)
mkCopy((*env2.values[0].attrs)[i->first], i->second);
foreach (Bindings::iterator, i, *env3->values[0].attrs) { foreach (Bindings::iterator, i, *env3->values[0].attrs) {
Bindings::iterator j = env2.values[0].attrs->find(i->first); Bindings::iterator j = env2.values[0].attrs->find(i->first);
if (j == env2.values[0].attrs->end()) if (j == env2.values[0].attrs->end())
(*env2.values[0].attrs)[i->first] = i->second; // !!! sharing mkCopy((*env2.values[0].attrs)[i->first], i->second);
} }
} }
state.eval(env2, body, v); state.eval(env2, body, v);
} }
@ -731,7 +734,7 @@ void ExprOpUpdate::eval(EvalState & state, Env & env, Value & v)
state.forceAttrs(v2); state.forceAttrs(v2);
foreach (Bindings::iterator, i, *v2.attrs) foreach (Bindings::iterator, i, *v2.attrs)
(*v.attrs)[i->first] = i->second; // !!! sharing mkCopy((*v.attrs)[i->first], i->second);
} }

2
src/libexpr/primops.cc
View file

@ -733,7 +733,7 @@ static void prim_listToAttrs(EvalState & state, Value * * args, Value & v)
if (j == v2.attrs->end()) if (j == v2.attrs->end())
throw TypeError("`value' attribute missing in a call to `listToAttrs'"); throw TypeError("`value' attribute missing in a call to `listToAttrs'");
(*v.attrs)[state.symbols.create(name)] = j->second; // !!! sharing? mkCopy((*v.attrs)[state.symbols.create(name)], j->second);
} }
} }