lachrimae/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Compare nulls.

Browse source
This commit is contained in:
Eelco Dolstra 2010-03-31 09:54:12 +00:00
parent 7f19e03c65
commit 4c53ca2692
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/eval.cc
View file

@ -417,7 +417,7 @@ void EvalState::eval(Env & env, Expr e, Value & v)
PathSet context; PathSet context;
std::ostringstream s; std::ostringstream s;
bool first = true, isPath; bool first = true, isPath = false;
for (ATermIterator i(es); i; ++i) { for (ATermIterator i(es); i; ++i) {
eval(env, *i, v); eval(env, *i, v);
@ -788,6 +788,9 @@ bool EvalState::eqValues(Value & v1, Value & v2)
/* !!! contexts */ /* !!! contexts */
return strcmp(v1.string.s, v2.string.s) == 0; return strcmp(v1.string.s, v2.string.s) == 0;
case tNull:
return true;
case tList: case tList:
if (v2.type != tList || v1.list.length != v2.list.length) return false; if (v2.type != tList || v1.list.length != v2.list.length) return false;
for (unsigned int n = 0; n < v1.list.length; ++n) for (unsigned int n = 0; n < v1.list.length; ++n)
@ -803,7 +806,7 @@ bool EvalState::eqValues(Value & v1, Value & v2)
} }
default: default:
throw Error("cannot compare given values"); throw Error(format("cannot compare %1% with %2%") % showType(v1) % showType(v2));
} }
} }