Mercurial > vim

diff src/eval.c @ 21044:dc2ca403a217 v8.2.1073

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1073: Vim9: no line break allowed in () expression Commit: https://github.com/vim/vim/commit/7a4981b93642b5b62018cd8150b3fb0dfa2417d4 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 27 20:46:29 2020 +0200 patch 8.2.1073: Vim9: no line break allowed in () expression Problem: Vim9: no line break allowed in () expression. Solution: Skip a line break.
author Bram Moolenaar <Bram@vim.org>
date Sat, 27 Jun 2020 21:00:03 +0200
parents d9e0db9b2b99
children 0ca7e04d39e3
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -2453,6 +2453,9 @@ eval5(char_u **arg, typval_T *rettv, eva
 	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);
 	if (eval6(arg, &var2, evalarg, op == '.') == FAIL)
 	{
 	    clear_tv(rettv);
@@ -2890,8 +2893,18 @@ 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);
+
 		    ret = eval1(arg, rettv, evalarg);	// recursive!
+
+		    eval_next_non_blank(*arg, evalarg, &getnext);
+		    if (getnext)
+			*arg = eval_next_line(evalarg);
 		    if (**arg == ')')
 			++*arg;
 		    else if (ret == OK)