diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-08-14 22:52:03 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-08-14 23:05:41 +0200 |
| commit | ded1677dd20ae795fadc8d6f3c01f012b1338fe1 (patch) | |
| tree | 2e5cbc96efbfa1c9a8dbbd5fb72ebf60fdd58060 | |
| parent | a1dc64956f36cb921d556910c5356bb6b91ba5b9 (diff) | |
patch 9.1.0675: Patch v9.1.0674 causes problemsv9.1.0675
Problem: Patch v9.1.0674 causes problems
Solution: Revert it for now
Revert "patch 9.1.0674: Vim9: compiling abstract method fails because of missing return"
This reverts commit 7477861e0d1d4bb168a65585c49c66e57b3ec636.
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_vim9_class.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 5 |
3 files changed, 4 insertions, 24 deletions
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index 702ec2609f..8791a5218d 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -6264,27 +6264,6 @@ 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 9bfca005dd..f96c473018 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 675, +/**/ 674, /**/ 673, diff --git a/src/vim9compile.c b/src/vim9compile.c index de13f9bb49..ea305b7b34 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4120,9 +4120,8 @@ 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. Same goes for an abstract method. - if ((ufunc->uf_class != NULL && IS_INTERFACE(ufunc->uf_class)) - || IS_ABSTRACT_METHOD(ufunc)) + // No code is actually compiled. + if (ufunc->uf_class != NULL && IS_INTERFACE(ufunc->uf_class)) { ufunc->uf_def_status = UF_NOT_COMPILED; ret = OK; |