0
0
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00

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>
This commit is contained in:
Yegappan Lakshmanan
2023-08-27 19:08:40 +02:00
committed by Christian Brabandt
parent 6a3897232a
commit b49ad28d73
4 changed files with 43 additions and 1 deletions

View File

@@ -282,7 +282,11 @@ arg_number(type_T *type, type_T *decl_type UNUSED, argcontext_T *context)
static int static int
arg_object(type_T *type, type_T *decl_type UNUSED, argcontext_T *context) 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;
} }
/* /*

View File

@@ -2317,6 +2317,28 @@ def Test_instanceof()
instanceof(Foo.new(), 123) instanceof(Foo.new(), 123)
END END
v9.CheckScriptFailure(lines, 'E693: List or Class required for argument 2') 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 enddef
def Test_invert() def Test_invert()

View File

@@ -2436,6 +2436,20 @@ def Test_instanceof()
assert_true(instanceof(b3, Mix1)) assert_true(instanceof(b3, Mix1))
assert_false(instanceof(b3, [])) assert_false(instanceof(b3, []))
assert_true(instanceof(b3, [Base1, Base2, Intf1])) 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 END
v9.CheckScriptSuccess(lines) v9.CheckScriptSuccess(lines)
enddef enddef

View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1801,
/**/ /**/
1800, 1800,
/**/ /**/