diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-11-03 18:12:03 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-11-03 18:12:03 +0000 |
commit | cb7ccb528bbaeb30d09fbb41e57ab75d3121e1bc (patch) | |
tree | d27270a2b3c6abc86f56956d906899374778f028 /src/libexpr/eval.cc | |
parent | 4cbd845aa491b5cf534f8c031d285fc454933868 (diff) |
* string2ATerm -> overloaded toATerm.
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r-- | src/libexpr/eval.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index cef346002..d4593b5c0 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -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"); } |