patch 9.0.1723: Fix regression in {func} argument of reduce()
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: #12824
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
diff --git a/src/list.c b/src/list.c
index 933480f..28799d5 100644
--- a/src/list.c
+++ b/src/list.c
@@ -2333,7 +2333,7 @@
copy_tv(tv, get_vim_var_tv(VV_VAL));
argv[0] = *get_vim_var_tv(VV_KEY);
argv[1] = *get_vim_var_tv(VV_VAL);
- if (eval_expr_typval(expr, argv, 2, fc, newtv) == FAIL)
+ if (eval_expr_typval(expr, FALSE, argv, 2, fc, newtv) == FAIL)
goto theend;
if (filtermap == FILTERMAP_FILTER)
{
@@ -3084,7 +3084,7 @@
else
argv[1] = li->li_tv;
- r = eval_expr_typval(expr, argv, 2, fc, rettv);
+ r = eval_expr_typval(expr, TRUE, argv, 2, fc, rettv);
if (argv[0].v_type != VAR_NUMBER && argv[0].v_type != VAR_UNKNOWN)
clear_tv(&argv[0]);
@@ -3125,7 +3125,7 @@
&& argvars[0].v_type != VAR_LIST
&& argvars[0].v_type != VAR_BLOB)
{
- semsg(_(e_string_list_or_blob_required), "reduce()");
+ emsg(_(e_string_list_or_blob_required));
return;
}