picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prim_mapAttrs: must be lazy to avoid infinite recursion

Browse source
This commit is contained in:
volth 2018-07-05 15:33:12 +00:00
parent 841747b0e6
commit e6bf1a79d7
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/primops.cc
View file

@ -1365,10 +1365,11 @@ static void prim_mapAttrs(EvalState & state, const Pos & pos, Value * * args, Va
state.mkAttrs(v, args[1]->attrs->size()); state.mkAttrs(v, args[1]->attrs->size());
for (auto & i : *args[1]->attrs) { for (auto & i : *args[1]->attrs) {
Value vName, vFun2; Value * vName = state.allocValue();
mkString(vName, i.name); Value * vFun2 = state.allocValue();
state.callFunction(*args[0], vName, vFun2, pos); mkString(*vName, i.name);
state.callFunction(vFun2, *i.value, *state.allocAttr(v, i.name), pos); state.callFunction(*args[0], *vName, *vFun2, pos);
mkApp(*state.allocAttr(v, i.name), *vFun2, *i.value);
} }
} }