thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.1146: Vim9: wrong context being used when evaluating class member

Browse Source 
Problem:  Vim9: wrong context being used when evaluating class member
          (lifepillar, Ernie Rael)
Solution: Use the correct script context when evaluating a class member
          init expression(Yegappan Lakshmanan)

fixes: #14011
fixes: #14402
closes: #15112
closes: #16660

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-02-24 19:23:43 +01:00
committed by Christian Brabandt
parent 5090a1fecb
commit 16f2d3a465
13 changed files with 197 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/vim9compile.c
View File

@@ -836,30 +836,6 @@ find_imported(char_u *name, size_t len, int load)
return ret;
}
/*
* Find "name" in imported items of extended base class of the class to which
* the context :def function belongs.
*/
imported_T *
find_imported_from_extends(cctx_T *cctx, char_u *name, size_t len, int load)
{
if (cctx == NULL || cctx->ctx_ufunc == NULL
|| cctx->ctx_ufunc->uf_class == NULL)
return NULL;
class_T *cl_extends = cctx->ctx_ufunc->uf_class->class_extends;
if (cl_extends == NULL
|| cl_extends->class_class_function_count_child <= 0)
return NULL;
sctx_T current_sctx_save = current_sctx;
current_sctx = cl_extends->class_class_functions[0]->uf_script_ctx;
imported_T *ret = find_imported(name, len, load);
current_sctx = current_sctx_save;
return ret;
}
/*
* Called when checking for a following operator at "arg". When the rest of
* the line is empty or only a comment, peek the next line. If there is a next
@@ -1398,7 +1374,7 @@ generate_loadvar(cctx_T *cctx, lhs_T *lhs)
case dest_script:
case dest_script_v9:
res = compile_load_scriptvar(cctx,
name + (name[1] == ':' ? 2 : 0), NULL, NULL, NULL);
name + (name[1] == ':' ? 2 : 0), NULL, NULL);
break;
case dest_env:
// Include $ in the name here
@@ -3995,9 +3971,34 @@ obj_constructor_prologue(ufunc_T *ufunc, cctx_T *cctx)
if (m->ocm_init != NULL)
{
char_u *expr = m->ocm_init;
char_u *expr = m->ocm_init;
sctx_T save_current_sctx;
int change_sctx = FALSE;
if (compile_expr0(&expr, cctx) == FAIL)
// If the member variable initialization script context is
// different from the current script context, then change it.
if (current_sctx.sc_sid != m->ocm_init_sctx.sc_sid)
change_sctx = TRUE;
if (change_sctx)
{
// generate an instruction to change the script context to the
// member variable initialization script context.
save_current_sctx = current_sctx;
current_sctx = m->ocm_init_sctx;
generate_SCRIPTCTX_SET(cctx, current_sctx);
}
int r = compile_expr0(&expr, cctx);
if (change_sctx)
{
// restore the previous script context
current_sctx = save_current_sctx;
generate_SCRIPTCTX_SET(cctx, current_sctx);
}
if (r == FAIL)
return FAIL;
if (!ends_excmd2(m->ocm_init, expr))