patch 9.0.1207: error when object type is expected but getting "any"
Problem: Error when object type is expected but getting "any".
Solution: When actual type is "any" use a runtime type check.
(closes #11826)
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 85f47a8..c2c4cf3 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -537,6 +537,26 @@
assert_equal(5, o.GetMember())
END
v9.CheckScriptSuccess(lines)
+
+ lines =<< trim END
+ vim9script
+
+ class Num
+ this.n: number = 0
+ endclass
+
+ def Ref(name: string): func(Num): Num
+ return (arg: Num): Num => {
+ return eval(name)(arg)
+ }
+ enddef
+
+ const Fn = Ref('Double')
+ var Double = (m: Num): Num => Num.new(m.n * 2)
+
+ echo Fn(Num.new(4))
+ END
+ v9.CheckScriptSuccess(lines)
enddef
def Test_class_member()
diff --git a/src/version.c b/src/version.c
index 7825984..afc4de8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1207,
+/**/
1206,
/**/
1205,
diff --git a/src/vim9type.c b/src/vim9type.c
index fb32a86..08dabd1 100644
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -878,6 +878,11 @@
}
else if (expected->tt_type == VAR_OBJECT)
{
+ if (actual->tt_type == VAR_ANY)
+ return MAYBE; // use runtime type check
+ if (actual->tt_type != VAR_OBJECT)
+ return FAIL; // don't use tt_member
+
// check the class, base class or an implemented interface matches
class_T *cl;
for (cl = (class_T *)actual->tt_member; cl != NULL;