patch 8.2.1074: Vim9: no line break allowed after some operators

Problem:    Vim9: no line break allowed after some operators.
Solution:   Skip a line break after the operator.  Add
            eval_may_get_next_line() to simplify checking for a line break.

diff --git a/src/dict.c b/src/dict.c
index be3282d37ddce32c11a9f0f2f8e5d27d9cf53064..079eb3e11e4ef79cd28c925acc111015a8491e12 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -805,7 +805,6 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
     char_u     buf[NUMBUFLEN];
     int                vim9script = current_sctx.sc_version == SCRIPT_VERSION_VIM9;
     int                had_comma;
-    int                getnext;
 
     /*
      * First check if it's not a curly-braces thing: {expr}.
@@ -831,10 +830,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
     tvkey.v_type = VAR_UNKNOWN;
     tv.v_type = VAR_UNKNOWN;
 
-    *arg = skipwhite(*arg + 1);
-    eval_next_non_blank(*arg, evalarg, &getnext);
-    if (getnext)
-       *arg = eval_next_line(evalarg);
+    *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
     while (**arg != '}' && **arg != NUL)
     {
        if ((literal
@@ -866,10 +862,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
            goto failret;
        }
 
-       *arg = skipwhite(*arg + 1);
-       eval_next_non_blank(*arg, evalarg, &getnext);
-       if (getnext)
-           *arg = eval_next_line(evalarg);
+       *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
        if (eval1(arg, &tv, evalarg) == FAIL)   // recursive!
        {
            if (evaluate)
@@ -911,9 +904,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
        }
 
        // the "}" can be on the next line
-       eval_next_non_blank(*arg, evalarg, &getnext);
-       if (getnext)
-           *arg = eval_next_line(evalarg);
+       *arg = skipwhite_and_linebreak(*arg, evalarg);
        if (**arg == '}')
            break;
        if (!had_comma)

diff --git a/src/eval.c b/src/eval.c
index 86d81fa09e44e382f19d15ae895c918bdc9d77d2..ca98d2eb0213d0fb60f760b782efb4edb7939758 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1871,6 +1871,18 @@ eval_next_line(evalarg_T *evalarg)
     return skipwhite(line);
 }
 
+    char_u *
+skipwhite_and_linebreak(char_u *arg, evalarg_T *evalarg)
+{
+    int            getnext;
+    char_u  *p = skipwhite(arg);
+
+    eval_next_non_blank(p, evalarg, &getnext);
+    if (getnext)
+       return eval_next_line(evalarg);
+    return p;
+}
+
 /*
  * The "evaluate" argument: When FALSE, the argument is only parsed but not
  * executed.  The function may return OK, but the rettv will be of type
@@ -1998,7 +2010,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
        /*
         * Get the second variable.  Recursive!
         */
-       *arg = skipwhite(*arg + 1);
+       *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
        nested_evalarg.eval_flags = result ? orig_flags
                                                 : orig_flags & ~EVAL_EVALUATE;
        if (eval1(arg, rettv, &nested_evalarg) == FAIL)
@@ -2021,7 +2033,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
        /*
         * Get the third variable.  Recursive!
         */
-       *arg = skipwhite(*arg + 1);
+       *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
        nested_evalarg.eval_flags = !result ? orig_flags
                                                 : orig_flags & ~EVAL_EVALUATE;
        if (eval1(arg, &var2, &nested_evalarg) == FAIL)
@@ -2103,7 +2115,7 @@ eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
        /*
         * Get the second variable.
         */
-       *arg = skipwhite(*arg + 2);
+       *arg = skipwhite_and_linebreak(*arg + 2, evalarg);
        nested_evalarg.eval_flags = !result ? orig_flags
                                                 : orig_flags & ~EVAL_EVALUATE;
        if (eval3(arg, &var2, &nested_evalarg) == FAIL)
@@ -2197,7 +2209,7 @@ eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
        /*
         * Get the second variable.
         */
-       *arg = skipwhite(*arg + 2);
+       *arg = skipwhite_and_linebreak(*arg + 2, evalarg);
        nested_evalarg.eval_flags = result ? orig_flags
                                                 : orig_flags & ~EVAL_EVALUATE;
        if (eval4(arg, &var2, &nested_evalarg) == FAIL)
@@ -2328,7 +2340,7 @@ eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
        /*
         * Get the second variable.
         */
-       *arg = skipwhite(p + len);
+       *arg = skipwhite_and_linebreak(p + len, evalarg);
        if (eval5(arg, &var2, evalarg) == FAIL)
        {
            clear_tv(rettv);
@@ -2452,10 +2464,7 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
         */
        if (op == '.' && *(*arg + 1) == '.')  // .. string concatenation
            ++*arg;
-       *arg = skipwhite(*arg + 1);
-       eval_next_non_blank(*arg, evalarg, &getnext);
-       if (getnext)
-           *arg = eval_next_line(evalarg);
+       *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
        if (eval6(arg, &var2, evalarg, op == '.') == FAIL)
        {
            clear_tv(rettv);
@@ -2893,18 +2902,10 @@ eval7(
      * nested expression: (expression).
      */
     case '(':  {
-                   int getnext;
-
-                   *arg = skipwhite(*arg + 1);
-                   eval_next_non_blank(*arg, evalarg, &getnext);
-                   if (getnext)
-                       *arg = eval_next_line(evalarg);
-
+                   *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
                    ret = eval1(arg, rettv, evalarg);   // recursive!
 
-                   eval_next_non_blank(*arg, evalarg, &getnext);
-                   if (getnext)
-                       *arg = eval_next_line(evalarg);
+                   *arg = skipwhite_and_linebreak(*arg, evalarg);
                    if (**arg == ')')
                        ++*arg;
                    else if (ret == OK)

diff --git a/src/list.c b/src/list.c
index c2c485652f1d979e46c6fc509c2d1e71ec2dff70..56ed5fcdb69a9f61976955d18b909ba9cce30a64 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -1164,7 +1164,6 @@ get_list_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
 {
     int                evaluate = evalarg == NULL ? FALSE
                                         : evalarg->eval_flags & EVAL_EVALUATE;
-    int                getnext;
     list_T     *l = NULL;
     typval_T   tv;
     listitem_T *item;
@@ -1178,10 +1177,7 @@ get_list_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
            return FAIL;
     }
 
-    *arg = skipwhite(*arg + 1);
-    eval_next_non_blank(*arg, evalarg, &getnext);
-    if (getnext)
-       *arg = eval_next_line(evalarg);
+    *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
     while (**arg != ']' && **arg != NUL)
     {
        if (eval1(arg, &tv, evalarg) == FAIL)   // recursive!
@@ -1212,9 +1208,7 @@ get_list_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
        }
 
        // the "]" can be on the next line
-       eval_next_non_blank(*arg, evalarg, &getnext);
-       if (getnext)
-           *arg = eval_next_line(evalarg);
+       *arg = skipwhite_and_linebreak(*arg, evalarg);
        if (**arg == ']')
            break;
 

diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index c66e331ce2dd58018e81717a8ca23fcf0add2374..9170385918213f8a75e6551969efdb47416be2aa 100644 (file)
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -29,6 +29,7 @@ void set_context_for_expression(expand_T *xp, char_u *arg, cmdidx_T cmdidx);
 int pattern_match(char_u *pat, char_u *text, int ic);
 char_u *eval_next_non_blank(char_u *arg, evalarg_T *evalarg, int *getnext);
 char_u *eval_next_line(evalarg_T *evalarg);
+char_u *skipwhite_and_linebreak(char_u *arg, evalarg_T *evalarg);
 int eval0(char_u *arg, typval_T *rettv, exarg_T *eap, evalarg_T *evalarg);
 int eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
 void eval_addblob(typval_T *tv1, typval_T *tv2);

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 0d2a2b0bfbb0ba76680d41527558b97e3ed3e81b..bf4f7d2eafe12e171f07dd8e70e6bc5ce82ce212 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -64,6 +64,15 @@ def Test_expr1_vimscript()
       assert_equal('no', var)
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      let var = v:false ?
+               'yes' :
+               'no'
+      assert_equal('no', var)
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 func Test_expr1_fails()
@@ -135,6 +144,15 @@ def Test_expr2_vimscript()
       assert_equal(1, var)
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      let var = v:false ||
+               v:true ||
+               v:false
+      assert_equal(1, var)
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 func Test_expr2_fails()
@@ -198,6 +216,15 @@ def Test_expr3_vimscript()
       assert_equal(1, var)
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      let var = v:true &&
+               v:true &&
+               v:true
+      assert_equal(1, var)
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 func Test_expr3_fails()
@@ -547,6 +574,14 @@ def Test_expr4_vimscript()
   END
   CheckScriptSuccess(lines)
 
+  lines =<< trim END
+      vim9script
+      let var = 123 ==
+                       123
+      assert_equal(1, var)
+  END
+  CheckScriptSuccess(lines)
+
   lines =<< trim END
       vim9script
       let list = [1, 2, 3]

diff --git a/src/userfunc.c b/src/userfunc.c
index b358ecb381a24f060ed8c792c1d3656fd4b4e18a..51c437f208132b69810d582e2d4e906d1c5f6869 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -402,17 +402,17 @@ get_lambda_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
     partial_T   *pt = NULL;
     int                varargs;
     int                ret;
-    char_u     *start = skipwhite(*arg + 1);
+    char_u     *start;
     char_u     *s, *e;
     int                *old_eval_lavars = eval_lavars_used;
     int                eval_lavars = FALSE;
-    int                getnext;
     char_u     *tofree = NULL;
 
     ga_init(&newargs);
     ga_init(&newlines);
 
     // First, check if this is a lambda expression. "->" must exist.
+    start = skipwhite(*arg + 1);
     ret = get_function_args(&start, '-', NULL, NULL, NULL, NULL, TRUE,
                                                                   NULL, NULL);
     if (ret == FAIL || *start != '>')
@@ -435,10 +435,7 @@ get_lambda_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
        eval_lavars_used = &eval_lavars;
 
     // Get the start and the end of the expression.
-    *arg = skipwhite(*arg + 1);
-    eval_next_non_blank(*arg, evalarg, &getnext);
-    if (getnext)
-       *arg = eval_next_line(evalarg);
+    *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
     s = *arg;
     ret = skip_expr_concatenate(&s, arg, evalarg);
     if (ret == FAIL)
@@ -451,10 +448,7 @@ get_lambda_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
     }
 
     e = *arg;
-    *arg = skipwhite(*arg);
-    eval_next_non_blank(*arg, evalarg, &getnext);
-    if (getnext)
-       *arg = eval_next_line(evalarg);
+    *arg = skipwhite_and_linebreak(*arg, evalarg);
     if (**arg != '}')
     {
        semsg(_("E451: Expected }: %s"), *arg);

diff --git a/src/version.c b/src/version.c
index 4184a69f3537ff3c0fd1b1c112673b9df7350b5c..dc05521890303200ab5d0953b0257853a13b4af2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1074,
 /**/
     1073,
 /**/