aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0549: duplicated code in calling a :def function

Browse Source 
Problem:    Duplicated code in calling a :def function.
Solution:   Simplify the code.
This commit is contained in:
Bram Moolenaar
2022-09-22 17:34:01 +01:00
parent f1c60d4bf1
commit 5800c79838
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
549,
/**/ /**/
548, 548,
/**/ /**/

34
src/vim9execute.c
View File

@@ -380,7 +380,7 @@ get_pt_outer(partial_T *pt)
* Call compiled function "cdf_idx" from compiled code. * Call compiled function "cdf_idx" from compiled code.
* This adds a stack frame and sets the instruction pointer to the start of the * This adds a stack frame and sets the instruction pointer to the start of the
* called function. * called function.
* If "pt" is not null use "pt->pt_outer" for ec_outer_ref->or_outer. * If "pt_arg" is not NULL use "pt_arg->pt_outer" for ec_outer_ref->or_outer.
* *
* Stack has: * Stack has:
* - current arguments (already there) * - current arguments (already there)
@@ -394,7 +394,7 @@ get_pt_outer(partial_T *pt)
static int static int
call_dfunc( call_dfunc(
int cdf_idx, int cdf_idx,
partial_T *pt, partial_T *pt_arg,
int argcount_arg, int argcount_arg,
ectx_T *ectx) ectx_T *ectx)
{ {
@@ -543,27 +543,21 @@ call_dfunc(
STACK_TV_BOT(STACK_FRAME_IDX_OFF)->vval.v_number = ectx->ec_frame_idx; STACK_TV_BOT(STACK_FRAME_IDX_OFF)->vval.v_number = ectx->ec_frame_idx;
ectx->ec_frame_idx = ectx->ec_stack.ga_len; ectx->ec_frame_idx = ectx->ec_stack.ga_len;
// Initialize local variables // Initialize all local variables to number zero. Also initialize the
for (idx = 0; idx < dfunc->df_varcount; ++idx) // variable that counts how many closures were created. This is used in
// handle_closure_in_use().
int initcount = dfunc->df_varcount + (dfunc->df_has_closure ? 1 : 0);
for (idx = 0; idx < initcount; ++idx)
{ {
typval_T *tv = STACK_TV_BOT(STACK_FRAME_SIZE + idx); typval_T *tv = STACK_TV_BOT(STACK_FRAME_SIZE + idx);
tv->v_type = VAR_NUMBER; tv->v_type = VAR_NUMBER;
tv->vval.v_number = 0; tv->vval.v_number = 0;
} }
if (dfunc->df_has_closure)
{
typval_T *tv = STACK_TV_BOT(STACK_FRAME_SIZE + dfunc->df_varcount);
// Initialize the variable that counts how many closures were created.
// This is used in handle_closure_in_use().
tv->v_type = VAR_NUMBER;
tv->vval.v_number = 0;
}
ectx->ec_stack.ga_len += STACK_FRAME_SIZE + varcount; ectx->ec_stack.ga_len += STACK_FRAME_SIZE + varcount;
if (pt != NULL || ufunc->uf_partial != NULL partial_T *pt = pt_arg != NULL ? pt_arg : ufunc->uf_partial;
|| (ufunc->uf_flags & FC_CLOSURE)) if (pt != NULL || (ufunc->uf_flags & FC_CLOSURE))
{ {
outer_ref_T *ref = ALLOC_CLEAR_ONE(outer_ref_T); outer_ref_T *ref = ALLOC_CLEAR_ONE(outer_ref_T);
@@ -575,12 +569,6 @@ call_dfunc(
++pt->pt_refcount; ++pt->pt_refcount;
ref->or_partial = pt; ref->or_partial = pt;
} }
else if (ufunc->uf_partial != NULL)
{
ref->or_outer = get_pt_outer(ufunc->uf_partial);
++ufunc->uf_partial->pt_refcount;
ref->or_partial = ufunc->uf_partial;
}
else else
{ {
ref->or_outer = ALLOC_CLEAR_ONE(outer_T); ref->or_outer = ALLOC_CLEAR_ONE(outer_T);
@@ -5832,7 +5820,9 @@ call_def_function(
ectx.ec_where.wt_index = 0; ectx.ec_where.wt_index = 0;
ectx.ec_where.wt_variable = FALSE; ectx.ec_where.wt_variable = FALSE;
// Execute the instructions until done. /*
* Execute the instructions until done.
*/
ret = exec_instructions(&ectx); ret = exec_instructions(&ectx);
if (ret == OK) if (ret == OK)
{ {