changeset 25263:5861cc1f5704 v8.2.3168

patch 8.2.3168: Vim9: type error for constant of type any Commit: https://github.com/vim/vim/commit/378697ac58b8f9705286e36d1805a052e96fb86e Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 15 19:23:18 2021 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Thu, 15 Jul 2021 19:30:04 +0200
parents e9065d299e9b
children 19bc0f4c9379
files src/testdir/test_vim9_assign.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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<number> = b ? d.b : [3]
+    enddef
+    defcompile
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 let g:dict_number = #{one: 1, two: 2}
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3168,
+/**/
     3167,
 /**/
     3166,
--- 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;