forked from aniani/vim
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.
This commit is contained in:
@@ -2541,8 +2541,10 @@ find_var_ht(char_u *name, char_u **varname)
|
|||||||
return &curtab->tp_vars->dv_hashtab;
|
return &curtab->tp_vars->dv_hashtab;
|
||||||
if (*name == 'v') // v: variable
|
if (*name == 'v') // v: variable
|
||||||
return &vimvarht;
|
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
|
if (*name == 'a') // a: function argument
|
||||||
return get_funccal_args_ht();
|
return get_funccal_args_ht();
|
||||||
if (*name == 'l') // l: local function variable
|
if (*name == 'l') // l: local function variable
|
||||||
|
@@ -178,6 +178,15 @@ func Test_call_default_args_from_func()
|
|||||||
call assert_fails('call MyDefaultArgs("one", "two")', 'E118:')
|
call assert_fails('call MyDefaultArgs("one", "two")', 'E118:')
|
||||||
endfunc
|
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
|
" Default arg and varargs
|
||||||
def MyDefVarargs(one: string, two = 'foo', ...rest: list<string>): string
|
def MyDefVarargs(one: string, two = 'foo', ...rest: list<string>): string
|
||||||
let res = one .. ',' .. two
|
let res = one .. ',' .. two
|
||||||
@@ -194,13 +203,12 @@ def Test_call_def_varargs()
|
|||||||
assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three'))
|
assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three'))
|
||||||
enddef
|
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()
|
func DefinedLater(arg)
|
||||||
" call assert_equal('one', DefineLater('one'))
|
|
||||||
" call assert_fails('call NotDefined("one")', 'E99:')
|
|
||||||
"enddef
|
|
||||||
|
|
||||||
func DefineLater(arg)
|
|
||||||
return a:arg
|
return a:arg
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
322,
|
||||||
/**/
|
/**/
|
||||||
321,
|
321,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -1545,7 +1545,8 @@ compile_load_scriptvar(
|
|||||||
cctx_T *cctx,
|
cctx_T *cctx,
|
||||||
char_u *name, // variable NUL terminated
|
char_u *name, // variable NUL terminated
|
||||||
char_u *start, // start of variable
|
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);
|
scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
|
||||||
int idx = get_script_item_idx(current_sctx.sc_sid, name, FALSE);
|
int idx = get_script_item_idx(current_sctx.sc_sid, name, FALSE);
|
||||||
@@ -1606,6 +1607,7 @@ compile_load_scriptvar(
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (error)
|
||||||
semsg(_("E1050: Item not found: %s"), name);
|
semsg(_("E1050: Item not found: %s"), name);
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
@@ -1642,7 +1644,7 @@ compile_load(char_u **arg, char_u *end_arg, cctx_T *cctx, int error)
|
|||||||
}
|
}
|
||||||
else if (**arg == 's')
|
else if (**arg == 's')
|
||||||
{
|
{
|
||||||
res = compile_load_scriptvar(cctx, name, NULL, NULL);
|
res = compile_load_scriptvar(cctx, name, NULL, NULL, error);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1698,7 +1700,7 @@ compile_load(char_u **arg, char_u *end_arg, cctx_T *cctx, int error)
|
|||||||
else if (SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
|
else if (SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
|
||||||
== SCRIPT_VERSION_VIM9)
|
== SCRIPT_VERSION_VIM9)
|
||||||
// in Vim9 script "var" can be script-local.
|
// 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)
|
if (gen_load)
|
||||||
@@ -3465,7 +3467,8 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
|
|||||||
generate_LOAD(cctx, ISN_LOADG, 0, name + 2, type);
|
generate_LOAD(cctx, ISN_LOADG, 0, name + 2, type);
|
||||||
break;
|
break;
|
||||||
case dest_script:
|
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;
|
break;
|
||||||
case dest_env:
|
case dest_env:
|
||||||
// Include $ in the name here
|
// Include $ in the name here
|
||||||
|
Reference in New Issue
Block a user