picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

forceValueDeep: Add to error prefix

Browse source
This commit is contained in:
Eelco Dolstra 2015-03-06 15:10:12 +01:00
parent 5badc8f975
commit 17c71334e1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.cc
View file

@ -1226,8 +1226,13 @@ void EvalState::forceValueDeep(Value & v)
forceValue(v);
if (v.type == tAttrs) {
foreach (Bindings::iterator, i, *v.attrs)
recurse(*i->value);
for (auto & i : *v.attrs)
try {
recurse(*i.value);
} catch (Error & e) {
addErrorPrefix(e, "while evaluating the attribute ‘%1%’ at %2%:\n", i.name, *i.pos);
throw;
}
}
else if (v.type == tList) {