diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-26 13:59:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-26 13:59:29 +0200 |
| commit | 4d5dfe20839e9d13c95eaf4254467f952653b042 (patch) | |
| tree | 053722d23651ebb11c7f337b8b7051ee91232119 | |
| parent | 13e45d14ba7f590fb243c041bc45e6d4d47c8432 (diff) | |
| download | vim-git-4d5dfe20839e9d13c95eaf4254467f952653b042.tar.gz | |
patch 8.2.3054: Vim9: unpack assignment using "_" after semicolon failsv8.2.3054
Problem: Vim9: unpack assignment using "_" after semicolon fails.
Solution: Drop the expression result. (closes #8453)
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_assign.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 7 |
4 files changed, 18 insertions, 3 deletions
diff --git a/src/errors.h b/src/errors.h index b4cf8ae54..a4dcea2c7 100644 --- a/src/errors.h +++ b/src/errors.h @@ -318,7 +318,7 @@ EXTERN char e_using_bool_as_number[] EXTERN char e_missing_matching_bracket_after_dict_key[] INIT(= N_("E1139: Missing matching bracket after dict key")); EXTERN char e_for_argument_must_be_sequence_of_lists[] - INIT(= N_("E1140: For argument must be a sequence of lists")); + INIT(= N_("E1140: :for argument must be a sequence of lists")); EXTERN char e_indexable_type_required[] INIT(= N_("E1141: Indexable type required")); EXTERN char e_non_empty_string_required[] diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 55b850a4b..8541d11a3 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -289,6 +289,16 @@ def Test_assign_unpack() assert_equal(1, v1) assert_equal(2, v2) + var reslist = [] + for text in ['aaa {bbb} ccc', 'ddd {eee} fff'] + var before: string + var middle: string + var after: string + [_, before, middle, after; _] = text->matchlist('\(.\{-\}\){\(.\{-\}\)}\(.*\)') + reslist->add(before)->add(middle)->add(after) + endfor + assert_equal(['aaa ', 'bbb', ' ccc', 'ddd ', 'eee', ' fff'], reslist) + var a = 1 var b = 3 [a, b] += [2, 4] diff --git a/src/version.c b/src/version.c index 429fb69d5..2002223e7 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3054, +/**/ 3053, /**/ 3052, diff --git a/src/vim9compile.c b/src/vim9compile.c index b8a879440..46f543284 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6598,6 +6598,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx) int var_count = 0; int var_idx; int semicolon = 0; + int did_generate_slice = FALSE; garray_T *instr = &cctx->ctx_instr; garray_T *stack = &cctx->ctx_type_stack; char_u *op; @@ -6801,6 +6802,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx) else if (semicolon && var_idx == var_count - 1) { // For "[var; var] = expr" get the rest of the list + did_generate_slice = TRUE; if (generate_SLICE(cctx, var_count - 1) == FAIL) goto theend; } @@ -7010,8 +7012,9 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx) var_start = skipwhite(lhs.lhs_dest_end + 1); } - // for "[var, var] = expr" drop the "expr" value - if (var_count > 0 && !semicolon) + // For "[var, var] = expr" drop the "expr" value. + // Also for "[var, var; _] = expr". + if (var_count > 0 && (!semicolon || !did_generate_slice)) { if (generate_instr_drop(cctx, ISN_DROP, 1) == NULL) goto theend; |