commit 97f227d9c9351f12138d923ffdf9232dc5520bef
author Bram Moolenaar <Bram@vim.org> Sun Jul 04 20:20:52 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jul 04 20:20:52 2021 +0200
tree 54c433f7400230e17cb1bc121e1ce85d0e362a21
parent b7480cd8931fa1696265f75c7d4d9fdf0be69e12

patch 8.2.3105: Vim9: type of partial is wrong when it has arguments

Problem:    Vim9: type of partial is wrong when it has arguments.
Solution:   Subtract arguments from the count. (issue #8492)

src/testdir/test_vim9_assign.vim

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 5f5b5d7..72884e5 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -661,13 +661,16 @@
   CheckDefExecAndScriptFailure(lines, 'E1012:', 5)
 enddef
 
-def PartFunc(b: bool): string
+def PartFuncBool(b: bool): string
   return 'done'
 enddef
 
 def Test_assignment_partial()
-  var Partial: func(): string = function(PartFunc, [true])
-  assert_equal('done', Partial())
+  var lines =<< trim END
+      var Partial: func(): string = function(PartFuncBool, [true])
+      assert_equal('done', Partial())
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_assignment_list_any_index()

src/userfunc.c

diff --git a/src/userfunc.c b/src/userfunc.c
index 7e7c0f6..404f85b 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3103,6 +3103,7 @@
     int		argv_clear = 0;
     int		argv_base = 0;
     partial_T	*partial = funcexe->partial;
+    type_T	check_type;
 
     // Initialize rettv so that it is safe for caller to invoke clear_tv(rettv)
     // even when call_func() returns FAIL.
@@ -3146,6 +3147,16 @@
 		argv[i + argv_clear] = argvars_in[i];
 	    argvars = argv;
 	    argcount = partial->pt_argc + argcount_in;
+
+	    if (funcexe->check_type != NULL)
+	    {
+		// Now funcexe->check_type is missing the added arguments, make
+		// a copy of the type with the correction.
+		check_type = *funcexe->check_type;
+		funcexe->check_type = &check_type;
+		check_type.tt_argcount += partial->pt_argc;
+		check_type.tt_min_argcount += partial->pt_argc;
+	    }
 	}
     }
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 1f2b18f..1f37479 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3105,
+/**/
     3104,
 /**/
     3103,

src/vim9type.c

diff --git a/src/vim9type.c b/src/vim9type.c
index b349404..5cf1f42 100644
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -355,7 +355,20 @@
 	    if (ufunc->uf_func_type == NULL)
 		set_function_type(ufunc);
 	    if (ufunc->uf_func_type != NULL)
+	    {
+		if (tv->v_type == VAR_PARTIAL
+					    && tv->vval.v_partial->pt_argc > 0)
+		{
+		    type = get_type_ptr(type_gap);
+		    if (type == NULL)
+			return NULL;
+		    *type = *ufunc->uf_func_type;
+		    type->tt_argcount -= tv->vval.v_partial->pt_argc;
+		    type->tt_min_argcount -= tv->vval.v_partial->pt_argc;
+		    return type;
+		}
 		return ufunc->uf_func_type;
+	    }
 	}
     }