aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1446: unnecessary checks for the "skip" flag when skipping

Browse Source 
Problem:    Unnecessary checks for the "skip" flag when skipping.
Solution:   Remove the unnecessary checks. (closes #12254)
This commit is contained in:
zeertzjq 2023-04-12 20:48:16 +01:00 committed by Bram Moolenaar
parent 01967f5b10
commit 5299c0933f
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/userfunc.c
View File

@ -5868,6 +5868,9 @@ ex_return(exarg_T *eap)
clear_evalarg(&evalarg, eap); clear_evalarg(&evalarg, eap);
} }
/*
* Lower level implementation of "call". Only called when not skipping.
*/
static int static int
ex_call_inner( ex_call_inner(
exarg_T *eap, exarg_T *eap,
@ -5882,24 +5885,12 @@ ex_call_inner(
typval_T rettv; typval_T rettv;
int failed = FALSE; int failed = FALSE;
/*
* When skipping, evaluate the function once, to find the end of the
* arguments.
* When the function takes a range, this is discovered after the first
* call, and the loop is broken.
*/
if (eap->skip)
{
++emsg_skip;
lnum = eap->line2; // do it once, also with an invalid range
}
else
lnum = eap->line1; lnum = eap->line1;
for ( ; lnum <= eap->line2; ++lnum) for ( ; lnum <= eap->line2; ++lnum)
{ {
funcexe_T funcexe; funcexe_T funcexe;
if (!eap->skip && eap->addr_count > 0) if (eap->addr_count > 0)
{ {
if (lnum > curbuf->b_ml.ml_line_count) if (lnum > curbuf->b_ml.ml_line_count)
{ {
@ -5927,14 +5918,14 @@ ex_call_inner(
// Handle a function returning a Funcref, Dictionary or List. // Handle a function returning a Funcref, Dictionary or List.
if (handle_subscript(arg, NULL, &rettv, if (handle_subscript(arg, NULL, &rettv,
eap->skip ? NULL : &EVALARG_EVALUATE, TRUE) == FAIL) &EVALARG_EVALUATE, TRUE) == FAIL)
{ {
failed = TRUE; failed = TRUE;
break; break;
} }
clear_tv(&rettv); clear_tv(&rettv);
if (doesrange || eap->skip) if (doesrange)
break; break;
// Stop when immediately aborting on error, or when an interrupt // Stop when immediately aborting on error, or when an interrupt
@ -5944,8 +5935,6 @@ ex_call_inner(
if (aborting()) if (aborting())
break; break;
} }
if (eap->skip)
--emsg_skip;
return failed; return failed;
} }
@ -6185,7 +6174,7 @@ ex_call(exarg_T *eap)
return; return;
} }
tofree = trans_function_name_ext(&arg, NULL, eap->skip, TFN_INT, tofree = trans_function_name_ext(&arg, NULL, FALSE, TFN_INT,
&fudi, &partial, vim9script ? &type : NULL, NULL); &fudi, &partial, vim9script ? &type : NULL, NULL);
if (fudi.fd_newkey != NULL) if (fudi.fd_newkey != NULL)
{ {
@ -6239,7 +6228,7 @@ ex_call(exarg_T *eap)
funcexe.fe_firstline = eap->line1; funcexe.fe_firstline = eap->line1;
funcexe.fe_lastline = eap->line2; funcexe.fe_lastline = eap->line2;
funcexe.fe_found_var = found_var; funcexe.fe_found_var = found_var;
funcexe.fe_evaluate = !eap->skip; funcexe.fe_evaluate = TRUE;
failed = ex_call_inner(eap, name, &arg, startarg, &funcexe, &evalarg); failed = ex_call_inner(eap, name, &arg, startarg, &funcexe, &evalarg);
} }

2
src/version.c
View File

@ -695,6 +695,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 */
/**/
1446,
/**/ /**/
1445, 1445,
/**/ /**/