commit b49ad28d731551ddbd5cc57f9c77d0df085ae845
author Yegappan Lakshmanan <yegappan@yahoo.com> Sun Aug 27 19:08:40 2023 +0200
committer Christian Brabandt <cb@256bit.org> Sun Aug 27 19:08:40 2023 +0200
tree 646c8f3584f76f0a4799a884c8c2e4f0581ee706
parent 6a3897232aecd3e8b9e8b23955e55c1993e5baec

patch 9.0.1801: Vim9 instanceof() fails in a def func

Problem:  Vim9 instanceof() fails in a def func
Solution: allow Objects in compile time check

closes: #12907

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>

src/evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index bdfd632..2cd1985 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -282,7 +282,11 @@
     static int
 arg_object(type_T *type, type_T *decl_type UNUSED, argcontext_T *context)
 {
-    return check_arg_type(&t_object, type, context);
+    if (type->tt_type == VAR_OBJECT
+	    || type_any_or_unknown(type))
+	return OK;
+    arg_type_mismatch(&t_object, type, context->arg_idx + 1);
+    return FAIL;
 }
 
 /*

src/testdir/test_vim9_builtin.vim

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index da8bc42..dc5f336 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2317,6 +2317,28 @@
     instanceof(Foo.new(), 123)
   END
   v9.CheckScriptFailure(lines, 'E693: List or Class required for argument 2')
+
+  lines =<< trim END
+    vim9script
+    class Foo
+    endclass
+    def Bar()
+      instanceof('hello', Foo)
+    enddef
+    Bar()
+  END
+  v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected object<Unknown> but got string')
+
+  lines =<< trim END
+    vim9script
+    class Foo
+    endclass
+    def Bar()
+      instanceof(Foo.new(), 123)
+    enddef
+    Bar()
+  END
+  v9.CheckScriptFailure(lines, 'E1013: Argument 2: type mismatch, expected class<Unknown> but got number')
 enddef
 
 def Test_invert()

src/testdir/test_vim9_class.vim

diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 2c6a501..5f5528a 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -2436,6 +2436,20 @@
     assert_true(instanceof(b3, Mix1))
     assert_false(instanceof(b3, []))
     assert_true(instanceof(b3, [Base1, Base2, Intf1]))
+
+    def Foo()
+      var a1 = Base1.new()
+      var a2 = Base2.new()
+      var a3 = Base3.new()
+
+      assert_true(instanceof(a1, Base1))
+      assert_true(instanceof(a2, Base1))
+      assert_false(instanceof(a1, Base2))
+      assert_true(instanceof(a3, Mix1))
+      assert_false(instanceof(a3, []))
+      assert_true(instanceof(a3, [Base1, Base2, Intf1]))
+    enddef
+    Foo()
   END
   v9.CheckScriptSuccess(lines)
 enddef

src/version.c

diff --git a/src/version.c b/src/version.c
index e686da6..431ac38 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1801,
+/**/
     1800,
 /**/
     1799,