diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-09-07 16:48:46 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-09-07 16:48:46 +0100 |
commit | c9c967da09d9faf5ba989c943352274fea365841 (patch) | |
tree | a072dd3a6d159560e012fc16615e4a849a0af8ff /src/vim9execute.c | |
parent | 1540d334a04d874c2aa9d26b82dbbcd4bc5a78de (diff) | |
download | vim-git-c9c967da09d9faf5ba989c943352274fea365841.tar.gz |
patch 9.0.0405: arguments in a partial not used by a :def functionv9.0.0405
Problem: Arguments in a partial not used by a :def function.
Solution: Put the partial arguments on the stack.
Diffstat (limited to 'src/vim9execute.c')
-rw-r--r-- | src/vim9execute.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/vim9execute.c b/src/vim9execute.c index 46251545e..30ff7a775 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -5272,16 +5272,21 @@ call_def_function( ufunc_T *ufunc, int argc_arg, // nr of arguments typval_T *argv, // arguments + int flags, // DEF_ flags partial_T *partial, // optional partial for context funccall_T *funccal, typval_T *rettv) // return value { ectx_T ectx; // execution context int argc = argc_arg; + int partial_argc = partial == NULL + || (flags & DEF_USE_PT_ARGV) == 0 + ? 0 : partial->pt_argc; + int total_argc = argc + partial_argc; typval_T *tv; int idx; int ret = FAIL; - int defcount = ufunc->uf_args.ga_len - argc; + int defcount = ufunc->uf_args.ga_len - total_argc; sctx_T save_current_sctx = current_sctx; int did_emsg_before = did_emsg_cumul + did_emsg; int save_suppress_errthrow = suppress_errthrow; @@ -5345,14 +5350,14 @@ call_def_function( ectx.ec_did_emsg_before = did_emsg_before; ++ex_nesting_level; - idx = argc - ufunc->uf_args.ga_len; + idx = total_argc - ufunc->uf_args.ga_len; if (idx > 0 && ufunc->uf_va_name == NULL) { semsg(NGETTEXT(e_one_argument_too_many, e_nr_arguments_too_many, - idx), idx); + idx), idx); goto failed_early; } - idx = argc - ufunc->uf_args.ga_len + ufunc->uf_def_args.ga_len; + idx = total_argc - ufunc->uf_args.ga_len + ufunc->uf_def_args.ga_len; if (idx < 0) { semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few, @@ -5360,15 +5365,19 @@ call_def_function( goto failed_early; } - // Put arguments on the stack, but no more than what the function expects. - // A lambda can be called with more arguments than it uses. - for (idx = 0; idx < argc + // Put values from the partial and arguments on the stack, but no more than + // what the function expects. A lambda can be called with more arguments + // than it uses. + for (idx = 0; idx < total_argc && (ufunc->uf_va_name != NULL || idx < ufunc->uf_args.ga_len); ++idx) { + int argv_idx = idx - partial_argc; + + tv = idx < partial_argc ? partial->pt_argv + idx : argv + argv_idx; if (idx >= ufunc->uf_args.ga_len - ufunc->uf_def_args.ga_len - && argv[idx].v_type == VAR_SPECIAL - && argv[idx].vval.v_number == VVAL_NONE) + && tv->v_type == VAR_SPECIAL + && tv->vval.v_number == VVAL_NONE) { // Use the default value. STACK_TV_BOT(0)->v_type = VAR_UNKNOWN; @@ -5377,10 +5386,10 @@ call_def_function( { if (ufunc->uf_arg_types != NULL && idx < ufunc->uf_args.ga_len && check_typval_arg_type( - ufunc->uf_arg_types[idx], &argv[idx], - NULL, idx + 1) == FAIL) + ufunc->uf_arg_types[idx], tv, + NULL, argv_idx + 1) == FAIL) goto failed_early; - copy_tv(&argv[idx], STACK_TV_BOT(0)); + copy_tv(tv, STACK_TV_BOT(0)); } ++ectx.ec_stack.ga_len; } |