patch 8.2.1291: Vim9: type of varargs items is not checked
Problem: Vim9: type of varargs items is not checked.
Solution: Check the list item types. (closes #6523)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index ef98583..49be8f9 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -164,7 +164,55 @@
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 = ''
diff --git a/src/version.c b/src/version.c
index 20365a0..8934011 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1291,
+/**/
1290,
/**/
1289,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index ab8142d..e52df61 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -755,9 +755,27 @@
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;
}