From 9ecfb42ec0b8959c291c5c1d28710fe12d3d070f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 14 Apr 2023 12:48:08 +0800 Subject: vim-patch:8.2.1062: Vim9: no line break allowed inside "cond ? val1 : val2" Problem: Vim9: no line break allowed inside "cond ? val1 : val2". Solution: Check for operator after line break. https://github.com/vim/vim/commit/793648fb563359396a23740c72a6e04cb64df3a9 Co-authored-by: Bram Moolenaar --- src/nvim/eval.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a9c5ca46f3..29c294c754 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2303,7 +2303,8 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg) return FAIL; } - if ((*arg)[0] == '?') { + char *p = *arg; + if (*p == '?') { evalarg_T nested_evalarg = evalarg == NULL ? (evalarg_T){ 0 } : *evalarg; const int orig_flags = evalarg == NULL ? 0 : evalarg->eval_flags; const bool evaluate = nested_evalarg.eval_flags & EVAL_EVALUATE; @@ -2329,7 +2330,8 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg) } // Check for the ":". - if ((*arg)[0] != ':') { + p = *arg; + if (*p != ':') { emsg(_("E109: Missing ':' after '?'")); if (evaluate && result) { tv_clear(rettv); -- cgit