Mercurial > vim
changeset 20411:23af9e1a5283 v8.2.0760
patch 8.2.0760: Vim9: dict member errors not tested
Commit: https://github.com/vim/vim/commit/4dac32caf38f7c35b707b7df104df03591bf6b14
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 15 21:44:19 2020 +0200
patch 8.2.0760: Vim9: dict member errors not tested
Problem: Vim9: dict member errors not tested.
Solution: Delete unreachable error. Add tests.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 15 May 2020 21:45:04 +0200 |
| parents | 09ba72f2463b |
| children | 65707e671589 |
| files | src/testdir/test_vim9_expr.vim src/version.c src/vim9execute.c |
| diffstat | 3 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -799,8 +799,12 @@ enddef def Test_expr_member() assert_equal(1, g:dict_one.one) + let d: dict<number> = g:dict_one + assert_equal(1, d['one']) call CheckDefFailure(["let x = g:dict_one.#$!"], 'E1002:') + call CheckDefExecFailure(["let d: dict<any>", "echo d['a']"], 'E716:') + call CheckDefExecFailure(["let d: dict<number>", "d = g:list_empty"], 'E1029: Expected dict but got list') enddef def Test_expr7_option()
--- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 760, +/**/ 759, /**/ 758,
--- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -2104,20 +2104,13 @@ call_def_function( // dict member: dict is at stack-2, key at stack-1 tv = STACK_TV_BOT(-2); - if (tv->v_type != VAR_DICT) - { - emsg(_(e_dictreq)); - goto failed; - } + // no need to check for VAR_DICT, CHECKTYPE will check. dict = tv->vval.v_dict; tv = STACK_TV_BOT(-1); - if (tv->v_type != VAR_STRING) - { - emsg(_(e_stringreq)); - goto failed; - } + // no need to check for VAR_STRING, 2STRING will check. key = tv->vval.v_string; + if ((di = dict_find(dict, key, -1)) == NULL) { semsg(_(e_dictkey), key);