changeset 22347:712bc35842aa v8.2.1722

patch 8.2.1722: Vim9: cannot assign a lambda to a variable of type function Commit: https://github.com/vim/vim/commit/dbd759309b4b6abea96b18d61770e100cf4264b5 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 21 21:48:21 2020 +0200 patch 8.2.1722: Vim9: cannot assign a lambda to a variable of type function Problem: Vim9: cannot assign a lambda to a variable of type function. Solution: Allow for assigning a partial to a variable of type function. (Naruhiko Nishino, closes #6996)
author Bram Moolenaar <Bram@vim.org>
date Mon, 21 Sep 2020 22:00:03 +0200
parents a395dbac89f7
children 267f3a1c5105
files src/testdir/test_vim9_expr.vim src/version.c src/vim9type.c
diffstat 3 files changed, 19 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1687,6 +1687,18 @@ def Test_expr7_lambda_vim9script()
 	->map({_, v -> synIDattr(v, 'name')})->len()})
   END
   CheckScriptSuccess(lines)
+
+  # check if assign a lambda to a variable which type is func or any.
+  lines =<< trim END
+      vim9script
+      let FuncRef = {->123}
+      assert_equal(123, FuncRef())
+      let FuncRef_Func: func = {->123}
+      assert_equal(123, FuncRef_Func())
+      let FuncRef_Any: any = {->123}
+      assert_equal(123, FuncRef_Any())
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 def Test_epxr7_funcref()
--- 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 */
 /**/
+    1722,
+/**/
     1721,
 /**/
     1720,
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -463,7 +463,11 @@ check_type(type_T *expected, type_T *act
 	    && !(expected->tt_type == VAR_ANY && actual->tt_type != VAR_VOID))
 
     {
-	if (expected->tt_type != actual->tt_type)
+	// tt_type should match, except that a "partial" can be assigned to a
+	// variable with type "func".
+	if (!(expected->tt_type == actual->tt_type
+		    || (expected->tt_type == VAR_FUNC
+					   && actual->tt_type == VAR_PARTIAL)))
 	{
 	    if (expected->tt_type == VAR_BOOL
 					&& (actual->tt_flags & TTFLAG_BOOL_OK))