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

patch 8.2.0529: Vim9: function argument with default not checked

Browse Source 
Problem:    Vim9: function argument with default not checked.
Solution:   Check type of argument with default value.
This commit is contained in:
Bram Moolenaar
2020-04-07 22:45:00 +02:00
parent 0b76b42d0a
commit 49cf7cc8d2
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/testdir/test_vim9_func.vim
View File

@@ -128,6 +128,7 @@ def Test_call_def_varargs()
assert_equal('one,foo', MyDefVarargs('one')) assert_equal('one,foo', MyDefVarargs('one'))
assert_equal('one,two', MyDefVarargs('one', 'two')) assert_equal('one,two', MyDefVarargs('one', 'two'))
assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three')) assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three'))
call CheckDefFailure(['MyDefVarargs("one", 22)'], 'E1013: argument 2: type mismatch, expected string but got number')
enddef enddef
" Only varargs " Only varargs

4
src/userfunc.c
View File

@@ -3045,8 +3045,8 @@ ex_function(exarg_T *eap)
{ {
p = ((char_u **)argtypes.ga_data)[i]; p = ((char_u **)argtypes.ga_data)[i];
if (p == NULL) if (p == NULL)
// todo: get type from default value // will get the type from the default value
type = &t_any; type = &t_unknown;
else else
type = parse_type(&p, &fp->uf_type_list); type = parse_type(&p, &fp->uf_type_list);
if (type == NULL) if (type == NULL)

2
src/version.c
View File

@@ -738,6 +738,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 */
/**/
529,
/**/ /**/
528, 528,
/**/ /**/

26
src/vim9compile.c
View File

@@ -5548,6 +5548,7 @@ compile_def_function(ufunc_T *ufunc, int set_return_type)
if (ufunc->uf_def_args.ga_len > 0) if (ufunc->uf_def_args.ga_len > 0)
{ {
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 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);
@@ -5561,11 +5562,30 @@ compile_def_function(ufunc_T *ufunc, int set_return_type)
goto erret; goto erret;
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
garray_T *stack = &cctx.ctx_type_stack;
type_T *val_type;
int arg_idx = first_def_arg + 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_expr1(&arg, &cctx) == FAIL if (compile_expr1(&arg, &cctx) == FAIL)
|| generate_STORE(&cctx, ISN_STORE, goto erret;
i - count - off, NULL) == FAIL)
// If no type specified use the type of the default value.
// Otherwise check that the default value type matches the
// specified type.
val_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
if (ufunc->uf_arg_types[arg_idx] == &t_unknown)
ufunc->uf_arg_types[arg_idx] = val_type;
else if (check_type(ufunc->uf_arg_types[i], val_type, FALSE)
== FAIL)
{
arg_type_mismatch(ufunc->uf_arg_types[arg_idx], val_type,
arg_idx + 1);
goto erret;
}
if (generate_STORE(&cctx, ISN_STORE, i - count - off, NULL) == FAIL)
goto erret; goto erret;
} }