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

* Optimisation in the // operator: if one of the sets is empty, return

Browse source 
the other set.
This commit is contained in:
Eelco Dolstra 2010-08-02 16:31:05 +00:00
parent 7af6a2fd71
commit 6d6200f37a
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/eval.cc
View file

@ -750,13 +750,15 @@ void ExprOpImpl::eval(EvalState & state, Env & env, Value & v)
void ExprOpUpdate::eval(EvalState & state, Env & env, Value & v) void ExprOpUpdate::eval(EvalState & state, Env & env, Value & v)
{ {
Value v2; Value v1, v2;
state.evalAttrs(env, e1, v2); state.evalAttrs(env, e1, v1);
state.cloneAttrs(v2, v);
state.evalAttrs(env, e2, v2); state.evalAttrs(env, e2, v2);
if (v1.attrs->size() == 0) { v = v2; return; }
if (v2.attrs->size() == 0) { v = v1; return; }
state.cloneAttrs(v1, v);
foreach (Bindings::iterator, i, *v2.attrs) { foreach (Bindings::iterator, i, *v2.attrs) {
Attr & a = (*v.attrs)[i->first]; Attr & a = (*v.attrs)[i->first];
mkCopy(a.value, i->second.value); mkCopy(a.value, i->second.value);