patch 9.1.0674: Vim9: compiling abstract method fails because of missing return
Commit: https://github.com/vim/vim/commit/7477861e0d1d4bb168a65585c49c66e57b3ec636 Author: Ernie Rael <err...@raelity.com> Date: Wed Aug 14 14:53:55 2024 +0200 patch 9.1.0674: Vim9: compiling abstract method fails because of missing return Problem: Vim9: compiling abstract method fails because of missing return (Aliaksei Budavei) Solution: don't require a return statement for an abstract method when compiling (Ernie Rael) fixes: #15432 closes: #15441 Signed-off-by: Ernie Rael <err...@raelity.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index 8791a5218..702ec2609 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -6264,6 +6264,27 @@ def Test_abstract_method() assert_equal('foo', A.Foo()) END v9.CheckSourceSuccess(lines) + + # Invoke method returning a value through the abstract class. See #15432. + lines =<< trim END + vim9script + + abstract class A + abstract def String(): string + endclass + + class B extends A + def String(): string + return 'B' + enddef + endclass + + def F(o: A) + assert_equal('B', o.String()) + enddef + F(B.new()) + END + v9.CheckSourceSuccess(lines) enddef " Test for calling a class method from a subclass diff --git a/src/version.c b/src/version.c index edde65f72..9bfca005d 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 674, /**/ 673, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index ea305b7b3..de13f9bb4 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4120,8 +4120,9 @@ compile_def_function( ufunc->uf_args_visible = ufunc->uf_args.ga_len; // Compiling a function in an interface is done to get the function type. - // No code is actually compiled. - if (ufunc->uf_class != NULL && IS_INTERFACE(ufunc->uf_class)) + // No code is actually compiled. Same goes for an abstract method. + if ((ufunc->uf_class != NULL && IS_INTERFACE(ufunc->uf_class)) + || IS_ABSTRACT_METHOD(ufunc)) { ufunc->uf_def_status = UF_NOT_COMPILED; ret = OK; -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/E1seDbk-000zTg-8Q%40256bit.org.
