diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-15 21:44:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-15 21:44:19 +0200 |
| commit | 4dac32caf38f7c35b707b7df104df03591bf6b14 (patch) | |
| tree | 65aa9cee91b309feb45904ff5af7b43441969aa5 | |
| parent | 270d0388d284c130b322b185497e437cfbbae412 (diff) | |
patch 8.2.0760: Vim9: dict member errors not testedv8.2.0760
Problem: Vim9: dict member errors not tested.
Solution: Delete unreachable error. Add tests.
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 13 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 6e8278850f..8b937dc722 100644 --- 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() diff --git a/src/version.c b/src/version.c index 1eb94bdd25..d447c4b280 100644 --- 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, diff --git a/src/vim9execute.c b/src/vim9execute.c index dcc982805e..f50f8c6e10 100644 --- 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); |