aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-27 20:13:38 -04:00
Code

patch 9.1.1356: Vim9: crash when unletting variable

Browse Source 
Problem:  Vim9: crash when unletting variable
Solution: fix crash, allow to use :unlet
          (Hirohito Higashi)

closes: #17226

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Hirohito Higashi 2025-05-01 08:56:39 +02:00 committed by Christian Brabandt
parent f57c065e75
commit f5bfc48c05
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/proto/vim9compile.pro
View File

@ -2,7 +2,6 @@
int lookup_local(char_u *name, size_t len, lvar_T *lvar, cctx_T *cctx); int lookup_local(char_u *name, size_t len, lvar_T *lvar, cctx_T *cctx);
int arg_exists(char_u *name, size_t len, int *idxp, type_T **type, int *gen_load_outer, cctx_T *cctx); int arg_exists(char_u *name, size_t len, int *idxp, type_T **type, int *gen_load_outer, cctx_T *cctx);
void update_script_var_block_id(char_u *name, int block_id); void update_script_var_block_id(char_u *name, int block_id);
int script_is_vim9(void);
int script_var_exists(char_u *name, size_t len, cctx_T *cctx, cstack_T *cstack); int script_var_exists(char_u *name, size_t len, cctx_T *cctx, cstack_T *cstack);
int cctx_class_method_idx(cctx_T *cctx, char_u *name, size_t len, class_T **cl_ret); int cctx_class_method_idx(cctx_T *cctx, char_u *name, size_t len, class_T **cl_ret);
int cctx_class_member_idx(cctx_T *cctx, char_u *name, size_t len, class_T **cl_ret); int cctx_class_member_idx(cctx_T *cctx, char_u *name, size_t len, class_T **cl_ret);

19
src/testdir/test_vim9_assign.vim
View File

@ -2499,12 +2499,11 @@ def Test_unlet()
assert_false(exists('g:somevar')) assert_false(exists('g:somevar'))
unlet! g:somevar unlet! g:somevar
# also works for script-local variable in legacy Vim script # script-local variable cannot be removed in Vim9 script
s:somevar = 'legacy' s:somevar = 'local'
assert_true(exists('s:somevar')) assert_true(exists('s:somevar'))
unlet s:somevar v9.CheckDefExecFailure(['unlet s:somevar'], 'E1081:', 1)
assert_false(exists('s:somevar')) v9.CheckDefExecFailure(['unlet! s:somevar'], 'E1081:', 1)
unlet! s:somevar
if 0 if 0
unlet g:does_not_exist unlet g:does_not_exist
@ -2677,13 +2676,21 @@ def Test_unlet()
'enddef', 'enddef',
'defcompile', 'defcompile',
], 'E1081:') ], 'E1081:')
v9.CheckScriptFailure([ v9.CheckScriptSuccess([
'vim9script', 'vim9script',
'var svar = 123', 'var svar = 123',
'func Func()', 'func Func()',
' unlet s:svar', ' unlet s:svar',
'endfunc', 'endfunc',
'Func()', 'Func()',
])
v9.CheckScriptFailure([
'vim9script',
'var svar = 123',
'def Func()',
' vim9cmd unlet s:svar',
'enddef',
'defcompile',
], 'E1081:') ], 'E1081:')
v9.CheckScriptFailure([ v9.CheckScriptFailure([
'vim9script', 'vim9script',

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1356,
/**/ /**/
1355, 1355,
/**/ /**/

2
src/vim9cmds.c
View File

@ -99,7 +99,7 @@ check_vim9_unlet(char_u *name)
if (name[1] != ':' || vim_strchr((char_u *)"gwtb", *name) == NULL) if (name[1] != ':' || vim_strchr((char_u *)"gwtb", *name) == NULL)
{ {
// "unlet s:var" is allowed in legacy script. // "unlet s:var" is allowed in legacy script.
if (*name == 's' && !script_is_vim9()) if (*name == 's' && !in_vim9script())
return OK; return OK;
semsg(_(e_cannot_unlet_str), name); semsg(_(e_cannot_unlet_str), name);
return FAIL; return FAIL;

11
src/vim9compile.c
View File

@ -287,15 +287,6 @@ update_script_var_block_id(char_u *name, int block_id)
sav->sav_block_id = block_id; sav->sav_block_id = block_id;
} }
/*
* Return TRUE if the script context is Vim9 script.
*/
int
script_is_vim9(void)
{
return SCRIPT_ITEM(current_sctx.sc_sid)->sn_version == SCRIPT_VERSION_VIM9;
}
/* /*
* Lookup a variable (without s: prefix) in the current script. * Lookup a variable (without s: prefix) in the current script.
* "cctx" is NULL at the script level, "cstack" is NULL in a function. * "cctx" is NULL at the script level, "cstack" is NULL in a function.
@ -306,7 +297,7 @@ script_var_exists(char_u *name, size_t len, cctx_T *cctx, cstack_T *cstack)
{ {
if (current_sctx.sc_sid <= 0) if (current_sctx.sc_sid <= 0)
return FAIL; return FAIL;
if (script_is_vim9()) if (current_script_is_vim9())
{ {
// Check script variables that were visible where the function was // Check script variables that were visible where the function was
// defined. // defined.