puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Call functors with both arguments at once

Browse source 
This is not really useful on its own, but it does recover the
'infinite recursion' error message for '{ __functor = x: x; } 1', and
is more efficient in conjunction with #3718.

Fixes #5515.
This commit is contained in:
Eelco Dolstra 2021-11-16 22:34:17 +01:00
parent e41cf8511f
commit d7bae52b9d
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -1406,13 +1406,15 @@ void EvalState::callFunction(Value & fun, size_t nrArgs, Value * * args, Value &
} }
else if (vCur.type() == nAttrs && (functor = vCur.attrs->get(sFunctor))) { else if (vCur.type() == nAttrs && (functor = vCur.attrs->get(sFunctor))) {
/* 'vCur" may be allocated on the stack of the calling /* 'vCur' may be allocated on the stack of the calling
function, but for functors we may keep a reference, so function, but for functors we may keep a reference, so
heap-allocate a copy and use that instead. */ heap-allocate a copy and use that instead. */
Value * args2[] = {allocValue()}; Value * args2[] = {allocValue(), args[0]};
*args2[0] = vCur; *args2[0] = vCur;
/* !!! Should we use the attr pos here? */ /* !!! Should we use the attr pos here? */
callFunction(*functor->value, 1, args2, vCur, pos); callFunction(*functor->value, 2, args2, vCur, pos);
nrArgs--;
args++;
} }
else else