patch 8.2.3054: Vim9: unpack assignment using "_" after semicolon fails
Problem: Vim9: unpack assignment using "_" after semicolon fails.
Solution: Drop the expression result. (closes #8453)
diff --git a/src/vim9compile.c b/src/vim9compile.c
index b8a8794..46f5432 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -6598,6 +6598,7 @@
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 @@
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 @@
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;