aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code

Browse Source 
Problem:    Vim9: cannot call a compiled closure from not compiled code.
Solution:   Pass funcexe to call_user_func().
This commit is contained in:
Bram Moolenaar
2020-05-16 21:20:12 +02:00
parent aa5fc4ec51
commit 6f5b6dfb16
6 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vim9execute.c
View File

@@ -641,6 +641,7 @@ call_def_function(
ufunc_T *ufunc,
int argc_arg, // nr of arguments
typval_T *argv, // arguments
partial_T *partial, // optional partial for context
typval_T *rettv) // return value
{
ectx_T ectx; // execution context
@@ -720,6 +721,12 @@ call_def_function(
ectx.ec_frame_idx = ectx.ec_stack.ga_len;
initial_frame_idx = ectx.ec_frame_idx;
if (partial != NULL)
{
ectx.ec_outer_stack = partial->pt_ectx_stack;
ectx.ec_outer_frame = partial->pt_ectx_frame;
}
// dummy frame entries
for (idx = 0; idx < STACK_FRAME_SIZE; ++idx)
{
@@ -1468,7 +1475,7 @@ call_def_function(
{
cpfunc_T *pfunc = &iptr->isn_arg.pfunc;
int r;
typval_T partial;
typval_T partial_tv;
SOURCING_LNUM = iptr->isn_lnum;
if (pfunc->cpf_top)
@@ -1480,12 +1487,12 @@ call_def_function(
{
// Get the funcref from the stack.
--ectx.ec_stack.ga_len;
partial = *STACK_TV_BOT(0);
tv = &partial;
partial_tv = *STACK_TV_BOT(0);
tv = &partial_tv;
}
r = call_partial(tv, pfunc->cpf_argcount, &ectx);
if (tv == &partial)
clear_tv(&partial);
if (tv == &partial_tv)
clear_tv(&partial_tv);
if (r == FAIL)
goto failed;
}