mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 04:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1723: Fix regression in {func} argument of reduce()

Browse Source 
Problem: Fix regression in {func} argument of reduce()
Solution: pass function name as string again

Before patch 9.0.0548, passing a string as {func} argument of reduce()
is treated as a function name, but after patch 9.0.0548 it is treated as
an expression instead, which is useless as reduce() doesn't set any v:
variables. This PR restores the behavior of {func} before that patch.

Also correct an emsg() call, as e_string_list_or_blob_required doesn't
contain format specifiers.

closes: vim/vim#12824

ad0c442f1f
This commit is contained in:
zeertzjq
2023-08-18 05:09:24 +08:00
parent ffb87f4dd9
commit bb29ef4008
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/eval/funcs.c
View File

@@ -2953,7 +2953,7 @@ static void f_wait(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
const int called_emsg_before = called_emsg;
LOOP_PROCESS_EVENTS_UNTIL(&main_loop, main_loop.events, timeout,
eval_expr_typval(&expr, &argv, 0, &exprval) != OK
eval_expr_typval(&expr, false, &argv, 0, &exprval) != OK
|| tv_get_number_chk(&exprval, &error)
|| called_emsg > called_emsg_before || error || got_int);
@@ -3515,7 +3515,7 @@ static varnumber_T indexof_eval_expr(typval_T *expr)
typval_T newtv;
newtv.v_type = VAR_UNKNOWN;
if (eval_expr_typval(expr, argv, 2, &newtv) == FAIL) {
if (eval_expr_typval(expr, false, argv, 2, &newtv) == FAIL) {
return false;
}
@@ -5537,7 +5537,7 @@ static varnumber_T readdir_checkitem(void *context, const char *name)
argv[0].vval.v_string = (char *)name;
typval_T rettv;
if (eval_expr_typval(expr, argv, 1, &rettv) == FAIL) {
if (eval_expr_typval(expr, false, argv, 1, &rettv) == FAIL) {
goto theend;
}
@@ -6259,7 +6259,7 @@ static void reduce_list(typval_T *argvars, typval_T *expr, typval_T *rettv)
argv[1] = *TV_LIST_ITEM_TV(li);
rettv->v_type = VAR_UNKNOWN;
const int r = eval_expr_typval(expr, argv, 2, rettv);
const int r = eval_expr_typval(expr, true, argv, 2, rettv);
tv_clear(&argv[0]);
if (r == FAIL || called_emsg != called_emsg_start) {
@@ -6306,7 +6306,7 @@ static void reduce_string(typval_T *argvars, typval_T *expr, typval_T *rettv)
.vval.v_string = xstrnsave(p, (size_t)len),
};
const int r = eval_expr_typval(expr, argv, 2, rettv);
const int r = eval_expr_typval(expr, true, argv, 2, rettv);
tv_clear(&argv[0]);
tv_clear(&argv[1]);
@@ -6354,7 +6354,7 @@ static void reduce_blob(typval_T *argvars, typval_T *expr, typval_T *rettv)
.vval.v_number = tv_blob_get(b, i),
};
const int r = eval_expr_typval(expr, argv, 2, rettv);
const int r = eval_expr_typval(expr, true, argv, 2, rettv);
if (r == FAIL || called_emsg != called_emsg_start) {
return;