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/userfunc.c | |
parent | b7480cd8931fa1696265f75c7d4d9fdf0be69e12 (diff) | |
download | vim-git-97f227d9c9351f12138d923ffdf9232dc5520bef.tar.gz |
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/userfunc.c')
-rw-r--r-- | src/userfunc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/userfunc.c b/src/userfunc.c index 7e7c0f6f6..404f85bb5 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; + } } } |