Mercurial > vim
changeset 33027:669898c9a6c3 v9.0.1805
patch 9.0.1805: Vim9: problem compiling object method as function call arg
Commit: https://github.com/vim/vim/commit/639751d218ef423efef8e9aa0fa9abaff7122186
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sun Aug 27 19:23:37 2023 +0200
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>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 27 Aug 2023 19:30:08 +0200 |
parents | 4b7b89b356e8 |
children | 50dfac4adf91 |
files | src/testdir/test_vim9_class.vim src/version.c src/vim9instr.c |
diffstat | 3 files changed, 53 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -3391,4 +3391,51 @@ def Test_interface_private_class_method( 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
--- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1805, +/**/ 1804, /**/ 1803,
--- a/src/vim9instr.c +++ b/src/vim9instr.c @@ -1902,6 +1902,10 @@ generate_CALL( // 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); }