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 7feec38..b68eb3e 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1176,6 +1176,10 @@
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 71c164a..ee1e3f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1256,
+/**/
1255,
/**/
1254,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 93a4d89..ce24dd6 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3797,9 +3797,12 @@
{
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)