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 8.2.2590: Vim9: default argument value may cause internal error

Browse Source 
Problem:    Vim9: default argument value may cause internal error.
Solution:   Hide later function arguments when compiling the expression.
            (closes #7948)
This commit is contained in:
Bram Moolenaar
2021-03-11 20:04:04 +01:00
parent 776b954622
commit 12bce95887
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_vim9_func.vim
View File

@@ -311,6 +311,14 @@ def Test_call_default_args()
delfunc g:Func delfunc g:Func
CheckScriptFailure(['def Func(arg: number = "text")', 'enddef', 'defcompile'], 'E1013: Argument 1: type mismatch, expected number but got string') CheckScriptFailure(['def Func(arg: number = "text")', 'enddef', 'defcompile'], 'E1013: Argument 1: type mismatch, expected number but got string')
delfunc g:Func delfunc g:Func
var lines =<< trim END
vim9script
def Func(a = b == 0 ? 1 : 2, b = 0)
enddef
defcompile
END
CheckScriptFailure(lines, 'E1001: Variable not found: b')
enddef enddef
def FuncWithComment( # comment def FuncWithComment( # comment

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2590,
/**/ /**/
2589, 2589,
/**/ /**/

11
src/vim9compile.c
View File

@@ -8199,6 +8199,7 @@ compile_def_function(
{ {
int count = ufunc->uf_def_args.ga_len; int count = ufunc->uf_def_args.ga_len;
int first_def_arg = ufunc->uf_args.ga_len - count; int first_def_arg = ufunc->uf_args.ga_len - count;
int uf_args_len = ufunc->uf_args.ga_len;
int i; int i;
char_u *arg; char_u *arg;
int off = STACK_FRAME_SIZE + (ufunc->uf_va_name != NULL ? 1 : 0); int off = STACK_FRAME_SIZE + (ufunc->uf_va_name != NULL ? 1 : 0);
@@ -8211,16 +8212,24 @@ compile_def_function(
ufunc->uf_def_arg_idx = ALLOC_CLEAR_MULT(int, count + 1); ufunc->uf_def_arg_idx = ALLOC_CLEAR_MULT(int, count + 1);
if (ufunc->uf_def_arg_idx == NULL) if (ufunc->uf_def_arg_idx == NULL)
goto erret; goto erret;
SOURCING_LNUM = 0; // line number unknown
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
garray_T *stack = &cctx.ctx_type_stack; garray_T *stack = &cctx.ctx_type_stack;
type_T *val_type; type_T *val_type;
int arg_idx = first_def_arg + i; int arg_idx = first_def_arg + i;
where_T where; where_T where;
int r;
// Make sure later arguments are not found.
ufunc->uf_args.ga_len = i;
ufunc->uf_def_arg_idx[i] = instr->ga_len; ufunc->uf_def_arg_idx[i] = instr->ga_len;
arg = ((char_u **)(ufunc->uf_def_args.ga_data))[i]; arg = ((char_u **)(ufunc->uf_def_args.ga_data))[i];
if (compile_expr0(&arg, &cctx) == FAIL) r = compile_expr0(&arg, &cctx);
ufunc->uf_args.ga_len = uf_args_len;
if (r == FAIL)
goto erret; goto erret;
// If no type specified use the type of the default value. // If no type specified use the type of the default value.