diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-04-14 13:03:04 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-04-14 16:10:09 +0800 |
| commit | d927128fccad1c234e4b87321ff0d6392b9d69d5 (patch) | |
| tree | 33897346aedc6aec1d2212f8ed6ea51a85224838 /src/nvim/eval/vars.c | |
| parent | 89ff05b258f9d5663b4659e9023ff83004021ce6 (diff) | |
| download | rneovim-d927128fccad1c234e4b87321ff0d6392b9d69d5.tar.gz rneovim-d927128fccad1c234e4b87321ff0d6392b9d69d5.tar.bz2 rneovim-d927128fccad1c234e4b87321ff0d6392b9d69d5.zip | |
vim-patch:8.2.1071: Vim9: no line break allowed inside a lambda
Problem: Vim9: no line break allowed inside a lambda.
Solution: Handle line break inside a lambda in Vim9 script.
https://github.com/vim/vim/commit/e40fbc2ca9fda07332a4da5af1fcaba91bed865b
Omit skip_expr_concatenate(). Apply the change to skip_expr() instead.
Omit eval_ga: Vim9 script only.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/eval/vars.c')
| -rw-r--r-- | src/nvim/eval/vars.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 79414acac9..c566129202 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -267,6 +267,7 @@ void ex_let(exarg_T *eap) if (eap->skip) { emsg_skip--; } + xfree(evalarg.eval_tofree); if (!eap->skip && eval_res != FAIL) { (void)ex_let_vars(eap->arg, &rettv, false, semicolon, var_count, is_const, op); @@ -510,7 +511,7 @@ static const char *list_arg_vars(exarg_T *eap, const char *arg, int *first) } else { // handle d.key, l[idx], f(expr) const char *const arg_subsc = arg; - if (handle_subscript(&arg, &tv, EVAL_EVALUATE, true) == FAIL) { + if (handle_subscript(&arg, &tv, &EVALARG_EVALUATE, true) == FAIL) { error = true; } else { if (arg == arg_subsc && len == 2 && name[1] == ':') { @@ -1717,7 +1718,7 @@ bool var_exists(const char *var) n = get_var_tv(name, len, &tv, NULL, false, true) == OK; if (n) { // Handle d.key, l[idx], f(expr). - n = handle_subscript(&var, &tv, EVAL_EVALUATE, false) == OK; + n = handle_subscript(&var, &tv, &EVALARG_EVALUATE, false) == OK; if (n) { tv_clear(&tv); } |