patch 9.0.2088: Vim9: still allows abstract static methods
Commit:
https://github.com/vim/vim/commit/5a53925a6eea929118e5438685e9ebc16ae48aa2
Author: Yegappan Lakshmanan <[email protected]>
Date: Sat Nov 4 09:42:46 2023 +0100
patch 9.0.2088: Vim9: still allows abstract static methods
Problem: Vim9: still allows abstract static methods
(after v9.0.2084, v9.0.2085 and v9.0.2087)
Solution: Disallow abstract static methods
closes: #13479
Signed-off-by: Yegappan Lakshmanan <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 65fa977d8..1f639e2b3 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -5607,15 +5607,13 @@ def Test_abstract_method()
v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3)
# Use a static abstract method
- # TODO: this does not fail, so skip it for now
-
- # lines =<< trim END
- # vim9script
- # abstract class A
- # abstract static def Foo(): number
- # endclass
- # END
- # v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"',
3)
+ lines =<< trim END
+ vim9script
+ abstract class A
+ abstract static def Foo(): number
+ endclass
+ END
+ v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3)
# Type mismatch between abstract method and concrete method
lines =<< trim END
diff --git a/src/version.c b/src/version.c
index a47536170..e45df160b 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 */
+/**/
+ 2088,
/**/
2087,
/**/
diff --git a/src/vim9class.c b/src/vim9class.c
index f709c1f04..e9131fe3b 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -1557,13 +1557,6 @@ early_ret:
break;
}
- p = skipwhite(pa + 8);
- if (STRNCMP(p, "def", 3) != 0 && STRNCMP(p, "static", 6) != 0)
- {
- emsg(_(e_abstract_must_be_followed_by_def));
- break;
- }
-
if (!is_class)
{
// "abstract" not supported in an interface
@@ -1577,6 +1570,13 @@ early_ret:
break;
}
+ p = skipwhite(pa + 8);
+ if (STRNCMP(p, "def", 3) != 0)
+ {
+ emsg(_(e_abstract_must_be_followed_by_def));
+ break;
+ }
+
abstract_method = TRUE;
}
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qzCVf-002O3r-P0%40256bit.org.
