diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-18 18:03:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-18 18:03:17 +0200 |
| commit | a2c026d0fd470d68d679616fddfc285cb4834412 (patch) | |
| tree | d27998d17bcf402ed722648db7ced31fa76f5f0a /src | |
| parent | 335e67132265b068f39f3671e5dff2aecd1bf403 (diff) | |
patch 8.2.1861: Vim9: no specific error when parsing lambda failsv8.2.1861
Problem: Vim9: no specific error when parsing lambda fails.
Solution: Also give syntax errors when not evaluating. (closes #7154)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dict.c | 28 | ||||
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 20 insertions, 19 deletions
diff --git a/src/dict.c b/src/dict.c index 5725140df3..503f5a5223 100644 --- a/src/dict.c +++ b/src/dict.c @@ -860,13 +860,10 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) *arg = skipwhite(*arg); if (**arg != ':') { - if (evaluate) - { - if (*skipwhite(*arg) == ':') - semsg(_(e_no_white_space_allowed_before_str), ":"); - else - semsg(_(e_missing_dict_colon), *arg); - } + if (*skipwhite(*arg) == ':') + semsg(_(e_no_white_space_allowed_before_str), ":"); + else + semsg(_(e_missing_dict_colon), *arg); clear_tv(&tvkey); goto failret; } @@ -899,8 +896,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) item = dict_find(d, key, -1); if (item != NULL) { - if (evaluate) - semsg(_(e_duplicate_key), key); + semsg(_(e_duplicate_key), key); clear_tv(&tvkey); clear_tv(&tv); goto failret; @@ -937,21 +933,17 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) break; if (!had_comma) { - if (evaluate) - { - if (**arg == ',') - semsg(_(e_no_white_space_allowed_before_str), ","); - else - semsg(_(e_missing_dict_comma), *arg); - } + if (**arg == ',') + semsg(_(e_no_white_space_allowed_before_str), ","); + else + semsg(_(e_missing_dict_comma), *arg); goto failret; } } if (**arg != '}') { - if (evaluate) - semsg(_(e_missing_dict_end), *arg); + semsg(_(e_missing_dict_end), *arg); failret: if (d != NULL) dict_free(d); diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 950c38ceb0..a4e7c510e5 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1805,6 +1805,13 @@ def Test_expr7_lambda() CheckDefExecFailure(["var s = 'asdf'->{a -> a}('x', 'y')"], 'E1106: 2 arguments too many') CheckDefFailure(["echo 'asdf'->{a -> a}(x)"], 'E1001:', 1) + + CheckDefSuccess(['var Fx = {a -> #{k1: 0,', ' k2: 1}}']) + CheckDefFailure(['var Fx = {a -> #{k1: 0', ' k2: 1}}'], 'E722:', 2) + CheckDefFailure(['var Fx = {a -> #{k1: 0,', ' k2 1}}'], 'E720:', 2) + + CheckDefSuccess(['var Fx = {a -> [0,', ' 1]}']) + CheckDefFailure(['var Fx = {a -> [0', ' 1]}'], 'E696:', 2) enddef def Test_expr7_lambda_vim9script() @@ -2371,7 +2378,7 @@ func Test_expr7_fails() call CheckDefFailure(["'yes'->", "Echo()"], 'E488: Trailing characters: ->', 1) call CheckDefExecFailure(["[1, 2->len()"], 'E697:', 2) - call CheckDefExecFailure(["#{a: 1->len()"], 'E488:', 1) + call CheckDefExecFailure(["#{a: 1->len()"], 'E722:', 1) call CheckDefExecFailure(["{'a': 1->len()"], 'E723:', 2) endfunc diff --git a/src/version.c b/src/version.c index 7720998fc1..5a5344315b 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1861, +/**/ 1860, /**/ 1859, |