diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-07-04 20:20:52 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-07-04 20:20:52 +0200 |
commit | 97f227d9c9351f12138d923ffdf9232dc5520bef (patch) | |
tree | 54c433f7400230e17cb1bc121e1ce85d0e362a21 /src | |
parent | b7480cd8931fa1696265f75c7d4d9fdf0be69e12 (diff) |
patch 8.2.3105: Vim9: type of partial is wrong when it has argumentsv8.2.3105
Problem: Vim9: type of partial is wrong when it has arguments.
Solution: Subtract arguments from the count. (issue #8492)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_vim9_assign.vim | 9 | ||||
-rw-r--r-- | src/userfunc.c | 11 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9type.c | 13 |
4 files changed, 32 insertions, 3 deletions
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 5f5b5d740a..72884e5ed9 100644 --- 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 7e7c0f6f63..404f85bb51 100644 --- 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 1f2b18f0f4..1f3747970b 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3105, +/**/ 3104, /**/ 3103, diff --git a/src/vim9type.c b/src/vim9type.c index b34940447d..5cf1f42844 100644 --- 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; + } } } |