From 7d4567f2cc16959e827f542e6de76a28ff11789e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Oct 2006 21:59:33 +0000 Subject: * Removed URIs from the evaluator (NIX-66). They are now just another kind of notation for strings. --- src/libexpr/primops.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/libexpr/primops.cc') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 761677a70..f35ba737d 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; } -- cgit v1.2.3