From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 20 Jul 2020 20:09:34 +0000 (+0200)
Subject: patch 8.2.1256: Vim9: type wrong after getting dict item in lambda
X-Git-Tag: v8.2.1256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7892b953e0e496408008434ae3505293c0c93af1;p=vim

patch 8.2.1256: Vim9: type wrong after getting dict item in lambda

Problem:    Vim9: type wrong after getting dict item in lambda.
Solution:   Set the type to "any" after enforcing dict type. (closes #6491)
---

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 7feec382a..b68eb3e4a 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1176,6 +1176,10 @@ def Test_expr7_lambda()
   let dl = [{'key': 0}, {'key': 22}]->filter({ _, v -> v['key'] })
   assert_equal([{'key': 22}], dl)
 
+  dl = [{'key': 12}, {'foo': 34}]
+  assert_equal([{'key': 12}], filter(dl,
+	{_, v -> has_key(v, 'key') ? v['key'] == 12 : 0}))
+
   call CheckDefFailure(["filter([1, 2], {k,v -> 1})"], 'E1069:')
 enddef
 
diff --git a/src/version.c b/src/version.c
index 71c164a42..ee1e3f44c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1256,
 /**/
     1255,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 93a4d896c..ce24dd6a5 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3797,9 +3797,12 @@ compile_subscript(
 	    {
 		if ((*typep)->tt_type == VAR_DICT)
 		    *typep = (*typep)->tt_member;
-		else if (need_type(*typep, &t_dict_any, -2, cctx, FALSE)
-								       == FAIL)
-		    return FAIL;
+		else
+		{
+		    if (need_type(*typep, &t_dict_any, -2, cctx, FALSE) == FAIL)
+			return FAIL;
+		    *typep = &t_any;
+		}
 		if (may_generate_2STRING(-1, cctx) == FAIL)
 		    return FAIL;
 		if (generate_instr_drop(cctx, ISN_MEMBER, 1) == FAIL)