diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-10-11T21·59+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-10-11T21·59+0000 |
| commit | 7d4567f2cc16959e827f542e6de76a28ff11789e (patch) | |
| tree | fc68581e60d9f29359173ce8b5398d36b9ee125c /src/libexpr/primops.cc | |
| parent | b4e012ab4d8ef2f9091c1e8d14e059b38a2e4529 (diff) | |
* Removed URIs from the evaluator (NIX-66). They are now just another
kind of notation for strings.
Diffstat (limited to 'src/libexpr/primops.cc')
| -rw-r--r-- | src/libexpr/primops.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 761677a706b6..f35ba737d9c4 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -137,7 +137,6 @@ void toString(EvalState & state, Expr e, scripting convenience, just like `null'. */ if (matchStr(e, s)) result += aterm2String(s); - else if (matchUri(e, s)) result += aterm2String(s); else if (e == eTrue) result += "1"; else if (e == eFalse) ; else if (matchInt(e, n)) result += int2String(n); @@ -482,7 +481,7 @@ static Expr primDirOf(EvalState & state, const ATermVector & args) ATerm coerceToString(Expr e) { ATerm s; - if (matchStr(e, s) || matchPath(e, s) || matchUri(e, s)) + if (matchStr(e, s) || matchPath(e, s)) return s; return 0; } |