Mercurial > vim
diff src/eval.c @ 21022:9d8634e91d1b v8.2.1062
patch 8.2.1062: Vim9: no line break allowed inside "cond ? val1 : val2"
Commit: https://github.com/vim/vim/commit/793648fb563359396a23740c72a6e04cb64df3a9
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jun 26 21:28:25 2020 +0200
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 26 Jun 2020 21:30:06 +0200 |
| parents | 4852db420162 |
| children | 02b03915855d |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -1892,13 +1892,17 @@ eval0( int eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) { + char_u *p; + int getnext; + /* * Get the first variable. */ if (eval2(arg, rettv, evalarg) == FAIL) return FAIL; - if ((*arg)[0] == '?') + p = eval_next_non_blank(*arg, evalarg, &getnext); + if (*p == '?') { int result; typval_T var2; @@ -1906,6 +1910,9 @@ eval1(char_u **arg, typval_T *rettv, eva int orig_flags; int evaluate; + if (getnext) + *arg = eval_next_line(evalarg); + if (evalarg == NULL) { CLEAR_FIELD(nested_evalarg); @@ -1942,13 +1949,16 @@ eval1(char_u **arg, typval_T *rettv, eva /* * Check for the ":". */ - if ((*arg)[0] != ':') + p = eval_next_non_blank(*arg, evalarg, &getnext); + if (*p != ':') { emsg(_(e_missing_colon)); if (evaluate && result) clear_tv(rettv); return FAIL; } + if (getnext) + *arg = eval_next_line(evalarg); /* * Get the third variable. Recursive!