mirror of
https://github.com/vim/vim.git
synced 2025-09-28 04:24: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:
committed by
Christian Brabandt
parent
ea76096fa9
commit
7477861e0d
@@ -6264,6 +6264,27 @@ def Test_abstract_method()
|
|||||||
assert_equal('foo', A.Foo())
|
assert_equal('foo', A.Foo())
|
||||||
END
|
END
|
||||||
v9.CheckSourceSuccess(lines)
|
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
|
enddef
|
||||||
|
|
||||||
" Test for calling a class method from a subclass
|
" Test for calling a class method from a subclass
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
674,
|
||||||
/**/
|
/**/
|
||||||
673,
|
673,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -4120,8 +4120,9 @@ compile_def_function(
|
|||||||
ufunc->uf_args_visible = ufunc->uf_args.ga_len;
|
ufunc->uf_args_visible = ufunc->uf_args.ga_len;
|
||||||
|
|
||||||
// Compiling a function in an interface is done to get the function type.
|
// Compiling a function in an interface is done to get the function type.
|
||||||
// No code is actually compiled.
|
// No code is actually compiled. Same goes for an abstract method.
|
||||||
if (ufunc->uf_class != NULL && IS_INTERFACE(ufunc->uf_class))
|
if ((ufunc->uf_class != NULL && IS_INTERFACE(ufunc->uf_class))
|
||||||
|
|| IS_ABSTRACT_METHOD(ufunc))
|
||||||
{
|
{
|
||||||
ufunc->uf_def_status = UF_NOT_COMPILED;
|
ufunc->uf_def_status = UF_NOT_COMPILED;
|
||||||
ret = OK;
|
ret = OK;
|
||||||
|
Reference in New Issue
Block a user