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

* String equality tests should take the context into account. All the

Browse source 
evaluation test cases now succeed.
This commit is contained in:
Eelco Dolstra 2010-04-22 09:54:11 +00:00
parent 6bbfe95e30
commit 2d7636529f
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/eval.cc
View file

@ -1019,9 +1019,17 @@ bool EvalState::eqValues(Value & v1, Value & v2)
case tBool: case tBool:
return v1.boolean == v2.boolean; return v1.boolean == v2.boolean;
case tString: case tString: {
/* !!! contexts */ /* Compare both the string and its context. */
return strcmp(v1.string.s, v2.string.s) == 0; if (strcmp(v1.string.s, v2.string.s) != 0) return false;
const char * * p = v1.string.context, * * q = v2.string.context;
if (!p && !q) return true;
if (!p || !q) return false;
for ( ; *p && *q; ++p, ++q)
if (strcmp(*p, *q) != 0) return false;
if (*p || *q) return false;
return true;
}
case tPath: case tPath:
return strcmp(v1.path, v2.path) == 0; return strcmp(v1.path, v2.path) == 0;

2
src/libexpr/eval.hh
View file

@ -69,7 +69,7 @@ struct Value
For canonicity, the store paths should be in sorted order. */ For canonicity, the store paths should be in sorted order. */
struct { struct {
const char * s; const char * s;
const char * * context; const char * * context; // must be in sorted order
} string; } string;
const char * path; const char * path;