wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

* Fix the ~ operator.

Browse source
This commit is contained in:
Eelco Dolstra 2006-08-29 15:29:38 +00:00
parent 1f6616dabf
commit 2132d9ddeb
4 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/eval.cc
View file

@ -321,7 +321,6 @@ Expr evalExpr2(EvalState & state, Expr e)
/* Normal forms. */
if (sym == symStr ||
sym == symPath ||
sym == symSubPath || /* !!! evaluate */
sym == symUri ||
sym == symNull ||
sym == symInt ||
@ -503,7 +502,7 @@ Expr evalExpr2(EvalState & state, Expr e)
}
/* String or path concatenation. */
ATermList es;
ATermList es = ATempty;
if (matchOpPlus(e, e1, e2) || matchConcatStrings(e, es)) {
ATermVector args;
if (matchOpPlus(e, e1, e2)) {
@ -520,6 +519,17 @@ Expr evalExpr2(EvalState & state, Expr e)
}
}
/* Backwards compatability: subpath operator (~). */
if (matchSubPath(e, e1, e2)) {
static bool haveWarned;
warnOnce(haveWarned, "the subpath operator (~) is deprecated, use string concatenation (+) instead");
ATermList context = ATempty;
bool dummy;
string s1 = coerceToStringWithContext(state, context, e1, dummy);
string s2 = coerceToStringWithContext(state, context, e2, dummy);
return wrapInContext(context, makePath(toATerm(canonPath(s1 + "/" + s2))));
}
/* List concatenation. */
if (matchOpConcat(e, e1, e2)) {
try {