thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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