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)

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 5f5b5d740aa3a00f9c5ac434b182f80d0499f069..72884e5ed94476c8acfe3c69387cac8c28aefee7 100644 (file)
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -661,13 +661,16 @@ def Test_assignment_list()
   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()

diff --git a/src/userfunc.c b/src/userfunc.c
index 7e7c0f6f63abb76f16e4d998f97e3f57ba3fa773..404f85bb511f9c43e22a79f282614ad9c76dcd26 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3103,6 +3103,7 @@ call_func(
     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 @@ call_func(
                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;
+           }
        }
     }
 

diff --git a/src/version.c b/src/version.c
index 1f2b18f0f4466a309b134df33dc66058a44756e6..1f3747970beeaa658fbc5aa94b6ecc1eef827d82 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3105,
 /**/
     3104,
 /**/

diff --git a/src/vim9type.c b/src/vim9type.c
index b34940447d9c5926e61d4baa11533a78b1357c1e..5cf1f428444beeb87a484d64d831e2ff8ccf97be 100644 (file)
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -355,7 +355,20 @@ typval2type_int(typval_T *tv, int copyID, garray_T *type_gap, int do_member)
            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;
+           }
        }
     }