summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-12 18:02:06 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-12 18:02:06 +0200
commit82de464f763d6e6d89229be03ce7c6d02fd5fb59 (patch)
tree0ea484040d675f41ae99b07fdf7094ec54c50da0 /src
parentbfe13ccc58ccb96f243a58309800410db1ccb52c (diff)
patch 8.2.0558: Vim9: dict code not covered by testsv8.2.0558
Problem: Vim9: dict code not covered by tests. Solution: Remove dead code, adjust test case.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_vim9_expr.vim2
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c5
3 files changed, 3 insertions, 6 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index a965bdf39d..3e0ed4f0c9 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -767,7 +767,7 @@ def Test_expr7_dict()
call CheckDefFailure("let x = #{8: 8}", 'E1014:')
call CheckDefFailure("let x = #{xxx}", 'E720:')
- call CheckDefFailure("let x = #{xxx: 1", 'E723:')
+ call CheckDefFailureMult(["let x = #{xxx: 1", "let y = 2"], 'E722:')
call CheckDefFailure("let x = #{xxx: 1,", 'E723:')
call CheckDefFailure("let x = {'a': xxx}", 'E1001:')
call CheckDefFailure("let x = {xxx: 8}", 'E1001:')
diff --git a/src/version.c b/src/version.c
index f1e274ba19..eeec3e942b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 558,
+/**/
557,
/**/
556,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index cf91d3bb37..f2f7cc37e9 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2788,11 +2788,6 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal)
*arg = skipwhite(*arg + 1);
}
- if (**arg != '}')
- {
- semsg(_(e_missing_dict_end), *arg);
- goto failret;
- }
*arg = *arg + 1;
// Allow for following comment, after at least one space.