diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2024-04-09 21:39:27 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-09 21:39:27 +0200 |
| commit | 1af0fbf955f799392f614bc38f9d2fcbd9960526 (patch) | |
| tree | 723f030d699f218b549d22b241115436823e4a04 | |
| parent | 78c51500f1bb16501521d721d52cb0982f5e70b6 (diff) | |
patch 9.1.0286: Vim9: E1027 with defcompile for abstract methodsv9.1.0286
Problem: Vim9: E1027 with defcompile for abstract methods with
non-void return types, but still compiles it
(zzzyxwvut)
Solution: Don't compile abstract methods
(Yegappan Lakshmanan)
fixes: #14443
closes: #14447
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_vim9_class.vim | 42 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9class.c | 4 |
3 files changed, 47 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index 77a2102c2d..6d6d178510 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -10583,4 +10583,46 @@ def Test_lambda_block_in_class() v9.CheckScriptSuccess(lines) enddef +" Test for defcompiling an abstract method +def Test_abstract_method_defcompile() + # Compile an abstract class with abstract object methods + var lines =<< trim END + vim9script + abstract class A + abstract def Foo(): string + abstract def Bar(): list<string> + endclass + defcompile + END + v9.CheckScriptSuccess(lines) + + # Compile a concrete object method in an abstract class + lines =<< trim END + vim9script + abstract class A + abstract def Foo(): string + abstract def Bar(): list<string> + def Baz(): string + pass + enddef + endclass + defcompile + END + v9.CheckScriptFailure(lines, 'E476: Invalid command: pass', 1) + + # Compile a concrete class method in an abstract class + lines =<< trim END + vim9script + abstract class A + abstract def Foo(): string + abstract def Bar(): list<string> + static def Baz(): string + pass + enddef + endclass + defcompile + END + v9.CheckScriptFailure(lines, 'E476: Invalid command: pass', 1) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index d3fde434cc..4cece61ad6 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 */ /**/ + 286, +/**/ 285, /**/ 284, diff --git a/src/vim9class.c b/src/vim9class.c index 11e952c797..a6b3ee2dc6 100644 --- a/src/vim9class.c +++ b/src/vim9class.c @@ -3723,7 +3723,9 @@ defcompile_class(class_T *cl) { ufunc_T *ufunc = loop == 1 ? cl->class_class_functions[i] : cl->class_obj_methods[i]; - defcompile_function(ufunc, cl); + // Don't compile abstract methods + if (!IS_ABSTRACT_METHOD(ufunc)) + defcompile_function(ufunc, cl); } } } |