wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00
Code Activity

* String/path concatenation operator (`+').

Browse source
This commit is contained in:
Eelco Dolstra 2004-10-26 17:01:35 +00:00
parent ee401afad8
commit 9fa07b376d
6 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/primops.cc
View file

@ -273,8 +273,8 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args)
attrs.set("outPath", ATmake("(Path(<str>), NoPos)", outPath.c_str()));
attrs.set("drvPath", ATmake("(Path(<str>), NoPos)", drvPath.c_str()));
attrs.set("drvHash", ATmake("(Str(<str>), NoPos)", ((string) drvHash).c_str()));
attrs.set("type", ATmake("(Str(\"derivation\"), NoPos)"));
attrs.set("drvHash", ATmake("(<term>, NoPos)", makeString(drvHash)));
attrs.set("type", ATmake("(<term>, NoPos)", makeString("derivation")));
return makeAttrs(attrs);
}
@ -284,8 +284,7 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args)
following the last slash. */
static Expr primBaseNameOf(EvalState & state, const ATermVector & args)
{
string s = evalString(state, args[0]);
return ATmake("Str(<str>)", baseNameOf(s).c_str());
return makeString(baseNameOf(evalString(state, args[0])));
}
@ -298,7 +297,7 @@ static Expr primToString(EvalState & state, const ATermVector & args)
if (atMatch(m, arg) >> "Str" >> s ||
atMatch(m, arg) >> "Path" >> s ||
atMatch(m, arg) >> "Uri" >> s)
return ATmake("Str(<str>)", s.c_str());
return makeString(s);
else throw Error("cannot coerce value to string");
}