mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Quick hack to make coerceToString work more or less correctly on

Browse source 
nested lists.  `nix-instantiate' can now evaluate the NixOS system
  derivation attribute correctly (in 2.1s on my laptop vs. 6.2s for
  the trunk).
This commit is contained in:
Eelco Dolstra 2010-04-01 14:35:03 +00:00
parent 7b851915bf
commit c172274e17
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/eval.cc
View file

@ -804,9 +804,12 @@ string EvalState::coerceToString(Value & v, PathSet & context,
if (v.type == tList) { if (v.type == tList) {
string result; string result;
for (unsigned int n = 0; n < v.list.length; ++n) { for (unsigned int n = 0; n < v.list.length; ++n) {
if (n) result += " ";
result += coerceToString(v.list.elems[n], result += coerceToString(v.list.elems[n],
context, coerceMore, copyToStore); context, coerceMore, copyToStore);
if (n < v.list.length - 1
/* !!! not quite correct */
&& (v.list.elems[n].type != tList || v.list.elems[n].list.length != 0))
result += " ";
} }
return result; return result;
} }