mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 05:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[editions] Make body after contract an error (#16382)

Browse source 
* [editions] Make `body` after contract an error

* Mention --help in build.d module comment

* Add ASTBase.Module.edition property, always Edition.legacy for now
This commit is contained in:
Nick Treleaven 2024-04-18 08:26:20 +01:00 • committed by GitHub
parent 3b3d496210
commit dca92a75b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/src/build.d
View file

@ -5,6 +5,8 @@ DMD builder
Usage: Usage:
./build.d dmd ./build.d dmd
See `--help` for targets.
detab, tolf, install targets - require the D Language Tools (detab.exe, tolf.exe) detab, tolf, install targets - require the D Language Tools (detab.exe, tolf.exe)
https://github.com/dlang/tools. https://github.com/dlang/tools.

1
compiler/src/dmd/astbase.d
View file

@ -1397,6 +1397,7 @@ struct ASTBase
const FileName srcfile; const FileName srcfile;
const(char)[] arg; const(char)[] arg;
Edition edition = Edition.legacy;
extern (D) this(const ref Loc loc, const(char)[] filename, Identifier ident, int doDocComment, int doHdrGen) extern (D) this(const ref Loc loc, const(char)[] filename, Identifier ident, int doDocComment, int doHdrGen)
{ {

3
compiler/src/dmd/mars.d
View file

@ -1212,9 +1212,10 @@ bool parseCommandLine(const ref Strings arguments, const size_t argc, ref Param
params.warnings = DiagnosticReporting.inform; params.warnings = DiagnosticReporting.inform;
else if (arg == "-wo") // https://dlang.org/dmd.html#switch-wo else if (arg == "-wo") // https://dlang.org/dmd.html#switch-wo
{ {
// Obsolete features has been obsoleted until a DIP for "additions" // Obsolete features has been obsoleted until a DIP for "editions"
// has been drafted and ratified in the language spec. // has been drafted and ratified in the language spec.
// Rather, these old features will just be accepted without warning. // Rather, these old features will just be accepted without warning.
// See also: @__edition_latest_do_not_use
} }
else if (arg == "-O") // https://dlang.org/dmd.html#switch-O else if (arg == "-O") // https://dlang.org/dmd.html#switch-O
driverParams.optimize = true; driverParams.optimize = true;

4
compiler/src/dmd/parse.d
View file

@ -9589,9 +9589,9 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
void usageOfBodyKeyword() void usageOfBodyKeyword()
{ {
version (none) // disable obsolete warning if (mod.edition >= Edition.v2024)
{ {
eSink.warning(token.loc, "usage of identifer `body` as a keyword is obsolete. Use `do` instead."); eSink.error(token.loc, "usage of identifer `body` as a keyword is obsolete. Use `do` instead.");
} }
} }
} }

11
compiler/test/fail_compilation/obsolete_body.d Normal file
View file

@ -0,0 +1,11 @@
/*
TEST_OUTPUT:
---
fail_compilation/obsolete_body.d(11): Error: usage of identifer `body` as a keyword is obsolete. Use `do` instead.
---
*/
@__edition_latest_do_not_use
module m;
void test()
in { } body { }