thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0477: Vim9: error messages not tested

Browse Source 
Problem:    Vim9: error messages not tested.
Solution:   Add more tests.
This commit is contained in:
Bram Moolenaar
2020-03-29 18:40:30 +02:00
parent 52ea92b19d
commit c58164c5cf
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_vim9_expr.vim
View File

@@ -728,6 +728,13 @@ def Test_expr7_dict()
let val = 1 let val = 1
assert_equal(g:dict_one, {key: val}) assert_equal(g:dict_one, {key: val})
call CheckDefFailure("let x = #{8: 8}", 'E1014:')
call CheckDefFailure("let x = #{xxx}", 'E720:')
call CheckDefFailure("let x = #{xxx: 1", 'E722:')
call CheckDefFailure("let x = #{xxx: 1,", 'E723:')
call CheckDefFailure("let x = {'a': xxx}", 'E1001:')
call CheckDefFailure("let x = {xxx: 8}", 'E1001:')
call CheckDefFailure("let x = #{a: 1, a: 2}", 'E721:')
call CheckDefExecFailure("let x = g:anint.member", 'E715:') call CheckDefExecFailure("let x = g:anint.member", 'E715:')
call CheckDefExecFailure("let x = g:dict_empty.member", 'E716:') call CheckDefExecFailure("let x = g:dict_empty.member", 'E716:')
enddef enddef
@@ -750,6 +757,8 @@ def Test_expr7_environment()
" environment variable " environment variable
assert_equal('testvar', $TESTVAR) assert_equal('testvar', $TESTVAR)
assert_equal('', $ASDF_ASD_XXX) assert_equal('', $ASDF_ASD_XXX)
call CheckDefFailure("let x = $$$", 'E1002:')
enddef enddef
def Test_expr7_register() def Test_expr7_register()
@@ -802,6 +811,9 @@ func Test_expr7_fails()
call CheckDefFailure("let x = -'xx'", "E1030:") call CheckDefFailure("let x = -'xx'", "E1030:")
call CheckDefFailure("let x = +'xx'", "E1030:") call CheckDefFailure("let x = +'xx'", "E1030:")
call CheckDefFailure("let x = -0z12", "E974:")
call CheckDefExecFailure("let x = -[8]", "E39:")
call CheckDefExecFailure("let x = -{'a': 1}", "E39:")
call CheckDefFailure("let x = @", "E1002:") call CheckDefFailure("let x = @", "E1002:")
call CheckDefFailure("let x = @<", "E354:") call CheckDefFailure("let x = @<", "E354:")

2
src/version.c
View File

@@ -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 */
/**/
477,
/**/ /**/
476, 476,
/**/ /**/

16
src/vim9execute.c
View File

@@ -1612,7 +1612,21 @@ call_def_function(
case ISN_NEGATENR: case ISN_NEGATENR:
tv = STACK_TV_BOT(-1); tv = STACK_TV_BOT(-1);
tv->vval.v_number = -tv->vval.v_number; if (tv->v_type != VAR_NUMBER
#ifdef FEAT_FLOAT
&& tv->v_type != VAR_FLOAT
#endif
)
{
emsg(_(e_number_exp));
goto failed;
}
#ifdef FEAT_FLOAT
if (tv->v_type == VAR_FLOAT)
tv->vval.v_float = -tv->vval.v_float;
else
#endif
tv->vval.v_number = -tv->vval.v_number;
break; break;
case ISN_CHECKNR: case ISN_CHECKNR: