aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2396: Vim9: no white space allowed before "->"

Browse Source 
Problem:    Vim9: no white space allowed before "->".
Solution:   Allow for white space. (closes #7725)
This commit is contained in:
Bram Moolenaar 2021-01-23 14:22:16 +01:00
parent 9a562c184d
commit 7cebe8ba7d
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/eval.c
View File

@ -3671,7 +3671,7 @@ call_func_rettv(
/* /*
* Evaluate "->method()". * Evaluate "->method()".
* "*arg" points to the '-'. * "*arg" points to "method".
* Returns FAIL or OK. "*arg" is advanced to after the ')'. * Returns FAIL or OK. "*arg" is advanced to after the ')'.
*/ */
static int static int
@ -3686,8 +3686,6 @@ eval_lambda(
typval_T base = *rettv; typval_T base = *rettv;
int ret; int ret;
// Skip over the ->.
*arg += 2;
rettv->v_type = VAR_UNKNOWN; rettv->v_type = VAR_UNKNOWN;
if (**arg == '{') if (**arg == '{')
@ -3735,7 +3733,7 @@ eval_lambda(
/* /*
* Evaluate "->method()". * Evaluate "->method()".
* "*arg" points to the '-'. * "*arg" points to "method".
* Returns FAIL or OK. "*arg" is advanced to after the ')'. * Returns FAIL or OK. "*arg" is advanced to after the ')'.
*/ */
static int static int
@ -3753,8 +3751,6 @@ eval_method(
int evaluate = evalarg != NULL int evaluate = evalarg != NULL
&& (evalarg->eval_flags & EVAL_EVALUATE); && (evalarg->eval_flags & EVAL_EVALUATE);
// Skip over the ->.
*arg += 2;
rettv->v_type = VAR_UNKNOWN; rettv->v_type = VAR_UNKNOWN;
name = *arg; name = *arg;
@ -5765,10 +5761,10 @@ handle_subscript(
} }
else if (p[0] == '-' && p[1] == '>') else if (p[0] == '-' && p[1] == '>')
{ {
*arg = p; *arg = skipwhite(p + 2);
if (ret == OK) if (ret == OK)
{ {
if (((*arg)[2] == '{' && !in_vim9script()) || (*arg)[2] == '(') if ((**arg == '{' && !in_vim9script()) || **arg == '(')
// expr->{lambda}() or expr->(lambda)() // expr->{lambda}() or expr->(lambda)()
ret = eval_lambda(arg, rettv, evalarg, verbose); ret = eval_lambda(arg, rettv, evalarg, verbose);
else else

7
src/ex_docmd.c
View File

@ -3313,8 +3313,9 @@ find_ex_command(
if (vim_strchr((char_u *)"{('[\"@", *p) != NULL if (vim_strchr((char_u *)"{('[\"@", *p) != NULL
|| ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL)) || ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL))
{ {
int oplen; int oplen;
int heredoc; int heredoc;
char_u *swp = skipwhite(p);
if ( if (
// "(..." is an expression. // "(..." is an expression.
@ -3332,7 +3333,7 @@ find_ex_command(
|| eap->cmd[1] == ':' || eap->cmd[1] == ':'
) )
// "varname->func()" is an expression. // "varname->func()" is an expression.
: (*p == '-' && p[1] == '>'))) : (*swp == '-' && swp[1] == '>')))
{ {
if (*eap->cmd == '{' && ends_excmd(*skipwhite(eap->cmd + 1))) if (*eap->cmd == '{' && ends_excmd(*skipwhite(eap->cmd + 1)))
{ {

14
src/testdir/test_vim9_cmd.vim
View File

@ -319,6 +319,20 @@ def Test_method_call_linebreak()
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
enddef enddef
def Test_method_call_whitespace()
var lines =<< trim END
new
var yank = 'text'
yank->setline(1)
yank ->setline(2)
yank-> setline(3)
yank -> setline(4)
assert_equal(['text', 'text', 'text', 'text'], getline(1, 4))
bwipe!
END
CheckDefAndScriptSuccess(lines)
enddef
def Test_skipped_expr_linebreak() def Test_skipped_expr_linebreak()
if 0 if 0
var x = [] var x = []

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2396,
/**/ /**/
2395, 2395,
/**/ /**/