From 378697ac58b8f9705286e36d1805a052e96fb86e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 15 Jul 2021 19:23:18 +0200 Subject: [PATCH] patch 8.2.3168: Vim9: type error for constant of type any Problem: Vim9: type error for constant of type any. Solution: Do add a runtime type check if a constant has type any. (closes #8570) --- src/testdir/test_vim9_assign.vim | 10 ++++++++++ src/version.c | 2 ++ src/vim9compile.c | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 6bbbc3681..3599d6c5d 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1667,6 +1667,16 @@ def Test_var_type_check() s:d = {} END CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + var d = {a: 1, b: [2]} + def Func(b: bool) + var l: list = b ? d.b : [3] + enddef + defcompile + END + CheckScriptSuccess(lines) enddef let g:dict_number = #{one: 1, two: 2} diff --git a/src/version.c b/src/version.c index 6a4943d50..b8c782eef 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3168, /**/ 3167, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 4763e9550..956ce44eb 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1051,7 +1051,8 @@ need_type( // If the actual type can be the expected type add a runtime check. // If it's a constant a runtime check makes no sense. - if (!actual_is_const && use_typecheck(actual, expected)) + if ((!actual_is_const || actual == &t_any) + && use_typecheck(actual, expected)) { generate_TYPECHECK(cctx, expected, offset, arg_idx); return OK; -- 2.50.1