kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/eval.c
View File

@ -820,21 +820,19 @@ bool eval_expr_valid_arg(const typval_T *const tv)
&& (tv->v_type != VAR_STRING || (tv->vval.v_string != NULL && *tv->vval.v_string != NUL));
}
int eval_expr_typval(const typval_T *expr, typval_T *argv, int argc, typval_T *rettv)
FUNC_ATTR_NONNULL_ARG(1, 2, 4)
/// Evaluate an expression, which can be a function, partial or string.
/// Pass arguments "argv[argc]".
/// Return the result in "rettv" and OK or FAIL.
///
/// @param want_func if true, treat a string as a function name, not an expression
int eval_expr_typval(const typval_T *expr, bool want_func, typval_T *argv, int argc,
typval_T *rettv)
FUNC_ATTR_NONNULL_ALL
{
char buf[NUMBUFLEN];
funcexe_T funcexe = FUNCEXE_INIT;
if (expr->v_type == VAR_FUNC) {
const char *const s = expr->vval.v_string;
if (s == NULL || *s == NUL) {
return FAIL;
}
funcexe.fe_evaluate = true;
if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) {
return FAIL;
}
} else if (expr->v_type == VAR_PARTIAL) {
if (expr->v_type == VAR_PARTIAL) {
partial_T *const partial = expr->vval.v_partial;
if (partial == NULL) {
return FAIL;
@ -848,8 +846,18 @@ int eval_expr_typval(const typval_T *expr, typval_T *argv, int argc, typval_T *r
if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) {
return FAIL;
}
} else if (expr->v_type == VAR_FUNC || want_func) {
const char *const s = (expr->v_type == VAR_FUNC
? expr->vval.v_string
: tv_get_string_buf_chk(expr, buf));
if (s == NULL || *s == NUL) {
return FAIL;
}
funcexe.fe_evaluate = true;
if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) {
return FAIL;
}
} else {
char buf[NUMBUFLEN];
char *s = (char *)tv_get_string_buf_chk(expr, buf);
if (s == NULL) {
return FAIL;
@ -874,7 +882,7 @@ bool eval_expr_to_bool(const typval_T *expr, bool *error)
{
typval_T argv, rettv;
if (eval_expr_typval(expr, &argv, 0, &rettv) == FAIL) {
if (eval_expr_typval(expr, false, &argv, 0, &rettv) == FAIL) {
*error = true;
return false;
}
@ -5352,7 +5360,7 @@ static int filter_map_one(typval_T *tv, typval_T *expr, const filtermap_T filter
tv_copy(tv, &vimvars[VV_VAL].vv_tv);
argv[0] = vimvars[VV_KEY].vv_tv;
argv[1] = vimvars[VV_VAL].vv_tv;
if (eval_expr_typval(expr, argv, 2, newtv) == FAIL) {
if (eval_expr_typval(expr, false, argv, 2, newtv) == FAIL) {
goto theend;
}
if (filtermap == FILTERMAP_FILTER) {

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;

6
test/old/testdir/test_listdict.vim
View File

@ -944,6 +944,10 @@ func Test_reduce()
call assert_equal('Å,s,t,r,ö,m', reduce('Åström', LSTART acc, val LMIDDLE acc .. ',' .. val LEND))
call assert_equal('Å,s,t,r,ö,m', reduce('Åström', LSTART acc, val LMIDDLE acc .. ',' .. val LEND))
call assert_equal(',a,b,c', reduce('abc', LSTART acc, val LMIDDLE acc .. ',' .. val LEND, v:_null_string))
call assert_equal(0x7d, reduce([0x30, 0x25, 0x08, 0x61], 'or'))
call assert_equal(0x7d, reduce(0z30250861, 'or'))
call assert_equal('β', reduce('ββββ', 'matchstr'))
END
call CheckLegacyAndVim9Success(lines)
@ -958,7 +962,7 @@ func Test_reduce()
call assert_fails("call reduce({}, { acc, val -> acc + val }, 1)", 'E1098:')
call assert_fails("call reduce(0, { acc, val -> acc + val }, 1)", 'E1098:')
call assert_fails("call reduce([1, 2], 'Xdoes_not_exist')", 'E121:')
call assert_fails("call reduce([1, 2], 'Xdoes_not_exist')", 'E117:')
call assert_fails("echo reduce(0z01, { acc, val -> 2 * acc + val }, '')", 'E1210:')
" call assert_fails("vim9 reduce(0, (acc, val) => (acc .. val), '')", 'E1252:')