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

* string2ATerm -> overloaded toATerm.

Browse source
This commit is contained in:
Eelco Dolstra 2004-11-03 18:12:03 +00:00
parent 4cbd845aa4
commit cb7ccb528b
10 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -328,11 +328,11 @@ Expr evalExpr2(EvalState & state, Expr e)
e2 = evalExpr(state, e2);
ATerm s1, s2;
if (matchStr(e1, s1) && matchStr(e2, s2))
return makeStr(string2ATerm((
(string) aterm2String(s1) + (string) aterm2String(s2)).c_str()));
return makeStr(toATerm(
(string) aterm2String(s1) + (string) aterm2String(s2)));
else if (matchPath(e1, s1) && matchPath(e2, s2))
return makePath(string2ATerm(canonPath(
(string) aterm2String(s1) + "/" + (string) aterm2String(s2)).c_str()));
return makePath(toATerm(canonPath(
(string) aterm2String(s1) + "/" + (string) aterm2String(s2))));
else throw Error("wrong argument types in `+' operator");
}