Mercurial > vim
diff src/userfunc.c @ 25137:34f18d4081af v8.2.3105
patch 8.2.3105: Vim9: type of partial is wrong when it has arguments
Commit: https://github.com/vim/vim/commit/97f227d9c9351f12138d923ffdf9232dc5520bef
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 4 20:20:52 2021 +0200
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 https://github.com/vim/vim/issues/8492)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 04 Jul 2021 20:30:03 +0200 |
| parents | 80cab530472b |
| children | 99f6087a5fd2 |
line wrap: on
line diff
--- 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; + } } }