changeset 24154:6e8f49a4a193 v8.2.2618

patch 8.2.2618: Vim9: cannot use a normal list name to store function refs Commit: https://github.com/vim/vim/commit/3f32788000258aabe078b426e3d71962bee9d2d1 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 17 20:56:38 2021 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Wed, 17 Mar 2021 21:00:04 +0100
parents a5c2a882f07b
children 17e994bcd7bb
files src/testdir/test_vim9_assign.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -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:')
 
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2618,
+/**/
     2617,
 /**/
     2616,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -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 
 		{
 		    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;