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 9.0.1254: calling a method on an interface does not work

Browse Source 
Problem:    Calling a method on an interface does not work.
Solution:   At runtime figure out what method to call. (closes #11901)
This commit is contained in:
Bram Moolenaar
2023-01-28 15:19:40 +00:00
parent 192e24d974
commit d0200c8631
10 changed files with 236 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/vim9instr.c
View File

@@ -1709,11 +1709,18 @@ generate_BLOBAPPEND(cctx_T *cctx)
}
/*
* Generate an ISN_DCALL or ISN_UCALL instruction.
* Generate an ISN_DCALL, ISN_UCALL or ISN_METHODCALL instruction.
* When calling a method on an object, of which we know the interface only,
* then "cl" is the interface and "mi" the method index on the interface.
* Return FAIL if the number of arguments is wrong.
*/
int
generate_CALL(cctx_T *cctx, ufunc_T *ufunc, int pushed_argcount)
generate_CALL(
cctx_T *cctx,
ufunc_T *ufunc,
class_T *cl,
int mi,
int pushed_argcount)
{
isn_T *isn;
int regular_args = ufunc->uf_args.ga_len;
@@ -1783,11 +1790,21 @@ generate_CALL(cctx_T *cctx, ufunc_T *ufunc, int pushed_argcount)
return FAIL;
}
if ((isn = generate_instr(cctx,
ufunc->uf_def_status != UF_NOT_COMPILED ? ISN_DCALL
: ISN_UCALL)) == NULL)
if ((isn = generate_instr(cctx, cl != NULL ? ISN_METHODCALL
: ufunc->uf_def_status != UF_NOT_COMPILED
? ISN_DCALL : ISN_UCALL)) == NULL)
return FAIL;
if (isn->isn_type == ISN_DCALL)
if (isn->isn_type == ISN_METHODCALL)
{
isn->isn_arg.mfunc = ALLOC_ONE(cmfunc_T);
if (isn->isn_arg.mfunc == NULL)
return FAIL;
isn->isn_arg.mfunc->cmf_itf = cl;
++cl->class_refcount;
isn->isn_arg.mfunc->cmf_idx = mi;
isn->isn_arg.mfunc->cmf_argcount = argcount;
}
else if (isn->isn_type == ISN_DCALL)
{
isn->isn_arg.dfunc.cdf_idx = ufunc->uf_dfunc_idx;
isn->isn_arg.dfunc.cdf_argcount = argcount;
@@ -2483,6 +2500,14 @@ delete_instr(isn_T *isn)
}
break;
case ISN_METHODCALL:
{
cmfunc_T *mfunc = isn->isn_arg.mfunc;
class_unref(mfunc->cmf_itf);
vim_free(mfunc);
}
break;
case ISN_NEWFUNC:
{
newfuncarg_T *arg = isn->isn_arg.newfunc.nf_arg;