aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 9.0.2087: build-failure in vim9class

Browse Source 
Problem:  build-failure in vim9class
Solution: reference correct error message,
          disable non-failing test

closes: #13476
closes: #13477

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2023-11-02 22:45:12 +01:00
parent deba02ddd4
commit 33c1da7ff4
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/testdir/test_vim9_class.vim
View File

@ -5607,13 +5607,15 @@ def Test_abstract_method()
v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3) v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3)
# Use a static abstract method # Use a static abstract method
lines =<< trim END # TODO: this does not fail, so skip it for now
vim9script
abstract class A # lines =<< trim END
abstract static def Foo(): number # vim9script
endclass # abstract class A
END # abstract static def Foo(): number
v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3) # endclass
# END
# v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3)
# Type mismatch between abstract method and concrete method # Type mismatch between abstract method and concrete method
lines =<< trim END lines =<< trim END

2
src/version.c
View File

@ -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 */
/**/
2087,
/**/ /**/
2086, 2086,
/**/ /**/

2
src/vim9class.c
View File

@ -1560,7 +1560,7 @@ early_ret:
p = skipwhite(pa + 8); p = skipwhite(pa + 8);
if (STRNCMP(p, "def", 3) != 0 && STRNCMP(p, "static", 6) != 0) if (STRNCMP(p, "def", 3) != 0 && STRNCMP(p, "static", 6) != 0)
{ {
emsg(_(e_abstract_must_be_followed_by_def_or_static)); emsg(_(e_abstract_must_be_followed_by_def));
break; break;
} }