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

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 <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Ernie Rael
2024-08-14 14:53:55 +02:00
committed by Christian Brabandt
parent ea76096fa9
commit 7477861e0d
3 changed files with 26 additions and 2 deletions

View File

@@ -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

View File

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

View File

@@ -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;