patch 8.2.1063: Vim9: no line break allowed before || or &&
Problem: Vim9: no line break allowed before || or &&.
Solution: Check for operator after line break.
diff --git a/src/eval.c b/src/eval.c
index fe53632..9f06fd8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1991,6 +1991,8 @@
static int
eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
{
+ char_u *p;
+ int getnext;
typval_T var2;
long result;
int first;
@@ -2007,12 +2009,16 @@
*/
first = TRUE;
result = FALSE;
- while ((*arg)[0] == '|' && (*arg)[1] == '|')
+ p = eval_next_non_blank(*arg, evalarg, &getnext);
+ while (p[0] == '|' && p[1] == '|')
{
evalarg_T nested_evalarg;
int evaluate;
int orig_flags;
+ if (getnext)
+ *arg = eval_next_line(evalarg);
+
if (evalarg == NULL)
{
CLEAR_FIELD(nested_evalarg);
@@ -2061,6 +2067,8 @@
rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = result;
}
+
+ p = eval_next_non_blank(*arg, evalarg, &getnext);
}
return OK;
@@ -2078,6 +2086,8 @@
static int
eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
{
+ char_u *p;
+ int getnext;
typval_T var2;
long result;
int first;
@@ -2094,12 +2104,16 @@
*/
first = TRUE;
result = TRUE;
- while ((*arg)[0] == '&' && (*arg)[1] == '&')
+ p = eval_next_non_blank(*arg, evalarg, &getnext);
+ while (p[0] == '&' && p[1] == '&')
{
evalarg_T nested_evalarg;
int orig_flags;
int evaluate;
+ if (getnext)
+ *arg = eval_next_line(evalarg);
+
if (evalarg == NULL)
{
CLEAR_FIELD(nested_evalarg);
@@ -2147,6 +2161,8 @@
rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = result;
}
+
+ p = eval_next_non_blank(*arg, evalarg, &getnext);
}
return OK;