wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

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

Browse source 
kind of notation for strings.
This commit is contained in:
Eelco Dolstra 2006-10-11 21:59:33 +00:00
parent b4e012ab4d
commit 7d4567f2cc
10 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/primops.cc
View file

@ -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;
}