patch 8.2.0322: Vim9: error checks not tested
Problem: Vim9: error checks not tested.
Solution: Add more test cases. Avoid error for function loaded later.
diff --git a/src/evalvars.c b/src/evalvars.c
index 894ee28..227253e 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2541,8 +2541,10 @@
return &curtab->tp_vars->dv_hashtab;
if (*name == 'v') // v: variable
return &vimvarht;
- if (current_sctx.sc_version != SCRIPT_VERSION_VIM9)
+ if (get_current_funccal() != NULL
+ && get_current_funccal()->func->uf_dfunc_idx < 0)
{
+ // a: and l: are only used in functions defined with ":function"
if (*name == 'a') // a: function argument
return get_funccal_args_ht();
if (*name == 'l') // l: local function variable
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 3f0773b..53ee511 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -178,6 +178,15 @@
call assert_fails('call MyDefaultArgs("one", "two")', 'E118:')
endfunc
+func TakesOneArg(arg)
+ echo a:arg
+endfunc
+
+def Test_call_wrong_arg_count()
+ call CheckDefFailure(['TakesOneArg()'], 'E119:')
+ call CheckDefFailure(['TakesOneArg(11, 22)'], 'E118:')
+enddef
+
" Default arg and varargs
def MyDefVarargs(one: string, two = 'foo', ...rest: list<string>): string
let res = one .. ',' .. two
@@ -194,13 +203,12 @@
assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three'))
enddef
+def Test_call_func_defined_later()
+ call assert_equal('one', DefinedLater('one'))
+ call assert_fails('call NotDefined("one")', 'E117:')
+enddef
-"def Test_call_func_defined_later()
-" call assert_equal('one', DefineLater('one'))
-" call assert_fails('call NotDefined("one")', 'E99:')
-"enddef
-
-func DefineLater(arg)
+func DefinedLater(arg)
return a:arg
endfunc
diff --git a/src/version.c b/src/version.c
index beceb6d..258cab2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 322,
+/**/
321,
/**/
320,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 32d6349..35f20c4 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1545,7 +1545,8 @@
cctx_T *cctx,
char_u *name, // variable NUL terminated
char_u *start, // start of variable
- char_u **end) // end of variable
+ char_u **end, // end of variable
+ int error) // when TRUE may give error
{
scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
int idx = get_script_item_idx(current_sctx.sc_sid, name, FALSE);
@@ -1606,7 +1607,8 @@
return OK;
}
- semsg(_("E1050: Item not found: %s"), name);
+ if (error)
+ semsg(_("E1050: Item not found: %s"), name);
return FAIL;
}
@@ -1642,7 +1644,7 @@
}
else if (**arg == 's')
{
- res = compile_load_scriptvar(cctx, name, NULL, NULL);
+ res = compile_load_scriptvar(cctx, name, NULL, NULL, error);
}
else
{
@@ -1698,7 +1700,7 @@
else if (SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
== SCRIPT_VERSION_VIM9)
// in Vim9 script "var" can be script-local.
- res = compile_load_scriptvar(cctx, name, *arg, &end);
+ res = compile_load_scriptvar(cctx, name, *arg, &end, error);
}
}
if (gen_load)
@@ -3465,7 +3467,8 @@
generate_LOAD(cctx, ISN_LOADG, 0, name + 2, type);
break;
case dest_script:
- compile_load_scriptvar(cctx, name + (name[1] == ':' ? 2 : 0), NULL, NULL);
+ compile_load_scriptvar(cctx,
+ name + (name[1] == ':' ? 2 : 0), NULL, NULL, TRUE);
break;
case dest_env:
// Include $ in the name here