diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2022-08-30 19:48:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-30 19:48:24 +0100 |
| commit | 04c4c5746e15884768d2cb41370c3276a196cd4c (patch) | |
| tree | 1e629820796635bd332b2066c03d548fad527f89 /src/evalfunc.c | |
| parent | f240395fca63d4b330112a4b81e94b05b50de1aa (diff) | |
| download | vim-git-04c4c5746e15884768d2cb41370c3276a196cd4c.tar.gz | |
patch 9.0.0335: checks for Dictionary argument often give a vague errorv9.0.0335
Problem: Checks for Dictionary argument often give a vague error message.
Solution: Give a useful error message. (Yegappan Lakshmanan, closes #11009)
Diffstat (limited to 'src/evalfunc.c')
| -rw-r--r-- | src/evalfunc.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 92c3269ef..be1b2e71f 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3277,11 +3277,9 @@ f_call(typval_T *argvars, typval_T *rettv) if (argvars[2].v_type != VAR_UNKNOWN) { - if (argvars[2].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); + if (check_for_dict_arg(argvars, 2) == FAIL) return; - } + selfdict = argvars[2].vval.v_dict; } @@ -4501,9 +4499,8 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) arg_idx = 1; if (dict_idx > 0) { - if (argvars[dict_idx].v_type != VAR_DICT) + if (check_for_dict_arg(argvars, dict_idx) == FAIL) { - emsg(_(e_expected_dict)); vim_free(name); goto theend; } @@ -9291,15 +9288,9 @@ f_setcharsearch(typval_T *argvars, typval_T *rettv UNUSED) dictitem_T *di; char_u *csearch; - if (in_vim9script() && check_for_dict_arg(argvars, 0) == FAIL) + if (check_for_dict_arg(argvars, 0) == FAIL) return; - if (argvars[0].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); - return; - } - if ((d = argvars[0].vval.v_dict) != NULL) { csearch = dict_get_string(d, "char", FALSE); @@ -9637,11 +9628,8 @@ f_settagstack(typval_T *argvars, typval_T *rettv) return; // second argument: dict with items to set in the tag stack - if (argvars[1].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); + if (check_for_dict_arg(argvars, 1) == FAIL) return; - } d = argvars[1].vval.v_dict; if (d == NULL) return; |