aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1062: Vim9: no line break allowed inside "cond ? val1 : val2"

Browse Source 
Problem:    Vim9: no line break allowed inside "cond ? val1 : val2".
Solution:   Check for operator after line break.
This commit is contained in:
Bram Moolenaar
2020-06-26 21:28:25 +02:00
parent 5d3c9f8c2a
commit 793648fb56
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/eval.c
View File

@@ -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, evalarg_T *evalarg)
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, evalarg_T *evalarg)
/*
* 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!