1
0
forked from aniani/vim

patch 8.2.2618: Vim9: cannot use a normal list name to store function refs

Problem:    Vim9: cannot use a normal list name to store function refs.
Solution:   Allow a lower case name if it is indexed.
This commit is contained in:
Bram Moolenaar
2021-03-17 20:56:38 +01:00
parent 8863bda25d
commit 3f32788000
3 changed files with 14 additions and 2 deletions

View File

@@ -72,6 +72,13 @@ def Test_assignment()
CheckDefFailure(['var lambda = () => "lambda"'], 'E704:')
CheckScriptFailure(['var x = "x"'], 'E1124:')
# lower case name is OK for a list
var lambdaLines =<< trim END
var lambdaList: list<func> = [Test_syntax]
lambdaList[0] = () => "lambda"
END
CheckDefAndScriptSuccess(lambdaLines)
var nr: number = 1234
CheckDefFailure(['var nr: number = "asdf"'], 'E1012:')

View File

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

View File

@@ -5832,11 +5832,13 @@ compile_lhs(
return FAIL;
}
// new local variable
// Check the name is valid for a funcref.
if ((lhs->lhs_type->tt_type == VAR_FUNC
|| lhs->lhs_type->tt_type == VAR_PARTIAL)
&& var_wrong_func_name(lhs->lhs_name, TRUE))
&& var_wrong_func_name(lhs->lhs_name, TRUE))
return FAIL;
// New local variable.
lhs->lhs_lvar = reserve_local(cctx, var_start, lhs->lhs_varlen,
cmdidx == CMD_final || cmdidx == CMD_const, lhs->lhs_type);
if (lhs->lhs_lvar == NULL)
@@ -6275,6 +6277,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
{
if ((rhs_type->tt_type == VAR_FUNC
|| rhs_type->tt_type == VAR_PARTIAL)
&& !lhs.lhs_has_index
&& var_wrong_func_name(lhs.lhs_name, TRUE))
goto theend;