Update the D grammar

Author: tim-dlang

.github/workflows/tests.yml

@@ -54,7 +54,7 @@ jobs:
       with:
         path: dmd
         repository: dlang/dmd
-        ref: 7bff453b5e3b16c5eab2874984ed7d973a4f9e5b
+        ref: 83adb8aeab12ef7902eefae81223fdd300cfc1e0
         persist-credentials: false
 
     - name: Checkout JSONTestSuite

examples/d/grammard.ebnf

@@ -1,4 +1,4 @@
-// Based on grammar from dlang.org commit 9607293a246a0dc7a96417a84266cd0803675dcd
+// Based on grammar from dlang.org commit 2c3088b5b6c1f35dfb3a0b2a37d4a0fe891d4350
 
 import "grammardlex.ebnf";
 SourceFile @start
@@ -288,30 +288,18 @@ PrimaryExpression @directUnwrap
     | "." IdentifierExpression
     | <TemplateInstance
     | "." TemplateInstance
-    | <ThisExpression
-    | "super"
-    | "null"
-    | "true"
-    | "false"
     | "$"
-    | IntegerLiteral
-    | FloatLiteral
-    | CharacterLiteral
-    | <StringLiterals
-    | <InterpolationExpressionSequence
-    | <ArrayLiteral
-    | <AssocArrayLiteral
-    | <FunctionLiteralNoParen
+    | <LiteralExpression
     | <AssertExpression
     | <MixinExpression
     | <ImportExpression
     | <NewExpression
     | FundamentalType "." Identifier
-    // | "(" Type ")" "." Identifier
+    // | TypeCtor? "(" Type ")" "." Identifier
     // | "(" Type ")" "." TemplateInstance
     // | FundamentalType "(" NamedArgumentList? ")"
     | TypeCtor "(" Type ")" "." Identifier
-    // | TypeCtor "(" Type ")" "(" NamedArgumentList? ")"
+    // | TypeCtor? "(" Type ")" "(" NamedArgumentList? ")"
     | <Typeof
     | <TypeidExpression
     | <IsExpression
@@ -320,6 +308,21 @@ PrimaryExpression @directUnwrap
     | <Vector
     | <PrimaryExpressionParen
     ;
+LiteralExpression
+    = <ThisExpression
+    | "super"
+    | "null"
+    | "true"
+    | "false"
+    | IntegerLiteral
+    | FloatLiteral
+    | CharacterLiteral
+    | <StringLiterals
+    | <InterpolationExpressionSequence
+    | <ArrayLiteral
+    | <AssocArrayLiteral
+    | <FunctionLiteralNoParen
+    ;
 PrimaryExpressionParen @backtrack
     = <FunctionLiteralParen
     | <ParenExpression
@@ -400,8 +403,10 @@ AssertExpression
     = "assert" "(" AssertArguments ")"
     ;
 AssertArguments
-    = AssignExpression ","?
-    | AssignExpression "," AssignExpression ","?
+    = <AssignExpression
+    | AssignExpression ","
+    | AssignExpression "," AssignExpression
+    | AssignExpression "," AssignExpression ","
     ;
 MixinExpression @directUnwrap
     = <Mixin
@@ -560,6 +565,9 @@ NonVoidInitializer @backtrack
     = <ArrayStructInitializer
     | <AssignExpression
     ;
+VoidInitializer
+    = "void"
+    ;
 ArrayInitializer
     = "[" ArrayMemberInitializations? "]"
     ;
@@ -619,9 +627,6 @@ AliasReassignment
     | IdentifierExpression "=" FunctionLiteral ";"
     | IdentifierExpression "=" StorageClasses? BasicType Parameters MemberFunctionAttributes? ";"
     ;
-VoidInitializer
-    = "void"
-    ;
 AsmStatement
     = "asm" FunctionAttributes? "{" AsmInstructionList? "}"
     ;
@@ -986,6 +991,7 @@ FunctionAttributeKwd @directUnwrap
     ;
 AtAttribute @directUnwrap
     = "@" Identifier>>"disable"
+    | "@" Identifier>>"__future"
     | "@" Identifier>>"nogc"
     | "@" Identifier>>"live"
     | <Property
@@ -1149,10 +1155,18 @@ IfCondition @backtrack
     | <Expression
     ;
 IfConditionDecl
-    = Auto Identifier "=" Expression
-    | Scope Identifier "=" Expression
-    | TypeCtors Identifier "=" Expression
-    | TypeCtors? PostfixType Declarator "=" Expression
+    = IfConditionStorageClasses Identifier "=" Expression
+    | IfConditionStorageClasses? PostfixType Declarator "=" Expression
+    ;
+IfConditionStorageClasses
+    = <IfConditionStorageClass
+    | IfConditionStorageClass IfConditionStorageClasses
+    ;
+IfConditionStorageClass
+    = "scope"
+    | "auto"
+    | "ref"
+    | <TypeCtor
     ;
 ThenStatement @directUnwrap
     = <ScopeStatement
@@ -1548,15 +1562,14 @@ VariadicParameter
     = VariadicArgumentsAttributes? "..."
     ;
 Parameter
+    = ParameterDeclaration
+    | ParameterDeclaration "..."
+    | ParameterDeclaration "=" AssignExpression
+    | ParameterDeclaration "=" AssignExpression "..."
+    ;
+ParameterDeclaration
     = ParameterAttributes? PostfixType Declarator
-    | ParameterAttributes? PostfixType Declarator "..."
-    | ParameterAttributes? PostfixType Declarator "=" AssignExpression
-    | ParameterAttributes? PostfixType Declarator "=" AssignExpression "..."
-    | ParameterAttributes PostfixType
-    | ParameterAttributes? PostfixType "=" AssignExpression
-    | ParameterAttributes? PostfixType "=" AssignExpression "..."
-    | PostfixType
-    | ParameterAttributes? PostfixType "..."
+    | ParameterAttributes? PostfixType
     ;
 ParameterAttributes @array @regArray
     = ParameterStorageClass
@@ -1662,13 +1675,13 @@ InOutStatement @directUnwrap
 InContractExpression
     = "in" "(" AssertArguments ")"
     ;
+InStatement
+    = "in" BlockStatement
+    ;
 OutContractExpression
     = "out" "(" ";" AssertArguments ")"
     | "out" "(" Identifier ";" AssertArguments ")"
     ;
-InStatement
-    = "in" BlockStatement
-    ;
 OutStatement
     = "out" BlockStatement
     | "out" "(" Identifier ")" BlockStatement

examples/d/grammardlex.ebnf

@@ -1,4 +1,4 @@
-// Based on grammar from dlang.org commit 9607293a246a0dc7a96417a84266cd0803675dcd
+// Based on grammar from dlang.org commit 2c3088b5b6c1f35dfb3a0b2a37d4a0fe891d4350
 
 token ByteOrderMark
     = "\uFEFF"

examples/d/testgrammard.d

@@ -241,10 +241,10 @@ immutable string[] syntaxErrorExtra = [
     "C style cast illegal",
     "instead of `long ",
     "instead of C-style syntax, use D-style",
-    "only parameters, functions and `foreach` declarations can be `ref`",
     "function cannot have enum storage class",
     "token is not allowed in postfix position",
     "String postfixes on interpolated expression sequences are not allowed.",
+    "use `{ }` for an empty statement, not `;`",
 ];
 
 size_t[syntaxErrorExceptions.length] syntaxErrorExceptionsUsed;
@@ -358,8 +358,6 @@ bool runTests(TestDirType testDirType, string testDir)
         {
             if (relative.startsWith("protection"))
                 continue;
-            if (relative == "mixintype2.d")
-                continue;
             if (relative.startsWith("imports"))
                 continue;
         }
@@ -386,12 +384,14 @@ bool runTests(TestDirType testDirType, string testDir)
             expectFailure = true;
         }
 
-        if (testDirType == TestDirType.failDmd && relative.among(
+        if (relative.among(
                 "fail18228.d",
                 "test12228.d",
                 "fail_typeof.d",
                 "fail19912d.d",
                 "fail54.d",
+                "ident_all.d",
+                "ident_c11.d",
                 ))
         {
             if (expectFailure)
@@ -403,7 +403,8 @@ bool runTests(TestDirType testDirType, string testDir)
         if (testDirType == TestDirType.failDmd && relative.among(
             "fail11751.d",
             "t1252.d",
-            "fail14009.d"
+            "fail14009.d",
+            "mixintype2.d"
             ))
         {
             if (!expectFailure)