aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0469: Vim9: no error for missing ] after list

Browse Source 
Problem:    Vim9: no error for missing ] after list.
Solution:   Add error message. Add more tests.
This commit is contained in:
Bram Moolenaar 2020-03-28 21:38:06 +01:00
parent 7c003aa314
commit ee619e5bc0
6 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.h
View File

@ -1644,6 +1644,7 @@ EXTERN char e_func_deleted[] INIT(= N_("E933: Function was deleted: %s"));
EXTERN char e_dictkey[] INIT(= N_("E716: Key not present in Dictionary: %s"));
EXTERN char e_listreq[] INIT(= N_("E714: List required"));
EXTERN char e_listblobreq[] INIT(= N_("E897: List or Blob required"));
EXTERN char e_list_end[] INIT(= N_("E697: Missing end of List ']': %s"));
EXTERN char e_listdictarg[] INIT(= N_("E712: Argument of %s must be a List or Dictionary"));
EXTERN char e_listdictblobarg[] INIT(= N_("E896: Argument of %s must be a List, Dictionary or Blob"));
EXTERN char e_modulus[] INIT(= N_("E804: Cannot use '%' with Float"));

2
src/list.c
View File

@ -1083,7 +1083,7 @@ get_list_tv(char_u **arg, typval_T *rettv, int evaluate, int do_error)
if (**arg != ']')
{
if (do_error)
semsg(_("E697: Missing end of List ']': %s"), *arg);
semsg(_(e_list_end), *arg);
failret:
if (evaluate)
list_free(l);

2
src/testdir/test_lambda.vim
View File

@ -62,7 +62,7 @@ endfunc
function Test_lambda_fails()
call assert_equal(3, {a, b -> a + b}(1, 2))
call assert_fails('echo {a, a -> a + a}(1, 2)', 'E853:')
call assert_fails('echo {a, b -> a + b)}(1, 2)', 'E15:')
call assert_fails('echo {a, b -> a + b)}(1, 2)', 'E451:')
echo assert_fails('echo 10->{a -> a + 2}', 'E107:')
endfunc

7
src/testdir/test_vim9_expr.vim
View File

@ -806,6 +806,12 @@ func Test_expr7_fails()
call CheckDefFailure("let x = @", "E1002:")
call CheckDefFailure("let x = @<", "E354:")
call CheckDefFailure("let x = [1, 2", "E697:")
call CheckDefFailure("let x = [notfound]", "E1001:")
call CheckDefFailure("let x = { -> 123) }", "E451:")
call CheckDefFailure("let x = 123->{x -> x + 5) }", "E451:")
call CheckDefFailure("let x = &notexist", 'E113:')
call CheckDefExecFailure("&grepprg = [343]", 'E1051:')
@ -878,6 +884,7 @@ enddef
func Test_expr7_trailing_fails()
call CheckDefFailureList(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
call CheckDefFailureList(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
endfunc
func Test_expr_fails()

3
src/userfunc.c
View File

@ -350,7 +350,10 @@ get_lambda_tv(char_u **arg, typval_T *rettv, int evaluate)
e = *arg;
*arg = skipwhite(*arg);
if (**arg != '}')
{
semsg(_("E451: Expected }: %s"), *arg);
goto errret;
}
++*arg;
if (evaluate)

2
src/version.c
View File

@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
469,
/**/
468,
/**/