aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.0632: calling a function from an "expr" option has overhead

Browse Source 
Problem:    Calling a function from an "expr" option has too much overhead.
Solution:   Add call_simple_func() and use it for 'foldexpr'
This commit is contained in:
Bram Moolenaar
2022-10-01 15:32:46 +01:00
parent 145d1fd910
commit 87b4e5c5db
8 changed files with 144 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/eval.c
View File

@@ -899,13 +899,14 @@ eval_foldexpr(win_T *wp, int *cp)
{
char_u *arg;
typval_T tv;
int r = NOTDONE;
varnumber_T retval;
char_u *s;
sctx_T saved_sctx = current_sctx;
int use_sandbox = was_set_insecurely((char_u *)"foldexpr",
OPT_LOCAL);
arg = wp->w_p_fde;
arg = skipwhite(wp->w_p_fde);
current_sctx = wp->w_p_script_ctx[WV_FDE];
++emsg_off;
@@ -913,7 +914,21 @@ eval_foldexpr(win_T *wp, int *cp)
++sandbox;
++textlock;
*cp = NUL;
if (eval0(arg, &tv, NULL, &EVALARG_EVALUATE) == FAIL)
// If the expression is "FuncName()" then we can skip a lot of overhead.
char_u *parens = (char_u *)strstr((char *)arg, "()");
if (parens != NULL && *skipwhite(parens + 2) == NUL)
{
char_u *p = STRNCMP(arg, "<SNR>", 5) == 0 ? skipdigits(arg + 5) : arg;
if (to_name_end(p, TRUE) == parens)
r = call_simple_func(arg, (int)(parens - arg), &tv);
}
if (r == NOTDONE)
r = eval0(arg, &tv, NULL, &EVALARG_EVALUATE);
if (r == FAIL)
retval = 0;
else
{