aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1140: cannot call an object method in a compiled function

Browse Source 
Problem:    Cannot call an object method in a compiled function.
Solution:   Compile the instructins to invoke an object method.
This commit is contained in:
Bram Moolenaar
2023-01-03 19:08:50 +00:00
parent 46ab925937
commit 574950dfb1
7 changed files with 74 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vim9execute.c
View File

@@ -532,6 +532,9 @@ call_dfunc(
return FAIL;
}
// If this is an object method, the object is just before the arguments.
typval_T *obj = STACK_TV_BOT(0) - argcount - vararg_count - 1;
// Check the argument types.
if (check_ufunc_arg_types(ufunc, argcount, vararg_count, ectx) == FAIL)
return FAIL;
@@ -594,6 +597,14 @@ call_dfunc(
}
ectx->ec_stack.ga_len += STACK_FRAME_SIZE + varcount;
// For an object method move the object from just before the arguments to
// the first local variable.
if (ufunc->uf_flags & FC_OBJECT)
{
*STACK_TV_VAR(0) = *obj;
obj->v_type = VAR_UNKNOWN;
}
partial_T *pt = pt_arg != NULL ? pt_arg : ufunc->uf_partial;
if (pt != NULL || (ufunc->uf_flags & FC_CLOSURE))
{
@@ -1073,7 +1084,6 @@ func_return(ectx_T *ectx)
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
+ ectx->ec_dfunc_idx;
int argcount = ufunc_argcount(dfunc->df_ufunc);
int top = ectx->ec_frame_idx - argcount;
estack_T *entry;
int prev_dfunc_idx = STACK_TV(ectx->ec_frame_idx
+ STACK_FRAME_FUNC_OFF)->vval.v_number;
@@ -1111,7 +1121,11 @@ func_return(ectx_T *ectx)
if (handle_closure_in_use(ectx, TRUE) == FAIL)
return FAIL;
// Clear the arguments.
// Clear the arguments. If this was an object method also clear the
// object, it is just before the arguments.
int top = ectx->ec_frame_idx - argcount;
if (dfunc->df_ufunc->uf_flags & FC_OBJECT)
--top;
for (idx = top; idx < ectx->ec_frame_idx; ++idx)
clear_tv(STACK_TV(idx));