Skip to content

[stable] Make enum function a deprecation, not an error #15533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 2 commits into from
Aug 12, 2023
Merged

[stable] Make enum function a deprecation, not an error #15533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2768cb
Make enum function a deprecation, not an error
ntrel Aug 11, 2023
d3a03da
Fix error date
ntrel Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/dmd.enum-function.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
A function with enum storage class is now deprecated, not an error

The error was introduced in 2.105.0.
4 changes: 3 additions & 1 deletion compiler/src/dmd/parse.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4581,8 +4581,10 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
}
else if (t.ty == Tfunction)
{
/* @@@DEPRECATED_2.115@@@
* change to error, deprecated in 2.105.1 */
if (storage_class & STC.manifest)
error("function cannot have enum storage class");
deprecation("function cannot have enum storage class");

AST.Expression constraint = null;
//printf("%s funcdecl t = %s, storage_class = x%lx\n", loc.toChars(), t.toChars(), storage_class);
Expand Down
9 changes: 5 additions & 4 deletions compiler/test/fail_compilation/enum_function.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/*
REQUIRED_ARGS: -de
TEST_OUTPUT:
---
fail_compilation/enum_function.d(10): Error: function cannot have enum storage class
fail_compilation/enum_function.d(11): Error: function cannot have enum storage class
fail_compilation/enum_function.d(12): Error: function cannot have enum storage class
fail_compilation/enum_function.d(13): Error: function cannot have enum storage class
fail_compilation/enum_function.d(11): Deprecation: function cannot have enum storage class
fail_compilation/enum_function.d(12): Deprecation: function cannot have enum storage class
fail_compilation/enum_function.d(13): Deprecation: function cannot have enum storage class
fail_compilation/enum_function.d(14): Deprecation: function cannot have enum storage class
---
*/
enum void f1() { return; }
Expand Down