mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.2.1073: Vim9: no line break allowed in () expression
Problem: Vim9: no line break allowed in () expression. Solution: Skip a line break.
This commit is contained in:
13
src/eval.c
13
src/eval.c
@@ -2453,6 +2453,9 @@ 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);
|
||||
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)
|
||||
|
@@ -1137,6 +1137,19 @@ def Test_expr7_parens()
|
||||
assert_equal(true, !+-+0)
|
||||
enddef
|
||||
|
||||
def Test_expr7_parens_vim9script()
|
||||
let lines =<< trim END
|
||||
vim9script
|
||||
let s = (
|
||||
'one'
|
||||
..
|
||||
'two'
|
||||
)
|
||||
assert_equal('onetwo', s)
|
||||
END
|
||||
CheckScriptSuccess(lines)
|
||||
enddef
|
||||
|
||||
def Test_expr7_negate()
|
||||
assert_equal(-99, -99)
|
||||
assert_equal(99, --99)
|
||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1073,
|
||||
/**/
|
||||
1072,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user