patch 8.2.3206: Vim9: argument types are not checked at compile time
Problem: Vim9: argument types are not checked at compile time.
Solution: Add several more type checks. (Yegappan Lakshmanan, closes #8611)
diff --git a/src/list.c b/src/list.c
index c59197b..7f607be 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1540,12 +1540,6 @@
int error = FALSE;
long idx;
- if (in_vim9script()
- && (check_for_list_arg(argvars, 0) == FAIL
- || check_for_number_arg(argvars, 1) == FAIL
- || check_for_opt_number_arg(argvars, 2) == FAIL))
- return;
-
if ((l = argvars[0].vval.v_list) == NULL
|| value_check_lock(l->lv_lock, arg_errmsg, TRUE))
return;
@@ -1806,6 +1800,12 @@
long len;
long i;
+ if (in_vim9script()
+ && (check_for_list_arg(argvars, 0) == FAIL
+ || (argvars[1].v_type != VAR_UNKNOWN
+ && check_for_opt_dict_arg(argvars, 2) == FAIL)))
+ return;
+
// Pointer to current info struct used in compare function. Save and
// restore the current one for nested calls.
old_sortinfo = sortinfo;
@@ -2103,6 +2103,11 @@
// map() and filter() return the first argument, also on failure.
if (filtermap != FILTERMAP_MAPNEW)
copy_tv(&argvars[0], rettv);
+
+ if (in_vim9script()
+ && (check_for_list_or_dict_or_blob_arg(argvars, 0) == FAIL))
+ return;
+
if (filtermap == FILTERMAP_MAP && in_vim9script())
{
// Check that map() does not change the type of the dict.
@@ -2463,6 +2468,13 @@
f_add(typval_T *argvars, typval_T *rettv)
{
rettv->vval.v_number = 1; // Default: Failed
+
+ if (in_vim9script()
+ && (check_for_list_or_blob_arg(argvars, 0) == FAIL
+ || (argvars[0].v_type == VAR_BLOB
+ && check_for_number_arg(argvars, 1) == FAIL)))
+ return;
+
if (argvars[0].v_type == VAR_LIST)
{
list_T *l = argvars[0].vval.v_list;
@@ -2799,6 +2811,13 @@
listitem_T *item;
int error = FALSE;
+ if (in_vim9script()
+ && (check_for_list_or_blob_arg(argvars, 0) == FAIL
+ || (argvars[0].v_type == VAR_BLOB
+ && check_for_number_arg(argvars, 1) == FAIL)
+ || check_for_opt_number_arg(argvars, 2) == FAIL))
+ return;
+
if (argvars[0].v_type == VAR_BLOB)
{
int val, len;
@@ -2888,6 +2907,16 @@
{
char_u *arg_errmsg = (char_u *)N_("remove() argument");
+ if (in_vim9script()
+ && (check_for_list_or_dict_or_blob_arg(argvars, 0) == FAIL
+ || ((argvars[0].v_type == VAR_LIST
+ || argvars[0].v_type == VAR_BLOB)
+ && (check_for_number_arg(argvars, 1) == FAIL
+ || check_for_opt_number_arg(argvars, 2) == FAIL))
+ || (argvars[0].v_type == VAR_DICT
+ && check_for_string_or_number_arg(argvars, 1) == FAIL)))
+ return;
+
if (argvars[0].v_type == VAR_DICT)
dict_remove(argvars, rettv, arg_errmsg);
else if (argvars[0].v_type == VAR_BLOB)
@@ -2907,6 +2936,9 @@
list_T *l;
listitem_T *li, *ni;
+ if (in_vim9script() && check_for_list_or_blob_arg(argvars, 0) == FAIL)
+ return;
+
if (argvars[0].v_type == VAR_BLOB)
{
blob_T *b = argvars[0].vval.v_blob;