forked from aniani/vim
patch 8.2.4116: Vim9: cannot use a method with a complex expression in :def
Problem: Vim9: cannot use a method with a complex expression in a :def function. Solution: Implement compiling the expression.
This commit is contained in:
@@ -3140,7 +3140,6 @@ def Test_expr7_method_call()
|
|||||||
CheckDefAndScriptSuccess(lines)
|
CheckDefAndScriptSuccess(lines)
|
||||||
|
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
vim9script
|
|
||||||
def SetNumber(n: number)
|
def SetNumber(n: number)
|
||||||
g:number = n
|
g:number = n
|
||||||
enddef
|
enddef
|
||||||
@@ -3166,7 +3165,7 @@ def Test_expr7_method_call()
|
|||||||
|
|
||||||
unlet g:number
|
unlet g:number
|
||||||
END
|
END
|
||||||
CheckScriptSuccess(lines) # TODO: CheckDefAndScriptSuccess()
|
CheckDefAndScriptSuccess(lines)
|
||||||
|
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
def RetVoid()
|
def RetVoid()
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
4116,
|
||||||
/**/
|
/**/
|
||||||
4115,
|
4115,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -1583,6 +1583,8 @@ compile_parenthesis(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int compile_expr8(char_u **arg, cctx_T *cctx, ppconst_T *ppconst);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Compile whatever comes after "name" or "name()".
|
* Compile whatever comes after "name" or "name()".
|
||||||
* Advances "*arg" only when something was recognized.
|
* Advances "*arg" only when something was recognized.
|
||||||
@@ -1651,13 +1653,15 @@ compile_subscript(
|
|||||||
}
|
}
|
||||||
else if (*p == '-' && p[1] == '>')
|
else if (*p == '-' && p[1] == '>')
|
||||||
{
|
{
|
||||||
char_u *pstart = p;
|
char_u *pstart = p;
|
||||||
|
int alt;
|
||||||
|
char_u *paren;
|
||||||
|
|
||||||
|
// something->method()
|
||||||
if (generate_ppconst(cctx, ppconst) == FAIL)
|
if (generate_ppconst(cctx, ppconst) == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
ppconst->pp_is_const = FALSE;
|
ppconst->pp_is_const = FALSE;
|
||||||
|
|
||||||
// something->method()
|
|
||||||
// Apply the '!', '-' and '+' first:
|
// Apply the '!', '-' and '+' first:
|
||||||
// -1.0->func() works like (-1.0)->func()
|
// -1.0->func() works like (-1.0)->func()
|
||||||
if (compile_leader(cctx, TRUE, start_leader, end_leader) == FAIL)
|
if (compile_leader(cctx, TRUE, start_leader, end_leader) == FAIL)
|
||||||
@@ -1666,7 +1670,48 @@ compile_subscript(
|
|||||||
p += 2;
|
p += 2;
|
||||||
*arg = skipwhite(p);
|
*arg = skipwhite(p);
|
||||||
// No line break supported right after "->".
|
// No line break supported right after "->".
|
||||||
|
|
||||||
|
// Three alternatives handled here:
|
||||||
|
// 1. "base->name(" only a name, use compile_call()
|
||||||
|
// 2. "base->(expr)(" evaluate "expr", then use PCALL
|
||||||
|
// 3. "base->expr(" Same, find the end of "expr" by "("
|
||||||
if (**arg == '(')
|
if (**arg == '(')
|
||||||
|
alt = 2;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// alternative 1 or 3
|
||||||
|
p = *arg;
|
||||||
|
if (!eval_isnamec1(*p))
|
||||||
|
{
|
||||||
|
semsg(_(e_trailing_characters_str), pstart);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
|
if (ASCII_ISALPHA(*p) && p[1] == ':')
|
||||||
|
p += 2;
|
||||||
|
for ( ; eval_isnamec(*p); ++p)
|
||||||
|
;
|
||||||
|
if (*p == '(')
|
||||||
|
{
|
||||||
|
// alternative 1
|
||||||
|
alt = 1;
|
||||||
|
if (compile_call(arg, p - *arg, cctx, ppconst, 1) == FAIL)
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Must be alternative 3, find the "(". Only works within
|
||||||
|
// one line.
|
||||||
|
alt = 3;
|
||||||
|
paren = vim_strchr(p, '(');
|
||||||
|
if (paren == NULL)
|
||||||
|
{
|
||||||
|
semsg(_(e_missing_parenthesis_str), *arg);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (alt != 1)
|
||||||
{
|
{
|
||||||
int argcount = 1;
|
int argcount = 1;
|
||||||
garray_T *stack = &cctx->ctx_type_stack;
|
garray_T *stack = &cctx->ctx_type_stack;
|
||||||
@@ -1676,12 +1721,27 @@ compile_subscript(
|
|||||||
int expr_isn_end;
|
int expr_isn_end;
|
||||||
int arg_isn_count;
|
int arg_isn_count;
|
||||||
|
|
||||||
// Funcref call: list->(Refs[2])(arg)
|
if (alt == 2)
|
||||||
// or lambda: list->((arg) => expr)(arg)
|
{
|
||||||
//
|
// Funcref call: list->(Refs[2])(arg)
|
||||||
// Fist compile the function expression.
|
// or lambda: list->((arg) => expr)(arg)
|
||||||
if (compile_parenthesis(arg, cctx, ppconst) == FAIL)
|
//
|
||||||
return FAIL;
|
// Fist compile the function expression.
|
||||||
|
if (compile_parenthesis(arg, cctx, ppconst) == FAIL)
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
*paren = NUL;
|
||||||
|
if (compile_expr8(arg, cctx, ppconst) == FAIL
|
||||||
|
|| *skipwhite(*arg) != NUL)
|
||||||
|
{
|
||||||
|
*paren = '(';
|
||||||
|
semsg(_(e_invalid_expression_str), pstart);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
|
*paren = '(';
|
||||||
|
}
|
||||||
|
|
||||||
// Remember the next instruction index, where the instructions
|
// Remember the next instruction index, where the instructions
|
||||||
// for arguments are being written.
|
// for arguments are being written.
|
||||||
@@ -1742,27 +1802,7 @@ compile_subscript(
|
|||||||
if (generate_PCALL(cctx, argcount, p - 2, type, FALSE) == FAIL)
|
if (generate_PCALL(cctx, argcount, p - 2, type, FALSE) == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// method call: list->method()
|
|
||||||
p = *arg;
|
|
||||||
if (!eval_isnamec1(*p))
|
|
||||||
{
|
|
||||||
semsg(_(e_trailing_characters_str), pstart);
|
|
||||||
return FAIL;
|
|
||||||
}
|
|
||||||
if (ASCII_ISALPHA(*p) && p[1] == ':')
|
|
||||||
p += 2;
|
|
||||||
for ( ; eval_isnamec(*p); ++p)
|
|
||||||
;
|
|
||||||
if (*p != '(')
|
|
||||||
{
|
|
||||||
semsg(_(e_missing_parenthesis_str), *arg);
|
|
||||||
return FAIL;
|
|
||||||
}
|
|
||||||
if (compile_call(arg, p - *arg, cctx, ppconst, 1) == FAIL)
|
|
||||||
return FAIL;
|
|
||||||
}
|
|
||||||
if (keeping_dict)
|
if (keeping_dict)
|
||||||
{
|
{
|
||||||
keeping_dict = FALSE;
|
keeping_dict = FALSE;
|
||||||
|
Reference in New Issue
Block a user