aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1291: Vim9: type of varargs items is not checked

Browse Source 
Problem:    Vim9: type of varargs items is not checked.
Solution:   Check the list item types. (closes #6523)
This commit is contained in:
Bram Moolenaar 2020-07-25 16:33:02 +02:00
parent 925e9fd633
commit 24aa48b7a2
3 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/testdir/test_vim9_func.vim
View File

@ -164,7 +164,55 @@ def Test_call_def_varargs()
assert_equal('one,foo', MyDefVarargs('one'))
assert_equal('one,two', MyDefVarargs('one', 'two'))
assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three'))
call CheckDefFailure(['MyDefVarargs("one", 22)'], 'E1013: argument 2: type mismatch, expected string but got number')
CheckDefFailure(['MyDefVarargs("one", 22)'],
'E1013: argument 2: type mismatch, expected string but got number')
CheckDefFailure(['MyDefVarargs("one", "two", 123)'],
'E1013: argument 3: type mismatch, expected string but got number')
let lines =<< trim END
vim9script
def Func(...l: list<string>)
echo l
enddef
Func('a', 'b', 'c')
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
def Func(...l: list<string>)
echo l
enddef
Func()
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
def Func(...l: list<string>)
echo l
enddef
Func(1, 2, 3)
END
CheckScriptFailure(lines, 'E1013:')
lines =<< trim END
vim9script
def Func(...l: list<string>)
echo l
enddef
Func('a', 9)
END
CheckScriptFailure(lines, 'E1013:')
lines =<< trim END
vim9script
def Func(...l: list<string>)
echo l
enddef
Func(1, 'a')
END
CheckScriptFailure(lines, 'E1013:')
enddef
let s:value = ''

2
src/version.c
View File

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

20
src/vim9execute.c
View File

@ -755,9 +755,27 @@ call_def_function(
argc -= vararg_count;
if (exe_newlist(vararg_count, &ectx) == FAIL)
goto failed_early;
// Check the type of the list items.
tv = STACK_TV_BOT(-1);
if (ufunc->uf_va_type != NULL
&& ufunc->uf_va_type->tt_member != &t_any
&& tv->vval.v_list != NULL)
{
type_T *expected = ufunc->uf_va_type->tt_member;
listitem_T *li = tv->vval.v_list->lv_first;
for (idx = 0; idx < vararg_count; ++idx)
{
if (check_typval_type(expected, &li->li_tv) == FAIL)
goto failed_early;
li = li->li_next;
}
}
if (defcount > 0)
// Move varargs list to below missing default arguments.
*STACK_TV_BOT(defcount- 1) = *STACK_TV_BOT(-1);
*STACK_TV_BOT(defcount - 1) = *STACK_TV_BOT(-1);
--ectx.ec_stack.ga_len;
}