diff options
Diffstat (limited to 'src/vim9compile.c')
| -rw-r--r-- | src/vim9compile.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/vim9compile.c b/src/vim9compile.c index cafbd6b2f..9a534f46c 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6536,19 +6536,25 @@ compile_load_lhs( { size_t varlen = lhs->lhs_varlen; int c = var_start[varlen]; + int lines_len = cctx->ctx_ufunc->uf_lines.ga_len; char_u *p = var_start; garray_T *stack = &cctx->ctx_type_stack; + int res; - // Evaluate "ll[expr]" of "ll[expr][idx]" + // Evaluate "ll[expr]" of "ll[expr][idx]". End the line with a NUL and + // limit the lines array length to avoid skipping to a following line. var_start[varlen] = NUL; - if (compile_expr0(&p, cctx) == OK && p != var_start + varlen) + cctx->ctx_ufunc->uf_lines.ga_len = cctx->ctx_lnum + 1; + res = compile_expr0(&p, cctx); + var_start[varlen] = c; + cctx->ctx_ufunc->uf_lines.ga_len = lines_len; + if (res == FAIL || p != var_start + varlen) { // this should not happen - emsg(_(e_missbrac)); - var_start[varlen] = c; + if (res != FAIL) + emsg(_(e_missbrac)); return FAIL; } - var_start[varlen] = c; lhs->lhs_type = stack->ga_len == 0 ? &t_void : ((type_T **)stack->ga_data)[stack->ga_len - 1]; |