From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 15 May 2020 19:44:19 +0000 (+0200)
Subject: patch 8.2.0760: Vim9: dict member errors not tested
X-Git-Tag: v8.2.0760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4dac32caf38f7c35b707b7df104df03591bf6b14;p=vim

patch 8.2.0760: Vim9: dict member errors not tested

Problem:    Vim9: dict member errors not tested.
Solution:   Delete unreachable error.  Add tests.
---

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 6e8278850..8b937dc72 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 1eb94bdd2..d447c4b28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    760,
 /**/
     759,
 /**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index dcc982805..f50f8c6e1 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);