about summary refs log tree commit diff
path: root/src/libexpr/eval.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-10-11T21·59+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-10-11T21·59+0000
commit7d4567f2cc16959e827f542e6de76a28ff11789e (patch)
treefc68581e60d9f29359173ce8b5398d36b9ee125c /src/libexpr/eval.cc
parentb4e012ab4d8ef2f9091c1e8d14e059b38a2e4529 (diff)
* Removed URIs from the evaluator (NIX-66). They are now just another
  kind of notation for strings.

Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r--src/libexpr/eval.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 2d54f1fc2325..4f97c761ed98 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -254,8 +254,7 @@ string coerceToStringWithContext(EvalState & state,
     }
     
     ATerm s;
-    if (matchStr(e, s) || matchUri(e, s))
-        return aterm2String(s);
+    if (matchStr(e, s)) return aterm2String(s);
     
     if (matchPath(e, s)) {
         isPath = true;
@@ -346,7 +345,6 @@ Expr evalExpr2(EvalState & state, Expr e)
     /* Normal forms. */
     if (sym == symStr ||
         sym == symPath ||
-        sym == symUri ||
         sym == symNull ||
         sym == symInt ||
         sym == symBool ||