Mercurial > vim
changeset 33019:04c75e67ca30 v9.0.1801
patch 9.0.1801: Vim9 instanceof() fails in a def func
Commit: https://github.com/vim/vim/commit/b49ad28d731551ddbd5cc57f9c77d0df085ae845
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sun Aug 27 19:08:40 2023 +0200
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 27 Aug 2023 19:15:07 +0200 |
| parents | f0ac5bb79f9f |
| children | 120da95ad043 |
| files | src/evalfunc.c src/testdir/test_vim9_builtin.vim src/testdir/test_vim9_class.vim src/version.c |
| diffstat | 4 files changed, 43 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -282,7 +282,11 @@ arg_number(type_T *type, type_T *decl_ty 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; } /*
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -2317,6 +2317,28 @@ def Test_instanceof() 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()
--- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -2436,6 +2436,20 @@ def Test_instanceof() 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