* Removed URIs from the evaluator (NIX-66). They are now just another

kind of notation for strings.
2006-10-11 21:59:33 +00:00
parent b4e012ab4d
commit 7d4567f2cc
10 changed files with 16 additions and 21 deletions
@@ -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 ||