patch 9.0.1805: Vim9: problem compiling object method as function call arg
Problem: Vim9: problem compiling object method as function call arg
Solution: After a object/class method call, remove the object/class from
the stack.
closes: #12081
closes: #12929
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index bfe2032..f7d6b73 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -3391,4 +3391,51 @@
v9.CheckScriptFailure(lines, 'E1349: Function "_Foo" of interface "Intf" not implemented')
enddef
+" Test for using the return value of a class/object method as a function
+" argument.
+def Test_objmethod_funcarg()
+ var lines =<< trim END
+ vim9script
+
+ class C
+ def Foo(): string
+ return 'foo'
+ enddef
+ endclass
+
+ def Bar(a: number, s: string): string
+ return s
+ enddef
+
+ def Baz(c: C)
+ assert_equal('foo', Bar(10, c.Foo()))
+ enddef
+
+ var t = C.new()
+ Baz(t)
+ END
+ v9.CheckScriptSuccess(lines)
+
+ lines =<< trim END
+ vim9script
+
+ class C
+ static def Foo(): string
+ return 'foo'
+ enddef
+ endclass
+
+ def Bar(a: number, s: string): string
+ return s
+ enddef
+
+ def Baz()
+ assert_equal('foo', Bar(10, C.Foo()))
+ enddef
+
+ Baz()
+ END
+ v9.CheckScriptSuccess(lines)
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 8b66b33..39cac79 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1805,
+/**/
1804,
/**/
1803,
diff --git a/src/vim9instr.c b/src/vim9instr.c
index 3e9c6b6..ba1aa0c 100644
--- a/src/vim9instr.c
+++ b/src/vim9instr.c
@@ -1902,6 +1902,10 @@
// drop the argument types
cctx->ctx_type_stack.ga_len -= argcount;
+ // For an object or class method call, drop the object/class type
+ if (ufunc->uf_class != NULL)
+ cctx->ctx_type_stack.ga_len--;
+
// add return type
return push_type_stack(cctx, ufunc->uf_ret_type);
}