Mercurial > vim
diff src/evalfunc.c @ 29994:86eb4aba16c3 v9.0.0335
patch 9.0.0335: checks for Dictionary argument often give a vague error
Commit: https://github.com/vim/vim/commit/04c4c5746e15884768d2cb41370c3276a196cd4c
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Tue Aug 30 19:48:24 2022 +0100
patch 9.0.0335: checks for Dictionary argument often give a vague error
Problem: Checks for Dictionary argument often give a vague error message.
Solution: Give a useful error message. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/11009)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 30 Aug 2022 21:00:05 +0200 |
| parents | 0ad8b72af148 |
| children | 6c1a9d7a931f |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3277,11 +3277,9 @@ f_call(typval_T *argvars, typval_T *rett 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, typva 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,14 +9288,8 @@ f_setcharsearch(typval_T *argvars, typva dictitem_T *di; char_u *csearch; - if (in_vim9script() && check_for_dict_arg(argvars, 0) == FAIL) - return; - - if (argvars[0].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); - return; - } + if (check_for_dict_arg(argvars, 0) == FAIL) + return; if ((d = argvars[0].vval.v_dict) != NULL) { @@ -9637,11 +9628,8 @@ f_settagstack(typval_T *argvars, typval_ return; // second argument: dict with items to set in the tag stack - if (argvars[1].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); - return; - } + if (check_for_dict_arg(argvars, 1) == FAIL) + return; d = argvars[1].vval.v_dict; if (d == NULL) return;