mirror of
https://github.com/NixOS/nix
synced 2025-06-25 14:51:16 +02:00
* Removed URIs from the evaluator (NIX-66). They are now just another
kind of notation for strings.
This commit is contained in:
parent
b4e012ab4d
commit
7d4567f2cc
10 changed files with 16 additions and 21 deletions
|
@ -301,7 +301,6 @@ string showType(Expr e)
|
|||
int i1;
|
||||
if (matchStr(e, t1)) return "a string";
|
||||
if (matchPath(e, t1)) return "a path";
|
||||
if (matchUri(e, t1)) return "a path";
|
||||
if (matchNull(e)) return "null";
|
||||
if (matchInt(e, i1)) return "an integer";
|
||||
if (matchBool(e, t1)) return "a boolean";
|
||||
|
@ -330,7 +329,6 @@ string showValue(Expr e)
|
|||
return "\"" + u + "\"";
|
||||
}
|
||||
if (matchPath(e, s)) return aterm2String(s);
|
||||
if (matchUri(e, s)) return aterm2String(s);
|
||||
if (matchNull(e)) return "null";
|
||||
if (matchInt(e, i)) return (format("%1%") % i).str();
|
||||
if (e == eTrue) return "true";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue