diff --git a/Cargo.lock b/Cargo.lock
index cf033755e8..b798052096 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -330,6 +330,7 @@ dependencies = [
  "codegen_language_definition",
  "derive-new",
  "indexmap",
+ "strum_macros",
 ]
 
 [[package]]
diff --git a/crates/codegen/ebnf/Cargo.toml b/crates/codegen/ebnf/Cargo.toml
index 3c91582b73..43cebdead0 100644
--- a/crates/codegen/ebnf/Cargo.toml
+++ b/crates/codegen/ebnf/Cargo.toml
@@ -11,6 +11,7 @@ codegen_language_definition = { workspace = true }
 derive-new = { workspace = true }
 indexmap = { workspace = true }
 Inflector = { workspace = true }
+strum_macros = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/crates/codegen/ebnf/src/builder.rs b/crates/codegen/ebnf/src/builder.rs
index 3acc989c8d..a77dc38885 100644
--- a/crates/codegen/ebnf/src/builder.rs
+++ b/crates/codegen/ebnf/src/builder.rs
@@ -11,6 +11,21 @@ use inflector::Inflector;
 
 use crate::model::{Definition, DefinitionKind, Entry, Expression, Value};
 
+#[allow(dead_code)]
+#[derive(strum_macros::AsRefStr)]
+#[strum(serialize_all = "snake_case")]
+enum BuiltInLabel {
+    // _SLANG_INTERNAL_RESERVED_NODE_LABELS_ (keep in sync)
+    Item,
+    Variant,
+    Separator,
+    Operand,
+    LeftOperand,
+    RightOperand,
+    LeadingTrivia,
+    TrailingTrivia,
+}
+
 pub struct Builder {
     section_index: usize,
     topic_index: usize,
@@ -128,7 +143,7 @@ impl Builder {
 
         let variants = variants.iter().map(|EnumVariant { reference, enabled }| {
             Value::new(
-                Self::build_ref(reference),
+                Self::build_ref(Some(BuiltInLabel::Variant.as_ref()), reference),
                 Self::build_enabled_comment(enabled),
             )
         });
@@ -151,10 +166,11 @@ impl Builder {
 
         self.add_entry(name, Terminal::No, Inlined::No);
 
+        let label = BuiltInLabel::Item.as_ref();
         let expression = if allow_empty.unwrap_or_default() {
-            Expression::new_zero_or_more(Self::build_ref(reference).into())
+            Expression::new_zero_or_more(Self::build_ref(Some(label), reference).into())
         } else {
-            Expression::new_one_or_more(Self::build_ref(reference).into())
+            Expression::new_one_or_more(Self::build_ref(Some(label), reference).into())
         };
 
         self.add_definition(
@@ -177,11 +193,11 @@ impl Builder {
         self.add_entry(name, Terminal::No, Inlined::No);
 
         let mut expression = Expression::new_sequence(vec![
-            Self::build_ref(reference),
+            Self::build_ref(Some(BuiltInLabel::Item.as_ref()), reference),
             Expression::new_zero_or_more(
                 Expression::new_sequence(vec![
-                    Self::build_ref(separator),
-                    Self::build_ref(reference),
+                    Self::build_ref(Some(BuiltInLabel::Separator.as_ref()), separator),
+                    Self::build_ref(Some(BuiltInLabel::Item.as_ref()), reference),
                 ])
                 .into(),
             ),
@@ -214,7 +230,10 @@ impl Builder {
         for precedence_expression in precedence_expressions {
             let PrecedenceExpression { name, operators } = precedence_expression.as_ref();
 
-            values.push(Value::new(Self::build_ref(name), None));
+            values.push(Value::new(
+                Self::build_ref(Some(BuiltInLabel::Variant.as_ref()), name),
+                None,
+            ));
 
             self.add_entry(name, Terminal::No, Inlined::No);
 
@@ -227,7 +246,7 @@ impl Builder {
             let PrimaryExpression { reference, enabled } = primary_expression;
 
             values.push(Value::new(
-                Self::build_ref(reference),
+                Self::build_ref(Some(BuiltInLabel::Variant.as_ref()), reference),
                 Self::build_enabled_comment(enabled),
             ));
         }
@@ -260,24 +279,51 @@ impl Builder {
             OperatorModel::Prefix => {
                 leading_comments.push("Prefix unary operator".to_string());
 
-                values.push(Value::new(Self::build_ref(base_name), None));
+                values.push(Value::new(
+                    Self::build_ref(Some(BuiltInLabel::Operand.as_ref()), base_name),
+                    None,
+                ));
             }
             OperatorModel::Postfix => {
                 leading_comments.push("Postfix unary operator".to_string());
 
-                values.insert(0, Value::new(Self::build_ref(base_name), None));
+                values.insert(
+                    0,
+                    Value::new(
+                        Self::build_ref(Some(BuiltInLabel::Operand.as_ref()), base_name),
+                        None,
+                    ),
+                );
             }
             OperatorModel::BinaryLeftAssociative => {
                 leading_comments.push("Left-associative binary operator".to_string());
 
-                values.insert(0, Value::new(Self::build_ref(base_name), None));
-                values.push(Value::new(Self::build_ref(base_name), None));
+                values.insert(
+                    0,
+                    Value::new(
+                        Self::build_ref(Some(BuiltInLabel::LeftOperand.as_ref()), base_name),
+                        None,
+                    ),
+                );
+                values.push(Value::new(
+                    Self::build_ref(Some(BuiltInLabel::RightOperand.as_ref()), base_name),
+                    None,
+                ));
             }
             OperatorModel::BinaryRightAssociative => {
                 leading_comments.push("Right-associative binary operator".to_string());
 
-                values.insert(0, Value::new(Self::build_ref(base_name), None));
-                values.push(Value::new(Self::build_ref(base_name), None));
+                values.insert(
+                    0,
+                    Value::new(
+                        Self::build_ref(Some(BuiltInLabel::LeftOperand.as_ref()), base_name),
+                        None,
+                    ),
+                );
+                values.push(Value::new(
+                    Self::build_ref(Some(BuiltInLabel::RightOperand.as_ref()), base_name),
+                    None,
+                ));
             }
         };
 
@@ -288,11 +334,13 @@ impl Builder {
 
     fn build_fields(fields: &IndexMap<Identifier, Field>) -> Vec<Value> {
         fields
-            .values()
-            .map(|field| match field {
-                Field::Required { reference } => Value::new(Self::build_ref(reference), None),
+            .iter()
+            .map(|(identifier, field)| match field {
+                Field::Required { reference } => {
+                    Value::new(Self::build_ref(Some(identifier), reference), None)
+                }
                 Field::Optional { reference, enabled } => Value::new(
-                    Expression::new_optional(Self::build_ref(reference).into()),
+                    Expression::new_optional(Self::build_ref(Some(identifier), reference).into()),
                     Self::build_enabled_comment(enabled),
                 ),
             })
@@ -454,12 +502,13 @@ impl Builder {
                 scanner,
                 not_followed_by: _,
             } => Self::build_scanner(scanner),
-            Scanner::Fragment { reference } => Self::build_ref(reference),
+            Scanner::Fragment { reference } => Self::build_ref(None, reference),
         }
     }
 
-    fn build_ref(reference: &Identifier) -> Expression {
-        Expression::new_reference(reference.to_owned())
+    fn build_ref(label: Option<&str>, reference: &Identifier) -> Expression {
+        let leading_comment = label.map(|label| format!("{label}:"));
+        Expression::new_reference(leading_comment, reference.to_owned())
     }
 }
 
diff --git a/crates/codegen/ebnf/src/model.rs b/crates/codegen/ebnf/src/model.rs
index fe609da9e7..6046564c88 100644
--- a/crates/codegen/ebnf/src/model.rs
+++ b/crates/codegen/ebnf/src/model.rs
@@ -90,6 +90,7 @@ pub enum Expression {
         atom: String,
     },
     Reference {
+        leading_comment: Option<String>,
         reference: Identifier,
     },
 }
diff --git a/crates/codegen/ebnf/src/serializer.rs b/crates/codegen/ebnf/src/serializer.rs
index 5df620b41a..59faf86efe 100644
--- a/crates/codegen/ebnf/src/serializer.rs
+++ b/crates/codegen/ebnf/src/serializer.rs
@@ -147,7 +147,14 @@ impl<'s, W: EbnfWriter> Serializer<'s, W> {
             Expression::Atom { atom } => {
                 self.serialize_string_literal(atom)?;
             }
-            Expression::Reference { reference } => {
+            Expression::Reference {
+                leading_comment,
+                reference,
+            } => {
+                if let Some(comment) = leading_comment {
+                    self.serialize_comment(comment)?;
+                    self.serialize_punctuation(" ")?;
+                }
                 self.serialize_identifier(reference)?;
             }
         };
diff --git a/crates/codegen/spec/src/model.rs b/crates/codegen/spec/src/model.rs
index 5e9f47a785..e46ea7f0ed 100644
--- a/crates/codegen/spec/src/model.rs
+++ b/crates/codegen/spec/src/model.rs
@@ -1,7 +1,7 @@
 use std::rc::Rc;
 
 use codegen_ebnf::EbnfModel;
-use codegen_language_definition::model::{Identifier, Language, Section, Topic};
+use codegen_language_definition::model::{Identifier, Item, Language, Section, Topic};
 use inflector::Inflector;
 use serde::Serialize;
 
@@ -91,6 +91,17 @@ impl SpecTopic {
 
         for item in &topic.items {
             items.push(item.name().to_owned());
+
+            // We need to also add any precedence expressions, as they define
+            // items but are not direct children of the topic
+            if let Item::Precedence {
+                item: precedence_item,
+            } = item
+            {
+                for precedence_expr in &precedence_item.precedence_expressions {
+                    items.push(precedence_expr.name.clone());
+                }
+            }
         }
 
         Self { title, slug, items }
diff --git a/crates/solidity/outputs/spec/generated/grammar.ebnf b/crates/solidity/outputs/spec/generated/grammar.ebnf
index d6df242d61..40b7143943 100644
--- a/crates/solidity/outputs/spec/generated/grammar.ebnf
+++ b/crates/solidity/outputs/spec/generated/grammar.ebnf
@@ -10,57 +10,90 @@
 
 (* 1.2. Source Unit: *)
 
-SourceUnit = SourceUnitMembers;
-
-SourceUnitMembers = SourceUnitMember*;
-
-SourceUnitMember = PragmaDirective
-                 | ImportDirective
-                 | ContractDefinition
-                 | InterfaceDefinition
-                 | LibraryDefinition
-                 | StructDefinition (* Introduced in 0.6.0 *)
-                 | EnumDefinition (* Introduced in 0.6.0 *)
-                 | FunctionDefinition (* Introduced in 0.7.1 *)
-                 | ConstantDefinition (* Introduced in 0.7.4 *)
-                 | ErrorDefinition (* Introduced in 0.8.4 *)
-                 | UserDefinedValueTypeDefinition (* Introduced in 0.8.8 *)
-                 | UsingDirective (* Introduced in 0.8.13 *)
-                 | EventDefinition; (* Introduced in 0.8.22 *)
+SourceUnit = (* members: *) SourceUnitMembers;
+
+SourceUnitMembers = (* item: *) SourceUnitMember*;
+
+SourceUnitMember = (* variant: *) PragmaDirective
+                 | (* variant: *) ImportDirective
+                 | (* variant: *) ContractDefinition
+                 | (* variant: *) InterfaceDefinition
+                 | (* variant: *) LibraryDefinition
+                 | (* variant: *) StructDefinition (* Introduced in 0.6.0 *)
+                 | (* variant: *) EnumDefinition (* Introduced in 0.6.0 *)
+                 | (* variant: *) FunctionDefinition (* Introduced in 0.7.1 *)
+                 | (* variant: *) ConstantDefinition (* Introduced in 0.7.4 *)
+                 | (* variant: *) ErrorDefinition (* Introduced in 0.8.4 *)
+                 | (* variant: *) UserDefinedValueTypeDefinition (* Introduced in 0.8.8 *)
+                 | (* variant: *) UsingDirective (* Introduced in 0.8.13 *)
+                 | (* variant: *) EventDefinition; (* Introduced in 0.8.22 *)
 
 (* 1.3. Pragma Directives: *)
 
-PragmaDirective = PRAGMA_KEYWORD
-                  Pragma
-                  SEMICOLON;
+PragmaDirective = (* pragma_keyword: *) PRAGMA_KEYWORD
+                  (* pragma: *) Pragma
+                  (* semicolon: *) SEMICOLON;
 
-Pragma = ABICoderPragma
-       | ExperimentalPragma
-       | VersionPragma;
+Pragma = (* variant: *) ABICoderPragma
+       | (* variant: *) ExperimentalPragma
+       | (* variant: *) VersionPragma;
 
-ABICoderPragma = ABICODER_KEYWORD
-                 IDENTIFIER;
+ABICoderPragma = (* abicoder_keyword: *) ABICODER_KEYWORD
+                 (* version: *) IDENTIFIER;
 
-ExperimentalPragma = EXPERIMENTAL_KEYWORD
-                     ExperimentalFeature;
+ExperimentalPragma = (* experimental_keyword: *) EXPERIMENTAL_KEYWORD
+                     (* feature: *) ExperimentalFeature;
 
-ExperimentalFeature = IDENTIFIER
-                    | StringLiteral;
+ExperimentalFeature = (* variant: *) IDENTIFIER
+                    | (* variant: *) StringLiteral;
 
-VersionPragma = SOLIDITY_KEYWORD
-                VersionExpressionSets;
+VersionPragma = (* solidity_keyword: *) SOLIDITY_KEYWORD
+                (* sets: *) VersionExpressionSets;
 
-VersionExpressionSets = VersionExpressionSet (BAR_BAR VersionExpressionSet)*;
+VersionExpressionSets = (* item: *) VersionExpressionSet ((* separator: *) BAR_BAR (* item: *) VersionExpressionSet)*;
 
-VersionExpressionSet = VersionExpression+;
+VersionExpressionSet = (* item: *) VersionExpression+;
 
-VersionExpression = VersionRange
-                  | VersionComparator
-                  | VersionSpecifiers
-                  | SINGLE_QUOTED_VERSION_LITERAL
-                  | DOUBLE_QUOTED_VERSION_LITERAL;
+VersionExpression = (* variant: *) VersionRange
+                  | (* variant: *) VersionComparator
+                  | (* variant: *) VersionSpecifiers
+                  | (* variant: *) SINGLE_QUOTED_VERSION_LITERAL
+                  | (* variant: *) DOUBLE_QUOTED_VERSION_LITERAL;
 
-VersionSpecifiers = VERSION_SPECIFIER (PERIOD VERSION_SPECIFIER)*;
+(* Left-associative binary operator *)
+VersionRange = (* left_operand: *) VersionExpression
+               (* operator: *) MINUS
+               (* right_operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) CARET
+                    (* operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) TILDE
+                    (* operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) EQUAL
+                    (* operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) LESS_THAN
+                    (* operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) GREATER_THAN
+                    (* operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) LESS_THAN_EQUAL
+                    (* operand: *) VersionExpression;
+
+(* Prefix unary operator *)
+VersionComparator = (* operator: *) GREATER_THAN_EQUAL
+                    (* operand: *) VersionExpression;
+
+VersionSpecifiers = (* item: *) VERSION_SPECIFIER ((* separator: *) PERIOD (* item: *) VERSION_SPECIFIER)*;
 
 VERSION_SPECIFIER = «VERSION_SPECIFIER_FRAGMENT»;
 
@@ -81,83 +114,83 @@ SOLIDITY_KEYWORD = "solidity";
 
 (* 1.4. Import Directives: *)
 
-ImportDirective = IMPORT_KEYWORD
-                  ImportClause
-                  SEMICOLON;
+ImportDirective = (* import_keyword: *) IMPORT_KEYWORD
+                  (* clause: *) ImportClause
+                  (* semicolon: *) SEMICOLON;
 
-ImportClause = PathImport
-             | NamedImport
-             | ImportDeconstruction;
+ImportClause = (* variant: *) PathImport
+             | (* variant: *) NamedImport
+             | (* variant: *) ImportDeconstruction;
 
-PathImport = StringLiteral
-             ImportAlias?;
+PathImport = (* path: *) StringLiteral
+             (* alias: *) ImportAlias?;
 
-NamedImport = ASTERISK
-              ImportAlias
-              FROM_KEYWORD
-              StringLiteral;
+NamedImport = (* asterisk: *) ASTERISK
+              (* alias: *) ImportAlias
+              (* from_keyword: *) FROM_KEYWORD
+              (* path: *) StringLiteral;
 
-ImportDeconstruction = OPEN_BRACE
-                       ImportDeconstructionSymbols
-                       CLOSE_BRACE
-                       FROM_KEYWORD
-                       StringLiteral;
+ImportDeconstruction = (* open_brace: *) OPEN_BRACE
+                       (* symbols: *) ImportDeconstructionSymbols
+                       (* close_brace: *) CLOSE_BRACE
+                       (* from_keyword: *) FROM_KEYWORD
+                       (* path: *) StringLiteral;
 
-ImportDeconstructionSymbols = ImportDeconstructionSymbol (COMMA ImportDeconstructionSymbol)*;
+ImportDeconstructionSymbols = (* item: *) ImportDeconstructionSymbol ((* separator: *) COMMA (* item: *) ImportDeconstructionSymbol)*;
 
-ImportDeconstructionSymbol = IDENTIFIER
-                             ImportAlias?;
+ImportDeconstructionSymbol = (* name: *) IDENTIFIER
+                             (* alias: *) ImportAlias?;
 
-ImportAlias = AS_KEYWORD
-              IDENTIFIER;
+ImportAlias = (* as_keyword: *) AS_KEYWORD
+              (* identifier: *) IDENTIFIER;
 
 (* 1.5. Using Directives: *)
 
-UsingDirective = USING_KEYWORD
-                 UsingClause
-                 FOR_KEYWORD
-                 UsingTarget
-                 GLOBAL_KEYWORD? (* Introduced in 0.8.13 *)
-                 SEMICOLON;
+UsingDirective = (* using_keyword: *) USING_KEYWORD
+                 (* clause: *) UsingClause
+                 (* for_keyword: *) FOR_KEYWORD
+                 (* target: *) UsingTarget
+                 (* global_keyword: *) GLOBAL_KEYWORD? (* Introduced in 0.8.13 *)
+                 (* semicolon: *) SEMICOLON;
 
-UsingClause = IdentifierPath
-            | UsingDeconstruction; (* Introduced in 0.8.13 *)
+UsingClause = (* variant: *) IdentifierPath
+            | (* variant: *) UsingDeconstruction; (* Introduced in 0.8.13 *)
 
 (* Introduced in 0.8.13 *)
-UsingDeconstruction = OPEN_BRACE
-                      UsingDeconstructionSymbols
-                      CLOSE_BRACE;
+UsingDeconstruction = (* open_brace: *) OPEN_BRACE
+                      (* symbols: *) UsingDeconstructionSymbols
+                      (* close_brace: *) CLOSE_BRACE;
 
 (* Introduced in 0.8.13 *)
-UsingDeconstructionSymbols = UsingDeconstructionSymbol (COMMA UsingDeconstructionSymbol)*;
+UsingDeconstructionSymbols = (* item: *) UsingDeconstructionSymbol ((* separator: *) COMMA (* item: *) UsingDeconstructionSymbol)*;
 
 (* Introduced in 0.8.13 *)
-UsingDeconstructionSymbol = IdentifierPath
-                            UsingAlias?; (* Introduced in 0.8.19 *)
+UsingDeconstructionSymbol = (* name: *) IdentifierPath
+                            (* alias: *) UsingAlias?; (* Introduced in 0.8.19 *)
 
 (* Introduced in 0.8.19 *)
-UsingAlias = AS_KEYWORD
-             UsingOperator;
+UsingAlias = (* as_keyword: *) AS_KEYWORD
+             (* operator: *) UsingOperator;
 
 (* Introduced in 0.8.19 *)
-UsingOperator = AMPERSAND
-              | ASTERISK
-              | BANG_EQUAL
-              | BAR
-              | CARET
-              | EQUAL_EQUAL
-              | GREATER_THAN
-              | GREATER_THAN_EQUAL
-              | LESS_THAN
-              | LESS_THAN_EQUAL
-              | MINUS
-              | PERCENT
-              | PLUS
-              | SLASH
-              | TILDE;
-
-UsingTarget = TypeName
-            | ASTERISK;
+UsingOperator = (* variant: *) AMPERSAND
+              | (* variant: *) ASTERISK
+              | (* variant: *) BANG_EQUAL
+              | (* variant: *) BAR
+              | (* variant: *) CARET
+              | (* variant: *) EQUAL_EQUAL
+              | (* variant: *) GREATER_THAN
+              | (* variant: *) GREATER_THAN_EQUAL
+              | (* variant: *) LESS_THAN
+              | (* variant: *) LESS_THAN_EQUAL
+              | (* variant: *) MINUS
+              | (* variant: *) PERCENT
+              | (* variant: *) PLUS
+              | (* variant: *) SLASH
+              | (* variant: *) TILDE;
+
+UsingTarget = (* variant: *) TypeName
+            | (* variant: *) ASTERISK;
 
 (* 1.6. Trivia: *)
 
@@ -579,302 +612,302 @@ TILDE = "~";
 
 (* 2.1. Contracts: *)
 
-ContractDefinition = ABSTRACT_KEYWORD? (* Introduced in 0.6.0 *)
-                     CONTRACT_KEYWORD
-                     IDENTIFIER
-                     InheritanceSpecifier?
-                     OPEN_BRACE
-                     ContractMembers
-                     CLOSE_BRACE;
-
-InheritanceSpecifier = IS_KEYWORD
-                       InheritanceTypes;
-
-InheritanceTypes = InheritanceType (COMMA InheritanceType)*;
-
-InheritanceType = IdentifierPath
-                  ArgumentsDeclaration?;
-
-ContractMembers = ContractMember*;
-
-ContractMember = UsingDirective
-               | FunctionDefinition
-               | ConstructorDefinition (* Introduced in 0.4.22 *)
-               | ReceiveFunctionDefinition (* Introduced in 0.6.0 *)
-               | FallbackFunctionDefinition (* Introduced in 0.6.0 *)
-               | UnnamedFunctionDefinition (* Deprecated in 0.6.0 *)
-               | ModifierDefinition
-               | StructDefinition
-               | EnumDefinition
-               | EventDefinition
-               | StateVariableDefinition
-               | ErrorDefinition (* Introduced in 0.8.4 *)
-               | UserDefinedValueTypeDefinition; (* Introduced in 0.8.8 *)
+ContractDefinition = (* abstract_keyword: *) ABSTRACT_KEYWORD? (* Introduced in 0.6.0 *)
+                     (* contract_keyword: *) CONTRACT_KEYWORD
+                     (* name: *) IDENTIFIER
+                     (* inheritance: *) InheritanceSpecifier?
+                     (* open_brace: *) OPEN_BRACE
+                     (* members: *) ContractMembers
+                     (* close_brace: *) CLOSE_BRACE;
+
+InheritanceSpecifier = (* is_keyword: *) IS_KEYWORD
+                       (* types: *) InheritanceTypes;
+
+InheritanceTypes = (* item: *) InheritanceType ((* separator: *) COMMA (* item: *) InheritanceType)*;
+
+InheritanceType = (* type_name: *) IdentifierPath
+                  (* arguments: *) ArgumentsDeclaration?;
+
+ContractMembers = (* item: *) ContractMember*;
+
+ContractMember = (* variant: *) UsingDirective
+               | (* variant: *) FunctionDefinition
+               | (* variant: *) ConstructorDefinition (* Introduced in 0.4.22 *)
+               | (* variant: *) ReceiveFunctionDefinition (* Introduced in 0.6.0 *)
+               | (* variant: *) FallbackFunctionDefinition (* Introduced in 0.6.0 *)
+               | (* variant: *) UnnamedFunctionDefinition (* Deprecated in 0.6.0 *)
+               | (* variant: *) ModifierDefinition
+               | (* variant: *) StructDefinition
+               | (* variant: *) EnumDefinition
+               | (* variant: *) EventDefinition
+               | (* variant: *) StateVariableDefinition
+               | (* variant: *) ErrorDefinition (* Introduced in 0.8.4 *)
+               | (* variant: *) UserDefinedValueTypeDefinition; (* Introduced in 0.8.8 *)
 
 (* 2.2. Interfaces: *)
 
-InterfaceDefinition = INTERFACE_KEYWORD
-                      IDENTIFIER
-                      InheritanceSpecifier?
-                      OPEN_BRACE
-                      InterfaceMembers
-                      CLOSE_BRACE;
+InterfaceDefinition = (* interface_keyword: *) INTERFACE_KEYWORD
+                      (* name: *) IDENTIFIER
+                      (* inheritance: *) InheritanceSpecifier?
+                      (* open_brace: *) OPEN_BRACE
+                      (* members: *) InterfaceMembers
+                      (* close_brace: *) CLOSE_BRACE;
 
-InterfaceMembers = ContractMember*;
+InterfaceMembers = (* item: *) ContractMember*;
 
 (* 2.3. Libraries: *)
 
-LibraryDefinition = LIBRARY_KEYWORD
-                    IDENTIFIER
-                    OPEN_BRACE
-                    LibraryMembers
-                    CLOSE_BRACE;
+LibraryDefinition = (* library_keyword: *) LIBRARY_KEYWORD
+                    (* name: *) IDENTIFIER
+                    (* open_brace: *) OPEN_BRACE
+                    (* members: *) LibraryMembers
+                    (* close_brace: *) CLOSE_BRACE;
 
-LibraryMembers = ContractMember*;
+LibraryMembers = (* item: *) ContractMember*;
 
 (* 2.4. Structs: *)
 
-StructDefinition = STRUCT_KEYWORD
-                   IDENTIFIER
-                   OPEN_BRACE
-                   StructMembers
-                   CLOSE_BRACE;
+StructDefinition = (* struct_keyword: *) STRUCT_KEYWORD
+                   (* name: *) IDENTIFIER
+                   (* open_brace: *) OPEN_BRACE
+                   (* members: *) StructMembers
+                   (* close_brace: *) CLOSE_BRACE;
 
-StructMembers = StructMember*;
+StructMembers = (* item: *) StructMember*;
 
-StructMember = TypeName
-               IDENTIFIER
-               SEMICOLON;
+StructMember = (* type_name: *) TypeName
+               (* name: *) IDENTIFIER
+               (* semicolon: *) SEMICOLON;
 
 (* 2.5. Enums: *)
 
-EnumDefinition = ENUM_KEYWORD
-                 IDENTIFIER
-                 OPEN_BRACE
-                 EnumMembers
-                 CLOSE_BRACE;
+EnumDefinition = (* enum_keyword: *) ENUM_KEYWORD
+                 (* name: *) IDENTIFIER
+                 (* open_brace: *) OPEN_BRACE
+                 (* members: *) EnumMembers
+                 (* close_brace: *) CLOSE_BRACE;
 
-EnumMembers = (IDENTIFIER (COMMA IDENTIFIER)*)?;
+EnumMembers = ((* item: *) IDENTIFIER ((* separator: *) COMMA (* item: *) IDENTIFIER)*)?;
 
 (* 2.6. Constants: *)
 
 (* Introduced in 0.7.4 *)
-ConstantDefinition = TypeName
-                     CONSTANT_KEYWORD
-                     IDENTIFIER
-                     EQUAL
-                     Expression
-                     SEMICOLON;
+ConstantDefinition = (* type_name: *) TypeName
+                     (* constant_keyword: *) CONSTANT_KEYWORD
+                     (* name: *) IDENTIFIER
+                     (* equal: *) EQUAL
+                     (* value: *) Expression
+                     (* semicolon: *) SEMICOLON;
 
 (* 2.7. State Variables: *)
 
-StateVariableDefinition = TypeName
-                          StateVariableAttributes
-                          IDENTIFIER
-                          StateVariableDefinitionValue?
-                          SEMICOLON;
+StateVariableDefinition = (* type_name: *) TypeName
+                          (* attributes: *) StateVariableAttributes
+                          (* name: *) IDENTIFIER
+                          (* value: *) StateVariableDefinitionValue?
+                          (* semicolon: *) SEMICOLON;
 
-StateVariableDefinitionValue = EQUAL
-                               Expression;
+StateVariableDefinitionValue = (* equal: *) EQUAL
+                               (* value: *) Expression;
 
-StateVariableAttributes = StateVariableAttribute*;
+StateVariableAttributes = (* item: *) StateVariableAttribute*;
 
-StateVariableAttribute = OverrideSpecifier (* Introduced in 0.6.0 *)
-                       | CONSTANT_KEYWORD
-                       | INTERNAL_KEYWORD
-                       | PRIVATE_KEYWORD
-                       | PUBLIC_KEYWORD
-                       | IMMUTABLE_KEYWORD; (* Introduced in 0.6.5 *)
+StateVariableAttribute = (* variant: *) OverrideSpecifier (* Introduced in 0.6.0 *)
+                       | (* variant: *) CONSTANT_KEYWORD
+                       | (* variant: *) INTERNAL_KEYWORD
+                       | (* variant: *) PRIVATE_KEYWORD
+                       | (* variant: *) PUBLIC_KEYWORD
+                       | (* variant: *) IMMUTABLE_KEYWORD; (* Introduced in 0.6.5 *)
 
 (* 2.8. Functions: *)
 
-FunctionDefinition = FUNCTION_KEYWORD
-                     FunctionName
-                     ParametersDeclaration
-                     FunctionAttributes
-                     ReturnsDeclaration?
-                     FunctionBody;
-
-FunctionName = IDENTIFIER
-             | FALLBACK_KEYWORD
-             | RECEIVE_KEYWORD;
-
-ParametersDeclaration = OPEN_PAREN
-                        Parameters
-                        CLOSE_PAREN;
-
-Parameters = (Parameter (COMMA Parameter)*)?;
-
-Parameter = TypeName
-            StorageLocation?
-            IDENTIFIER?;
-
-FunctionAttributes = FunctionAttribute*;
-
-FunctionAttribute = ModifierInvocation
-                  | OverrideSpecifier (* Introduced in 0.6.0 *)
-                  | CONSTANT_KEYWORD (* Deprecated in 0.5.0 *)
-                  | EXTERNAL_KEYWORD
-                  | INTERNAL_KEYWORD
-                  | PAYABLE_KEYWORD
-                  | PRIVATE_KEYWORD
-                  | PUBLIC_KEYWORD
-                  | PURE_KEYWORD (* Introduced in 0.4.16 *)
-                  | VIEW_KEYWORD (* Introduced in 0.4.16 *)
-                  | VIRTUAL_KEYWORD; (* Introduced in 0.6.0 *)
+FunctionDefinition = (* function_keyword: *) FUNCTION_KEYWORD
+                     (* name: *) FunctionName
+                     (* parameters: *) ParametersDeclaration
+                     (* attributes: *) FunctionAttributes
+                     (* returns: *) ReturnsDeclaration?
+                     (* body: *) FunctionBody;
+
+FunctionName = (* variant: *) IDENTIFIER
+             | (* variant: *) FALLBACK_KEYWORD
+             | (* variant: *) RECEIVE_KEYWORD;
+
+ParametersDeclaration = (* open_paren: *) OPEN_PAREN
+                        (* parameters: *) Parameters
+                        (* close_paren: *) CLOSE_PAREN;
+
+Parameters = ((* item: *) Parameter ((* separator: *) COMMA (* item: *) Parameter)*)?;
+
+Parameter = (* type_name: *) TypeName
+            (* storage_location: *) StorageLocation?
+            (* name: *) IDENTIFIER?;
+
+FunctionAttributes = (* item: *) FunctionAttribute*;
+
+FunctionAttribute = (* variant: *) ModifierInvocation
+                  | (* variant: *) OverrideSpecifier (* Introduced in 0.6.0 *)
+                  | (* variant: *) CONSTANT_KEYWORD (* Deprecated in 0.5.0 *)
+                  | (* variant: *) EXTERNAL_KEYWORD
+                  | (* variant: *) INTERNAL_KEYWORD
+                  | (* variant: *) PAYABLE_KEYWORD
+                  | (* variant: *) PRIVATE_KEYWORD
+                  | (* variant: *) PUBLIC_KEYWORD
+                  | (* variant: *) PURE_KEYWORD (* Introduced in 0.4.16 *)
+                  | (* variant: *) VIEW_KEYWORD (* Introduced in 0.4.16 *)
+                  | (* variant: *) VIRTUAL_KEYWORD; (* Introduced in 0.6.0 *)
 
 (* Introduced in 0.6.0 *)
-OverrideSpecifier = OVERRIDE_KEYWORD
-                    OverridePathsDeclaration?;
+OverrideSpecifier = (* override_keyword: *) OVERRIDE_KEYWORD
+                    (* overridden: *) OverridePathsDeclaration?;
 
 (* Introduced in 0.6.0 *)
-OverridePathsDeclaration = OPEN_PAREN
-                           OverridePaths
-                           CLOSE_PAREN;
+OverridePathsDeclaration = (* open_paren: *) OPEN_PAREN
+                           (* paths: *) OverridePaths
+                           (* close_paren: *) CLOSE_PAREN;
 
 (* Introduced in 0.6.0 *)
-OverridePaths = IdentifierPath (COMMA IdentifierPath)*;
+OverridePaths = (* item: *) IdentifierPath ((* separator: *) COMMA (* item: *) IdentifierPath)*;
 
-ReturnsDeclaration = RETURNS_KEYWORD
-                     ParametersDeclaration;
+ReturnsDeclaration = (* returns_keyword: *) RETURNS_KEYWORD
+                     (* variables: *) ParametersDeclaration;
 
-FunctionBody = Block
-             | SEMICOLON;
+FunctionBody = (* variant: *) Block
+             | (* variant: *) SEMICOLON;
 
 (* Introduced in 0.4.22 *)
-ConstructorDefinition = CONSTRUCTOR_KEYWORD
-                        ParametersDeclaration
-                        ConstructorAttributes
-                        Block;
+ConstructorDefinition = (* constructor_keyword: *) CONSTRUCTOR_KEYWORD
+                        (* parameters: *) ParametersDeclaration
+                        (* attributes: *) ConstructorAttributes
+                        (* body: *) Block;
 
 (* Introduced in 0.4.22 *)
-ConstructorAttributes = ConstructorAttribute*;
+ConstructorAttributes = (* item: *) ConstructorAttribute*;
 
 (* Introduced in 0.4.22 *)
-ConstructorAttribute = ModifierInvocation
-                     | INTERNAL_KEYWORD
-                     | OVERRIDE_KEYWORD (* Introduced in 0.6.0 and deprecated in 0.6.7. *)
-                     | PAYABLE_KEYWORD
-                     | PUBLIC_KEYWORD
-                     | VIRTUAL_KEYWORD; (* Introduced in 0.6.0 and deprecated in 0.6.7. *)
+ConstructorAttribute = (* variant: *) ModifierInvocation
+                     | (* variant: *) INTERNAL_KEYWORD
+                     | (* variant: *) OVERRIDE_KEYWORD (* Introduced in 0.6.0 and deprecated in 0.6.7. *)
+                     | (* variant: *) PAYABLE_KEYWORD
+                     | (* variant: *) PUBLIC_KEYWORD
+                     | (* variant: *) VIRTUAL_KEYWORD; (* Introduced in 0.6.0 and deprecated in 0.6.7. *)
 
 (* Deprecated in 0.6.0 *)
-UnnamedFunctionDefinition = FUNCTION_KEYWORD
-                            ParametersDeclaration
-                            UnnamedFunctionAttributes
-                            FunctionBody;
+UnnamedFunctionDefinition = (* function_keyword: *) FUNCTION_KEYWORD
+                            (* parameters: *) ParametersDeclaration
+                            (* attributes: *) UnnamedFunctionAttributes
+                            (* body: *) FunctionBody;
 
 (* Deprecated in 0.6.0 *)
-UnnamedFunctionAttributes = UnnamedFunctionAttribute*;
+UnnamedFunctionAttributes = (* item: *) UnnamedFunctionAttribute*;
 
 (* Deprecated in 0.6.0 *)
-UnnamedFunctionAttribute = ModifierInvocation
-                         | CONSTANT_KEYWORD (* Deprecated in 0.5.0 *)
-                         | EXTERNAL_KEYWORD
-                         | INTERNAL_KEYWORD (* Deprecated in 0.5.0 *)
-                         | PAYABLE_KEYWORD
-                         | PRIVATE_KEYWORD (* Deprecated in 0.5.0 *)
-                         | PUBLIC_KEYWORD (* Deprecated in 0.5.0 *)
-                         | PURE_KEYWORD (* Introduced in 0.4.16 and deprecated in 0.6.0. *)
-                         | VIEW_KEYWORD; (* Introduced in 0.4.16 and deprecated in 0.6.0. *)
+UnnamedFunctionAttribute = (* variant: *) ModifierInvocation
+                         | (* variant: *) CONSTANT_KEYWORD (* Deprecated in 0.5.0 *)
+                         | (* variant: *) EXTERNAL_KEYWORD
+                         | (* variant: *) INTERNAL_KEYWORD (* Deprecated in 0.5.0 *)
+                         | (* variant: *) PAYABLE_KEYWORD
+                         | (* variant: *) PRIVATE_KEYWORD (* Deprecated in 0.5.0 *)
+                         | (* variant: *) PUBLIC_KEYWORD (* Deprecated in 0.5.0 *)
+                         | (* variant: *) PURE_KEYWORD (* Introduced in 0.4.16 and deprecated in 0.6.0. *)
+                         | (* variant: *) VIEW_KEYWORD; (* Introduced in 0.4.16 and deprecated in 0.6.0. *)
 
 (* Introduced in 0.6.0 *)
-FallbackFunctionDefinition = FALLBACK_KEYWORD
-                             ParametersDeclaration
-                             FallbackFunctionAttributes
-                             ReturnsDeclaration?
-                             FunctionBody;
+FallbackFunctionDefinition = (* fallback_keyword: *) FALLBACK_KEYWORD
+                             (* parameters: *) ParametersDeclaration
+                             (* attributes: *) FallbackFunctionAttributes
+                             (* returns: *) ReturnsDeclaration?
+                             (* body: *) FunctionBody;
 
 (* Introduced in 0.6.0 *)
-FallbackFunctionAttributes = FallbackFunctionAttribute*;
+FallbackFunctionAttributes = (* item: *) FallbackFunctionAttribute*;
 
 (* Introduced in 0.6.0 *)
-FallbackFunctionAttribute = ModifierInvocation
-                          | OverrideSpecifier
-                          | EXTERNAL_KEYWORD
-                          | PAYABLE_KEYWORD
-                          | PURE_KEYWORD
-                          | VIEW_KEYWORD
-                          | VIRTUAL_KEYWORD;
+FallbackFunctionAttribute = (* variant: *) ModifierInvocation
+                          | (* variant: *) OverrideSpecifier
+                          | (* variant: *) EXTERNAL_KEYWORD
+                          | (* variant: *) PAYABLE_KEYWORD
+                          | (* variant: *) PURE_KEYWORD
+                          | (* variant: *) VIEW_KEYWORD
+                          | (* variant: *) VIRTUAL_KEYWORD;
 
 (* Introduced in 0.6.0 *)
-ReceiveFunctionDefinition = RECEIVE_KEYWORD
-                            ParametersDeclaration
-                            ReceiveFunctionAttributes
-                            FunctionBody;
+ReceiveFunctionDefinition = (* receive_keyword: *) RECEIVE_KEYWORD
+                            (* parameters: *) ParametersDeclaration
+                            (* attributes: *) ReceiveFunctionAttributes
+                            (* body: *) FunctionBody;
 
 (* Introduced in 0.6.0 *)
-ReceiveFunctionAttributes = ReceiveFunctionAttribute*;
+ReceiveFunctionAttributes = (* item: *) ReceiveFunctionAttribute*;
 
 (* Introduced in 0.6.0 *)
-ReceiveFunctionAttribute = ModifierInvocation
-                         | OverrideSpecifier
-                         | EXTERNAL_KEYWORD
-                         | PAYABLE_KEYWORD
-                         | VIRTUAL_KEYWORD;
+ReceiveFunctionAttribute = (* variant: *) ModifierInvocation
+                         | (* variant: *) OverrideSpecifier
+                         | (* variant: *) EXTERNAL_KEYWORD
+                         | (* variant: *) PAYABLE_KEYWORD
+                         | (* variant: *) VIRTUAL_KEYWORD;
 
 (* 2.9. Modifiers: *)
 
-ModifierDefinition = MODIFIER_KEYWORD
-                     IDENTIFIER
-                     ParametersDeclaration?
-                     ModifierAttributes
-                     FunctionBody;
+ModifierDefinition = (* modifier_keyword: *) MODIFIER_KEYWORD
+                     (* name: *) IDENTIFIER
+                     (* parameters: *) ParametersDeclaration?
+                     (* attributes: *) ModifierAttributes
+                     (* body: *) FunctionBody;
 
-ModifierAttributes = ModifierAttribute*;
+ModifierAttributes = (* item: *) ModifierAttribute*;
 
-ModifierAttribute = OverrideSpecifier (* Introduced in 0.6.0 *)
-                  | VIRTUAL_KEYWORD; (* Introduced in 0.6.0 *)
+ModifierAttribute = (* variant: *) OverrideSpecifier (* Introduced in 0.6.0 *)
+                  | (* variant: *) VIRTUAL_KEYWORD; (* Introduced in 0.6.0 *)
 
-ModifierInvocation = IdentifierPath
-                     ArgumentsDeclaration?;
+ModifierInvocation = (* name: *) IdentifierPath
+                     (* arguments: *) ArgumentsDeclaration?;
 
 (* 2.10. Events: *)
 
-EventDefinition = EVENT_KEYWORD
-                  IDENTIFIER
-                  EventParametersDeclaration
-                  ANONYMOUS_KEYWORD?
-                  SEMICOLON;
+EventDefinition = (* event_keyword: *) EVENT_KEYWORD
+                  (* name: *) IDENTIFIER
+                  (* parameters: *) EventParametersDeclaration
+                  (* anonymous_keyword: *) ANONYMOUS_KEYWORD?
+                  (* semicolon: *) SEMICOLON;
 
-EventParametersDeclaration = OPEN_PAREN
-                             EventParameters
-                             CLOSE_PAREN;
+EventParametersDeclaration = (* open_paren: *) OPEN_PAREN
+                             (* parameters: *) EventParameters
+                             (* close_paren: *) CLOSE_PAREN;
 
-EventParameters = (EventParameter (COMMA EventParameter)*)?;
+EventParameters = ((* item: *) EventParameter ((* separator: *) COMMA (* item: *) EventParameter)*)?;
 
-EventParameter = TypeName
-                 INDEXED_KEYWORD?
-                 IDENTIFIER?;
+EventParameter = (* type_name: *) TypeName
+                 (* indexed_keyword: *) INDEXED_KEYWORD?
+                 (* name: *) IDENTIFIER?;
 
 (* 2.11. User Defined Value Types: *)
 
 (* Introduced in 0.8.8 *)
-UserDefinedValueTypeDefinition = TYPE_KEYWORD
-                                 IDENTIFIER
-                                 IS_KEYWORD
-                                 ElementaryType
-                                 SEMICOLON;
+UserDefinedValueTypeDefinition = (* type_keyword: *) TYPE_KEYWORD
+                                 (* name: *) IDENTIFIER
+                                 (* is_keyword: *) IS_KEYWORD
+                                 (* value_type: *) ElementaryType
+                                 (* semicolon: *) SEMICOLON;
 
 (* 2.12. Errors: *)
 
 (* Introduced in 0.8.4 *)
-ErrorDefinition = ERROR_KEYWORD
-                  IDENTIFIER
-                  ErrorParametersDeclaration
-                  SEMICOLON;
+ErrorDefinition = (* error_keyword: *) ERROR_KEYWORD
+                  (* name: *) IDENTIFIER
+                  (* members: *) ErrorParametersDeclaration
+                  (* semicolon: *) SEMICOLON;
 
 (* Introduced in 0.8.4 *)
-ErrorParametersDeclaration = OPEN_PAREN
-                             ErrorParameters
-                             CLOSE_PAREN;
+ErrorParametersDeclaration = (* open_paren: *) OPEN_PAREN
+                             (* parameters: *) ErrorParameters
+                             (* close_paren: *) CLOSE_PAREN;
 
 (* Introduced in 0.8.4 *)
-ErrorParameters = (ErrorParameter (COMMA ErrorParameter)*)?;
+ErrorParameters = ((* item: *) ErrorParameter ((* separator: *) COMMA (* item: *) ErrorParameter)*)?;
 
 (* Introduced in 0.8.4 *)
-ErrorParameter = TypeName
-                 IDENTIFIER?;
+ErrorParameter = (* type_name: *) TypeName
+                 (* name: *) IDENTIFIER?;
 
 (*
  * 3. Types:
@@ -882,58 +915,64 @@ ErrorParameter = TypeName
 
 (* 3.1. Advanced Types: *)
 
-TypeName = ArrayTypeName
-         | FunctionType
-         | MappingType
-         | ElementaryType
-         | IdentifierPath;
-
-FunctionType = FUNCTION_KEYWORD
-               ParametersDeclaration
-               FunctionTypeAttributes
-               ReturnsDeclaration?;
-
-FunctionTypeAttributes = FunctionTypeAttribute*;
-
-FunctionTypeAttribute = INTERNAL_KEYWORD
-                      | EXTERNAL_KEYWORD
-                      | PRIVATE_KEYWORD
-                      | PUBLIC_KEYWORD
-                      | CONSTANT_KEYWORD (* Deprecated in 0.5.0 *)
-                      | PURE_KEYWORD (* Introduced in 0.4.16 *)
-                      | VIEW_KEYWORD (* Introduced in 0.4.16 *)
-                      | PAYABLE_KEYWORD;
-
-MappingType = MAPPING_KEYWORD
-              OPEN_PAREN
-              MappingKey
-              EQUAL_GREATER_THAN
-              MappingValue
-              CLOSE_PAREN;
-
-MappingKey = MappingKeyType
-             IDENTIFIER?; (* Introduced in 0.8.18 *)
-
-MappingKeyType = ElementaryType
-               | IdentifierPath;
-
-MappingValue = TypeName
-               IDENTIFIER?; (* Introduced in 0.8.18 *)
+TypeName = (* variant: *) ArrayTypeName
+         | (* variant: *) FunctionType
+         | (* variant: *) MappingType
+         | (* variant: *) ElementaryType
+         | (* variant: *) IdentifierPath;
+
+(* Postfix unary operator *)
+ArrayTypeName = (* operand: *) TypeName
+                (* open_bracket: *) OPEN_BRACKET
+                (* index: *) Expression?
+                (* close_bracket: *) CLOSE_BRACKET;
+
+FunctionType = (* function_keyword: *) FUNCTION_KEYWORD
+               (* parameters: *) ParametersDeclaration
+               (* attributes: *) FunctionTypeAttributes
+               (* returns: *) ReturnsDeclaration?;
+
+FunctionTypeAttributes = (* item: *) FunctionTypeAttribute*;
+
+FunctionTypeAttribute = (* variant: *) INTERNAL_KEYWORD
+                      | (* variant: *) EXTERNAL_KEYWORD
+                      | (* variant: *) PRIVATE_KEYWORD
+                      | (* variant: *) PUBLIC_KEYWORD
+                      | (* variant: *) CONSTANT_KEYWORD (* Deprecated in 0.5.0 *)
+                      | (* variant: *) PURE_KEYWORD (* Introduced in 0.4.16 *)
+                      | (* variant: *) VIEW_KEYWORD (* Introduced in 0.4.16 *)
+                      | (* variant: *) PAYABLE_KEYWORD;
+
+MappingType = (* mapping_keyword: *) MAPPING_KEYWORD
+              (* open_paren: *) OPEN_PAREN
+              (* key_type: *) MappingKey
+              (* equal_greater_than: *) EQUAL_GREATER_THAN
+              (* value_type: *) MappingValue
+              (* close_paren: *) CLOSE_PAREN;
+
+MappingKey = (* key_type: *) MappingKeyType
+             (* name: *) IDENTIFIER?; (* Introduced in 0.8.18 *)
+
+MappingKeyType = (* variant: *) ElementaryType
+               | (* variant: *) IdentifierPath;
+
+MappingValue = (* type_name: *) TypeName
+               (* name: *) IDENTIFIER?; (* Introduced in 0.8.18 *)
 
 (* 3.2. Elementary Types: *)
 
-ElementaryType = BOOL_KEYWORD
-               | BYTE_KEYWORD (* Deprecated in 0.8.0 *)
-               | STRING_KEYWORD
-               | AddressType
-               | BYTES_KEYWORD
-               | INT_KEYWORD
-               | UINT_KEYWORD
-               | FIXED_KEYWORD
-               | UFIXED_KEYWORD;
+ElementaryType = (* variant: *) BOOL_KEYWORD
+               | (* variant: *) BYTE_KEYWORD (* Deprecated in 0.8.0 *)
+               | (* variant: *) STRING_KEYWORD
+               | (* variant: *) AddressType
+               | (* variant: *) BYTES_KEYWORD
+               | (* variant: *) INT_KEYWORD
+               | (* variant: *) UINT_KEYWORD
+               | (* variant: *) FIXED_KEYWORD
+               | (* variant: *) UFIXED_KEYWORD;
 
-AddressType = ADDRESS_KEYWORD
-              PAYABLE_KEYWORD?;
+AddressType = (* address_keyword: *) ADDRESS_KEYWORD
+              (* payable_keyword: *) PAYABLE_KEYWORD?;
 
 (*
  * 4. Statements:
@@ -941,176 +980,176 @@ AddressType = ADDRESS_KEYWORD
 
 (* 4.1. Blocks: *)
 
-Block = OPEN_BRACE
-        Statements
-        CLOSE_BRACE;
-
-Statements = Statement*;
-
-Statement = ExpressionStatement
-          | VariableDeclarationStatement
-          | TupleDeconstructionStatement
-          | IfStatement
-          | ForStatement
-          | WhileStatement
-          | DoWhileStatement
-          | ContinueStatement
-          | BreakStatement
-          | ReturnStatement
-          | ThrowStatement (* Deprecated in 0.5.0 *)
-          | EmitStatement (* Introduced in 0.4.21 *)
-          | TryStatement (* Introduced in 0.6.0 *)
-          | RevertStatement (* Introduced in 0.8.4 *)
-          | AssemblyStatement
-          | Block
-          | UncheckedBlock; (* Introduced in 0.8.0 *)
+Block = (* open_brace: *) OPEN_BRACE
+        (* statements: *) Statements
+        (* close_brace: *) CLOSE_BRACE;
+
+Statements = (* item: *) Statement*;
+
+Statement = (* variant: *) ExpressionStatement
+          | (* variant: *) VariableDeclarationStatement
+          | (* variant: *) TupleDeconstructionStatement
+          | (* variant: *) IfStatement
+          | (* variant: *) ForStatement
+          | (* variant: *) WhileStatement
+          | (* variant: *) DoWhileStatement
+          | (* variant: *) ContinueStatement
+          | (* variant: *) BreakStatement
+          | (* variant: *) ReturnStatement
+          | (* variant: *) ThrowStatement (* Deprecated in 0.5.0 *)
+          | (* variant: *) EmitStatement (* Introduced in 0.4.21 *)
+          | (* variant: *) TryStatement (* Introduced in 0.6.0 *)
+          | (* variant: *) RevertStatement (* Introduced in 0.8.4 *)
+          | (* variant: *) AssemblyStatement
+          | (* variant: *) Block
+          | (* variant: *) UncheckedBlock; (* Introduced in 0.8.0 *)
 
 (* Introduced in 0.8.0 *)
-UncheckedBlock = UNCHECKED_KEYWORD
-                 Block;
+UncheckedBlock = (* unchecked_keyword: *) UNCHECKED_KEYWORD
+                 (* block: *) Block;
 
-ExpressionStatement = Expression
-                      SEMICOLON;
+ExpressionStatement = (* expression: *) Expression
+                      (* semicolon: *) SEMICOLON;
 
-AssemblyStatement = ASSEMBLY_KEYWORD
-                    StringLiteral?
-                    AssemblyFlagsDeclaration?
-                    YulBlock;
+AssemblyStatement = (* assembly_keyword: *) ASSEMBLY_KEYWORD
+                    (* label: *) StringLiteral?
+                    (* flags: *) AssemblyFlagsDeclaration?
+                    (* body: *) YulBlock;
 
-AssemblyFlagsDeclaration = OPEN_PAREN
-                           AssemblyFlags
-                           CLOSE_PAREN;
+AssemblyFlagsDeclaration = (* open_paren: *) OPEN_PAREN
+                           (* flags: *) AssemblyFlags
+                           (* close_paren: *) CLOSE_PAREN;
 
-AssemblyFlags = StringLiteral (COMMA StringLiteral)*;
+AssemblyFlags = (* item: *) StringLiteral ((* separator: *) COMMA (* item: *) StringLiteral)*;
 
 (* 4.2. Declaration Statements: *)
 
-TupleDeconstructionStatement = VAR_KEYWORD? (* Deprecated in 0.5.0 *)
-                               OPEN_PAREN
-                               TupleDeconstructionElements
-                               CLOSE_PAREN
-                               EQUAL
-                               Expression
-                               SEMICOLON;
+TupleDeconstructionStatement = (* var_keyword: *) VAR_KEYWORD? (* Deprecated in 0.5.0 *)
+                               (* open_paren: *) OPEN_PAREN
+                               (* elements: *) TupleDeconstructionElements
+                               (* close_paren: *) CLOSE_PAREN
+                               (* equal: *) EQUAL
+                               (* expression: *) Expression
+                               (* semicolon: *) SEMICOLON;
 
-TupleDeconstructionElements = TupleDeconstructionElement (COMMA TupleDeconstructionElement)*;
+TupleDeconstructionElements = (* item: *) TupleDeconstructionElement ((* separator: *) COMMA (* item: *) TupleDeconstructionElement)*;
 
-TupleDeconstructionElement = TupleMember?;
+TupleDeconstructionElement = (* member: *) TupleMember?;
 
-TupleMember = TypedTupleMember
-            | UntypedTupleMember;
+TupleMember = (* variant: *) TypedTupleMember
+            | (* variant: *) UntypedTupleMember;
 
-TypedTupleMember = TypeName
-                   StorageLocation?
-                   IDENTIFIER;
+TypedTupleMember = (* type_name: *) TypeName
+                   (* storage_location: *) StorageLocation?
+                   (* name: *) IDENTIFIER;
 
-UntypedTupleMember = StorageLocation?
-                     IDENTIFIER;
+UntypedTupleMember = (* storage_location: *) StorageLocation?
+                     (* name: *) IDENTIFIER;
 
-VariableDeclarationStatement = VariableDeclarationType
-                               StorageLocation?
-                               IDENTIFIER
-                               VariableDeclarationValue?
-                               SEMICOLON;
+VariableDeclarationStatement = (* variable_type: *) VariableDeclarationType
+                               (* storage_location: *) StorageLocation?
+                               (* name: *) IDENTIFIER
+                               (* value: *) VariableDeclarationValue?
+                               (* semicolon: *) SEMICOLON;
 
-VariableDeclarationType = TypeName
-                        | VAR_KEYWORD; (* Deprecated in 0.5.0 *)
+VariableDeclarationType = (* variant: *) TypeName
+                        | (* variant: *) VAR_KEYWORD; (* Deprecated in 0.5.0 *)
 
-VariableDeclarationValue = EQUAL
-                           Expression;
+VariableDeclarationValue = (* equal: *) EQUAL
+                           (* expression: *) Expression;
 
-StorageLocation = MEMORY_KEYWORD
-                | STORAGE_KEYWORD
-                | CALL_DATA_KEYWORD; (* Introduced in 0.5.0 *)
+StorageLocation = (* variant: *) MEMORY_KEYWORD
+                | (* variant: *) STORAGE_KEYWORD
+                | (* variant: *) CALL_DATA_KEYWORD; (* Introduced in 0.5.0 *)
 
 (* 4.3. Control Statements: *)
 
-IfStatement = IF_KEYWORD
-              OPEN_PAREN
-              Expression
-              CLOSE_PAREN
-              Statement
-              ElseBranch?;
-
-ElseBranch = ELSE_KEYWORD
-             Statement;
-
-ForStatement = FOR_KEYWORD
-               OPEN_PAREN
-               ForStatementInitialization
-               ForStatementCondition
-               Expression?
-               CLOSE_PAREN
-               Statement;
-
-ForStatementInitialization = ExpressionStatement
-                           | VariableDeclarationStatement
-                           | TupleDeconstructionStatement
-                           | SEMICOLON;
-
-ForStatementCondition = ExpressionStatement
-                      | SEMICOLON;
-
-WhileStatement = WHILE_KEYWORD
-                 OPEN_PAREN
-                 Expression
-                 CLOSE_PAREN
-                 Statement;
-
-DoWhileStatement = DO_KEYWORD
-                   Statement
-                   WHILE_KEYWORD
-                   OPEN_PAREN
-                   Expression
-                   CLOSE_PAREN
-                   SEMICOLON;
-
-ContinueStatement = CONTINUE_KEYWORD
-                    SEMICOLON;
-
-BreakStatement = BREAK_KEYWORD
-                 SEMICOLON;
-
-ReturnStatement = RETURN_KEYWORD
-                  Expression?
-                  SEMICOLON;
+IfStatement = (* if_keyword: *) IF_KEYWORD
+              (* open_paren: *) OPEN_PAREN
+              (* condition: *) Expression
+              (* close_paren: *) CLOSE_PAREN
+              (* body: *) Statement
+              (* else_branch: *) ElseBranch?;
+
+ElseBranch = (* else_keyword: *) ELSE_KEYWORD
+             (* body: *) Statement;
+
+ForStatement = (* for_keyword: *) FOR_KEYWORD
+               (* open_paren: *) OPEN_PAREN
+               (* initialization: *) ForStatementInitialization
+               (* condition: *) ForStatementCondition
+               (* iterator: *) Expression?
+               (* close_paren: *) CLOSE_PAREN
+               (* body: *) Statement;
+
+ForStatementInitialization = (* variant: *) ExpressionStatement
+                           | (* variant: *) VariableDeclarationStatement
+                           | (* variant: *) TupleDeconstructionStatement
+                           | (* variant: *) SEMICOLON;
+
+ForStatementCondition = (* variant: *) ExpressionStatement
+                      | (* variant: *) SEMICOLON;
+
+WhileStatement = (* while_keyword: *) WHILE_KEYWORD
+                 (* open_paren: *) OPEN_PAREN
+                 (* condition: *) Expression
+                 (* close_paren: *) CLOSE_PAREN
+                 (* body: *) Statement;
+
+DoWhileStatement = (* do_keyword: *) DO_KEYWORD
+                   (* body: *) Statement
+                   (* while_keyword: *) WHILE_KEYWORD
+                   (* open_paren: *) OPEN_PAREN
+                   (* condition: *) Expression
+                   (* close_paren: *) CLOSE_PAREN
+                   (* semicolon: *) SEMICOLON;
+
+ContinueStatement = (* continue_keyword: *) CONTINUE_KEYWORD
+                    (* semicolon: *) SEMICOLON;
+
+BreakStatement = (* break_keyword: *) BREAK_KEYWORD
+                 (* semicolon: *) SEMICOLON;
+
+ReturnStatement = (* return_keyword: *) RETURN_KEYWORD
+                  (* expression: *) Expression?
+                  (* semicolon: *) SEMICOLON;
 
 (* Introduced in 0.4.21 *)
-EmitStatement = EMIT_KEYWORD
-                IdentifierPath
-                ArgumentsDeclaration
-                SEMICOLON;
+EmitStatement = (* emit_keyword: *) EMIT_KEYWORD
+                (* event: *) IdentifierPath
+                (* arguments: *) ArgumentsDeclaration
+                (* semicolon: *) SEMICOLON;
 
 (* 4.4. Error Handling: *)
 
 (* Introduced in 0.6.0 *)
-TryStatement = TRY_KEYWORD
-               Expression
-               ReturnsDeclaration?
-               Block
-               CatchClauses;
+TryStatement = (* try_keyword: *) TRY_KEYWORD
+               (* expression: *) Expression
+               (* returns: *) ReturnsDeclaration?
+               (* body: *) Block
+               (* catch_clauses: *) CatchClauses;
 
 (* Introduced in 0.6.0 *)
-CatchClauses = CatchClause+;
+CatchClauses = (* item: *) CatchClause+;
 
 (* Introduced in 0.6.0 *)
-CatchClause = CATCH_KEYWORD
-              CatchClauseError?
-              Block;
+CatchClause = (* catch_keyword: *) CATCH_KEYWORD
+              (* error: *) CatchClauseError?
+              (* body: *) Block;
 
 (* Introduced in 0.6.0 *)
-CatchClauseError = IDENTIFIER?
-                   ParametersDeclaration;
+CatchClauseError = (* name: *) IDENTIFIER?
+                   (* parameters: *) ParametersDeclaration;
 
 (* Introduced in 0.8.4 *)
-RevertStatement = REVERT_KEYWORD
-                  IdentifierPath?
-                  ArgumentsDeclaration
-                  SEMICOLON;
+RevertStatement = (* revert_keyword: *) REVERT_KEYWORD
+                  (* error: *) IdentifierPath?
+                  (* arguments: *) ArgumentsDeclaration
+                  (* semicolon: *) SEMICOLON;
 
 (* Deprecated in 0.5.0 *)
-ThrowStatement = THROW_KEYWORD
-                 SEMICOLON;
+ThrowStatement = (* throw_keyword: *) THROW_KEYWORD
+                 (* semicolon: *) SEMICOLON;
 
 (*
  * 5. Expressions:
@@ -1118,104 +1157,338 @@ ThrowStatement = THROW_KEYWORD
 
 (* 5.1. Base Expressions: *)
 
-Expression = AssignmentExpression
-           | ConditionalExpression
-           | OrExpression
-           | AndExpression
-           | EqualityExpression
-           | ComparisonExpression
-           | BitwiseOrExpression
-           | BitwiseXorExpression
-           | BitwiseAndExpression
-           | ShiftExpression
-           | AdditiveExpression
-           | MultiplicativeExpression
-           | ExponentiationExpression
-           | PostfixExpression
-           | PrefixExpression
-           | FunctionCallExpression
-           | CallOptionsExpression
-           | MemberAccessExpression
-           | IndexAccessExpression
-           | NewExpression
-           | TupleExpression
-           | TypeExpression (* Introduced in 0.5.3 *)
-           | ArrayExpression
-           | HexNumberExpression
-           | DecimalNumberExpression
-           | StringExpression
-           | ElementaryType
-           | PAYABLE_KEYWORD (* Introduced in 0.6.0 *)
-           | TRUE_KEYWORD
-           | FALSE_KEYWORD
-           | IDENTIFIER;
-
-MemberAccess = IDENTIFIER
-             | ADDRESS_KEYWORD;
-
-IndexAccessEnd = COLON
-                 Expression?;
+Expression = (* variant: *) AssignmentExpression
+           | (* variant: *) ConditionalExpression
+           | (* variant: *) OrExpression
+           | (* variant: *) AndExpression
+           | (* variant: *) EqualityExpression
+           | (* variant: *) ComparisonExpression
+           | (* variant: *) BitwiseOrExpression
+           | (* variant: *) BitwiseXorExpression
+           | (* variant: *) BitwiseAndExpression
+           | (* variant: *) ShiftExpression
+           | (* variant: *) AdditiveExpression
+           | (* variant: *) MultiplicativeExpression
+           | (* variant: *) ExponentiationExpression
+           | (* variant: *) PostfixExpression
+           | (* variant: *) PrefixExpression
+           | (* variant: *) FunctionCallExpression
+           | (* variant: *) CallOptionsExpression
+           | (* variant: *) MemberAccessExpression
+           | (* variant: *) IndexAccessExpression
+           | (* variant: *) NewExpression
+           | (* variant: *) TupleExpression
+           | (* variant: *) TypeExpression (* Introduced in 0.5.3 *)
+           | (* variant: *) ArrayExpression
+           | (* variant: *) HexNumberExpression
+           | (* variant: *) DecimalNumberExpression
+           | (* variant: *) StringExpression
+           | (* variant: *) ElementaryType
+           | (* variant: *) PAYABLE_KEYWORD (* Introduced in 0.6.0 *)
+           | (* variant: *) TRUE_KEYWORD
+           | (* variant: *) FALSE_KEYWORD
+           | (* variant: *) IDENTIFIER;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) BAR_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) PLUS_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) MINUS_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) CARET_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) SLASH_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) PERCENT_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) ASTERISK_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) AMPERSAND_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) LESS_THAN_LESS_THAN_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) GREATER_THAN_GREATER_THAN_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AssignmentExpression = (* left_operand: *) Expression
+                       (* operator: *) GREATER_THAN_GREATER_THAN_GREATER_THAN_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Postfix unary operator *)
+ConditionalExpression = (* operand: *) Expression
+                        (* question_mark: *) QUESTION_MARK
+                        (* true_expression: *) Expression
+                        (* colon: *) COLON
+                        (* false_expression: *) Expression;
+
+(* Left-associative binary operator *)
+OrExpression = (* left_operand: *) Expression
+               (* operator: *) BAR_BAR
+               (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AndExpression = (* left_operand: *) Expression
+                (* operator: *) AMPERSAND_AMPERSAND
+                (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+EqualityExpression = (* left_operand: *) Expression
+                     (* operator: *) EQUAL_EQUAL
+                     (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+EqualityExpression = (* left_operand: *) Expression
+                     (* operator: *) BANG_EQUAL
+                     (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ComparisonExpression = (* left_operand: *) Expression
+                       (* operator: *) LESS_THAN
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ComparisonExpression = (* left_operand: *) Expression
+                       (* operator: *) GREATER_THAN
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ComparisonExpression = (* left_operand: *) Expression
+                       (* operator: *) LESS_THAN_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ComparisonExpression = (* left_operand: *) Expression
+                       (* operator: *) GREATER_THAN_EQUAL
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+BitwiseOrExpression = (* left_operand: *) Expression
+                      (* operator: *) BAR
+                      (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+BitwiseXorExpression = (* left_operand: *) Expression
+                       (* operator: *) CARET
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+BitwiseAndExpression = (* left_operand: *) Expression
+                       (* operator: *) AMPERSAND
+                       (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ShiftExpression = (* left_operand: *) Expression
+                  (* operator: *) LESS_THAN_LESS_THAN
+                  (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ShiftExpression = (* left_operand: *) Expression
+                  (* operator: *) GREATER_THAN_GREATER_THAN
+                  (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+ShiftExpression = (* left_operand: *) Expression
+                  (* operator: *) GREATER_THAN_GREATER_THAN_GREATER_THAN
+                  (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AdditiveExpression = (* left_operand: *) Expression
+                     (* operator: *) PLUS
+                     (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+AdditiveExpression = (* left_operand: *) Expression
+                     (* operator: *) MINUS
+                     (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+MultiplicativeExpression = (* left_operand: *) Expression
+                           (* operator: *) ASTERISK
+                           (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+MultiplicativeExpression = (* left_operand: *) Expression
+                           (* operator: *) SLASH
+                           (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+MultiplicativeExpression = (* left_operand: *) Expression
+                           (* operator: *) PERCENT
+                           (* right_operand: *) Expression;
+
+(* Left-associative binary operator *)
+(* Deprecated in 0.6.0 *)
+ExponentiationExpression = (* left_operand: *) Expression
+                           (* operator: *) ASTERISK_ASTERISK
+                           (* right_operand: *) Expression;
+
+(* Right-associative binary operator *)
+(* Introduced in 0.6.0 *)
+ExponentiationExpression = (* left_operand: *) Expression
+                           (* operator: *) ASTERISK_ASTERISK
+                           (* right_operand: *) Expression;
+
+(* Postfix unary operator *)
+PostfixExpression = (* operand: *) Expression
+                    (* operator: *) PLUS_PLUS;
+
+(* Postfix unary operator *)
+PostfixExpression = (* operand: *) Expression
+                    (* operator: *) MINUS_MINUS;
+
+(* Prefix unary operator *)
+PrefixExpression = (* operator: *) PLUS_PLUS
+                   (* operand: *) Expression;
+
+(* Prefix unary operator *)
+PrefixExpression = (* operator: *) MINUS_MINUS
+                   (* operand: *) Expression;
+
+(* Prefix unary operator *)
+PrefixExpression = (* operator: *) TILDE
+                   (* operand: *) Expression;
+
+(* Prefix unary operator *)
+PrefixExpression = (* operator: *) BANG
+                   (* operand: *) Expression;
+
+(* Prefix unary operator *)
+PrefixExpression = (* operator: *) MINUS
+                   (* operand: *) Expression;
+
+(* Prefix unary operator *)
+(* Deprecated in 0.5.0 *)
+PrefixExpression = (* operator: *) PLUS
+                   (* operand: *) Expression;
+
+(* Prefix unary operator *)
+PrefixExpression = (* operator: *) DELETE_KEYWORD
+                   (* operand: *) Expression;
+
+(* Postfix unary operator *)
+FunctionCallExpression = (* operand: *) Expression
+                         (* arguments: *) ArgumentsDeclaration;
+
+(* Postfix unary operator *)
+(* Introduced in 0.6.2 *)
+CallOptionsExpression = (* operand: *) Expression
+                        (* open_brace: *) OPEN_BRACE
+                        (* options: *) CallOptions
+                        (* close_brace: *) CLOSE_BRACE;
+
+(* Postfix unary operator *)
+MemberAccessExpression = (* operand: *) Expression
+                         (* period: *) PERIOD
+                         (* member: *) MemberAccess;
+
+(* Postfix unary operator *)
+IndexAccessExpression = (* operand: *) Expression
+                        (* open_bracket: *) OPEN_BRACKET
+                        (* start: *) Expression?
+                        (* end: *) IndexAccessEnd?
+                        (* close_bracket: *) CLOSE_BRACKET;
+
+MemberAccess = (* variant: *) IDENTIFIER
+             | (* variant: *) ADDRESS_KEYWORD;
+
+IndexAccessEnd = (* colon: *) COLON
+                 (* end: *) Expression?;
 
 (* 5.2. Function Calls: *)
 
-ArgumentsDeclaration = PositionalArgumentsDeclaration
-                     | NamedArgumentsDeclaration;
+ArgumentsDeclaration = (* variant: *) PositionalArgumentsDeclaration
+                     | (* variant: *) NamedArgumentsDeclaration;
 
-PositionalArgumentsDeclaration = OPEN_PAREN
-                                 PositionalArguments
-                                 CLOSE_PAREN;
+PositionalArgumentsDeclaration = (* open_paren: *) OPEN_PAREN
+                                 (* arguments: *) PositionalArguments
+                                 (* close_paren: *) CLOSE_PAREN;
 
-PositionalArguments = (Expression (COMMA Expression)*)?;
+PositionalArguments = ((* item: *) Expression ((* separator: *) COMMA (* item: *) Expression)*)?;
 
-NamedArgumentsDeclaration = OPEN_PAREN
-                            NamedArgumentGroup?
-                            CLOSE_PAREN;
+NamedArgumentsDeclaration = (* open_paren: *) OPEN_PAREN
+                            (* arguments: *) NamedArgumentGroup?
+                            (* close_paren: *) CLOSE_PAREN;
 
-NamedArgumentGroup = OPEN_BRACE
-                     NamedArguments
-                     CLOSE_BRACE;
+NamedArgumentGroup = (* open_brace: *) OPEN_BRACE
+                     (* arguments: *) NamedArguments
+                     (* close_brace: *) CLOSE_BRACE;
 
-NamedArguments = (NamedArgument (COMMA NamedArgument)*)?;
+NamedArguments = ((* item: *) NamedArgument ((* separator: *) COMMA (* item: *) NamedArgument)*)?;
 
 (* Introduced in 0.6.2 *)
-CallOptions = NamedArgument (COMMA NamedArgument)*;
+CallOptions = (* item: *) NamedArgument ((* separator: *) COMMA (* item: *) NamedArgument)*;
 
-NamedArgument = IDENTIFIER
-                COLON
-                Expression;
+NamedArgument = (* name: *) IDENTIFIER
+                (* colon: *) COLON
+                (* value: *) Expression;
 
 (* 5.3. Primary Expressions: *)
 
 (* Introduced in 0.5.3 *)
-TypeExpression = TYPE_KEYWORD
-                 OPEN_PAREN
-                 TypeName
-                 CLOSE_PAREN;
+TypeExpression = (* type_keyword: *) TYPE_KEYWORD
+                 (* open_paren: *) OPEN_PAREN
+                 (* type_name: *) TypeName
+                 (* close_paren: *) CLOSE_PAREN;
 
-NewExpression = NEW_KEYWORD
-                TypeName;
+NewExpression = (* new_keyword: *) NEW_KEYWORD
+                (* type_name: *) TypeName;
 
-TupleExpression = OPEN_PAREN
-                  TupleValues
-                  CLOSE_PAREN;
+TupleExpression = (* open_paren: *) OPEN_PAREN
+                  (* items: *) TupleValues
+                  (* close_paren: *) CLOSE_PAREN;
 
-TupleValues = TupleValue (COMMA TupleValue)*;
+TupleValues = (* item: *) TupleValue ((* separator: *) COMMA (* item: *) TupleValue)*;
 
-TupleValue = Expression?;
+TupleValue = (* expression: *) Expression?;
 
-ArrayExpression = OPEN_BRACKET
-                  ArrayValues
-                  CLOSE_BRACKET;
+ArrayExpression = (* open_bracket: *) OPEN_BRACKET
+                  (* items: *) ArrayValues
+                  (* close_bracket: *) CLOSE_BRACKET;
 
-ArrayValues = Expression (COMMA Expression)*;
+ArrayValues = (* item: *) Expression ((* separator: *) COMMA (* item: *) Expression)*;
 
 (* 5.4. Numbers: *)
 
-HexNumberExpression = HEX_LITERAL
-                      NumberUnit?; (* Deprecated in 0.5.0 *)
+HexNumberExpression = (* literal: *) HEX_LITERAL
+                      (* unit: *) NumberUnit?; (* Deprecated in 0.5.0 *)
 
-DecimalNumberExpression = DECIMAL_LITERAL
-                          NumberUnit?;
+DecimalNumberExpression = (* literal: *) DECIMAL_LITERAL
+                          (* unit: *) NumberUnit?;
 
 HEX_LITERAL = "0x" «HEX_CHARACTER»+ ("_" «HEX_CHARACTER»+)*;
 
@@ -1239,31 +1512,31 @@ DECIMAL_LITERAL = «DECIMAL_DIGITS» ("." «DECIMAL_DIGITS»)? «DECIMAL_EXPONEN
 
 «DECIMAL_EXPONENT» = ("e" | "E") "-"? «DECIMAL_DIGITS»;
 
-NumberUnit = WEI_KEYWORD
-           | GWEI_KEYWORD (* Introduced in 0.6.11 *)
-           | SZABO_KEYWORD (* Deprecated in 0.7.0 *)
-           | FINNEY_KEYWORD (* Deprecated in 0.7.0 *)
-           | ETHER_KEYWORD
-           | SECONDS_KEYWORD
-           | MINUTES_KEYWORD
-           | HOURS_KEYWORD
-           | DAYS_KEYWORD
-           | WEEKS_KEYWORD
-           | YEARS_KEYWORD; (* Deprecated in 0.5.0 *)
+NumberUnit = (* variant: *) WEI_KEYWORD
+           | (* variant: *) GWEI_KEYWORD (* Introduced in 0.6.11 *)
+           | (* variant: *) SZABO_KEYWORD (* Deprecated in 0.7.0 *)
+           | (* variant: *) FINNEY_KEYWORD (* Deprecated in 0.7.0 *)
+           | (* variant: *) ETHER_KEYWORD
+           | (* variant: *) SECONDS_KEYWORD
+           | (* variant: *) MINUTES_KEYWORD
+           | (* variant: *) HOURS_KEYWORD
+           | (* variant: *) DAYS_KEYWORD
+           | (* variant: *) WEEKS_KEYWORD
+           | (* variant: *) YEARS_KEYWORD; (* Deprecated in 0.5.0 *)
 
 (* 5.5. Strings: *)
 
-StringExpression = StringLiteral (* Deprecated in 0.5.14 *)
-                 | StringLiterals (* Introduced in 0.5.14 *)
-                 | HexStringLiteral (* Deprecated in 0.5.14 *)
-                 | HexStringLiterals (* Introduced in 0.5.14 *)
-                 | UnicodeStringLiterals; (* Introduced in 0.7.0 *)
+StringExpression = (* variant: *) StringLiteral (* Deprecated in 0.5.14 *)
+                 | (* variant: *) StringLiterals (* Introduced in 0.5.14 *)
+                 | (* variant: *) HexStringLiteral (* Deprecated in 0.5.14 *)
+                 | (* variant: *) HexStringLiterals (* Introduced in 0.5.14 *)
+                 | (* variant: *) UnicodeStringLiterals; (* Introduced in 0.7.0 *)
 
 (* Introduced in 0.5.14 *)
-StringLiterals = StringLiteral+;
+StringLiterals = (* item: *) StringLiteral+;
 
-StringLiteral = SINGLE_QUOTED_STRING_LITERAL
-              | DOUBLE_QUOTED_STRING_LITERAL;
+StringLiteral = (* variant: *) SINGLE_QUOTED_STRING_LITERAL
+              | (* variant: *) DOUBLE_QUOTED_STRING_LITERAL;
 
 (* Deprecated in 0.4.25 *)
 SINGLE_QUOTED_STRING_LITERAL = "'" («ESCAPE_SEQUENCE_ARBITRARY» | !("'" "\\" "\r" "\n"))* "'";
@@ -1282,10 +1555,10 @@ DOUBLE_QUOTED_STRING_LITERAL = '"' («ESCAPE_SEQUENCE» | !('"' "\\" "\r" "\n"))
 DOUBLE_QUOTED_STRING_LITERAL = '"' («ESCAPE_SEQUENCE» | (" "…"!") | ("#"…"[") | ("]"…"~"))* '"';
 
 (* Introduced in 0.5.14 *)
-HexStringLiterals = HexStringLiteral+;
+HexStringLiterals = (* item: *) HexStringLiteral+;
 
-HexStringLiteral = SINGLE_QUOTED_HEX_STRING_LITERAL
-                 | DOUBLE_QUOTED_HEX_STRING_LITERAL;
+HexStringLiteral = (* variant: *) SINGLE_QUOTED_HEX_STRING_LITERAL
+                 | (* variant: *) DOUBLE_QUOTED_HEX_STRING_LITERAL;
 
 SINGLE_QUOTED_HEX_STRING_LITERAL = "hex'" «HEX_STRING_CONTENTS»? "'";
 
@@ -1296,11 +1569,11 @@ DOUBLE_QUOTED_HEX_STRING_LITERAL = 'hex"' «HEX_STRING_CONTENTS»? '"';
 «HEX_CHARACTER» = ("0"…"9") | ("a"…"f") | ("A"…"F");
 
 (* Introduced in 0.7.0 *)
-UnicodeStringLiterals = UnicodeStringLiteral+;
+UnicodeStringLiterals = (* item: *) UnicodeStringLiteral+;
 
 (* Introduced in 0.7.0 *)
-UnicodeStringLiteral = SINGLE_QUOTED_UNICODE_STRING_LITERAL
-                     | DOUBLE_QUOTED_UNICODE_STRING_LITERAL;
+UnicodeStringLiteral = (* variant: *) SINGLE_QUOTED_UNICODE_STRING_LITERAL
+                     | (* variant: *) DOUBLE_QUOTED_UNICODE_STRING_LITERAL;
 
 (* Introduced in 0.7.0 *)
 SINGLE_QUOTED_UNICODE_STRING_LITERAL = "unicode'" («ESCAPE_SEQUENCE» | !("'" "\\" "\r" "\n"))* "'";
@@ -1321,7 +1594,7 @@ DOUBLE_QUOTED_UNICODE_STRING_LITERAL = 'unicode"' («ESCAPE_SEQUENCE» | !('"' "
 
 (* 5.6. Identifiers: *)
 
-IdentifierPath = IDENTIFIER (PERIOD IDENTIFIER)*;
+IdentifierPath = (* item: *) IDENTIFIER ((* separator: *) PERIOD (* item: *) IDENTIFIER)*;
 
 IDENTIFIER = «IDENTIFIER_START» «IDENTIFIER_PART»*;
 
@@ -1335,206 +1608,212 @@ IDENTIFIER = «IDENTIFIER_START» «IDENTIFIER_PART»*;
 
 (* 6.1. Yul Statements: *)
 
-YulBlock = OPEN_BRACE
-           YulStatements
-           CLOSE_BRACE;
+YulBlock = (* open_brace: *) OPEN_BRACE
+           (* statements: *) YulStatements
+           (* close_brace: *) CLOSE_BRACE;
 
-YulStatements = YulStatement*;
+YulStatements = (* item: *) YulStatement*;
 
-YulStatement = YulBlock
-             | YulFunctionDefinition
-             | YulVariableDeclarationStatement
-             | YulAssignmentStatement
-             | YulIfStatement
-             | YulForStatement
-             | YulSwitchStatement
-             | YulLeaveStatement (* Introduced in 0.6.0 *)
-             | YulBreakStatement
-             | YulContinueStatement
-             | YulLabel (* Deprecated in 0.5.0 *)
-             | YulExpression;
+YulStatement = (* variant: *) YulBlock
+             | (* variant: *) YulFunctionDefinition
+             | (* variant: *) YulVariableDeclarationStatement
+             | (* variant: *) YulAssignmentStatement
+             | (* variant: *) YulIfStatement
+             | (* variant: *) YulForStatement
+             | (* variant: *) YulSwitchStatement
+             | (* variant: *) YulLeaveStatement (* Introduced in 0.6.0 *)
+             | (* variant: *) YulBreakStatement
+             | (* variant: *) YulContinueStatement
+             | (* variant: *) YulLabel (* Deprecated in 0.5.0 *)
+             | (* variant: *) YulExpression;
 
-YulFunctionDefinition = YUL_FUNCTION_KEYWORD
-                        YUL_IDENTIFIER
-                        YulParametersDeclaration
-                        YulReturnsDeclaration?
-                        YulBlock;
+YulFunctionDefinition = (* function_keyword: *) YUL_FUNCTION_KEYWORD
+                        (* name: *) YUL_IDENTIFIER
+                        (* parameters: *) YulParametersDeclaration
+                        (* returns: *) YulReturnsDeclaration?
+                        (* body: *) YulBlock;
 
-YulParametersDeclaration = OPEN_PAREN
-                           YulParameters
-                           CLOSE_PAREN;
+YulParametersDeclaration = (* open_paren: *) OPEN_PAREN
+                           (* parameters: *) YulParameters
+                           (* close_paren: *) CLOSE_PAREN;
 
-YulParameters = (YUL_IDENTIFIER (COMMA YUL_IDENTIFIER)*)?;
+YulParameters = ((* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*)?;
 
-YulReturnsDeclaration = MINUS_GREATER_THAN
-                        YulReturnVariables;
+YulReturnsDeclaration = (* minus_greater_than: *) MINUS_GREATER_THAN
+                        (* variables: *) YulReturnVariables;
 
-YulReturnVariables = YUL_IDENTIFIER (COMMA YUL_IDENTIFIER)*;
+YulReturnVariables = (* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*;
 
-YulVariableDeclarationStatement = YUL_LET_KEYWORD
-                                  YUL_IDENTIFIER
-                                  YulVariableDeclarationValue?;
+YulVariableDeclarationStatement = (* let_keyword: *) YUL_LET_KEYWORD
+                                  (* names: *) YUL_IDENTIFIER
+                                  (* value: *) YulVariableDeclarationValue?;
 
-YulVariableDeclarationValue = YulAssignmentOperator
-                              YulExpression;
+YulVariableDeclarationValue = (* assignment: *) YulAssignmentOperator
+                              (* expression: *) YulExpression;
 
-YulAssignmentStatement = YulPaths
-                         YulAssignmentOperator
-                         YulExpression;
+YulAssignmentStatement = (* names: *) YulPaths
+                         (* assignment: *) YulAssignmentOperator
+                         (* expression: *) YulExpression;
 
-YulAssignmentOperator = YulColonAndEqual (* Deprecated in 0.5.5 *)
-                      | COLON_EQUAL;
+YulAssignmentOperator = (* variant: *) YulColonAndEqual (* Deprecated in 0.5.5 *)
+                      | (* variant: *) COLON_EQUAL;
 
 (* Deprecated in 0.5.5 *)
-YulColonAndEqual = COLON
-                   EQUAL;
+YulColonAndEqual = (* colon: *) COLON
+                   (* equal: *) EQUAL;
 
-YulIfStatement = YUL_IF_KEYWORD
-                 YulExpression
-                 YulBlock;
+YulIfStatement = (* if_keyword: *) YUL_IF_KEYWORD
+                 (* condition: *) YulExpression
+                 (* body: *) YulBlock;
 
-YulForStatement = YUL_FOR_KEYWORD
-                  YulBlock
-                  YulExpression
-                  YulBlock
-                  YulBlock;
+YulForStatement = (* for_keyword: *) YUL_FOR_KEYWORD
+                  (* initialization: *) YulBlock
+                  (* condition: *) YulExpression
+                  (* iterator: *) YulBlock
+                  (* body: *) YulBlock;
 
-YulSwitchStatement = YUL_SWITCH_KEYWORD
-                     YulExpression
-                     YulSwitchCases;
+YulSwitchStatement = (* switch_keyword: *) YUL_SWITCH_KEYWORD
+                     (* expression: *) YulExpression
+                     (* cases: *) YulSwitchCases;
 
-YulSwitchCases = YulSwitchCase+;
+YulSwitchCases = (* item: *) YulSwitchCase+;
 
-YulSwitchCase = YulDefaultCase
-              | YulValueCase;
+YulSwitchCase = (* variant: *) YulDefaultCase
+              | (* variant: *) YulValueCase;
 
-YulDefaultCase = YUL_DEFAULT_KEYWORD
-                 YulBlock;
+YulDefaultCase = (* default_keyword: *) YUL_DEFAULT_KEYWORD
+                 (* body: *) YulBlock;
 
-YulValueCase = YUL_CASE_KEYWORD
-               YulLiteral
-               YulBlock;
+YulValueCase = (* case_keyword: *) YUL_CASE_KEYWORD
+               (* value: *) YulLiteral
+               (* body: *) YulBlock;
 
 (* Introduced in 0.6.0 *)
-YulLeaveStatement = YUL_LEAVE_KEYWORD;
+YulLeaveStatement = (* leave_keyword: *) YUL_LEAVE_KEYWORD;
 
-YulBreakStatement = YUL_BREAK_KEYWORD;
+YulBreakStatement = (* break_keyword: *) YUL_BREAK_KEYWORD;
 
-YulContinueStatement = YUL_CONTINUE_KEYWORD;
+YulContinueStatement = (* continue_keyword: *) YUL_CONTINUE_KEYWORD;
 
 (* Deprecated in 0.5.0 *)
-YulLabel = YUL_IDENTIFIER
-           COLON;
+YulLabel = (* label: *) YUL_IDENTIFIER
+           (* colon: *) COLON;
 
 (* 6.2. Yul Expressions: *)
 
-YulExpression = YulFunctionCallExpression
-              | YulLiteral
-              | YulBuiltInFunction
-              | YulPath;
+YulExpression = (* variant: *) YulFunctionCallExpression
+              | (* variant: *) YulLiteral
+              | (* variant: *) YulBuiltInFunction
+              | (* variant: *) YulPath;
+
+(* Postfix unary operator *)
+YulFunctionCallExpression = (* operand: *) YulExpression
+                            (* open_paren: *) OPEN_PAREN
+                            (* arguments: *) YulArguments
+                            (* close_paren: *) CLOSE_PAREN;
 
-YulArguments = (YulExpression (COMMA YulExpression)*)?;
+YulArguments = ((* item: *) YulExpression ((* separator: *) COMMA (* item: *) YulExpression)*)?;
 
-YulPaths = YulPath (COMMA YulPath)*;
+YulPaths = (* item: *) YulPath ((* separator: *) COMMA (* item: *) YulPath)*;
 
-YulPath = YulPathComponent (PERIOD YulPathComponent)*;
+YulPath = (* item: *) YulPathComponent ((* separator: *) PERIOD (* item: *) YulPathComponent)*;
 
-YulPathComponent = YUL_IDENTIFIER
-                 | YUL_ADDRESS_KEYWORD; (* Introduced in 0.8.10 *)
+YulPathComponent = (* variant: *) YUL_IDENTIFIER
+                 | (* variant: *) YUL_ADDRESS_KEYWORD; (* Introduced in 0.8.10 *)
 
 (* Introduced in 0.5.8 and deprecated in 0.7.0. *)
 YUL_IDENTIFIER = «IDENTIFIER_START» («IDENTIFIER_PART» | ".")*;
 
 YUL_IDENTIFIER = «IDENTIFIER_START» «IDENTIFIER_PART»*;
 
-YulBuiltInFunction = YUL_ADD_KEYWORD
-                   | YUL_ADD_MOD_KEYWORD
-                   | YUL_ADDRESS_KEYWORD
-                   | YUL_AND_KEYWORD
-                   | YUL_BALANCE_KEYWORD
-                   | YUL_BLOCK_HASH_KEYWORD
-                   | YUL_BYTE_KEYWORD
-                   | YUL_CALL_CODE_KEYWORD
-                   | YUL_CALL_DATA_COPY_KEYWORD
-                   | YUL_CALL_DATA_LOAD_KEYWORD
-                   | YUL_CALL_DATA_SIZE_KEYWORD
-                   | YUL_CALLER_KEYWORD
-                   | YUL_CALL_KEYWORD
-                   | YUL_CALL_VALUE_KEYWORD
-                   | YUL_COIN_BASE_KEYWORD
-                   | YUL_CREATE_KEYWORD
-                   | YUL_DELEGATE_CALL_KEYWORD
-                   | YUL_DIV_KEYWORD
-                   | YUL_EQ_KEYWORD
-                   | YUL_EXP_KEYWORD
-                   | YUL_EXT_CODE_COPY_KEYWORD
-                   | YUL_EXT_CODE_SIZE_KEYWORD
-                   | YUL_GAS_KEYWORD
-                   | YUL_GAS_LIMIT_KEYWORD
-                   | YUL_GAS_PRICE_KEYWORD
-                   | YUL_GT_KEYWORD
-                   | YUL_INVALID_KEYWORD
-                   | YUL_IS_ZERO_KEYWORD
-                   | YUL_LOG_0_KEYWORD
-                   | YUL_LOG_1_KEYWORD
-                   | YUL_LOG_2_KEYWORD
-                   | YUL_LOG_3_KEYWORD
-                   | YUL_LOG_4_KEYWORD
-                   | YUL_LT_KEYWORD
-                   | YUL_M_LOAD_KEYWORD
-                   | YUL_MOD_KEYWORD
-                   | YUL_M_SIZE_KEYWORD
-                   | YUL_M_STORE_8_KEYWORD
-                   | YUL_M_STORE_KEYWORD
-                   | YUL_MUL_KEYWORD
-                   | YUL_MUL_MOD_KEYWORD
-                   | YUL_NOT_KEYWORD
-                   | YUL_NUMBER_KEYWORD
-                   | YUL_ORIGIN_KEYWORD
-                   | YUL_OR_KEYWORD
-                   | YUL_POP_KEYWORD
-                   | YUL_RETURN_KEYWORD
-                   | YUL_REVERT_KEYWORD
-                   | YUL_S_DIV_KEYWORD
-                   | YUL_SELF_DESTRUCT_KEYWORD
-                   | YUL_SGT_KEYWORD
-                   | YUL_SIGN_EXTEND_KEYWORD
-                   | YUL_S_LOAD_KEYWORD
-                   | YUL_SLT_KEYWORD
-                   | YUL_S_MOD_KEYWORD
-                   | YUL_S_STORE_KEYWORD
-                   | YUL_STOP_KEYWORD
-                   | YUL_SUB_KEYWORD
-                   | YUL_TIMESTAMP_KEYWORD
-                   | YUL_XOR_KEYWORD
-                   | YUL_KECCAK_256_KEYWORD (* Introduced in 0.4.12 *)
-                   | YUL_SHA_3_KEYWORD (* Deprecated in 0.5.0 *)
-                   | YUL_SUICIDE_KEYWORD (* Deprecated in 0.5.0 *)
-                   | YUL_RETURN_DATA_COPY_KEYWORD (* Introduced in 0.4.12 *)
-                   | YUL_RETURN_DATA_SIZE_KEYWORD (* Introduced in 0.4.12 *)
-                   | YUL_STATIC_CALL_KEYWORD (* Introduced in 0.4.12 *)
-                   | YUL_CREATE_2_KEYWORD (* Introduced in 0.4.12 *)
-                   | YUL_EXT_CODE_HASH_KEYWORD (* Introduced in 0.5.0 *)
-                   | YUL_SAR_KEYWORD
-                   | YUL_SHL_KEYWORD
-                   | YUL_SHR_KEYWORD
-                   | YUL_CHAIN_ID_KEYWORD
-                   | YUL_SELF_BALANCE_KEYWORD
-                   | YUL_BASE_FEE_KEYWORD (* Introduced in 0.8.7 *)
-                   | YUL_DIFFICULTY_KEYWORD (* Deprecated in 0.8.18 *)
-                   | YUL_PREV_RANDAO_KEYWORD (* Introduced in 0.8.18 *)
-                   | YUL_BLOB_BASE_FEE_KEYWORD (* Introduced in 0.8.24 *)
-                   | YUL_BLOB_HASH_KEYWORD (* Introduced in 0.8.24 *)
-                   | YUL_T_LOAD_KEYWORD (* Introduced in 0.8.24 *)
-                   | YUL_T_STORE_KEYWORD (* Introduced in 0.8.24 *)
-                   | YUL_M_COPY_KEYWORD; (* Introduced in 0.8.24 *)
-
-YulLiteral = YUL_TRUE_KEYWORD
-           | YUL_FALSE_KEYWORD
-           | YUL_DECIMAL_LITERAL
-           | YUL_HEX_LITERAL
-           | HexStringLiteral
-           | StringLiteral;
+YulBuiltInFunction = (* variant: *) YUL_ADD_KEYWORD
+                   | (* variant: *) YUL_ADD_MOD_KEYWORD
+                   | (* variant: *) YUL_ADDRESS_KEYWORD
+                   | (* variant: *) YUL_AND_KEYWORD
+                   | (* variant: *) YUL_BALANCE_KEYWORD
+                   | (* variant: *) YUL_BLOCK_HASH_KEYWORD
+                   | (* variant: *) YUL_BYTE_KEYWORD
+                   | (* variant: *) YUL_CALL_CODE_KEYWORD
+                   | (* variant: *) YUL_CALL_DATA_COPY_KEYWORD
+                   | (* variant: *) YUL_CALL_DATA_LOAD_KEYWORD
+                   | (* variant: *) YUL_CALL_DATA_SIZE_KEYWORD
+                   | (* variant: *) YUL_CALLER_KEYWORD
+                   | (* variant: *) YUL_CALL_KEYWORD
+                   | (* variant: *) YUL_CALL_VALUE_KEYWORD
+                   | (* variant: *) YUL_COIN_BASE_KEYWORD
+                   | (* variant: *) YUL_CREATE_KEYWORD
+                   | (* variant: *) YUL_DELEGATE_CALL_KEYWORD
+                   | (* variant: *) YUL_DIV_KEYWORD
+                   | (* variant: *) YUL_EQ_KEYWORD
+                   | (* variant: *) YUL_EXP_KEYWORD
+                   | (* variant: *) YUL_EXT_CODE_COPY_KEYWORD
+                   | (* variant: *) YUL_EXT_CODE_SIZE_KEYWORD
+                   | (* variant: *) YUL_GAS_KEYWORD
+                   | (* variant: *) YUL_GAS_LIMIT_KEYWORD
+                   | (* variant: *) YUL_GAS_PRICE_KEYWORD
+                   | (* variant: *) YUL_GT_KEYWORD
+                   | (* variant: *) YUL_INVALID_KEYWORD
+                   | (* variant: *) YUL_IS_ZERO_KEYWORD
+                   | (* variant: *) YUL_LOG_0_KEYWORD
+                   | (* variant: *) YUL_LOG_1_KEYWORD
+                   | (* variant: *) YUL_LOG_2_KEYWORD
+                   | (* variant: *) YUL_LOG_3_KEYWORD
+                   | (* variant: *) YUL_LOG_4_KEYWORD
+                   | (* variant: *) YUL_LT_KEYWORD
+                   | (* variant: *) YUL_M_LOAD_KEYWORD
+                   | (* variant: *) YUL_MOD_KEYWORD
+                   | (* variant: *) YUL_M_SIZE_KEYWORD
+                   | (* variant: *) YUL_M_STORE_8_KEYWORD
+                   | (* variant: *) YUL_M_STORE_KEYWORD
+                   | (* variant: *) YUL_MUL_KEYWORD
+                   | (* variant: *) YUL_MUL_MOD_KEYWORD
+                   | (* variant: *) YUL_NOT_KEYWORD
+                   | (* variant: *) YUL_NUMBER_KEYWORD
+                   | (* variant: *) YUL_ORIGIN_KEYWORD
+                   | (* variant: *) YUL_OR_KEYWORD
+                   | (* variant: *) YUL_POP_KEYWORD
+                   | (* variant: *) YUL_RETURN_KEYWORD
+                   | (* variant: *) YUL_REVERT_KEYWORD
+                   | (* variant: *) YUL_S_DIV_KEYWORD
+                   | (* variant: *) YUL_SELF_DESTRUCT_KEYWORD
+                   | (* variant: *) YUL_SGT_KEYWORD
+                   | (* variant: *) YUL_SIGN_EXTEND_KEYWORD
+                   | (* variant: *) YUL_S_LOAD_KEYWORD
+                   | (* variant: *) YUL_SLT_KEYWORD
+                   | (* variant: *) YUL_S_MOD_KEYWORD
+                   | (* variant: *) YUL_S_STORE_KEYWORD
+                   | (* variant: *) YUL_STOP_KEYWORD
+                   | (* variant: *) YUL_SUB_KEYWORD
+                   | (* variant: *) YUL_TIMESTAMP_KEYWORD
+                   | (* variant: *) YUL_XOR_KEYWORD
+                   | (* variant: *) YUL_KECCAK_256_KEYWORD (* Introduced in 0.4.12 *)
+                   | (* variant: *) YUL_SHA_3_KEYWORD (* Deprecated in 0.5.0 *)
+                   | (* variant: *) YUL_SUICIDE_KEYWORD (* Deprecated in 0.5.0 *)
+                   | (* variant: *) YUL_RETURN_DATA_COPY_KEYWORD (* Introduced in 0.4.12 *)
+                   | (* variant: *) YUL_RETURN_DATA_SIZE_KEYWORD (* Introduced in 0.4.12 *)
+                   | (* variant: *) YUL_STATIC_CALL_KEYWORD (* Introduced in 0.4.12 *)
+                   | (* variant: *) YUL_CREATE_2_KEYWORD (* Introduced in 0.4.12 *)
+                   | (* variant: *) YUL_EXT_CODE_HASH_KEYWORD (* Introduced in 0.5.0 *)
+                   | (* variant: *) YUL_SAR_KEYWORD
+                   | (* variant: *) YUL_SHL_KEYWORD
+                   | (* variant: *) YUL_SHR_KEYWORD
+                   | (* variant: *) YUL_CHAIN_ID_KEYWORD
+                   | (* variant: *) YUL_SELF_BALANCE_KEYWORD
+                   | (* variant: *) YUL_BASE_FEE_KEYWORD (* Introduced in 0.8.7 *)
+                   | (* variant: *) YUL_DIFFICULTY_KEYWORD (* Deprecated in 0.8.18 *)
+                   | (* variant: *) YUL_PREV_RANDAO_KEYWORD (* Introduced in 0.8.18 *)
+                   | (* variant: *) YUL_BLOB_BASE_FEE_KEYWORD (* Introduced in 0.8.24 *)
+                   | (* variant: *) YUL_BLOB_HASH_KEYWORD (* Introduced in 0.8.24 *)
+                   | (* variant: *) YUL_T_LOAD_KEYWORD (* Introduced in 0.8.24 *)
+                   | (* variant: *) YUL_T_STORE_KEYWORD (* Introduced in 0.8.24 *)
+                   | (* variant: *) YUL_M_COPY_KEYWORD; (* Introduced in 0.8.24 *)
+
+YulLiteral = (* variant: *) YUL_TRUE_KEYWORD
+           | (* variant: *) YUL_FALSE_KEYWORD
+           | (* variant: *) YUL_DECIMAL_LITERAL
+           | (* variant: *) YUL_HEX_LITERAL
+           | (* variant: *) HexStringLiteral
+           | (* variant: *) StringLiteral;
 
 YUL_DECIMAL_LITERAL = "0" | (("1"…"9") ("0"…"9")*);
 
diff --git a/crates/solidity/outputs/spec/generated/public/01-file-structure/02-source-unit.md b/crates/solidity/outputs/spec/generated/public/01-file-structure/02-source-unit.md
index f2d3a393fd..7a1d506e89 100644
--- a/crates/solidity/outputs/spec/generated/public/01-file-structure/02-source-unit.md
+++ b/crates/solidity/outputs/spec/generated/public/01-file-structure/02-source-unit.md
@@ -8,18 +8,18 @@
 
 ```
 
-<pre ebnf-snippet="SourceUnit" style="display: none;"><a href="#SourceUnit"><span class="k">SourceUnit</span></a><span class="o"> = </span><a href="#SourceUnitMembers"><span class="k">SourceUnitMembers</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="SourceUnit" style="display: none;"><a href="#SourceUnit"><span class="k">SourceUnit</span></a><span class="o"> = </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#SourceUnitMembers"><span class="k">SourceUnitMembers</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #SourceUnitMembers }
 
 ```
 
-<pre ebnf-snippet="SourceUnitMembers" style="display: none;"><a href="#SourceUnitMembers"><span class="k">SourceUnitMembers</span></a><span class="o"> = </span><a href="#SourceUnitMember"><span class="k">SourceUnitMember</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="SourceUnitMembers" style="display: none;"><a href="#SourceUnitMembers"><span class="k">SourceUnitMembers</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#SourceUnitMember"><span class="k">SourceUnitMember</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #SourceUnitMember }
 
 ```
 
-<pre ebnf-snippet="SourceUnitMember" style="display: none;"><a href="#SourceUnitMember"><span class="k">SourceUnitMember</span></a><span class="o"> = </span><a href="../03-pragma-directives#PragmaDirective"><span class="k">PragmaDirective</span></a><br /><span class="o">                 | </span><a href="../04-import-directives#ImportDirective"><span class="k">ImportDirective</span></a><br /><span class="o">                 | </span><a href="../../02-definitions/01-contracts#ContractDefinition"><span class="k">ContractDefinition</span></a><br /><span class="o">                 | </span><a href="../../02-definitions/02-interfaces#InterfaceDefinition"><span class="k">InterfaceDefinition</span></a><br /><span class="o">                 | </span><a href="../../02-definitions/03-libraries#LibraryDefinition"><span class="k">LibraryDefinition</span></a><br /><span class="o">                 | </span><a href="../../02-definitions/04-structs#StructDefinition"><span class="k">StructDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                 | </span><a href="../../02-definitions/05-enums#EnumDefinition"><span class="k">EnumDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                 | </span><a href="../../02-definitions/08-functions#FunctionDefinition"><span class="k">FunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.7.1 *)</span><br /><span class="o">                 | </span><a href="../../02-definitions/06-constants#ConstantDefinition"><span class="k">ConstantDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.7.4 *)</span><br /><span class="o">                 | </span><a href="../../02-definitions/12-errors#ErrorDefinition"><span class="k">ErrorDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.4 *)</span><br /><span class="o">                 | </span><a href="../../02-definitions/11-user-defined-value-types#UserDefinedValueTypeDefinition"><span class="k">UserDefinedValueTypeDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.8 *)</span><br /><span class="o">                 | </span><a href="../05-using-directives#UsingDirective"><span class="k">UsingDirective</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.13 *)</span><br /><span class="o">                 | </span><a href="../../02-definitions/10-events#EventDefinition"><span class="k">EventDefinition</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.22 *)</span></pre>
+<pre ebnf-snippet="SourceUnitMember" style="display: none;"><a href="#SourceUnitMember"><span class="k">SourceUnitMember</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-pragma-directives#PragmaDirective"><span class="k">PragmaDirective</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-import-directives#ImportDirective"><span class="k">ImportDirective</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/01-contracts#ContractDefinition"><span class="k">ContractDefinition</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/02-interfaces#InterfaceDefinition"><span class="k">InterfaceDefinition</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/03-libraries#LibraryDefinition"><span class="k">LibraryDefinition</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/04-structs#StructDefinition"><span class="k">StructDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/05-enums#EnumDefinition"><span class="k">EnumDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/08-functions#FunctionDefinition"><span class="k">FunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.7.1 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/06-constants#ConstantDefinition"><span class="k">ConstantDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.7.4 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/12-errors#ErrorDefinition"><span class="k">ErrorDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.4 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/11-user-defined-value-types#UserDefinedValueTypeDefinition"><span class="k">UserDefinedValueTypeDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.8 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../05-using-directives#UsingDirective"><span class="k">UsingDirective</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.13 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../02-definitions/10-events#EventDefinition"><span class="k">EventDefinition</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.22 *)</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/01-file-structure/02-source-unit.md"
diff --git a/crates/solidity/outputs/spec/generated/public/01-file-structure/03-pragma-directives.md b/crates/solidity/outputs/spec/generated/public/01-file-structure/03-pragma-directives.md
index 7a03870375..148a9dcb0d 100644
--- a/crates/solidity/outputs/spec/generated/public/01-file-structure/03-pragma-directives.md
+++ b/crates/solidity/outputs/spec/generated/public/01-file-structure/03-pragma-directives.md
@@ -8,61 +8,73 @@
 
 ```
 
-<pre ebnf-snippet="PragmaDirective" style="display: none;"><a href="#PragmaDirective"><span class="k">PragmaDirective</span></a><span class="o"> = </span><a href="../08-keywords#PragmaKeyword"><span class="k">PRAGMA_KEYWORD</span></a><br /><span class="o">                  </span><a href="#Pragma"><span class="k">Pragma</span></a><br /><span class="o">                  </span><a href="../09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="PragmaDirective" style="display: none;"><a href="#PragmaDirective"><span class="k">PragmaDirective</span></a><span class="o"> = </span><span class="cm">(* pragma_keyword: *)</span><span class="o"> </span><a href="../08-keywords#PragmaKeyword"><span class="k">PRAGMA_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* pragma: *)</span><span class="o"> </span><a href="#Pragma"><span class="k">Pragma</span></a><br /><span class="o">                  </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #Pragma }
 
 ```
 
-<pre ebnf-snippet="Pragma" style="display: none;"><a href="#Pragma"><span class="k">Pragma</span></a><span class="o"> = </span><a href="#ABICoderPragma"><span class="k">ABICoderPragma</span></a><br /><span class="o">       | </span><a href="#ExperimentalPragma"><span class="k">ExperimentalPragma</span></a><br /><span class="o">       | </span><a href="#VersionPragma"><span class="k">VersionPragma</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="Pragma" style="display: none;"><a href="#Pragma"><span class="k">Pragma</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ABICoderPragma"><span class="k">ABICoderPragma</span></a><br /><span class="o">       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ExperimentalPragma"><span class="k">ExperimentalPragma</span></a><br /><span class="o">       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#VersionPragma"><span class="k">VersionPragma</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ABICoderPragma }
 
 ```
 
-<pre ebnf-snippet="ABICoderPragma" style="display: none;"><a href="#ABICoderPragma"><span class="k">ABICoderPragma</span></a><span class="o"> = </span><a href="#AbicoderKeyword"><span class="k">ABICODER_KEYWORD</span></a><br /><span class="o">                 </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ABICoderPragma" style="display: none;"><a href="#ABICoderPragma"><span class="k">ABICoderPragma</span></a><span class="o"> = </span><span class="cm">(* abicoder_keyword: *)</span><span class="o"> </span><a href="#AbicoderKeyword"><span class="k">ABICODER_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* version: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ExperimentalPragma }
 
 ```
 
-<pre ebnf-snippet="ExperimentalPragma" style="display: none;"><a href="#ExperimentalPragma"><span class="k">ExperimentalPragma</span></a><span class="o"> = </span><a href="#ExperimentalKeyword"><span class="k">EXPERIMENTAL_KEYWORD</span></a><br /><span class="o">                     </span><a href="#ExperimentalFeature"><span class="k">ExperimentalFeature</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ExperimentalPragma" style="display: none;"><a href="#ExperimentalPragma"><span class="k">ExperimentalPragma</span></a><span class="o"> = </span><span class="cm">(* experimental_keyword: *)</span><span class="o"> </span><a href="#ExperimentalKeyword"><span class="k">EXPERIMENTAL_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* feature: *)</span><span class="o"> </span><a href="#ExperimentalFeature"><span class="k">ExperimentalFeature</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ExperimentalFeature }
 
 ```
 
-<pre ebnf-snippet="ExperimentalFeature" style="display: none;"><a href="#ExperimentalFeature"><span class="k">ExperimentalFeature</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                    | </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ExperimentalFeature" style="display: none;"><a href="#ExperimentalFeature"><span class="k">ExperimentalFeature</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                    | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #VersionPragma }
 
 ```
 
-<pre ebnf-snippet="VersionPragma" style="display: none;"><a href="#VersionPragma"><span class="k">VersionPragma</span></a><span class="o"> = </span><a href="#SolidityKeyword"><span class="k">SOLIDITY_KEYWORD</span></a><br /><span class="o">                </span><a href="#VersionExpressionSets"><span class="k">VersionExpressionSets</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="VersionPragma" style="display: none;"><a href="#VersionPragma"><span class="k">VersionPragma</span></a><span class="o"> = </span><span class="cm">(* solidity_keyword: *)</span><span class="o"> </span><a href="#SolidityKeyword"><span class="k">SOLIDITY_KEYWORD</span></a><br /><span class="o">                </span><span class="cm">(* sets: *)</span><span class="o"> </span><a href="#VersionExpressionSets"><span class="k">VersionExpressionSets</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #VersionExpressionSets }
 
 ```
 
-<pre ebnf-snippet="VersionExpressionSets" style="display: none;"><a href="#VersionExpressionSets"><span class="k">VersionExpressionSets</span></a><span class="o"> = </span><a href="#VersionExpressionSet"><span class="k">VersionExpressionSet</span></a><span class="o"> </span><span class="o">(</span><a href="../09-punctuation#BarBar"><span class="k">BAR_BAR</span></a><span class="o"> </span><a href="#VersionExpressionSet"><span class="k">VersionExpressionSet</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="VersionExpressionSets" style="display: none;"><a href="#VersionExpressionSets"><span class="k">VersionExpressionSets</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#VersionExpressionSet"><span class="k">VersionExpressionSet</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../09-punctuation#BarBar"><span class="k">BAR_BAR</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#VersionExpressionSet"><span class="k">VersionExpressionSet</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #VersionExpressionSet }
 
 ```
 
-<pre ebnf-snippet="VersionExpressionSet" style="display: none;"><a href="#VersionExpressionSet"><span class="k">VersionExpressionSet</span></a><span class="o"> = </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">+</span><span class="o">;</span></pre>
+<pre ebnf-snippet="VersionExpressionSet" style="display: none;"><a href="#VersionExpressionSet"><span class="k">VersionExpressionSet</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">+</span><span class="o">;</span></pre>
 
 ```{ .ebnf #VersionExpression }
 
 ```
 
-<pre ebnf-snippet="VersionExpression" style="display: none;"><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o"> = </span><a href="#VersionRange"><span class="k">VersionRange</span></a><br /><span class="o">                  | </span><a href="#VersionComparator"><span class="k">VersionComparator</span></a><br /><span class="o">                  | </span><a href="#VersionSpecifiers"><span class="k">VersionSpecifiers</span></a><br /><span class="o">                  | </span><a href="#SingleQuotedVersionLiteral"><span class="k">SINGLE_QUOTED_VERSION_LITERAL</span></a><br /><span class="o">                  | </span><a href="#DoubleQuotedVersionLiteral"><span class="k">DOUBLE_QUOTED_VERSION_LITERAL</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="VersionExpression" style="display: none;"><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#VersionRange"><span class="k">VersionRange</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#VersionComparator"><span class="k">VersionComparator</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#VersionSpecifiers"><span class="k">VersionSpecifiers</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#SingleQuotedVersionLiteral"><span class="k">SINGLE_QUOTED_VERSION_LITERAL</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#DoubleQuotedVersionLiteral"><span class="k">DOUBLE_QUOTED_VERSION_LITERAL</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #VersionRange }
+
+```
+
+<pre ebnf-snippet="VersionRange" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#VersionRange"><span class="k">VersionRange</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><br /><span class="o">               </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#Minus"><span class="k">MINUS</span></a><br /><span class="o">               </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #VersionComparator }
+
+```
+
+<pre ebnf-snippet="VersionComparator" style="display: none;"><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#Caret"><span class="k">CARET</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#Tilde"><span class="k">TILDE</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#LessThan"><span class="k">LESS_THAN</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#GreaterThan"><span class="k">GREATER_THAN</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#LessThanEqual"><span class="k">LESS_THAN_EQUAL</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#VersionComparator"><span class="k">VersionComparator</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../09-punctuation#GreaterThanEqual"><span class="k">GREATER_THAN_EQUAL</span></a><br /><span class="o">                    </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#VersionExpression"><span class="k">VersionExpression</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #VersionSpecifiers }
 
 ```
 
-<pre ebnf-snippet="VersionSpecifiers" style="display: none;"><a href="#VersionSpecifiers"><span class="k">VersionSpecifiers</span></a><span class="o"> = </span><a href="#VersionSpecifier"><span class="k">VERSION_SPECIFIER</span></a><span class="o"> </span><span class="o">(</span><a href="../09-punctuation#Period"><span class="k">PERIOD</span></a><span class="o"> </span><a href="#VersionSpecifier"><span class="k">VERSION_SPECIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="VersionSpecifiers" style="display: none;"><a href="#VersionSpecifiers"><span class="k">VersionSpecifiers</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#VersionSpecifier"><span class="k">VERSION_SPECIFIER</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../09-punctuation#Period"><span class="k">PERIOD</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#VersionSpecifier"><span class="k">VERSION_SPECIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #VersionSpecifier }
 
diff --git a/crates/solidity/outputs/spec/generated/public/01-file-structure/04-import-directives.md b/crates/solidity/outputs/spec/generated/public/01-file-structure/04-import-directives.md
index df6fc39e04..40286f639c 100644
--- a/crates/solidity/outputs/spec/generated/public/01-file-structure/04-import-directives.md
+++ b/crates/solidity/outputs/spec/generated/public/01-file-structure/04-import-directives.md
@@ -8,48 +8,48 @@
 
 ```
 
-<pre ebnf-snippet="ImportDirective" style="display: none;"><a href="#ImportDirective"><span class="k">ImportDirective</span></a><span class="o"> = </span><a href="../08-keywords#ImportKeyword"><span class="k">IMPORT_KEYWORD</span></a><br /><span class="o">                  </span><a href="#ImportClause"><span class="k">ImportClause</span></a><br /><span class="o">                  </span><a href="../09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ImportDirective" style="display: none;"><a href="#ImportDirective"><span class="k">ImportDirective</span></a><span class="o"> = </span><span class="cm">(* import_keyword: *)</span><span class="o"> </span><a href="../08-keywords#ImportKeyword"><span class="k">IMPORT_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* clause: *)</span><span class="o"> </span><a href="#ImportClause"><span class="k">ImportClause</span></a><br /><span class="o">                  </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ImportClause }
 
 ```
 
-<pre ebnf-snippet="ImportClause" style="display: none;"><a href="#ImportClause"><span class="k">ImportClause</span></a><span class="o"> = </span><a href="#PathImport"><span class="k">PathImport</span></a><br /><span class="o">             | </span><a href="#NamedImport"><span class="k">NamedImport</span></a><br /><span class="o">             | </span><a href="#ImportDeconstruction"><span class="k">ImportDeconstruction</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ImportClause" style="display: none;"><a href="#ImportClause"><span class="k">ImportClause</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#PathImport"><span class="k">PathImport</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#NamedImport"><span class="k">NamedImport</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ImportDeconstruction"><span class="k">ImportDeconstruction</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #PathImport }
 
 ```
 
-<pre ebnf-snippet="PathImport" style="display: none;"><a href="#PathImport"><span class="k">PathImport</span></a><span class="o"> = </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><br /><span class="o">             </span><a href="#ImportAlias"><span class="k">ImportAlias</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="PathImport" style="display: none;"><a href="#PathImport"><span class="k">PathImport</span></a><span class="o"> = </span><span class="cm">(* path: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><br /><span class="o">             </span><span class="cm">(* alias: *)</span><span class="o"> </span><a href="#ImportAlias"><span class="k">ImportAlias</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #NamedImport }
 
 ```
 
-<pre ebnf-snippet="NamedImport" style="display: none;"><a href="#NamedImport"><span class="k">NamedImport</span></a><span class="o"> = </span><a href="../09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><br /><span class="o">              </span><a href="#ImportAlias"><span class="k">ImportAlias</span></a><br /><span class="o">              </span><a href="../08-keywords#FromKeyword"><span class="k">FROM_KEYWORD</span></a><br /><span class="o">              </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="NamedImport" style="display: none;"><a href="#NamedImport"><span class="k">NamedImport</span></a><span class="o"> = </span><span class="cm">(* asterisk: *)</span><span class="o"> </span><a href="../09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><br /><span class="o">              </span><span class="cm">(* alias: *)</span><span class="o"> </span><a href="#ImportAlias"><span class="k">ImportAlias</span></a><br /><span class="o">              </span><span class="cm">(* from_keyword: *)</span><span class="o"> </span><a href="../08-keywords#FromKeyword"><span class="k">FROM_KEYWORD</span></a><br /><span class="o">              </span><span class="cm">(* path: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ImportDeconstruction }
 
 ```
 
-<pre ebnf-snippet="ImportDeconstruction" style="display: none;"><a href="#ImportDeconstruction"><span class="k">ImportDeconstruction</span></a><span class="o"> = </span><a href="../09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                       </span><a href="#ImportDeconstructionSymbols"><span class="k">ImportDeconstructionSymbols</span></a><br /><span class="o">                       </span><a href="../09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><br /><span class="o">                       </span><a href="../08-keywords#FromKeyword"><span class="k">FROM_KEYWORD</span></a><br /><span class="o">                       </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ImportDeconstruction" style="display: none;"><a href="#ImportDeconstruction"><span class="k">ImportDeconstruction</span></a><span class="o"> = </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                       </span><span class="cm">(* symbols: *)</span><span class="o"> </span><a href="#ImportDeconstructionSymbols"><span class="k">ImportDeconstructionSymbols</span></a><br /><span class="o">                       </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><br /><span class="o">                       </span><span class="cm">(* from_keyword: *)</span><span class="o"> </span><a href="../08-keywords#FromKeyword"><span class="k">FROM_KEYWORD</span></a><br /><span class="o">                       </span><span class="cm">(* path: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ImportDeconstructionSymbols }
 
 ```
 
-<pre ebnf-snippet="ImportDeconstructionSymbols" style="display: none;"><a href="#ImportDeconstructionSymbols"><span class="k">ImportDeconstructionSymbols</span></a><span class="o"> = </span><a href="#ImportDeconstructionSymbol"><span class="k">ImportDeconstructionSymbol</span></a><span class="o"> </span><span class="o">(</span><a href="../09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#ImportDeconstructionSymbol"><span class="k">ImportDeconstructionSymbol</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ImportDeconstructionSymbols" style="display: none;"><a href="#ImportDeconstructionSymbols"><span class="k">ImportDeconstructionSymbols</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ImportDeconstructionSymbol"><span class="k">ImportDeconstructionSymbol</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ImportDeconstructionSymbol"><span class="k">ImportDeconstructionSymbol</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ImportDeconstructionSymbol }
 
 ```
 
-<pre ebnf-snippet="ImportDeconstructionSymbol" style="display: none;"><a href="#ImportDeconstructionSymbol"><span class="k">ImportDeconstructionSymbol</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                             </span><a href="#ImportAlias"><span class="k">ImportAlias</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ImportDeconstructionSymbol" style="display: none;"><a href="#ImportDeconstructionSymbol"><span class="k">ImportDeconstructionSymbol</span></a><span class="o"> = </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                             </span><span class="cm">(* alias: *)</span><span class="o"> </span><a href="#ImportAlias"><span class="k">ImportAlias</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ImportAlias }
 
 ```
 
-<pre ebnf-snippet="ImportAlias" style="display: none;"><a href="#ImportAlias"><span class="k">ImportAlias</span></a><span class="o"> = </span><a href="../08-keywords#AsKeyword"><span class="k">AS_KEYWORD</span></a><br /><span class="o">              </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ImportAlias" style="display: none;"><a href="#ImportAlias"><span class="k">ImportAlias</span></a><span class="o"> = </span><span class="cm">(* as_keyword: *)</span><span class="o"> </span><a href="../08-keywords#AsKeyword"><span class="k">AS_KEYWORD</span></a><br /><span class="o">              </span><span class="cm">(* identifier: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/01-file-structure/04-import-directives.md"
diff --git a/crates/solidity/outputs/spec/generated/public/01-file-structure/05-using-directives.md b/crates/solidity/outputs/spec/generated/public/01-file-structure/05-using-directives.md
index 12609b1792..55e9a2f582 100644
--- a/crates/solidity/outputs/spec/generated/public/01-file-structure/05-using-directives.md
+++ b/crates/solidity/outputs/spec/generated/public/01-file-structure/05-using-directives.md
@@ -8,48 +8,48 @@
 
 ```
 
-<pre ebnf-snippet="UsingDirective" style="display: none;"><a href="#UsingDirective"><span class="k">UsingDirective</span></a><span class="o"> = </span><a href="../08-keywords#UsingKeyword"><span class="k">USING_KEYWORD</span></a><br /><span class="o">                 </span><a href="#UsingClause"><span class="k">UsingClause</span></a><br /><span class="o">                 </span><a href="../08-keywords#ForKeyword"><span class="k">FOR_KEYWORD</span></a><br /><span class="o">                 </span><a href="#UsingTarget"><span class="k">UsingTarget</span></a><br /><span class="o">                 </span><a href="../08-keywords#GlobalKeyword"><span class="k">GLOBAL_KEYWORD</span></a><span class="o">?</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.13 *)</span><br /><span class="o">                 </span><a href="../09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UsingDirective" style="display: none;"><a href="#UsingDirective"><span class="k">UsingDirective</span></a><span class="o"> = </span><span class="cm">(* using_keyword: *)</span><span class="o"> </span><a href="../08-keywords#UsingKeyword"><span class="k">USING_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* clause: *)</span><span class="o"> </span><a href="#UsingClause"><span class="k">UsingClause</span></a><br /><span class="o">                 </span><span class="cm">(* for_keyword: *)</span><span class="o"> </span><a href="../08-keywords#ForKeyword"><span class="k">FOR_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* target: *)</span><span class="o"> </span><a href="#UsingTarget"><span class="k">UsingTarget</span></a><br /><span class="o">                 </span><span class="cm">(* global_keyword: *)</span><span class="o"> </span><a href="../08-keywords#GlobalKeyword"><span class="k">GLOBAL_KEYWORD</span></a><span class="o">?</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.13 *)</span><br /><span class="o">                 </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #UsingClause }
 
 ```
 
-<pre ebnf-snippet="UsingClause" style="display: none;"><a href="#UsingClause"><span class="k">UsingClause</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">            | </span><a href="#UsingDeconstruction"><span class="k">UsingDeconstruction</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.13 *)</span></pre>
+<pre ebnf-snippet="UsingClause" style="display: none;"><a href="#UsingClause"><span class="k">UsingClause</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">            | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#UsingDeconstruction"><span class="k">UsingDeconstruction</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.13 *)</span></pre>
 
 ```{ .ebnf #UsingDeconstruction }
 
 ```
 
-<pre ebnf-snippet="UsingDeconstruction" style="display: none;"><span class="cm">(* Introduced in 0.8.13 *)</span><br /><a href="#UsingDeconstruction"><span class="k">UsingDeconstruction</span></a><span class="o"> = </span><a href="../09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                      </span><a href="#UsingDeconstructionSymbols"><span class="k">UsingDeconstructionSymbols</span></a><br /><span class="o">                      </span><a href="../09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UsingDeconstruction" style="display: none;"><span class="cm">(* Introduced in 0.8.13 *)</span><br /><a href="#UsingDeconstruction"><span class="k">UsingDeconstruction</span></a><span class="o"> = </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                      </span><span class="cm">(* symbols: *)</span><span class="o"> </span><a href="#UsingDeconstructionSymbols"><span class="k">UsingDeconstructionSymbols</span></a><br /><span class="o">                      </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #UsingDeconstructionSymbols }
 
 ```
 
-<pre ebnf-snippet="UsingDeconstructionSymbols" style="display: none;"><span class="cm">(* Introduced in 0.8.13 *)</span><br /><a href="#UsingDeconstructionSymbols"><span class="k">UsingDeconstructionSymbols</span></a><span class="o"> = </span><a href="#UsingDeconstructionSymbol"><span class="k">UsingDeconstructionSymbol</span></a><span class="o"> </span><span class="o">(</span><a href="../09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#UsingDeconstructionSymbol"><span class="k">UsingDeconstructionSymbol</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="UsingDeconstructionSymbols" style="display: none;"><span class="cm">(* Introduced in 0.8.13 *)</span><br /><a href="#UsingDeconstructionSymbols"><span class="k">UsingDeconstructionSymbols</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#UsingDeconstructionSymbol"><span class="k">UsingDeconstructionSymbol</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#UsingDeconstructionSymbol"><span class="k">UsingDeconstructionSymbol</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #UsingDeconstructionSymbol }
 
 ```
 
-<pre ebnf-snippet="UsingDeconstructionSymbol" style="display: none;"><span class="cm">(* Introduced in 0.8.13 *)</span><br /><a href="#UsingDeconstructionSymbol"><span class="k">UsingDeconstructionSymbol</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                            </span><a href="#UsingAlias"><span class="k">UsingAlias</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.19 *)</span></pre>
+<pre ebnf-snippet="UsingDeconstructionSymbol" style="display: none;"><span class="cm">(* Introduced in 0.8.13 *)</span><br /><a href="#UsingDeconstructionSymbol"><span class="k">UsingDeconstructionSymbol</span></a><span class="o"> = </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                            </span><span class="cm">(* alias: *)</span><span class="o"> </span><a href="#UsingAlias"><span class="k">UsingAlias</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.19 *)</span></pre>
 
 ```{ .ebnf #UsingAlias }
 
 ```
 
-<pre ebnf-snippet="UsingAlias" style="display: none;"><span class="cm">(* Introduced in 0.8.19 *)</span><br /><a href="#UsingAlias"><span class="k">UsingAlias</span></a><span class="o"> = </span><a href="../08-keywords#AsKeyword"><span class="k">AS_KEYWORD</span></a><br /><span class="o">             </span><a href="#UsingOperator"><span class="k">UsingOperator</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UsingAlias" style="display: none;"><span class="cm">(* Introduced in 0.8.19 *)</span><br /><a href="#UsingAlias"><span class="k">UsingAlias</span></a><span class="o"> = </span><span class="cm">(* as_keyword: *)</span><span class="o"> </span><a href="../08-keywords#AsKeyword"><span class="k">AS_KEYWORD</span></a><br /><span class="o">             </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="#UsingOperator"><span class="k">UsingOperator</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #UsingOperator }
 
 ```
 
-<pre ebnf-snippet="UsingOperator" style="display: none;"><span class="cm">(* Introduced in 0.8.19 *)</span><br /><a href="#UsingOperator"><span class="k">UsingOperator</span></a><span class="o"> = </span><a href="../09-punctuation#Ampersand"><span class="k">AMPERSAND</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><br /><span class="o">              | </span><a href="../09-punctuation#BangEqual"><span class="k">BANG_EQUAL</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Bar"><span class="k">BAR</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Caret"><span class="k">CARET</span></a><br /><span class="o">              | </span><a href="../09-punctuation#EqualEqual"><span class="k">EQUAL_EQUAL</span></a><br /><span class="o">              | </span><a href="../09-punctuation#GreaterThan"><span class="k">GREATER_THAN</span></a><br /><span class="o">              | </span><a href="../09-punctuation#GreaterThanEqual"><span class="k">GREATER_THAN_EQUAL</span></a><br /><span class="o">              | </span><a href="../09-punctuation#LessThan"><span class="k">LESS_THAN</span></a><br /><span class="o">              | </span><a href="../09-punctuation#LessThanEqual"><span class="k">LESS_THAN_EQUAL</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Minus"><span class="k">MINUS</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Percent"><span class="k">PERCENT</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Plus"><span class="k">PLUS</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Slash"><span class="k">SLASH</span></a><br /><span class="o">              | </span><a href="../09-punctuation#Tilde"><span class="k">TILDE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UsingOperator" style="display: none;"><span class="cm">(* Introduced in 0.8.19 *)</span><br /><a href="#UsingOperator"><span class="k">UsingOperator</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Ampersand"><span class="k">AMPERSAND</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#BangEqual"><span class="k">BANG_EQUAL</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Bar"><span class="k">BAR</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Caret"><span class="k">CARET</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#EqualEqual"><span class="k">EQUAL_EQUAL</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#GreaterThan"><span class="k">GREATER_THAN</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#GreaterThanEqual"><span class="k">GREATER_THAN_EQUAL</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#LessThan"><span class="k">LESS_THAN</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#LessThanEqual"><span class="k">LESS_THAN_EQUAL</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Minus"><span class="k">MINUS</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Percent"><span class="k">PERCENT</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Plus"><span class="k">PLUS</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Slash"><span class="k">SLASH</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Tilde"><span class="k">TILDE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #UsingTarget }
 
 ```
 
-<pre ebnf-snippet="UsingTarget" style="display: none;"><a href="#UsingTarget"><span class="k">UsingTarget</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">            | </span><a href="../09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UsingTarget" style="display: none;"><a href="#UsingTarget"><span class="k">UsingTarget</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">            | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/01-file-structure/05-using-directives.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/01-contracts.md b/crates/solidity/outputs/spec/generated/public/02-definitions/01-contracts.md
index b2524eefd4..17142f4a06 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/01-contracts.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/01-contracts.md
@@ -8,36 +8,36 @@
 
 ```
 
-<pre ebnf-snippet="ContractDefinition" style="display: none;"><a href="#ContractDefinition"><span class="k">ContractDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#AbstractKeyword"><span class="k">ABSTRACT_KEYWORD</span></a><span class="o">?</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                     </span><a href="../../01-file-structure/08-keywords#ContractKeyword"><span class="k">CONTRACT_KEYWORD</span></a><br /><span class="o">                     </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                     </span><a href="#InheritanceSpecifier"><span class="k">InheritanceSpecifier</span></a><span class="o">?</span><br /><span class="o">                     </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                     </span><a href="#ContractMembers"><span class="k">ContractMembers</span></a><br /><span class="o">                     </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ContractDefinition" style="display: none;"><a href="#ContractDefinition"><span class="k">ContractDefinition</span></a><span class="o"> = </span><span class="cm">(* abstract_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#AbstractKeyword"><span class="k">ABSTRACT_KEYWORD</span></a><span class="o">?</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                     </span><span class="cm">(* contract_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ContractKeyword"><span class="k">CONTRACT_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                     </span><span class="cm">(* inheritance: *)</span><span class="o"> </span><a href="#InheritanceSpecifier"><span class="k">InheritanceSpecifier</span></a><span class="o">?</span><br /><span class="o">                     </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                     </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#ContractMembers"><span class="k">ContractMembers</span></a><br /><span class="o">                     </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #InheritanceSpecifier }
 
 ```
 
-<pre ebnf-snippet="InheritanceSpecifier" style="display: none;"><a href="#InheritanceSpecifier"><span class="k">InheritanceSpecifier</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#IsKeyword"><span class="k">IS_KEYWORD</span></a><br /><span class="o">                       </span><a href="#InheritanceTypes"><span class="k">InheritanceTypes</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="InheritanceSpecifier" style="display: none;"><a href="#InheritanceSpecifier"><span class="k">InheritanceSpecifier</span></a><span class="o"> = </span><span class="cm">(* is_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#IsKeyword"><span class="k">IS_KEYWORD</span></a><br /><span class="o">                       </span><span class="cm">(* types: *)</span><span class="o"> </span><a href="#InheritanceTypes"><span class="k">InheritanceTypes</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #InheritanceTypes }
 
 ```
 
-<pre ebnf-snippet="InheritanceTypes" style="display: none;"><a href="#InheritanceTypes"><span class="k">InheritanceTypes</span></a><span class="o"> = </span><a href="#InheritanceType"><span class="k">InheritanceType</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#InheritanceType"><span class="k">InheritanceType</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="InheritanceTypes" style="display: none;"><a href="#InheritanceTypes"><span class="k">InheritanceTypes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#InheritanceType"><span class="k">InheritanceType</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#InheritanceType"><span class="k">InheritanceType</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #InheritanceType }
 
 ```
 
-<pre ebnf-snippet="InheritanceType" style="display: none;"><a href="#InheritanceType"><span class="k">InheritanceType</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                  </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="InheritanceType" style="display: none;"><a href="#InheritanceType"><span class="k">InheritanceType</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                  </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ContractMembers }
 
 ```
 
-<pre ebnf-snippet="ContractMembers" style="display: none;"><a href="#ContractMembers"><span class="k">ContractMembers</span></a><span class="o"> = </span><a href="#ContractMember"><span class="k">ContractMember</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ContractMembers" style="display: none;"><a href="#ContractMembers"><span class="k">ContractMembers</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ContractMember"><span class="k">ContractMember</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ContractMember }
 
 ```
 
-<pre ebnf-snippet="ContractMember" style="display: none;"><a href="#ContractMember"><span class="k">ContractMember</span></a><span class="o"> = </span><a href="../../01-file-structure/05-using-directives#UsingDirective"><span class="k">UsingDirective</span></a><br /><span class="o">               | </span><a href="../08-functions#FunctionDefinition"><span class="k">FunctionDefinition</span></a><br /><span class="o">               | </span><a href="../08-functions#ConstructorDefinition"><span class="k">ConstructorDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.22 *)</span><br /><span class="o">               | </span><a href="../08-functions#ReceiveFunctionDefinition"><span class="k">ReceiveFunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">               | </span><a href="../08-functions#FallbackFunctionDefinition"><span class="k">FallbackFunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">               | </span><a href="../08-functions#UnnamedFunctionDefinition"><span class="k">UnnamedFunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><span class="o">               | </span><a href="../09-modifiers#ModifierDefinition"><span class="k">ModifierDefinition</span></a><br /><span class="o">               | </span><a href="../04-structs#StructDefinition"><span class="k">StructDefinition</span></a><br /><span class="o">               | </span><a href="../05-enums#EnumDefinition"><span class="k">EnumDefinition</span></a><br /><span class="o">               | </span><a href="../10-events#EventDefinition"><span class="k">EventDefinition</span></a><br /><span class="o">               | </span><a href="../07-state-variables#StateVariableDefinition"><span class="k">StateVariableDefinition</span></a><br /><span class="o">               | </span><a href="../12-errors#ErrorDefinition"><span class="k">ErrorDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.4 *)</span><br /><span class="o">               | </span><a href="../11-user-defined-value-types#UserDefinedValueTypeDefinition"><span class="k">UserDefinedValueTypeDefinition</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.8 *)</span></pre>
+<pre ebnf-snippet="ContractMember" style="display: none;"><a href="#ContractMember"><span class="k">ContractMember</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/05-using-directives#UsingDirective"><span class="k">UsingDirective</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#FunctionDefinition"><span class="k">FunctionDefinition</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#ConstructorDefinition"><span class="k">ConstructorDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.22 *)</span><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#ReceiveFunctionDefinition"><span class="k">ReceiveFunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#FallbackFunctionDefinition"><span class="k">FallbackFunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#UnnamedFunctionDefinition"><span class="k">UnnamedFunctionDefinition</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-modifiers#ModifierDefinition"><span class="k">ModifierDefinition</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-structs#StructDefinition"><span class="k">StructDefinition</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../05-enums#EnumDefinition"><span class="k">EnumDefinition</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../10-events#EventDefinition"><span class="k">EventDefinition</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../07-state-variables#StateVariableDefinition"><span class="k">StateVariableDefinition</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../12-errors#ErrorDefinition"><span class="k">ErrorDefinition</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.4 *)</span><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../11-user-defined-value-types#UserDefinedValueTypeDefinition"><span class="k">UserDefinedValueTypeDefinition</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.8 *)</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/01-contracts.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/02-interfaces.md b/crates/solidity/outputs/spec/generated/public/02-definitions/02-interfaces.md
index 7f42a81ff5..52181d0df4 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/02-interfaces.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/02-interfaces.md
@@ -8,12 +8,12 @@
 
 ```
 
-<pre ebnf-snippet="InterfaceDefinition" style="display: none;"><a href="#InterfaceDefinition"><span class="k">InterfaceDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#InterfaceKeyword"><span class="k">INTERFACE_KEYWORD</span></a><br /><span class="o">                      </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                      </span><a href="../01-contracts#InheritanceSpecifier"><span class="k">InheritanceSpecifier</span></a><span class="o">?</span><br /><span class="o">                      </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                      </span><a href="#InterfaceMembers"><span class="k">InterfaceMembers</span></a><br /><span class="o">                      </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="InterfaceDefinition" style="display: none;"><a href="#InterfaceDefinition"><span class="k">InterfaceDefinition</span></a><span class="o"> = </span><span class="cm">(* interface_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#InterfaceKeyword"><span class="k">INTERFACE_KEYWORD</span></a><br /><span class="o">                      </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                      </span><span class="cm">(* inheritance: *)</span><span class="o"> </span><a href="../01-contracts#InheritanceSpecifier"><span class="k">InheritanceSpecifier</span></a><span class="o">?</span><br /><span class="o">                      </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                      </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#InterfaceMembers"><span class="k">InterfaceMembers</span></a><br /><span class="o">                      </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #InterfaceMembers }
 
 ```
 
-<pre ebnf-snippet="InterfaceMembers" style="display: none;"><a href="#InterfaceMembers"><span class="k">InterfaceMembers</span></a><span class="o"> = </span><a href="../01-contracts#ContractMember"><span class="k">ContractMember</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="InterfaceMembers" style="display: none;"><a href="#InterfaceMembers"><span class="k">InterfaceMembers</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../01-contracts#ContractMember"><span class="k">ContractMember</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/02-interfaces.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/03-libraries.md b/crates/solidity/outputs/spec/generated/public/02-definitions/03-libraries.md
index 05ca86f044..5b93979313 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/03-libraries.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/03-libraries.md
@@ -8,12 +8,12 @@
 
 ```
 
-<pre ebnf-snippet="LibraryDefinition" style="display: none;"><a href="#LibraryDefinition"><span class="k">LibraryDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#LibraryKeyword"><span class="k">LIBRARY_KEYWORD</span></a><br /><span class="o">                    </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                    </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                    </span><a href="#LibraryMembers"><span class="k">LibraryMembers</span></a><br /><span class="o">                    </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="LibraryDefinition" style="display: none;"><a href="#LibraryDefinition"><span class="k">LibraryDefinition</span></a><span class="o"> = </span><span class="cm">(* library_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#LibraryKeyword"><span class="k">LIBRARY_KEYWORD</span></a><br /><span class="o">                    </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                    </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                    </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#LibraryMembers"><span class="k">LibraryMembers</span></a><br /><span class="o">                    </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #LibraryMembers }
 
 ```
 
-<pre ebnf-snippet="LibraryMembers" style="display: none;"><a href="#LibraryMembers"><span class="k">LibraryMembers</span></a><span class="o"> = </span><a href="../01-contracts#ContractMember"><span class="k">ContractMember</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="LibraryMembers" style="display: none;"><a href="#LibraryMembers"><span class="k">LibraryMembers</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../01-contracts#ContractMember"><span class="k">ContractMember</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/03-libraries.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/04-structs.md b/crates/solidity/outputs/spec/generated/public/02-definitions/04-structs.md
index bf8d3340af..b6c95259d7 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/04-structs.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/04-structs.md
@@ -8,18 +8,18 @@
 
 ```
 
-<pre ebnf-snippet="StructDefinition" style="display: none;"><a href="#StructDefinition"><span class="k">StructDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#StructKeyword"><span class="k">STRUCT_KEYWORD</span></a><br /><span class="o">                   </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                   </span><a href="#StructMembers"><span class="k">StructMembers</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="StructDefinition" style="display: none;"><a href="#StructDefinition"><span class="k">StructDefinition</span></a><span class="o"> = </span><span class="cm">(* struct_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#StructKeyword"><span class="k">STRUCT_KEYWORD</span></a><br /><span class="o">                   </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                   </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                   </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#StructMembers"><span class="k">StructMembers</span></a><br /><span class="o">                   </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #StructMembers }
 
 ```
 
-<pre ebnf-snippet="StructMembers" style="display: none;"><a href="#StructMembers"><span class="k">StructMembers</span></a><span class="o"> = </span><a href="#StructMember"><span class="k">StructMember</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="StructMembers" style="display: none;"><a href="#StructMembers"><span class="k">StructMembers</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#StructMember"><span class="k">StructMember</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #StructMember }
 
 ```
 
-<pre ebnf-snippet="StructMember" style="display: none;"><a href="#StructMember"><span class="k">StructMember</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">               </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">               </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="StructMember" style="display: none;"><a href="#StructMember"><span class="k">StructMember</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">               </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">               </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/04-structs.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/05-enums.md b/crates/solidity/outputs/spec/generated/public/02-definitions/05-enums.md
index d5a546c813..f516daed7a 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/05-enums.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/05-enums.md
@@ -8,12 +8,12 @@
 
 ```
 
-<pre ebnf-snippet="EnumDefinition" style="display: none;"><a href="#EnumDefinition"><span class="k">EnumDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#EnumKeyword"><span class="k">ENUM_KEYWORD</span></a><br /><span class="o">                 </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                 </span><a href="#EnumMembers"><span class="k">EnumMembers</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="EnumDefinition" style="display: none;"><a href="#EnumDefinition"><span class="k">EnumDefinition</span></a><span class="o"> = </span><span class="cm">(* enum_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#EnumKeyword"><span class="k">ENUM_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                 </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                 </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#EnumMembers"><span class="k">EnumMembers</span></a><br /><span class="o">                 </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #EnumMembers }
 
 ```
 
-<pre ebnf-snippet="EnumMembers" style="display: none;"><a href="#EnumMembers"><span class="k">EnumMembers</span></a><span class="o"> = </span><span class="o">(</span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="EnumMembers" style="display: none;"><a href="#EnumMembers"><span class="k">EnumMembers</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/05-enums.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/06-constants.md b/crates/solidity/outputs/spec/generated/public/02-definitions/06-constants.md
index 51d49279fd..9c8c46a9ec 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/06-constants.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/06-constants.md
@@ -8,6 +8,6 @@
 
 ```
 
-<pre ebnf-snippet="ConstantDefinition" style="display: none;"><span class="cm">(* Introduced in 0.7.4 *)</span><br /><a href="#ConstantDefinition"><span class="k">ConstantDefinition</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                     </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><br /><span class="o">                     </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                     </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                     </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                     </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ConstantDefinition" style="display: none;"><span class="cm">(* Introduced in 0.7.4 *)</span><br /><a href="#ConstantDefinition"><span class="k">ConstantDefinition</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                     </span><span class="cm">(* constant_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                     </span><span class="cm">(* equal: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                     </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                     </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/06-constants.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/07-state-variables.md b/crates/solidity/outputs/spec/generated/public/02-definitions/07-state-variables.md
index 9c147a41c7..6148270479 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/07-state-variables.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/07-state-variables.md
@@ -8,24 +8,24 @@
 
 ```
 
-<pre ebnf-snippet="StateVariableDefinition" style="display: none;"><a href="#StateVariableDefinition"><span class="k">StateVariableDefinition</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                          </span><a href="#StateVariableAttributes"><span class="k">StateVariableAttributes</span></a><br /><span class="o">                          </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                          </span><a href="#StateVariableDefinitionValue"><span class="k">StateVariableDefinitionValue</span></a><span class="o">?</span><br /><span class="o">                          </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="StateVariableDefinition" style="display: none;"><a href="#StateVariableDefinition"><span class="k">StateVariableDefinition</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                          </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#StateVariableAttributes"><span class="k">StateVariableAttributes</span></a><br /><span class="o">                          </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                          </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="#StateVariableDefinitionValue"><span class="k">StateVariableDefinitionValue</span></a><span class="o">?</span><br /><span class="o">                          </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #StateVariableDefinitionValue }
 
 ```
 
-<pre ebnf-snippet="StateVariableDefinitionValue" style="display: none;"><a href="#StateVariableDefinitionValue"><span class="k">StateVariableDefinitionValue</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                               </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="StateVariableDefinitionValue" style="display: none;"><a href="#StateVariableDefinitionValue"><span class="k">StateVariableDefinitionValue</span></a><span class="o"> = </span><span class="cm">(* equal: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                               </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #StateVariableAttributes }
 
 ```
 
-<pre ebnf-snippet="StateVariableAttributes" style="display: none;"><a href="#StateVariableAttributes"><span class="k">StateVariableAttributes</span></a><span class="o"> = </span><a href="#StateVariableAttribute"><span class="k">StateVariableAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="StateVariableAttributes" style="display: none;"><a href="#StateVariableAttributes"><span class="k">StateVariableAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#StateVariableAttribute"><span class="k">StateVariableAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #StateVariableAttribute }
 
 ```
 
-<pre ebnf-snippet="StateVariableAttribute" style="display: none;"><a href="#StateVariableAttribute"><span class="k">StateVariableAttribute</span></a><span class="o"> = </span><a href="../08-functions#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                       | </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><br /><span class="o">                       | </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                       | </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><br /><span class="o">                       | </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                       | </span><a href="../../01-file-structure/08-keywords#ImmutableKeyword"><span class="k">IMMUTABLE_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.5 *)</span></pre>
+<pre ebnf-snippet="StateVariableAttribute" style="display: none;"><a href="#StateVariableAttribute"><span class="k">StateVariableAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><br /><span class="o">                       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><br /><span class="o">                       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                       | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ImmutableKeyword"><span class="k">IMMUTABLE_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.5 *)</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/07-state-variables.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/08-functions.md b/crates/solidity/outputs/spec/generated/public/02-definitions/08-functions.md
index 8298e13355..ec2d831b30 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/08-functions.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/08-functions.md
@@ -8,144 +8,144 @@
 
 ```
 
-<pre ebnf-snippet="FunctionDefinition" style="display: none;"><a href="#FunctionDefinition"><span class="k">FunctionDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#FunctionKeyword"><span class="k">FUNCTION_KEYWORD</span></a><br /><span class="o">                     </span><a href="#FunctionName"><span class="k">FunctionName</span></a><br /><span class="o">                     </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                     </span><a href="#FunctionAttributes"><span class="k">FunctionAttributes</span></a><br /><span class="o">                     </span><a href="#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">                     </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionDefinition" style="display: none;"><a href="#FunctionDefinition"><span class="k">FunctionDefinition</span></a><span class="o"> = </span><span class="cm">(* function_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FunctionKeyword"><span class="k">FUNCTION_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="#FunctionName"><span class="k">FunctionName</span></a><br /><span class="o">                     </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                     </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#FunctionAttributes"><span class="k">FunctionAttributes</span></a><br /><span class="o">                     </span><span class="cm">(* returns: *)</span><span class="o"> </span><a href="#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">                     </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionName }
 
 ```
 
-<pre ebnf-snippet="FunctionName" style="display: none;"><a href="#FunctionName"><span class="k">FunctionName</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">             | </span><a href="../../01-file-structure/08-keywords#FallbackKeyword"><span class="k">FALLBACK_KEYWORD</span></a><br /><span class="o">             | </span><a href="../../01-file-structure/08-keywords#ReceiveKeyword"><span class="k">RECEIVE_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionName" style="display: none;"><a href="#FunctionName"><span class="k">FunctionName</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FallbackKeyword"><span class="k">FALLBACK_KEYWORD</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ReceiveKeyword"><span class="k">RECEIVE_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ParametersDeclaration }
 
 ```
 
-<pre ebnf-snippet="ParametersDeclaration" style="display: none;"><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                        </span><a href="#Parameters"><span class="k">Parameters</span></a><br /><span class="o">                        </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ParametersDeclaration" style="display: none;"><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                        </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#Parameters"><span class="k">Parameters</span></a><br /><span class="o">                        </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #Parameters }
 
 ```
 
-<pre ebnf-snippet="Parameters" style="display: none;"><a href="#Parameters"><span class="k">Parameters</span></a><span class="o"> = </span><span class="o">(</span><a href="#Parameter"><span class="k">Parameter</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#Parameter"><span class="k">Parameter</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="Parameters" style="display: none;"><a href="#Parameters"><span class="k">Parameters</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#Parameter"><span class="k">Parameter</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#Parameter"><span class="k">Parameter</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #Parameter }
 
 ```
 
-<pre ebnf-snippet="Parameter" style="display: none;"><a href="#Parameter"><span class="k">Parameter</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">            </span><a href="../../04-statements/02-declaration-statements#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">            </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="Parameter" style="display: none;"><a href="#Parameter"><span class="k">Parameter</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">            </span><span class="cm">(* storage_location: *)</span><span class="o"> </span><a href="../../04-statements/02-declaration-statements#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">            </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionAttributes }
 
 ```
 
-<pre ebnf-snippet="FunctionAttributes" style="display: none;"><a href="#FunctionAttributes"><span class="k">FunctionAttributes</span></a><span class="o"> = </span><a href="#FunctionAttribute"><span class="k">FunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionAttributes" style="display: none;"><a href="#FunctionAttributes"><span class="k">FunctionAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#FunctionAttribute"><span class="k">FunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionAttribute }
 
 ```
 
-<pre ebnf-snippet="FunctionAttribute" style="display: none;"><a href="#FunctionAttribute"><span class="k">FunctionAttribute</span></a><span class="o"> = </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                  | </span><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span></pre>
+<pre ebnf-snippet="FunctionAttribute" style="display: none;"><a href="#FunctionAttribute"><span class="k">FunctionAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span></pre>
 
 ```{ .ebnf #OverrideSpecifier }
 
 ```
 
-<pre ebnf-snippet="OverrideSpecifier" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#OverrideKeyword"><span class="k">OVERRIDE_KEYWORD</span></a><br /><span class="o">                    </span><a href="#OverridePathsDeclaration"><span class="k">OverridePathsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="OverrideSpecifier" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> = </span><span class="cm">(* override_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#OverrideKeyword"><span class="k">OVERRIDE_KEYWORD</span></a><br /><span class="o">                    </span><span class="cm">(* overridden: *)</span><span class="o"> </span><a href="#OverridePathsDeclaration"><span class="k">OverridePathsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #OverridePathsDeclaration }
 
 ```
 
-<pre ebnf-snippet="OverridePathsDeclaration" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#OverridePathsDeclaration"><span class="k">OverridePathsDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                           </span><a href="#OverridePaths"><span class="k">OverridePaths</span></a><br /><span class="o">                           </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="OverridePathsDeclaration" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#OverridePathsDeclaration"><span class="k">OverridePathsDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                           </span><span class="cm">(* paths: *)</span><span class="o"> </span><a href="#OverridePaths"><span class="k">OverridePaths</span></a><br /><span class="o">                           </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #OverridePaths }
 
 ```
 
-<pre ebnf-snippet="OverridePaths" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#OverridePaths"><span class="k">OverridePaths</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="OverridePaths" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#OverridePaths"><span class="k">OverridePaths</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ReturnsDeclaration }
 
 ```
 
-<pre ebnf-snippet="ReturnsDeclaration" style="display: none;"><a href="#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ReturnsKeyword"><span class="k">RETURNS_KEYWORD</span></a><br /><span class="o">                     </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ReturnsDeclaration" style="display: none;"><a href="#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o"> = </span><span class="cm">(* returns_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ReturnsKeyword"><span class="k">RETURNS_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* variables: *)</span><span class="o"> </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionBody }
 
 ```
 
-<pre ebnf-snippet="FunctionBody" style="display: none;"><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o"> = </span><a href="../../04-statements/01-blocks#Block"><span class="k">Block</span></a><br /><span class="o">             | </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionBody" style="display: none;"><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../04-statements/01-blocks#Block"><span class="k">Block</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ConstructorDefinition }
 
 ```
 
-<pre ebnf-snippet="ConstructorDefinition" style="display: none;"><span class="cm">(* Introduced in 0.4.22 *)</span><br /><a href="#ConstructorDefinition"><span class="k">ConstructorDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ConstructorKeyword"><span class="k">CONSTRUCTOR_KEYWORD</span></a><br /><span class="o">                        </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                        </span><a href="#ConstructorAttributes"><span class="k">ConstructorAttributes</span></a><br /><span class="o">                        </span><a href="../../04-statements/01-blocks#Block"><span class="k">Block</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ConstructorDefinition" style="display: none;"><span class="cm">(* Introduced in 0.4.22 *)</span><br /><a href="#ConstructorDefinition"><span class="k">ConstructorDefinition</span></a><span class="o"> = </span><span class="cm">(* constructor_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ConstructorKeyword"><span class="k">CONSTRUCTOR_KEYWORD</span></a><br /><span class="o">                        </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                        </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#ConstructorAttributes"><span class="k">ConstructorAttributes</span></a><br /><span class="o">                        </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../../04-statements/01-blocks#Block"><span class="k">Block</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ConstructorAttributes }
 
 ```
 
-<pre ebnf-snippet="ConstructorAttributes" style="display: none;"><span class="cm">(* Introduced in 0.4.22 *)</span><br /><a href="#ConstructorAttributes"><span class="k">ConstructorAttributes</span></a><span class="o"> = </span><a href="#ConstructorAttribute"><span class="k">ConstructorAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ConstructorAttributes" style="display: none;"><span class="cm">(* Introduced in 0.4.22 *)</span><br /><a href="#ConstructorAttributes"><span class="k">ConstructorAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ConstructorAttribute"><span class="k">ConstructorAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ConstructorAttribute }
 
 ```
 
-<pre ebnf-snippet="ConstructorAttribute" style="display: none;"><span class="cm">(* Introduced in 0.4.22 *)</span><br /><a href="#ConstructorAttribute"><span class="k">ConstructorAttribute</span></a><span class="o"> = </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                     | </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                     | </span><a href="../../01-file-structure/08-keywords#OverrideKeyword"><span class="k">OVERRIDE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 and deprecated in 0.6.7. *)</span><br /><span class="o">                     | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                     | </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                     | </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 and deprecated in 0.6.7. *)</span></pre>
+<pre ebnf-snippet="ConstructorAttribute" style="display: none;"><span class="cm">(* Introduced in 0.4.22 *)</span><br /><a href="#ConstructorAttribute"><span class="k">ConstructorAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#OverrideKeyword"><span class="k">OVERRIDE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 and deprecated in 0.6.7. *)</span><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 and deprecated in 0.6.7. *)</span></pre>
 
 ```{ .ebnf #UnnamedFunctionDefinition }
 
 ```
 
-<pre ebnf-snippet="UnnamedFunctionDefinition" style="display: none;"><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#UnnamedFunctionDefinition"><span class="k">UnnamedFunctionDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#FunctionKeyword"><span class="k">FUNCTION_KEYWORD</span></a><br /><span class="o">                            </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                            </span><a href="#UnnamedFunctionAttributes"><span class="k">UnnamedFunctionAttributes</span></a><br /><span class="o">                            </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UnnamedFunctionDefinition" style="display: none;"><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#UnnamedFunctionDefinition"><span class="k">UnnamedFunctionDefinition</span></a><span class="o"> = </span><span class="cm">(* function_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FunctionKeyword"><span class="k">FUNCTION_KEYWORD</span></a><br /><span class="o">                            </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                            </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#UnnamedFunctionAttributes"><span class="k">UnnamedFunctionAttributes</span></a><br /><span class="o">                            </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #UnnamedFunctionAttributes }
 
 ```
 
-<pre ebnf-snippet="UnnamedFunctionAttributes" style="display: none;"><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#UnnamedFunctionAttributes"><span class="k">UnnamedFunctionAttributes</span></a><span class="o"> = </span><a href="#UnnamedFunctionAttribute"><span class="k">UnnamedFunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="UnnamedFunctionAttributes" style="display: none;"><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#UnnamedFunctionAttributes"><span class="k">UnnamedFunctionAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#UnnamedFunctionAttribute"><span class="k">UnnamedFunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #UnnamedFunctionAttribute }
 
 ```
 
-<pre ebnf-snippet="UnnamedFunctionAttribute" style="display: none;"><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#UnnamedFunctionAttribute"><span class="k">UnnamedFunctionAttribute</span></a><span class="o"> = </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 and deprecated in 0.6.0. *)</span><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 and deprecated in 0.6.0. *)</span></pre>
+<pre ebnf-snippet="UnnamedFunctionAttribute" style="display: none;"><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#UnnamedFunctionAttribute"><span class="k">UnnamedFunctionAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 and deprecated in 0.6.0. *)</span><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 and deprecated in 0.6.0. *)</span></pre>
 
 ```{ .ebnf #FallbackFunctionDefinition }
 
 ```
 
-<pre ebnf-snippet="FallbackFunctionDefinition" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#FallbackFunctionDefinition"><span class="k">FallbackFunctionDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#FallbackKeyword"><span class="k">FALLBACK_KEYWORD</span></a><br /><span class="o">                             </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                             </span><a href="#FallbackFunctionAttributes"><span class="k">FallbackFunctionAttributes</span></a><br /><span class="o">                             </span><a href="#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">                             </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="FallbackFunctionDefinition" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#FallbackFunctionDefinition"><span class="k">FallbackFunctionDefinition</span></a><span class="o"> = </span><span class="cm">(* fallback_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FallbackKeyword"><span class="k">FALLBACK_KEYWORD</span></a><br /><span class="o">                             </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                             </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#FallbackFunctionAttributes"><span class="k">FallbackFunctionAttributes</span></a><br /><span class="o">                             </span><span class="cm">(* returns: *)</span><span class="o"> </span><a href="#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">                             </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #FallbackFunctionAttributes }
 
 ```
 
-<pre ebnf-snippet="FallbackFunctionAttributes" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#FallbackFunctionAttributes"><span class="k">FallbackFunctionAttributes</span></a><span class="o"> = </span><a href="#FallbackFunctionAttribute"><span class="k">FallbackFunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="FallbackFunctionAttributes" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#FallbackFunctionAttributes"><span class="k">FallbackFunctionAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#FallbackFunctionAttribute"><span class="k">FallbackFunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #FallbackFunctionAttribute }
 
 ```
 
-<pre ebnf-snippet="FallbackFunctionAttribute" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#FallbackFunctionAttribute"><span class="k">FallbackFunctionAttribute</span></a><span class="o"> = </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                          | </span><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><br /><span class="o">                          | </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                          | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                          | </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><br /><span class="o">                          | </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><br /><span class="o">                          | </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="FallbackFunctionAttribute" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#FallbackFunctionAttribute"><span class="k">FallbackFunctionAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><br /><span class="o">                          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><br /><span class="o">                          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><br /><span class="o">                          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ReceiveFunctionDefinition }
 
 ```
 
-<pre ebnf-snippet="ReceiveFunctionDefinition" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ReceiveFunctionDefinition"><span class="k">ReceiveFunctionDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ReceiveKeyword"><span class="k">RECEIVE_KEYWORD</span></a><br /><span class="o">                            </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                            </span><a href="#ReceiveFunctionAttributes"><span class="k">ReceiveFunctionAttributes</span></a><br /><span class="o">                            </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ReceiveFunctionDefinition" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ReceiveFunctionDefinition"><span class="k">ReceiveFunctionDefinition</span></a><span class="o"> = </span><span class="cm">(* receive_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ReceiveKeyword"><span class="k">RECEIVE_KEYWORD</span></a><br /><span class="o">                            </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">                            </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#ReceiveFunctionAttributes"><span class="k">ReceiveFunctionAttributes</span></a><br /><span class="o">                            </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ReceiveFunctionAttributes }
 
 ```
 
-<pre ebnf-snippet="ReceiveFunctionAttributes" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ReceiveFunctionAttributes"><span class="k">ReceiveFunctionAttributes</span></a><span class="o"> = </span><a href="#ReceiveFunctionAttribute"><span class="k">ReceiveFunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ReceiveFunctionAttributes" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ReceiveFunctionAttributes"><span class="k">ReceiveFunctionAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ReceiveFunctionAttribute"><span class="k">ReceiveFunctionAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ReceiveFunctionAttribute }
 
 ```
 
-<pre ebnf-snippet="ReceiveFunctionAttribute" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ReceiveFunctionAttribute"><span class="k">ReceiveFunctionAttribute</span></a><span class="o"> = </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                         | </span><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                         | </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ReceiveFunctionAttribute" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ReceiveFunctionAttribute"><span class="k">ReceiveFunctionAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../09-modifiers#ModifierInvocation"><span class="k">ModifierInvocation</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><br /><span class="o">                         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/08-functions.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/09-modifiers.md b/crates/solidity/outputs/spec/generated/public/02-definitions/09-modifiers.md
index 37cee74499..ff64dd7d5f 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/09-modifiers.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/09-modifiers.md
@@ -8,24 +8,24 @@
 
 ```
 
-<pre ebnf-snippet="ModifierDefinition" style="display: none;"><a href="#ModifierDefinition"><span class="k">ModifierDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ModifierKeyword"><span class="k">MODIFIER_KEYWORD</span></a><br /><span class="o">                     </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                     </span><a href="../08-functions#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o">?</span><br /><span class="o">                     </span><a href="#ModifierAttributes"><span class="k">ModifierAttributes</span></a><br /><span class="o">                     </span><a href="../08-functions#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ModifierDefinition" style="display: none;"><a href="#ModifierDefinition"><span class="k">ModifierDefinition</span></a><span class="o"> = </span><span class="cm">(* modifier_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ModifierKeyword"><span class="k">MODIFIER_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                     </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="../08-functions#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o">?</span><br /><span class="o">                     </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#ModifierAttributes"><span class="k">ModifierAttributes</span></a><br /><span class="o">                     </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../08-functions#FunctionBody"><span class="k">FunctionBody</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ModifierAttributes }
 
 ```
 
-<pre ebnf-snippet="ModifierAttributes" style="display: none;"><a href="#ModifierAttributes"><span class="k">ModifierAttributes</span></a><span class="o"> = </span><a href="#ModifierAttribute"><span class="k">ModifierAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ModifierAttributes" style="display: none;"><a href="#ModifierAttributes"><span class="k">ModifierAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ModifierAttribute"><span class="k">ModifierAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ModifierAttribute }
 
 ```
 
-<pre ebnf-snippet="ModifierAttribute" style="display: none;"><a href="#ModifierAttribute"><span class="k">ModifierAttribute</span></a><span class="o"> = </span><a href="../08-functions#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                  | </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span></pre>
+<pre ebnf-snippet="ModifierAttribute" style="display: none;"><a href="#ModifierAttribute"><span class="k">ModifierAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../08-functions#OverrideSpecifier"><span class="k">OverrideSpecifier</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">                  | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VirtualKeyword"><span class="k">VIRTUAL_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span></pre>
 
 ```{ .ebnf #ModifierInvocation }
 
 ```
 
-<pre ebnf-snippet="ModifierInvocation" style="display: none;"><a href="#ModifierInvocation"><span class="k">ModifierInvocation</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                     </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ModifierInvocation" style="display: none;"><a href="#ModifierInvocation"><span class="k">ModifierInvocation</span></a><span class="o"> = </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                     </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/09-modifiers.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/10-events.md b/crates/solidity/outputs/spec/generated/public/02-definitions/10-events.md
index e9e83bf53e..3b83001e24 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/10-events.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/10-events.md
@@ -8,24 +8,24 @@
 
 ```
 
-<pre ebnf-snippet="EventDefinition" style="display: none;"><a href="#EventDefinition"><span class="k">EventDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#EventKeyword"><span class="k">EVENT_KEYWORD</span></a><br /><span class="o">                  </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                  </span><a href="#EventParametersDeclaration"><span class="k">EventParametersDeclaration</span></a><br /><span class="o">                  </span><a href="../../01-file-structure/08-keywords#AnonymousKeyword"><span class="k">ANONYMOUS_KEYWORD</span></a><span class="o">?</span><br /><span class="o">                  </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="EventDefinition" style="display: none;"><a href="#EventDefinition"><span class="k">EventDefinition</span></a><span class="o"> = </span><span class="cm">(* event_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#EventKeyword"><span class="k">EVENT_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                  </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#EventParametersDeclaration"><span class="k">EventParametersDeclaration</span></a><br /><span class="o">                  </span><span class="cm">(* anonymous_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#AnonymousKeyword"><span class="k">ANONYMOUS_KEYWORD</span></a><span class="o">?</span><br /><span class="o">                  </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #EventParametersDeclaration }
 
 ```
 
-<pre ebnf-snippet="EventParametersDeclaration" style="display: none;"><a href="#EventParametersDeclaration"><span class="k">EventParametersDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                             </span><a href="#EventParameters"><span class="k">EventParameters</span></a><br /><span class="o">                             </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="EventParametersDeclaration" style="display: none;"><a href="#EventParametersDeclaration"><span class="k">EventParametersDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                             </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#EventParameters"><span class="k">EventParameters</span></a><br /><span class="o">                             </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #EventParameters }
 
 ```
 
-<pre ebnf-snippet="EventParameters" style="display: none;"><a href="#EventParameters"><span class="k">EventParameters</span></a><span class="o"> = </span><span class="o">(</span><a href="#EventParameter"><span class="k">EventParameter</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#EventParameter"><span class="k">EventParameter</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="EventParameters" style="display: none;"><a href="#EventParameters"><span class="k">EventParameters</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#EventParameter"><span class="k">EventParameter</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#EventParameter"><span class="k">EventParameter</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #EventParameter }
 
 ```
 
-<pre ebnf-snippet="EventParameter" style="display: none;"><a href="#EventParameter"><span class="k">EventParameter</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/08-keywords#IndexedKeyword"><span class="k">INDEXED_KEYWORD</span></a><span class="o">?</span><br /><span class="o">                 </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="EventParameter" style="display: none;"><a href="#EventParameter"><span class="k">EventParameter</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                 </span><span class="cm">(* indexed_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#IndexedKeyword"><span class="k">INDEXED_KEYWORD</span></a><span class="o">?</span><br /><span class="o">                 </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/10-events.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/11-user-defined-value-types.md b/crates/solidity/outputs/spec/generated/public/02-definitions/11-user-defined-value-types.md
index 9d72340d06..e53d19cb75 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/11-user-defined-value-types.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/11-user-defined-value-types.md
@@ -8,6 +8,6 @@
 
 ```
 
-<pre ebnf-snippet="UserDefinedValueTypeDefinition" style="display: none;"><span class="cm">(* Introduced in 0.8.8 *)</span><br /><a href="#UserDefinedValueTypeDefinition"><span class="k">UserDefinedValueTypeDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#TypeKeyword"><span class="k">TYPE_KEYWORD</span></a><br /><span class="o">                                 </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                                 </span><a href="../../01-file-structure/08-keywords#IsKeyword"><span class="k">IS_KEYWORD</span></a><br /><span class="o">                                 </span><a href="../../03-types/02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">                                 </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UserDefinedValueTypeDefinition" style="display: none;"><span class="cm">(* Introduced in 0.8.8 *)</span><br /><a href="#UserDefinedValueTypeDefinition"><span class="k">UserDefinedValueTypeDefinition</span></a><span class="o"> = </span><span class="cm">(* type_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#TypeKeyword"><span class="k">TYPE_KEYWORD</span></a><br /><span class="o">                                 </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                                 </span><span class="cm">(* is_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#IsKeyword"><span class="k">IS_KEYWORD</span></a><br /><span class="o">                                 </span><span class="cm">(* value_type: *)</span><span class="o"> </span><a href="../../03-types/02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">                                 </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/11-user-defined-value-types.md"
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/12-errors.md b/crates/solidity/outputs/spec/generated/public/02-definitions/12-errors.md
index 1141f48b20..2b73254377 100644
--- a/crates/solidity/outputs/spec/generated/public/02-definitions/12-errors.md
+++ b/crates/solidity/outputs/spec/generated/public/02-definitions/12-errors.md
@@ -8,24 +8,24 @@
 
 ```
 
-<pre ebnf-snippet="ErrorDefinition" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorDefinition"><span class="k">ErrorDefinition</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ErrorKeyword"><span class="k">ERROR_KEYWORD</span></a><br /><span class="o">                  </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                  </span><a href="#ErrorParametersDeclaration"><span class="k">ErrorParametersDeclaration</span></a><br /><span class="o">                  </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ErrorDefinition" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorDefinition"><span class="k">ErrorDefinition</span></a><span class="o"> = </span><span class="cm">(* error_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ErrorKeyword"><span class="k">ERROR_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                  </span><span class="cm">(* members: *)</span><span class="o"> </span><a href="#ErrorParametersDeclaration"><span class="k">ErrorParametersDeclaration</span></a><br /><span class="o">                  </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ErrorParametersDeclaration }
 
 ```
 
-<pre ebnf-snippet="ErrorParametersDeclaration" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorParametersDeclaration"><span class="k">ErrorParametersDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                             </span><a href="#ErrorParameters"><span class="k">ErrorParameters</span></a><br /><span class="o">                             </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ErrorParametersDeclaration" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorParametersDeclaration"><span class="k">ErrorParametersDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                             </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#ErrorParameters"><span class="k">ErrorParameters</span></a><br /><span class="o">                             </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ErrorParameters }
 
 ```
 
-<pre ebnf-snippet="ErrorParameters" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorParameters"><span class="k">ErrorParameters</span></a><span class="o"> = </span><span class="o">(</span><a href="#ErrorParameter"><span class="k">ErrorParameter</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#ErrorParameter"><span class="k">ErrorParameter</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ErrorParameters" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorParameters"><span class="k">ErrorParameters</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ErrorParameter"><span class="k">ErrorParameter</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#ErrorParameter"><span class="k">ErrorParameter</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ErrorParameter }
 
 ```
 
-<pre ebnf-snippet="ErrorParameter" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorParameter"><span class="k">ErrorParameter</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                 </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ErrorParameter" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#ErrorParameter"><span class="k">ErrorParameter</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                 </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/02-definitions/12-errors.md"
diff --git a/crates/solidity/outputs/spec/generated/public/03-types/01-advanced-types.md b/crates/solidity/outputs/spec/generated/public/03-types/01-advanced-types.md
index 6e0d93977d..3efcd3c946 100644
--- a/crates/solidity/outputs/spec/generated/public/03-types/01-advanced-types.md
+++ b/crates/solidity/outputs/spec/generated/public/03-types/01-advanced-types.md
@@ -8,48 +8,54 @@
 
 ```
 
-<pre ebnf-snippet="TypeName" style="display: none;"><a href="#TypeName"><span class="k">TypeName</span></a><span class="o"> = </span><a href="#ArrayTypeName"><span class="k">ArrayTypeName</span></a><br /><span class="o">         | </span><a href="#FunctionType"><span class="k">FunctionType</span></a><br /><span class="o">         | </span><a href="#MappingType"><span class="k">MappingType</span></a><br /><span class="o">         | </span><a href="../02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">         | </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TypeName" style="display: none;"><a href="#TypeName"><span class="k">TypeName</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ArrayTypeName"><span class="k">ArrayTypeName</span></a><br /><span class="o">         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#FunctionType"><span class="k">FunctionType</span></a><br /><span class="o">         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#MappingType"><span class="k">MappingType</span></a><br /><span class="o">         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">         | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #ArrayTypeName }
+
+```
+
+<pre ebnf-snippet="ArrayTypeName" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#ArrayTypeName"><span class="k">ArrayTypeName</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                </span><span class="cm">(* open_bracket: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBracket"><span class="k">OPEN_BRACKET</span></a><br /><span class="o">                </span><span class="cm">(* index: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><br /><span class="o">                </span><span class="cm">(* close_bracket: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBracket"><span class="k">CLOSE_BRACKET</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionType }
 
 ```
 
-<pre ebnf-snippet="FunctionType" style="display: none;"><a href="#FunctionType"><span class="k">FunctionType</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#FunctionKeyword"><span class="k">FUNCTION_KEYWORD</span></a><br /><span class="o">               </span><a href="../../02-definitions/08-functions#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">               </span><a href="#FunctionTypeAttributes"><span class="k">FunctionTypeAttributes</span></a><br /><span class="o">               </span><a href="../../02-definitions/08-functions#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionType" style="display: none;"><a href="#FunctionType"><span class="k">FunctionType</span></a><span class="o"> = </span><span class="cm">(* function_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FunctionKeyword"><span class="k">FUNCTION_KEYWORD</span></a><br /><span class="o">               </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="../../02-definitions/08-functions#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><br /><span class="o">               </span><span class="cm">(* attributes: *)</span><span class="o"> </span><a href="#FunctionTypeAttributes"><span class="k">FunctionTypeAttributes</span></a><br /><span class="o">               </span><span class="cm">(* returns: *)</span><span class="o"> </span><a href="../../02-definitions/08-functions#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionTypeAttributes }
 
 ```
 
-<pre ebnf-snippet="FunctionTypeAttributes" style="display: none;"><a href="#FunctionTypeAttributes"><span class="k">FunctionTypeAttributes</span></a><span class="o"> = </span><a href="#FunctionTypeAttribute"><span class="k">FunctionTypeAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionTypeAttributes" style="display: none;"><a href="#FunctionTypeAttributes"><span class="k">FunctionTypeAttributes</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#FunctionTypeAttribute"><span class="k">FunctionTypeAttribute</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #FunctionTypeAttribute }
 
 ```
 
-<pre ebnf-snippet="FunctionTypeAttribute" style="display: none;"><a href="#FunctionTypeAttribute"><span class="k">FunctionTypeAttribute</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                      | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="FunctionTypeAttribute" style="display: none;"><a href="#FunctionTypeAttribute"><span class="k">FunctionTypeAttribute</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#InternalKeyword"><span class="k">INTERNAL_KEYWORD</span></a><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ExternalKeyword"><span class="k">EXTERNAL_KEYWORD</span></a><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PrivateKeyword"><span class="k">PRIVATE_KEYWORD</span></a><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PublicKeyword"><span class="k">PUBLIC_KEYWORD</span></a><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ConstantKeyword"><span class="k">CONSTANT_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PureKeyword"><span class="k">PURE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ViewKeyword"><span class="k">VIEW_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.16 *)</span><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #MappingType }
 
 ```
 
-<pre ebnf-snippet="MappingType" style="display: none;"><a href="#MappingType"><span class="k">MappingType</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#MappingKeyword"><span class="k">MAPPING_KEYWORD</span></a><br /><span class="o">              </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">              </span><a href="#MappingKey"><span class="k">MappingKey</span></a><br /><span class="o">              </span><a href="../../01-file-structure/09-punctuation#EqualGreaterThan"><span class="k">EQUAL_GREATER_THAN</span></a><br /><span class="o">              </span><a href="#MappingValue"><span class="k">MappingValue</span></a><br /><span class="o">              </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="MappingType" style="display: none;"><a href="#MappingType"><span class="k">MappingType</span></a><span class="o"> = </span><span class="cm">(* mapping_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#MappingKeyword"><span class="k">MAPPING_KEYWORD</span></a><br /><span class="o">              </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">              </span><span class="cm">(* key_type: *)</span><span class="o"> </span><a href="#MappingKey"><span class="k">MappingKey</span></a><br /><span class="o">              </span><span class="cm">(* equal_greater_than: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#EqualGreaterThan"><span class="k">EQUAL_GREATER_THAN</span></a><br /><span class="o">              </span><span class="cm">(* value_type: *)</span><span class="o"> </span><a href="#MappingValue"><span class="k">MappingValue</span></a><br /><span class="o">              </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #MappingKey }
 
 ```
 
-<pre ebnf-snippet="MappingKey" style="display: none;"><a href="#MappingKey"><span class="k">MappingKey</span></a><span class="o"> = </span><a href="#MappingKeyType"><span class="k">MappingKeyType</span></a><br /><span class="o">             </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.18 *)</span></pre>
+<pre ebnf-snippet="MappingKey" style="display: none;"><a href="#MappingKey"><span class="k">MappingKey</span></a><span class="o"> = </span><span class="cm">(* key_type: *)</span><span class="o"> </span><a href="#MappingKeyType"><span class="k">MappingKeyType</span></a><br /><span class="o">             </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.18 *)</span></pre>
 
 ```{ .ebnf #MappingKeyType }
 
 ```
 
-<pre ebnf-snippet="MappingKeyType" style="display: none;"><a href="#MappingKeyType"><span class="k">MappingKeyType</span></a><span class="o"> = </span><a href="../02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">               | </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="MappingKeyType" style="display: none;"><a href="#MappingKeyType"><span class="k">MappingKeyType</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #MappingValue }
 
 ```
 
-<pre ebnf-snippet="MappingValue" style="display: none;"><a href="#MappingValue"><span class="k">MappingValue</span></a><span class="o"> = </span><a href="#TypeName"><span class="k">TypeName</span></a><br /><span class="o">               </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.18 *)</span></pre>
+<pre ebnf-snippet="MappingValue" style="display: none;"><a href="#MappingValue"><span class="k">MappingValue</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="#TypeName"><span class="k">TypeName</span></a><br /><span class="o">               </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.18 *)</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/03-types/01-advanced-types.md"
diff --git a/crates/solidity/outputs/spec/generated/public/03-types/02-elementary-types.md b/crates/solidity/outputs/spec/generated/public/03-types/02-elementary-types.md
index 10098c4457..0dffad95a4 100644
--- a/crates/solidity/outputs/spec/generated/public/03-types/02-elementary-types.md
+++ b/crates/solidity/outputs/spec/generated/public/03-types/02-elementary-types.md
@@ -8,12 +8,12 @@
 
 ```
 
-<pre ebnf-snippet="ElementaryType" style="display: none;"><a href="#ElementaryType"><span class="k">ElementaryType</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#BoolKeyword"><span class="k">BOOL_KEYWORD</span></a><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#ByteKeyword"><span class="k">BYTE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.8.0 *)</span><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#StringKeyword"><span class="k">STRING_KEYWORD</span></a><br /><span class="o">               | </span><a href="#AddressType"><span class="k">AddressType</span></a><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#BytesKeyword"><span class="k">BYTES_KEYWORD</span></a><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#IntKeyword"><span class="k">INT_KEYWORD</span></a><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#UintKeyword"><span class="k">UINT_KEYWORD</span></a><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#FixedKeyword"><span class="k">FIXED_KEYWORD</span></a><br /><span class="o">               | </span><a href="../../01-file-structure/08-keywords#UfixedKeyword"><span class="k">UFIXED_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ElementaryType" style="display: none;"><a href="#ElementaryType"><span class="k">ElementaryType</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#BoolKeyword"><span class="k">BOOL_KEYWORD</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ByteKeyword"><span class="k">BYTE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.8.0 *)</span><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#StringKeyword"><span class="k">STRING_KEYWORD</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#AddressType"><span class="k">AddressType</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#BytesKeyword"><span class="k">BYTES_KEYWORD</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#IntKeyword"><span class="k">INT_KEYWORD</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#UintKeyword"><span class="k">UINT_KEYWORD</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FixedKeyword"><span class="k">FIXED_KEYWORD</span></a><br /><span class="o">               | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#UfixedKeyword"><span class="k">UFIXED_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #AddressType }
 
 ```
 
-<pre ebnf-snippet="AddressType" style="display: none;"><a href="#AddressType"><span class="k">AddressType</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#AddressKeyword"><span class="k">ADDRESS_KEYWORD</span></a><br /><span class="o">              </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="AddressType" style="display: none;"><a href="#AddressType"><span class="k">AddressType</span></a><span class="o"> = </span><span class="cm">(* address_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#AddressKeyword"><span class="k">ADDRESS_KEYWORD</span></a><br /><span class="o">              </span><span class="cm">(* payable_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/03-types/02-elementary-types.md"
diff --git a/crates/solidity/outputs/spec/generated/public/04-statements/01-blocks.md b/crates/solidity/outputs/spec/generated/public/04-statements/01-blocks.md
index 683b1aca07..8ef2f28720 100644
--- a/crates/solidity/outputs/spec/generated/public/04-statements/01-blocks.md
+++ b/crates/solidity/outputs/spec/generated/public/04-statements/01-blocks.md
@@ -8,48 +8,48 @@
 
 ```
 
-<pre ebnf-snippet="Block" style="display: none;"><a href="#Block"><span class="k">Block</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">        </span><a href="#Statements"><span class="k">Statements</span></a><br /><span class="o">        </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="Block" style="display: none;"><a href="#Block"><span class="k">Block</span></a><span class="o"> = </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">        </span><span class="cm">(* statements: *)</span><span class="o"> </span><a href="#Statements"><span class="k">Statements</span></a><br /><span class="o">        </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #Statements }
 
 ```
 
-<pre ebnf-snippet="Statements" style="display: none;"><a href="#Statements"><span class="k">Statements</span></a><span class="o"> = </span><a href="#Statement"><span class="k">Statement</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="Statements" style="display: none;"><a href="#Statements"><span class="k">Statements</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#Statement"><span class="k">Statement</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #Statement }
 
 ```
 
-<pre ebnf-snippet="Statement" style="display: none;"><a href="#Statement"><span class="k">Statement</span></a><span class="o"> = </span><a href="#ExpressionStatement"><span class="k">ExpressionStatement</span></a><br /><span class="o">          | </span><a href="../02-declaration-statements#VariableDeclarationStatement"><span class="k">VariableDeclarationStatement</span></a><br /><span class="o">          | </span><a href="../02-declaration-statements#TupleDeconstructionStatement"><span class="k">TupleDeconstructionStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#IfStatement"><span class="k">IfStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#ForStatement"><span class="k">ForStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#WhileStatement"><span class="k">WhileStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#DoWhileStatement"><span class="k">DoWhileStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#ContinueStatement"><span class="k">ContinueStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#BreakStatement"><span class="k">BreakStatement</span></a><br /><span class="o">          | </span><a href="../03-control-statements#ReturnStatement"><span class="k">ReturnStatement</span></a><br /><span class="o">          | </span><a href="../04-error-handling#ThrowStatement"><span class="k">ThrowStatement</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">          | </span><a href="../03-control-statements#EmitStatement"><span class="k">EmitStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.21 *)</span><br /><span class="o">          | </span><a href="../04-error-handling#TryStatement"><span class="k">TryStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">          | </span><a href="../04-error-handling#RevertStatement"><span class="k">RevertStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.4 *)</span><br /><span class="o">          | </span><a href="#AssemblyStatement"><span class="k">AssemblyStatement</span></a><br /><span class="o">          | </span><a href="#Block"><span class="k">Block</span></a><br /><span class="o">          | </span><a href="#UncheckedBlock"><span class="k">UncheckedBlock</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.0 *)</span></pre>
+<pre ebnf-snippet="Statement" style="display: none;"><a href="#Statement"><span class="k">Statement</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ExpressionStatement"><span class="k">ExpressionStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-declaration-statements#VariableDeclarationStatement"><span class="k">VariableDeclarationStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-declaration-statements#TupleDeconstructionStatement"><span class="k">TupleDeconstructionStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#IfStatement"><span class="k">IfStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#ForStatement"><span class="k">ForStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#WhileStatement"><span class="k">WhileStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#DoWhileStatement"><span class="k">DoWhileStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#ContinueStatement"><span class="k">ContinueStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#BreakStatement"><span class="k">BreakStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#ReturnStatement"><span class="k">ReturnStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-error-handling#ThrowStatement"><span class="k">ThrowStatement</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-control-statements#EmitStatement"><span class="k">EmitStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.21 *)</span><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-error-handling#TryStatement"><span class="k">TryStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-error-handling#RevertStatement"><span class="k">RevertStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.4 *)</span><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#AssemblyStatement"><span class="k">AssemblyStatement</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#Block"><span class="k">Block</span></a><br /><span class="o">          | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#UncheckedBlock"><span class="k">UncheckedBlock</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.0 *)</span></pre>
 
 ```{ .ebnf #UncheckedBlock }
 
 ```
 
-<pre ebnf-snippet="UncheckedBlock" style="display: none;"><span class="cm">(* Introduced in 0.8.0 *)</span><br /><a href="#UncheckedBlock"><span class="k">UncheckedBlock</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#UncheckedKeyword"><span class="k">UNCHECKED_KEYWORD</span></a><br /><span class="o">                 </span><a href="#Block"><span class="k">Block</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UncheckedBlock" style="display: none;"><span class="cm">(* Introduced in 0.8.0 *)</span><br /><a href="#UncheckedBlock"><span class="k">UncheckedBlock</span></a><span class="o"> = </span><span class="cm">(* unchecked_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#UncheckedKeyword"><span class="k">UNCHECKED_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* block: *)</span><span class="o"> </span><a href="#Block"><span class="k">Block</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ExpressionStatement }
 
 ```
 
-<pre ebnf-snippet="ExpressionStatement" style="display: none;"><a href="#ExpressionStatement"><span class="k">ExpressionStatement</span></a><span class="o"> = </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                      </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ExpressionStatement" style="display: none;"><a href="#ExpressionStatement"><span class="k">ExpressionStatement</span></a><span class="o"> = </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                      </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #AssemblyStatement }
 
 ```
 
-<pre ebnf-snippet="AssemblyStatement" style="display: none;"><a href="#AssemblyStatement"><span class="k">AssemblyStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#AssemblyKeyword"><span class="k">ASSEMBLY_KEYWORD</span></a><br /><span class="o">                    </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">?</span><br /><span class="o">                    </span><a href="#AssemblyFlagsDeclaration"><span class="k">AssemblyFlagsDeclaration</span></a><span class="o">?</span><br /><span class="o">                    </span><a href="../../06-yul/01-yul-statements#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="AssemblyStatement" style="display: none;"><a href="#AssemblyStatement"><span class="k">AssemblyStatement</span></a><span class="o"> = </span><span class="cm">(* assembly_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#AssemblyKeyword"><span class="k">ASSEMBLY_KEYWORD</span></a><br /><span class="o">                    </span><span class="cm">(* label: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">?</span><br /><span class="o">                    </span><span class="cm">(* flags: *)</span><span class="o"> </span><a href="#AssemblyFlagsDeclaration"><span class="k">AssemblyFlagsDeclaration</span></a><span class="o">?</span><br /><span class="o">                    </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../../06-yul/01-yul-statements#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #AssemblyFlagsDeclaration }
 
 ```
 
-<pre ebnf-snippet="AssemblyFlagsDeclaration" style="display: none;"><a href="#AssemblyFlagsDeclaration"><span class="k">AssemblyFlagsDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                           </span><a href="#AssemblyFlags"><span class="k">AssemblyFlags</span></a><br /><span class="o">                           </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="AssemblyFlagsDeclaration" style="display: none;"><a href="#AssemblyFlagsDeclaration"><span class="k">AssemblyFlagsDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                           </span><span class="cm">(* flags: *)</span><span class="o"> </span><a href="#AssemblyFlags"><span class="k">AssemblyFlags</span></a><br /><span class="o">                           </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #AssemblyFlags }
 
 ```
 
-<pre ebnf-snippet="AssemblyFlags" style="display: none;"><a href="#AssemblyFlags"><span class="k">AssemblyFlags</span></a><span class="o"> = </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="AssemblyFlags" style="display: none;"><a href="#AssemblyFlags"><span class="k">AssemblyFlags</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/04-statements/01-blocks.md"
diff --git a/crates/solidity/outputs/spec/generated/public/04-statements/02-declaration-statements.md b/crates/solidity/outputs/spec/generated/public/04-statements/02-declaration-statements.md
index 4297e37a53..b3542db9de 100644
--- a/crates/solidity/outputs/spec/generated/public/04-statements/02-declaration-statements.md
+++ b/crates/solidity/outputs/spec/generated/public/04-statements/02-declaration-statements.md
@@ -8,60 +8,60 @@
 
 ```
 
-<pre ebnf-snippet="TupleDeconstructionStatement" style="display: none;"><a href="#TupleDeconstructionStatement"><span class="k">TupleDeconstructionStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#VarKeyword"><span class="k">VAR_KEYWORD</span></a><span class="o">?</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                               </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                               </span><a href="#TupleDeconstructionElements"><span class="k">TupleDeconstructionElements</span></a><br /><span class="o">                               </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">                               </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                               </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                               </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleDeconstructionStatement" style="display: none;"><a href="#TupleDeconstructionStatement"><span class="k">TupleDeconstructionStatement</span></a><span class="o"> = </span><span class="cm">(* var_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VarKeyword"><span class="k">VAR_KEYWORD</span></a><span class="o">?</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                               </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                               </span><span class="cm">(* elements: *)</span><span class="o"> </span><a href="#TupleDeconstructionElements"><span class="k">TupleDeconstructionElements</span></a><br /><span class="o">                               </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">                               </span><span class="cm">(* equal: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                               </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                               </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #TupleDeconstructionElements }
 
 ```
 
-<pre ebnf-snippet="TupleDeconstructionElements" style="display: none;"><a href="#TupleDeconstructionElements"><span class="k">TupleDeconstructionElements</span></a><span class="o"> = </span><a href="#TupleDeconstructionElement"><span class="k">TupleDeconstructionElement</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#TupleDeconstructionElement"><span class="k">TupleDeconstructionElement</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleDeconstructionElements" style="display: none;"><a href="#TupleDeconstructionElements"><span class="k">TupleDeconstructionElements</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#TupleDeconstructionElement"><span class="k">TupleDeconstructionElement</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#TupleDeconstructionElement"><span class="k">TupleDeconstructionElement</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #TupleDeconstructionElement }
 
 ```
 
-<pre ebnf-snippet="TupleDeconstructionElement" style="display: none;"><a href="#TupleDeconstructionElement"><span class="k">TupleDeconstructionElement</span></a><span class="o"> = </span><a href="#TupleMember"><span class="k">TupleMember</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleDeconstructionElement" style="display: none;"><a href="#TupleDeconstructionElement"><span class="k">TupleDeconstructionElement</span></a><span class="o"> = </span><span class="cm">(* member: *)</span><span class="o"> </span><a href="#TupleMember"><span class="k">TupleMember</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #TupleMember }
 
 ```
 
-<pre ebnf-snippet="TupleMember" style="display: none;"><a href="#TupleMember"><span class="k">TupleMember</span></a><span class="o"> = </span><a href="#TypedTupleMember"><span class="k">TypedTupleMember</span></a><br /><span class="o">            | </span><a href="#UntypedTupleMember"><span class="k">UntypedTupleMember</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleMember" style="display: none;"><a href="#TupleMember"><span class="k">TupleMember</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#TypedTupleMember"><span class="k">TypedTupleMember</span></a><br /><span class="o">            | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#UntypedTupleMember"><span class="k">UntypedTupleMember</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #TypedTupleMember }
 
 ```
 
-<pre ebnf-snippet="TypedTupleMember" style="display: none;"><a href="#TypedTupleMember"><span class="k">TypedTupleMember</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                   </span><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">                   </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TypedTupleMember" style="display: none;"><a href="#TypedTupleMember"><span class="k">TypedTupleMember</span></a><span class="o"> = </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                   </span><span class="cm">(* storage_location: *)</span><span class="o"> </span><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">                   </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #UntypedTupleMember }
 
 ```
 
-<pre ebnf-snippet="UntypedTupleMember" style="display: none;"><a href="#UntypedTupleMember"><span class="k">UntypedTupleMember</span></a><span class="o"> = </span><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">                     </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UntypedTupleMember" style="display: none;"><a href="#UntypedTupleMember"><span class="k">UntypedTupleMember</span></a><span class="o"> = </span><span class="cm">(* storage_location: *)</span><span class="o"> </span><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">                     </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #VariableDeclarationStatement }
 
 ```
 
-<pre ebnf-snippet="VariableDeclarationStatement" style="display: none;"><a href="#VariableDeclarationStatement"><span class="k">VariableDeclarationStatement</span></a><span class="o"> = </span><a href="#VariableDeclarationType"><span class="k">VariableDeclarationType</span></a><br /><span class="o">                               </span><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">                               </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                               </span><a href="#VariableDeclarationValue"><span class="k">VariableDeclarationValue</span></a><span class="o">?</span><br /><span class="o">                               </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="VariableDeclarationStatement" style="display: none;"><a href="#VariableDeclarationStatement"><span class="k">VariableDeclarationStatement</span></a><span class="o"> = </span><span class="cm">(* variable_type: *)</span><span class="o"> </span><a href="#VariableDeclarationType"><span class="k">VariableDeclarationType</span></a><br /><span class="o">                               </span><span class="cm">(* storage_location: *)</span><span class="o"> </span><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o">?</span><br /><span class="o">                               </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                               </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="#VariableDeclarationValue"><span class="k">VariableDeclarationValue</span></a><span class="o">?</span><br /><span class="o">                               </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #VariableDeclarationType }
 
 ```
 
-<pre ebnf-snippet="VariableDeclarationType" style="display: none;"><a href="#VariableDeclarationType"><span class="k">VariableDeclarationType</span></a><span class="o"> = </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                        | </span><a href="../../01-file-structure/08-keywords#VarKeyword"><span class="k">VAR_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span></pre>
+<pre ebnf-snippet="VariableDeclarationType" style="display: none;"><a href="#VariableDeclarationType"><span class="k">VariableDeclarationType</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                        | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#VarKeyword"><span class="k">VAR_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span></pre>
 
 ```{ .ebnf #VariableDeclarationValue }
 
 ```
 
-<pre ebnf-snippet="VariableDeclarationValue" style="display: none;"><a href="#VariableDeclarationValue"><span class="k">VariableDeclarationValue</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                           </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="VariableDeclarationValue" style="display: none;"><a href="#VariableDeclarationValue"><span class="k">VariableDeclarationValue</span></a><span class="o"> = </span><span class="cm">(* equal: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                           </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #StorageLocation }
 
 ```
 
-<pre ebnf-snippet="StorageLocation" style="display: none;"><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#MemoryKeyword"><span class="k">MEMORY_KEYWORD</span></a><br /><span class="o">                | </span><a href="../../01-file-structure/08-keywords#StorageKeyword"><span class="k">STORAGE_KEYWORD</span></a><br /><span class="o">                | </span><a href="../../01-file-structure/08-keywords#CallDataKeyword"><span class="k">CALL_DATA_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.5.0 *)</span></pre>
+<pre ebnf-snippet="StorageLocation" style="display: none;"><a href="#StorageLocation"><span class="k">StorageLocation</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#MemoryKeyword"><span class="k">MEMORY_KEYWORD</span></a><br /><span class="o">                | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#StorageKeyword"><span class="k">STORAGE_KEYWORD</span></a><br /><span class="o">                | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#CallDataKeyword"><span class="k">CALL_DATA_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.5.0 *)</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/04-statements/02-declaration-statements.md"
diff --git a/crates/solidity/outputs/spec/generated/public/04-statements/03-control-statements.md b/crates/solidity/outputs/spec/generated/public/04-statements/03-control-statements.md
index 11c9ba1893..f908dbb547 100644
--- a/crates/solidity/outputs/spec/generated/public/04-statements/03-control-statements.md
+++ b/crates/solidity/outputs/spec/generated/public/04-statements/03-control-statements.md
@@ -8,66 +8,66 @@
 
 ```
 
-<pre ebnf-snippet="IfStatement" style="display: none;"><a href="#IfStatement"><span class="k">IfStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#IfKeyword"><span class="k">IF_KEYWORD</span></a><br /><span class="o">              </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">              </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">              </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">              </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><br /><span class="o">              </span><a href="#ElseBranch"><span class="k">ElseBranch</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="IfStatement" style="display: none;"><a href="#IfStatement"><span class="k">IfStatement</span></a><span class="o"> = </span><span class="cm">(* if_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#IfKeyword"><span class="k">IF_KEYWORD</span></a><br /><span class="o">              </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">              </span><span class="cm">(* condition: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">              </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">              </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><br /><span class="o">              </span><span class="cm">(* else_branch: *)</span><span class="o"> </span><a href="#ElseBranch"><span class="k">ElseBranch</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ElseBranch }
 
 ```
 
-<pre ebnf-snippet="ElseBranch" style="display: none;"><a href="#ElseBranch"><span class="k">ElseBranch</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ElseKeyword"><span class="k">ELSE_KEYWORD</span></a><br /><span class="o">             </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ElseBranch" style="display: none;"><a href="#ElseBranch"><span class="k">ElseBranch</span></a><span class="o"> = </span><span class="cm">(* else_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ElseKeyword"><span class="k">ELSE_KEYWORD</span></a><br /><span class="o">             </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ForStatement }
 
 ```
 
-<pre ebnf-snippet="ForStatement" style="display: none;"><a href="#ForStatement"><span class="k">ForStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ForKeyword"><span class="k">FOR_KEYWORD</span></a><br /><span class="o">               </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">               </span><a href="#ForStatementInitialization"><span class="k">ForStatementInitialization</span></a><br /><span class="o">               </span><a href="#ForStatementCondition"><span class="k">ForStatementCondition</span></a><br /><span class="o">               </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><br /><span class="o">               </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">               </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ForStatement" style="display: none;"><a href="#ForStatement"><span class="k">ForStatement</span></a><span class="o"> = </span><span class="cm">(* for_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ForKeyword"><span class="k">FOR_KEYWORD</span></a><br /><span class="o">               </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">               </span><span class="cm">(* initialization: *)</span><span class="o"> </span><a href="#ForStatementInitialization"><span class="k">ForStatementInitialization</span></a><br /><span class="o">               </span><span class="cm">(* condition: *)</span><span class="o"> </span><a href="#ForStatementCondition"><span class="k">ForStatementCondition</span></a><br /><span class="o">               </span><span class="cm">(* iterator: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><br /><span class="o">               </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">               </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ForStatementInitialization }
 
 ```
 
-<pre ebnf-snippet="ForStatementInitialization" style="display: none;"><a href="#ForStatementInitialization"><span class="k">ForStatementInitialization</span></a><span class="o"> = </span><a href="../01-blocks#ExpressionStatement"><span class="k">ExpressionStatement</span></a><br /><span class="o">                           | </span><a href="../02-declaration-statements#VariableDeclarationStatement"><span class="k">VariableDeclarationStatement</span></a><br /><span class="o">                           | </span><a href="../02-declaration-statements#TupleDeconstructionStatement"><span class="k">TupleDeconstructionStatement</span></a><br /><span class="o">                           | </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ForStatementInitialization" style="display: none;"><a href="#ForStatementInitialization"><span class="k">ForStatementInitialization</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../01-blocks#ExpressionStatement"><span class="k">ExpressionStatement</span></a><br /><span class="o">                           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-declaration-statements#VariableDeclarationStatement"><span class="k">VariableDeclarationStatement</span></a><br /><span class="o">                           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-declaration-statements#TupleDeconstructionStatement"><span class="k">TupleDeconstructionStatement</span></a><br /><span class="o">                           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ForStatementCondition }
 
 ```
 
-<pre ebnf-snippet="ForStatementCondition" style="display: none;"><a href="#ForStatementCondition"><span class="k">ForStatementCondition</span></a><span class="o"> = </span><a href="../01-blocks#ExpressionStatement"><span class="k">ExpressionStatement</span></a><br /><span class="o">                      | </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ForStatementCondition" style="display: none;"><a href="#ForStatementCondition"><span class="k">ForStatementCondition</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../01-blocks#ExpressionStatement"><span class="k">ExpressionStatement</span></a><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #WhileStatement }
 
 ```
 
-<pre ebnf-snippet="WhileStatement" style="display: none;"><a href="#WhileStatement"><span class="k">WhileStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#WhileKeyword"><span class="k">WHILE_KEYWORD</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                 </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">                 </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="WhileStatement" style="display: none;"><a href="#WhileStatement"><span class="k">WhileStatement</span></a><span class="o"> = </span><span class="cm">(* while_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#WhileKeyword"><span class="k">WHILE_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                 </span><span class="cm">(* condition: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                 </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">                 </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #DoWhileStatement }
 
 ```
 
-<pre ebnf-snippet="DoWhileStatement" style="display: none;"><a href="#DoWhileStatement"><span class="k">DoWhileStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#DoKeyword"><span class="k">DO_KEYWORD</span></a><br /><span class="o">                   </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/08-keywords#WhileKeyword"><span class="k">WHILE_KEYWORD</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                   </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="DoWhileStatement" style="display: none;"><a href="#DoWhileStatement"><span class="k">DoWhileStatement</span></a><span class="o"> = </span><span class="cm">(* do_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#DoKeyword"><span class="k">DO_KEYWORD</span></a><br /><span class="o">                   </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Statement"><span class="k">Statement</span></a><br /><span class="o">                   </span><span class="cm">(* while_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#WhileKeyword"><span class="k">WHILE_KEYWORD</span></a><br /><span class="o">                   </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                   </span><span class="cm">(* condition: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">                   </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><br /><span class="o">                   </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ContinueStatement }
 
 ```
 
-<pre ebnf-snippet="ContinueStatement" style="display: none;"><a href="#ContinueStatement"><span class="k">ContinueStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ContinueKeyword"><span class="k">CONTINUE_KEYWORD</span></a><br /><span class="o">                    </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ContinueStatement" style="display: none;"><a href="#ContinueStatement"><span class="k">ContinueStatement</span></a><span class="o"> = </span><span class="cm">(* continue_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ContinueKeyword"><span class="k">CONTINUE_KEYWORD</span></a><br /><span class="o">                    </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #BreakStatement }
 
 ```
 
-<pre ebnf-snippet="BreakStatement" style="display: none;"><a href="#BreakStatement"><span class="k">BreakStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#BreakKeyword"><span class="k">BREAK_KEYWORD</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="BreakStatement" style="display: none;"><a href="#BreakStatement"><span class="k">BreakStatement</span></a><span class="o"> = </span><span class="cm">(* break_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#BreakKeyword"><span class="k">BREAK_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ReturnStatement }
 
 ```
 
-<pre ebnf-snippet="ReturnStatement" style="display: none;"><a href="#ReturnStatement"><span class="k">ReturnStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ReturnKeyword"><span class="k">RETURN_KEYWORD</span></a><br /><span class="o">                  </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><br /><span class="o">                  </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ReturnStatement" style="display: none;"><a href="#ReturnStatement"><span class="k">ReturnStatement</span></a><span class="o"> = </span><span class="cm">(* return_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ReturnKeyword"><span class="k">RETURN_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><br /><span class="o">                  </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #EmitStatement }
 
 ```
 
-<pre ebnf-snippet="EmitStatement" style="display: none;"><span class="cm">(* Introduced in 0.4.21 *)</span><br /><a href="#EmitStatement"><span class="k">EmitStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#EmitKeyword"><span class="k">EMIT_KEYWORD</span></a><br /><span class="o">                </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><br /><span class="o">                </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="EmitStatement" style="display: none;"><span class="cm">(* Introduced in 0.4.21 *)</span><br /><a href="#EmitStatement"><span class="k">EmitStatement</span></a><span class="o"> = </span><span class="cm">(* emit_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#EmitKeyword"><span class="k">EMIT_KEYWORD</span></a><br /><span class="o">                </span><span class="cm">(* event: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><br /><span class="o">                </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><br /><span class="o">                </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/04-statements/03-control-statements.md"
diff --git a/crates/solidity/outputs/spec/generated/public/04-statements/04-error-handling.md b/crates/solidity/outputs/spec/generated/public/04-statements/04-error-handling.md
index 5fc598fd27..0f2c7a1b82 100644
--- a/crates/solidity/outputs/spec/generated/public/04-statements/04-error-handling.md
+++ b/crates/solidity/outputs/spec/generated/public/04-statements/04-error-handling.md
@@ -8,36 +8,36 @@
 
 ```
 
-<pre ebnf-snippet="TryStatement" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#TryStatement"><span class="k">TryStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#TryKeyword"><span class="k">TRY_KEYWORD</span></a><br /><span class="o">               </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">               </span><a href="../../02-definitions/08-functions#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">               </span><a href="../01-blocks#Block"><span class="k">Block</span></a><br /><span class="o">               </span><a href="#CatchClauses"><span class="k">CatchClauses</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TryStatement" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#TryStatement"><span class="k">TryStatement</span></a><span class="o"> = </span><span class="cm">(* try_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#TryKeyword"><span class="k">TRY_KEYWORD</span></a><br /><span class="o">               </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../../05-expressions/01-base-expressions#Expression"><span class="k">Expression</span></a><br /><span class="o">               </span><span class="cm">(* returns: *)</span><span class="o"> </span><a href="../../02-definitions/08-functions#ReturnsDeclaration"><span class="k">ReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">               </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Block"><span class="k">Block</span></a><br /><span class="o">               </span><span class="cm">(* catch_clauses: *)</span><span class="o"> </span><a href="#CatchClauses"><span class="k">CatchClauses</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #CatchClauses }
 
 ```
 
-<pre ebnf-snippet="CatchClauses" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#CatchClauses"><span class="k">CatchClauses</span></a><span class="o"> = </span><a href="#CatchClause"><span class="k">CatchClause</span></a><span class="o">+</span><span class="o">;</span></pre>
+<pre ebnf-snippet="CatchClauses" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#CatchClauses"><span class="k">CatchClauses</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#CatchClause"><span class="k">CatchClause</span></a><span class="o">+</span><span class="o">;</span></pre>
 
 ```{ .ebnf #CatchClause }
 
 ```
 
-<pre ebnf-snippet="CatchClause" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#CatchClause"><span class="k">CatchClause</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#CatchKeyword"><span class="k">CATCH_KEYWORD</span></a><br /><span class="o">              </span><a href="#CatchClauseError"><span class="k">CatchClauseError</span></a><span class="o">?</span><br /><span class="o">              </span><a href="../01-blocks#Block"><span class="k">Block</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="CatchClause" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#CatchClause"><span class="k">CatchClause</span></a><span class="o"> = </span><span class="cm">(* catch_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#CatchKeyword"><span class="k">CATCH_KEYWORD</span></a><br /><span class="o">              </span><span class="cm">(* error: *)</span><span class="o"> </span><a href="#CatchClauseError"><span class="k">CatchClauseError</span></a><span class="o">?</span><br /><span class="o">              </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="../01-blocks#Block"><span class="k">Block</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #CatchClauseError }
 
 ```
 
-<pre ebnf-snippet="CatchClauseError" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#CatchClauseError"><span class="k">CatchClauseError</span></a><span class="o"> = </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><br /><span class="o">                   </span><a href="../../02-definitions/08-functions#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="CatchClauseError" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#CatchClauseError"><span class="k">CatchClauseError</span></a><span class="o"> = </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">?</span><br /><span class="o">                   </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="../../02-definitions/08-functions#ParametersDeclaration"><span class="k">ParametersDeclaration</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #RevertStatement }
 
 ```
 
-<pre ebnf-snippet="RevertStatement" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#RevertStatement"><span class="k">RevertStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#RevertKeyword"><span class="k">REVERT_KEYWORD</span></a><br /><span class="o">                  </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">?</span><br /><span class="o">                  </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><br /><span class="o">                  </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="RevertStatement" style="display: none;"><span class="cm">(* Introduced in 0.8.4 *)</span><br /><a href="#RevertStatement"><span class="k">RevertStatement</span></a><span class="o"> = </span><span class="cm">(* revert_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#RevertKeyword"><span class="k">REVERT_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* error: *)</span><span class="o"> </span><a href="../../05-expressions/06-identifiers#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o">?</span><br /><span class="o">                  </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="../../05-expressions/02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><br /><span class="o">                  </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ThrowStatement }
 
 ```
 
-<pre ebnf-snippet="ThrowStatement" style="display: none;"><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><a href="#ThrowStatement"><span class="k">ThrowStatement</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#ThrowKeyword"><span class="k">THROW_KEYWORD</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ThrowStatement" style="display: none;"><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><a href="#ThrowStatement"><span class="k">ThrowStatement</span></a><span class="o"> = </span><span class="cm">(* throw_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#ThrowKeyword"><span class="k">THROW_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* semicolon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Semicolon"><span class="k">SEMICOLON</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/04-statements/04-error-handling.md"
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/01-base-expressions.md b/crates/solidity/outputs/spec/generated/public/05-expressions/01-base-expressions.md
index 126e467a3d..5cbb48801e 100644
--- a/crates/solidity/outputs/spec/generated/public/05-expressions/01-base-expressions.md
+++ b/crates/solidity/outputs/spec/generated/public/05-expressions/01-base-expressions.md
@@ -8,18 +8,132 @@
 
 ```
 
-<pre ebnf-snippet="Expression" style="display: none;"><a href="#Expression"><span class="k">Expression</span></a><span class="o"> = </span><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><br /><span class="o">           | </span><a href="#ConditionalExpression"><span class="k">ConditionalExpression</span></a><br /><span class="o">           | </span><a href="#OrExpression"><span class="k">OrExpression</span></a><br /><span class="o">           | </span><a href="#AndExpression"><span class="k">AndExpression</span></a><br /><span class="o">           | </span><a href="#EqualityExpression"><span class="k">EqualityExpression</span></a><br /><span class="o">           | </span><a href="#ComparisonExpression"><span class="k">ComparisonExpression</span></a><br /><span class="o">           | </span><a href="#BitwiseOrExpression"><span class="k">BitwiseOrExpression</span></a><br /><span class="o">           | </span><a href="#BitwiseXorExpression"><span class="k">BitwiseXorExpression</span></a><br /><span class="o">           | </span><a href="#BitwiseAndExpression"><span class="k">BitwiseAndExpression</span></a><br /><span class="o">           | </span><a href="#ShiftExpression"><span class="k">ShiftExpression</span></a><br /><span class="o">           | </span><a href="#AdditiveExpression"><span class="k">AdditiveExpression</span></a><br /><span class="o">           | </span><a href="#MultiplicativeExpression"><span class="k">MultiplicativeExpression</span></a><br /><span class="o">           | </span><a href="#ExponentiationExpression"><span class="k">ExponentiationExpression</span></a><br /><span class="o">           | </span><a href="#PostfixExpression"><span class="k">PostfixExpression</span></a><br /><span class="o">           | </span><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><br /><span class="o">           | </span><a href="#FunctionCallExpression"><span class="k">FunctionCallExpression</span></a><br /><span class="o">           | </span><a href="#CallOptionsExpression"><span class="k">CallOptionsExpression</span></a><br /><span class="o">           | </span><a href="#MemberAccessExpression"><span class="k">MemberAccessExpression</span></a><br /><span class="o">           | </span><a href="#IndexAccessExpression"><span class="k">IndexAccessExpression</span></a><br /><span class="o">           | </span><a href="../03-primary-expressions#NewExpression"><span class="k">NewExpression</span></a><br /><span class="o">           | </span><a href="../03-primary-expressions#TupleExpression"><span class="k">TupleExpression</span></a><br /><span class="o">           | </span><a href="../03-primary-expressions#TypeExpression"><span class="k">TypeExpression</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.3 *)</span><br /><span class="o">           | </span><a href="../03-primary-expressions#ArrayExpression"><span class="k">ArrayExpression</span></a><br /><span class="o">           | </span><a href="../04-numbers#HexNumberExpression"><span class="k">HexNumberExpression</span></a><br /><span class="o">           | </span><a href="../04-numbers#DecimalNumberExpression"><span class="k">DecimalNumberExpression</span></a><br /><span class="o">           | </span><a href="../05-strings#StringExpression"><span class="k">StringExpression</span></a><br /><span class="o">           | </span><a href="../../03-types/02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#TrueKeyword"><span class="k">TRUE_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#FalseKeyword"><span class="k">FALSE_KEYWORD</span></a><br /><span class="o">           | </span><a href="../06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="Expression" style="display: none;"><a href="#Expression"><span class="k">Expression</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ConditionalExpression"><span class="k">ConditionalExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#OrExpression"><span class="k">OrExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#AndExpression"><span class="k">AndExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#EqualityExpression"><span class="k">EqualityExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ComparisonExpression"><span class="k">ComparisonExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#BitwiseOrExpression"><span class="k">BitwiseOrExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#BitwiseXorExpression"><span class="k">BitwiseXorExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#BitwiseAndExpression"><span class="k">BitwiseAndExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ShiftExpression"><span class="k">ShiftExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#AdditiveExpression"><span class="k">AdditiveExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#MultiplicativeExpression"><span class="k">MultiplicativeExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#ExponentiationExpression"><span class="k">ExponentiationExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#PostfixExpression"><span class="k">PostfixExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#FunctionCallExpression"><span class="k">FunctionCallExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#CallOptionsExpression"><span class="k">CallOptionsExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#MemberAccessExpression"><span class="k">MemberAccessExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#IndexAccessExpression"><span class="k">IndexAccessExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-primary-expressions#NewExpression"><span class="k">NewExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-primary-expressions#TupleExpression"><span class="k">TupleExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-primary-expressions#TypeExpression"><span class="k">TypeExpression</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.3 *)</span><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-primary-expressions#ArrayExpression"><span class="k">ArrayExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-numbers#HexNumberExpression"><span class="k">HexNumberExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../04-numbers#DecimalNumberExpression"><span class="k">DecimalNumberExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../05-strings#StringExpression"><span class="k">StringExpression</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../03-types/02-elementary-types#ElementaryType"><span class="k">ElementaryType</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#PayableKeyword"><span class="k">PAYABLE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#TrueKeyword"><span class="k">TRUE_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FalseKeyword"><span class="k">FALSE_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #AssignmentExpression }
+
+```
+
+<pre ebnf-snippet="AssignmentExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#BarEqual"><span class="k">BAR_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#PlusEqual"><span class="k">PLUS_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#MinusEqual"><span class="k">MINUS_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CaretEqual"><span class="k">CARET_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#SlashEqual"><span class="k">SLASH_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#PercentEqual"><span class="k">PERCENT_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#AsteriskEqual"><span class="k">ASTERISK_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#AmpersandEqual"><span class="k">AMPERSAND_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#LessThanLessThanEqual"><span class="k">LESS_THAN_LESS_THAN_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#GreaterThanGreaterThanEqual"><span class="k">GREATER_THAN_GREATER_THAN_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AssignmentExpression"><span class="k">AssignmentExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#GreaterThanGreaterThanGreaterThanEqual"><span class="k">GREATER_THAN_GREATER_THAN_GREATER_THAN_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #ConditionalExpression }
+
+```
+
+<pre ebnf-snippet="ConditionalExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#ConditionalExpression"><span class="k">ConditionalExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                        </span><span class="cm">(* question_mark: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#QuestionMark"><span class="k">QUESTION_MARK</span></a><br /><span class="o">                        </span><span class="cm">(* true_expression: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                        </span><span class="cm">(* colon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                        </span><span class="cm">(* false_expression: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #OrExpression }
+
+```
+
+<pre ebnf-snippet="OrExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#OrExpression"><span class="k">OrExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">               </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#BarBar"><span class="k">BAR_BAR</span></a><br /><span class="o">               </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #AndExpression }
+
+```
+
+<pre ebnf-snippet="AndExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AndExpression"><span class="k">AndExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#AmpersandAmpersand"><span class="k">AMPERSAND_AMPERSAND</span></a><br /><span class="o">                </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #EqualityExpression }
+
+```
+
+<pre ebnf-snippet="EqualityExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#EqualityExpression"><span class="k">EqualityExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                     </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#EqualEqual"><span class="k">EQUAL_EQUAL</span></a><br /><span class="o">                     </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#EqualityExpression"><span class="k">EqualityExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                     </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#BangEqual"><span class="k">BANG_EQUAL</span></a><br /><span class="o">                     </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #ComparisonExpression }
+
+```
+
+<pre ebnf-snippet="ComparisonExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ComparisonExpression"><span class="k">ComparisonExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#LessThan"><span class="k">LESS_THAN</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ComparisonExpression"><span class="k">ComparisonExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#GreaterThan"><span class="k">GREATER_THAN</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ComparisonExpression"><span class="k">ComparisonExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#LessThanEqual"><span class="k">LESS_THAN_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ComparisonExpression"><span class="k">ComparisonExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#GreaterThanEqual"><span class="k">GREATER_THAN_EQUAL</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #BitwiseOrExpression }
+
+```
+
+<pre ebnf-snippet="BitwiseOrExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#BitwiseOrExpression"><span class="k">BitwiseOrExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                      </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Bar"><span class="k">BAR</span></a><br /><span class="o">                      </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #BitwiseXorExpression }
+
+```
+
+<pre ebnf-snippet="BitwiseXorExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#BitwiseXorExpression"><span class="k">BitwiseXorExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Caret"><span class="k">CARET</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #BitwiseAndExpression }
+
+```
+
+<pre ebnf-snippet="BitwiseAndExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#BitwiseAndExpression"><span class="k">BitwiseAndExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                       </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Ampersand"><span class="k">AMPERSAND</span></a><br /><span class="o">                       </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #ShiftExpression }
+
+```
+
+<pre ebnf-snippet="ShiftExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ShiftExpression"><span class="k">ShiftExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                  </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#LessThanLessThan"><span class="k">LESS_THAN_LESS_THAN</span></a><br /><span class="o">                  </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ShiftExpression"><span class="k">ShiftExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                  </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#GreaterThanGreaterThan"><span class="k">GREATER_THAN_GREATER_THAN</span></a><br /><span class="o">                  </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#ShiftExpression"><span class="k">ShiftExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                  </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#GreaterThanGreaterThanGreaterThan"><span class="k">GREATER_THAN_GREATER_THAN_GREATER_THAN</span></a><br /><span class="o">                  </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #AdditiveExpression }
+
+```
+
+<pre ebnf-snippet="AdditiveExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AdditiveExpression"><span class="k">AdditiveExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                     </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Plus"><span class="k">PLUS</span></a><br /><span class="o">                     </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#AdditiveExpression"><span class="k">AdditiveExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                     </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Minus"><span class="k">MINUS</span></a><br /><span class="o">                     </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #MultiplicativeExpression }
+
+```
+
+<pre ebnf-snippet="MultiplicativeExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#MultiplicativeExpression"><span class="k">MultiplicativeExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                           </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Asterisk"><span class="k">ASTERISK</span></a><br /><span class="o">                           </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#MultiplicativeExpression"><span class="k">MultiplicativeExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                           </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Slash"><span class="k">SLASH</span></a><br /><span class="o">                           </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Left-associative binary operator *)</span><br /><a href="#MultiplicativeExpression"><span class="k">MultiplicativeExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                           </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Percent"><span class="k">PERCENT</span></a><br /><span class="o">                           </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #ExponentiationExpression }
+
+```
+
+<pre ebnf-snippet="ExponentiationExpression" style="display: none;"><span class="cm">(* Left-associative binary operator *)</span><br /><span class="cm">(* Deprecated in 0.6.0 *)</span><br /><a href="#ExponentiationExpression"><span class="k">ExponentiationExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                           </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#AsteriskAsterisk"><span class="k">ASTERISK_ASTERISK</span></a><br /><span class="o">                           </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Right-associative binary operator *)</span><br /><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#ExponentiationExpression"><span class="k">ExponentiationExpression</span></a><span class="o"> = </span><span class="cm">(* left_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                           </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#AsteriskAsterisk"><span class="k">ASTERISK_ASTERISK</span></a><br /><span class="o">                           </span><span class="cm">(* right_operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #PostfixExpression }
+
+```
+
+<pre ebnf-snippet="PostfixExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#PostfixExpression"><span class="k">PostfixExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                    </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#PlusPlus"><span class="k">PLUS_PLUS</span></a><span class="o">;</span><br /><br /><span class="cm">(* Postfix unary operator *)</span><br /><a href="#PostfixExpression"><span class="k">PostfixExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                    </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#MinusMinus"><span class="k">MINUS_MINUS</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #PrefixExpression }
+
+```
+
+<pre ebnf-snippet="PrefixExpression" style="display: none;"><span class="cm">(* Prefix unary operator *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#PlusPlus"><span class="k">PLUS_PLUS</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#MinusMinus"><span class="k">MINUS_MINUS</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Tilde"><span class="k">TILDE</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Bang"><span class="k">BANG</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Minus"><span class="k">MINUS</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Plus"><span class="k">PLUS</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span><br /><br /><span class="cm">(* Prefix unary operator *)</span><br /><a href="#PrefixExpression"><span class="k">PrefixExpression</span></a><span class="o"> = </span><span class="cm">(* operator: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#DeleteKeyword"><span class="k">DELETE_KEYWORD</span></a><br /><span class="o">                   </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #FunctionCallExpression }
+
+```
+
+<pre ebnf-snippet="FunctionCallExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#FunctionCallExpression"><span class="k">FunctionCallExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                         </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="../02-function-calls#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #CallOptionsExpression }
+
+```
+
+<pre ebnf-snippet="CallOptionsExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><span class="cm">(* Introduced in 0.6.2 *)</span><br /><a href="#CallOptionsExpression"><span class="k">CallOptionsExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                        </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                        </span><span class="cm">(* options: *)</span><span class="o"> </span><a href="../02-function-calls#CallOptions"><span class="k">CallOptions</span></a><br /><span class="o">                        </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #MemberAccessExpression }
+
+```
+
+<pre ebnf-snippet="MemberAccessExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#MemberAccessExpression"><span class="k">MemberAccessExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                         </span><span class="cm">(* period: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Period"><span class="k">PERIOD</span></a><br /><span class="o">                         </span><span class="cm">(* member: *)</span><span class="o"> </span><a href="#MemberAccess"><span class="k">MemberAccess</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #IndexAccessExpression }
+
+```
+
+<pre ebnf-snippet="IndexAccessExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#IndexAccessExpression"><span class="k">IndexAccessExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><br /><span class="o">                        </span><span class="cm">(* open_bracket: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBracket"><span class="k">OPEN_BRACKET</span></a><br /><span class="o">                        </span><span class="cm">(* start: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">?</span><br /><span class="o">                        </span><span class="cm">(* end: *)</span><span class="o"> </span><a href="#IndexAccessEnd"><span class="k">IndexAccessEnd</span></a><span class="o">?</span><br /><span class="o">                        </span><span class="cm">(* close_bracket: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBracket"><span class="k">CLOSE_BRACKET</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #MemberAccess }
 
 ```
 
-<pre ebnf-snippet="MemberAccess" style="display: none;"><a href="#MemberAccess"><span class="k">MemberAccess</span></a><span class="o"> = </span><a href="../06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">             | </span><a href="../../01-file-structure/08-keywords#AddressKeyword"><span class="k">ADDRESS_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="MemberAccess" style="display: none;"><a href="#MemberAccess"><span class="k">MemberAccess</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#AddressKeyword"><span class="k">ADDRESS_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #IndexAccessEnd }
 
 ```
 
-<pre ebnf-snippet="IndexAccessEnd" style="display: none;"><a href="#IndexAccessEnd"><span class="k">IndexAccessEnd</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                 </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="IndexAccessEnd" style="display: none;"><a href="#IndexAccessEnd"><span class="k">IndexAccessEnd</span></a><span class="o"> = </span><span class="cm">(* colon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                 </span><span class="cm">(* end: *)</span><span class="o"> </span><a href="#Expression"><span class="k">Expression</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/05-expressions/01-base-expressions.md"
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/02-function-calls.md b/crates/solidity/outputs/spec/generated/public/05-expressions/02-function-calls.md
index 54916576bc..ef35ad10cb 100644
--- a/crates/solidity/outputs/spec/generated/public/05-expressions/02-function-calls.md
+++ b/crates/solidity/outputs/spec/generated/public/05-expressions/02-function-calls.md
@@ -8,48 +8,48 @@
 
 ```
 
-<pre ebnf-snippet="ArgumentsDeclaration" style="display: none;"><a href="#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o"> = </span><a href="#PositionalArgumentsDeclaration"><span class="k">PositionalArgumentsDeclaration</span></a><br /><span class="o">                     | </span><a href="#NamedArgumentsDeclaration"><span class="k">NamedArgumentsDeclaration</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ArgumentsDeclaration" style="display: none;"><a href="#ArgumentsDeclaration"><span class="k">ArgumentsDeclaration</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#PositionalArgumentsDeclaration"><span class="k">PositionalArgumentsDeclaration</span></a><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#NamedArgumentsDeclaration"><span class="k">NamedArgumentsDeclaration</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #PositionalArgumentsDeclaration }
 
 ```
 
-<pre ebnf-snippet="PositionalArgumentsDeclaration" style="display: none;"><a href="#PositionalArgumentsDeclaration"><span class="k">PositionalArgumentsDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                                 </span><a href="#PositionalArguments"><span class="k">PositionalArguments</span></a><br /><span class="o">                                 </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="PositionalArgumentsDeclaration" style="display: none;"><a href="#PositionalArgumentsDeclaration"><span class="k">PositionalArgumentsDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                                 </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="#PositionalArguments"><span class="k">PositionalArguments</span></a><br /><span class="o">                                 </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #PositionalArguments }
 
 ```
 
-<pre ebnf-snippet="PositionalArguments" style="display: none;"><a href="#PositionalArguments"><span class="k">PositionalArguments</span></a><span class="o"> = </span><span class="o">(</span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="PositionalArguments" style="display: none;"><a href="#PositionalArguments"><span class="k">PositionalArguments</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #NamedArgumentsDeclaration }
 
 ```
 
-<pre ebnf-snippet="NamedArgumentsDeclaration" style="display: none;"><a href="#NamedArgumentsDeclaration"><span class="k">NamedArgumentsDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                            </span><a href="#NamedArgumentGroup"><span class="k">NamedArgumentGroup</span></a><span class="o">?</span><br /><span class="o">                            </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="NamedArgumentsDeclaration" style="display: none;"><a href="#NamedArgumentsDeclaration"><span class="k">NamedArgumentsDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                            </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="#NamedArgumentGroup"><span class="k">NamedArgumentGroup</span></a><span class="o">?</span><br /><span class="o">                            </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #NamedArgumentGroup }
 
 ```
 
-<pre ebnf-snippet="NamedArgumentGroup" style="display: none;"><a href="#NamedArgumentGroup"><span class="k">NamedArgumentGroup</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                     </span><a href="#NamedArguments"><span class="k">NamedArguments</span></a><br /><span class="o">                     </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="NamedArgumentGroup" style="display: none;"><a href="#NamedArgumentGroup"><span class="k">NamedArgumentGroup</span></a><span class="o"> = </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">                     </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="#NamedArguments"><span class="k">NamedArguments</span></a><br /><span class="o">                     </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #NamedArguments }
 
 ```
 
-<pre ebnf-snippet="NamedArguments" style="display: none;"><a href="#NamedArguments"><span class="k">NamedArguments</span></a><span class="o"> = </span><span class="o">(</span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="NamedArguments" style="display: none;"><a href="#NamedArguments"><span class="k">NamedArguments</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #CallOptions }
 
 ```
 
-<pre ebnf-snippet="CallOptions" style="display: none;"><span class="cm">(* Introduced in 0.6.2 *)</span><br /><a href="#CallOptions"><span class="k">CallOptions</span></a><span class="o"> = </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="CallOptions" style="display: none;"><span class="cm">(* Introduced in 0.6.2 *)</span><br /><a href="#CallOptions"><span class="k">CallOptions</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #NamedArgument }
 
 ```
 
-<pre ebnf-snippet="NamedArgument" style="display: none;"><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o"> = </span><a href="../06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="NamedArgument" style="display: none;"><a href="#NamedArgument"><span class="k">NamedArgument</span></a><span class="o"> = </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../06-identifiers#Identifier"><span class="k">IDENTIFIER</span></a><br /><span class="o">                </span><span class="cm">(* colon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/05-expressions/02-function-calls.md"
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/03-primary-expressions.md b/crates/solidity/outputs/spec/generated/public/05-expressions/03-primary-expressions.md
index 06f94be9d3..cd692f0a38 100644
--- a/crates/solidity/outputs/spec/generated/public/05-expressions/03-primary-expressions.md
+++ b/crates/solidity/outputs/spec/generated/public/05-expressions/03-primary-expressions.md
@@ -8,42 +8,42 @@
 
 ```
 
-<pre ebnf-snippet="TypeExpression" style="display: none;"><span class="cm">(* Introduced in 0.5.3 *)</span><br /><a href="#TypeExpression"><span class="k">TypeExpression</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#TypeKeyword"><span class="k">TYPE_KEYWORD</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                 </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                 </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TypeExpression" style="display: none;"><span class="cm">(* Introduced in 0.5.3 *)</span><br /><a href="#TypeExpression"><span class="k">TypeExpression</span></a><span class="o"> = </span><span class="cm">(* type_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#TypeKeyword"><span class="k">TYPE_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                 </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><br /><span class="o">                 </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #NewExpression }
 
 ```
 
-<pre ebnf-snippet="NewExpression" style="display: none;"><a href="#NewExpression"><span class="k">NewExpression</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#NewKeyword"><span class="k">NEW_KEYWORD</span></a><br /><span class="o">                </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="NewExpression" style="display: none;"><a href="#NewExpression"><span class="k">NewExpression</span></a><span class="o"> = </span><span class="cm">(* new_keyword: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#NewKeyword"><span class="k">NEW_KEYWORD</span></a><br /><span class="o">                </span><span class="cm">(* type_name: *)</span><span class="o"> </span><a href="../../03-types/01-advanced-types#TypeName"><span class="k">TypeName</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #TupleExpression }
 
 ```
 
-<pre ebnf-snippet="TupleExpression" style="display: none;"><a href="#TupleExpression"><span class="k">TupleExpression</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                  </span><a href="#TupleValues"><span class="k">TupleValues</span></a><br /><span class="o">                  </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleExpression" style="display: none;"><a href="#TupleExpression"><span class="k">TupleExpression</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                  </span><span class="cm">(* items: *)</span><span class="o"> </span><a href="#TupleValues"><span class="k">TupleValues</span></a><br /><span class="o">                  </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #TupleValues }
 
 ```
 
-<pre ebnf-snippet="TupleValues" style="display: none;"><a href="#TupleValues"><span class="k">TupleValues</span></a><span class="o"> = </span><a href="#TupleValue"><span class="k">TupleValue</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#TupleValue"><span class="k">TupleValue</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleValues" style="display: none;"><a href="#TupleValues"><span class="k">TupleValues</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#TupleValue"><span class="k">TupleValue</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#TupleValue"><span class="k">TupleValue</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #TupleValue }
 
 ```
 
-<pre ebnf-snippet="TupleValue" style="display: none;"><a href="#TupleValue"><span class="k">TupleValue</span></a><span class="o"> = </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="TupleValue" style="display: none;"><a href="#TupleValue"><span class="k">TupleValue</span></a><span class="o"> = </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #ArrayExpression }
 
 ```
 
-<pre ebnf-snippet="ArrayExpression" style="display: none;"><a href="#ArrayExpression"><span class="k">ArrayExpression</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenBracket"><span class="k">OPEN_BRACKET</span></a><br /><span class="o">                  </span><a href="#ArrayValues"><span class="k">ArrayValues</span></a><br /><span class="o">                  </span><a href="../../01-file-structure/09-punctuation#CloseBracket"><span class="k">CLOSE_BRACKET</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="ArrayExpression" style="display: none;"><a href="#ArrayExpression"><span class="k">ArrayExpression</span></a><span class="o"> = </span><span class="cm">(* open_bracket: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBracket"><span class="k">OPEN_BRACKET</span></a><br /><span class="o">                  </span><span class="cm">(* items: *)</span><span class="o"> </span><a href="#ArrayValues"><span class="k">ArrayValues</span></a><br /><span class="o">                  </span><span class="cm">(* close_bracket: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBracket"><span class="k">CLOSE_BRACKET</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #ArrayValues }
 
 ```
 
-<pre ebnf-snippet="ArrayValues" style="display: none;"><a href="#ArrayValues"><span class="k">ArrayValues</span></a><span class="o"> = </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="ArrayValues" style="display: none;"><a href="#ArrayValues"><span class="k">ArrayValues</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../01-base-expressions#Expression"><span class="k">Expression</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/05-expressions/03-primary-expressions.md"
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/04-numbers.md b/crates/solidity/outputs/spec/generated/public/05-expressions/04-numbers.md
index aafa656187..94eafff46c 100644
--- a/crates/solidity/outputs/spec/generated/public/05-expressions/04-numbers.md
+++ b/crates/solidity/outputs/spec/generated/public/05-expressions/04-numbers.md
@@ -8,13 +8,13 @@
 
 ```
 
-<pre ebnf-snippet="HexNumberExpression" style="display: none;"><a href="#HexNumberExpression"><span class="k">HexNumberExpression</span></a><span class="o"> = </span><a href="#HexLiteral"><span class="k">HEX_LITERAL</span></a><br /><span class="o">                      </span><a href="#NumberUnit"><span class="k">NumberUnit</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span></pre>
+<pre ebnf-snippet="HexNumberExpression" style="display: none;"><a href="#HexNumberExpression"><span class="k">HexNumberExpression</span></a><span class="o"> = </span><span class="cm">(* literal: *)</span><span class="o"> </span><a href="#HexLiteral"><span class="k">HEX_LITERAL</span></a><br /><span class="o">                      </span><span class="cm">(* unit: *)</span><span class="o"> </span><a href="#NumberUnit"><span class="k">NumberUnit</span></a><span class="o">?</span><span class="o">;</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span></pre>
 
 ```{ .ebnf #DecimalNumberExpression }
 
 ```
 
-<pre ebnf-snippet="DecimalNumberExpression" style="display: none;"><a href="#DecimalNumberExpression"><span class="k">DecimalNumberExpression</span></a><span class="o"> = </span><a href="#DecimalLiteral"><span class="k">DECIMAL_LITERAL</span></a><br /><span class="o">                          </span><a href="#NumberUnit"><span class="k">NumberUnit</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="DecimalNumberExpression" style="display: none;"><a href="#DecimalNumberExpression"><span class="k">DecimalNumberExpression</span></a><span class="o"> = </span><span class="cm">(* literal: *)</span><span class="o"> </span><a href="#DecimalLiteral"><span class="k">DECIMAL_LITERAL</span></a><br /><span class="o">                          </span><span class="cm">(* unit: *)</span><span class="o"> </span><a href="#NumberUnit"><span class="k">NumberUnit</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #HexLiteral }
 
@@ -44,6 +44,6 @@
 
 ```
 
-<pre ebnf-snippet="NumberUnit" style="display: none;"><a href="#NumberUnit"><span class="k">NumberUnit</span></a><span class="o"> = </span><a href="../../01-file-structure/08-keywords#WeiKeyword"><span class="k">WEI_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#GweiKeyword"><span class="k">GWEI_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.11 *)</span><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#SzaboKeyword"><span class="k">SZABO_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.7.0 *)</span><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#FinneyKeyword"><span class="k">FINNEY_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.7.0 *)</span><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#EtherKeyword"><span class="k">ETHER_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#SecondsKeyword"><span class="k">SECONDS_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#MinutesKeyword"><span class="k">MINUTES_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#HoursKeyword"><span class="k">HOURS_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#DaysKeyword"><span class="k">DAYS_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#WeeksKeyword"><span class="k">WEEKS_KEYWORD</span></a><br /><span class="o">           | </span><a href="../../01-file-structure/08-keywords#YearsKeyword"><span class="k">YEARS_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span></pre>
+<pre ebnf-snippet="NumberUnit" style="display: none;"><a href="#NumberUnit"><span class="k">NumberUnit</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#WeiKeyword"><span class="k">WEI_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#GweiKeyword"><span class="k">GWEI_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.11 *)</span><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#SzaboKeyword"><span class="k">SZABO_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.7.0 *)</span><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#FinneyKeyword"><span class="k">FINNEY_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.7.0 *)</span><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#EtherKeyword"><span class="k">ETHER_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#SecondsKeyword"><span class="k">SECONDS_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#MinutesKeyword"><span class="k">MINUTES_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#HoursKeyword"><span class="k">HOURS_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#DaysKeyword"><span class="k">DAYS_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#WeeksKeyword"><span class="k">WEEKS_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/08-keywords#YearsKeyword"><span class="k">YEARS_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/05-expressions/04-numbers.md"
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/05-strings.md b/crates/solidity/outputs/spec/generated/public/05-expressions/05-strings.md
index 031a95d445..1c2846059c 100644
--- a/crates/solidity/outputs/spec/generated/public/05-expressions/05-strings.md
+++ b/crates/solidity/outputs/spec/generated/public/05-expressions/05-strings.md
@@ -8,19 +8,19 @@
 
 ```
 
-<pre ebnf-snippet="StringExpression" style="display: none;"><a href="#StringExpression"><span class="k">StringExpression</span></a><span class="o"> = </span><a href="#StringLiteral"><span class="k">StringLiteral</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.14 *)</span><br /><span class="o">                 | </span><a href="#StringLiterals"><span class="k">StringLiterals</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.14 *)</span><br /><span class="o">                 | </span><a href="#HexStringLiteral"><span class="k">HexStringLiteral</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.14 *)</span><br /><span class="o">                 | </span><a href="#HexStringLiterals"><span class="k">HexStringLiterals</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.14 *)</span><br /><span class="o">                 | </span><a href="#UnicodeStringLiterals"><span class="k">UnicodeStringLiterals</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.7.0 *)</span></pre>
+<pre ebnf-snippet="StringExpression" style="display: none;"><a href="#StringExpression"><span class="k">StringExpression</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#StringLiteral"><span class="k">StringLiteral</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.14 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#StringLiterals"><span class="k">StringLiterals</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.14 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#HexStringLiteral"><span class="k">HexStringLiteral</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.14 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#HexStringLiterals"><span class="k">HexStringLiterals</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.14 *)</span><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#UnicodeStringLiterals"><span class="k">UnicodeStringLiterals</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.7.0 *)</span></pre>
 
 ```{ .ebnf #StringLiterals }
 
 ```
 
-<pre ebnf-snippet="StringLiterals" style="display: none;"><span class="cm">(* Introduced in 0.5.14 *)</span><br /><a href="#StringLiterals"><span class="k">StringLiterals</span></a><span class="o"> = </span><a href="#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">+</span><span class="o">;</span></pre>
+<pre ebnf-snippet="StringLiterals" style="display: none;"><span class="cm">(* Introduced in 0.5.14 *)</span><br /><a href="#StringLiterals"><span class="k">StringLiterals</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">+</span><span class="o">;</span></pre>
 
 ```{ .ebnf #StringLiteral }
 
 ```
 
-<pre ebnf-snippet="StringLiteral" style="display: none;"><a href="#StringLiteral"><span class="k">StringLiteral</span></a><span class="o"> = </span><a href="#SingleQuotedStringLiteral"><span class="k">SINGLE_QUOTED_STRING_LITERAL</span></a><br /><span class="o">              | </span><a href="#DoubleQuotedStringLiteral"><span class="k">DOUBLE_QUOTED_STRING_LITERAL</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="StringLiteral" style="display: none;"><a href="#StringLiteral"><span class="k">StringLiteral</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#SingleQuotedStringLiteral"><span class="k">SINGLE_QUOTED_STRING_LITERAL</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#DoubleQuotedStringLiteral"><span class="k">DOUBLE_QUOTED_STRING_LITERAL</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #SingleQuotedStringLiteral }
 
@@ -38,13 +38,13 @@
 
 ```
 
-<pre ebnf-snippet="HexStringLiterals" style="display: none;"><span class="cm">(* Introduced in 0.5.14 *)</span><br /><a href="#HexStringLiterals"><span class="k">HexStringLiterals</span></a><span class="o"> = </span><a href="#HexStringLiteral"><span class="k">HexStringLiteral</span></a><span class="o">+</span><span class="o">;</span></pre>
+<pre ebnf-snippet="HexStringLiterals" style="display: none;"><span class="cm">(* Introduced in 0.5.14 *)</span><br /><a href="#HexStringLiterals"><span class="k">HexStringLiterals</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#HexStringLiteral"><span class="k">HexStringLiteral</span></a><span class="o">+</span><span class="o">;</span></pre>
 
 ```{ .ebnf #HexStringLiteral }
 
 ```
 
-<pre ebnf-snippet="HexStringLiteral" style="display: none;"><a href="#HexStringLiteral"><span class="k">HexStringLiteral</span></a><span class="o"> = </span><a href="#SingleQuotedHexStringLiteral"><span class="k">SINGLE_QUOTED_HEX_STRING_LITERAL</span></a><br /><span class="o">                 | </span><a href="#DoubleQuotedHexStringLiteral"><span class="k">DOUBLE_QUOTED_HEX_STRING_LITERAL</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="HexStringLiteral" style="display: none;"><a href="#HexStringLiteral"><span class="k">HexStringLiteral</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#SingleQuotedHexStringLiteral"><span class="k">SINGLE_QUOTED_HEX_STRING_LITERAL</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#DoubleQuotedHexStringLiteral"><span class="k">DOUBLE_QUOTED_HEX_STRING_LITERAL</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #SingleQuotedHexStringLiteral }
 
@@ -74,13 +74,13 @@
 
 ```
 
-<pre ebnf-snippet="UnicodeStringLiterals" style="display: none;"><span class="cm">(* Introduced in 0.7.0 *)</span><br /><a href="#UnicodeStringLiterals"><span class="k">UnicodeStringLiterals</span></a><span class="o"> = </span><a href="#UnicodeStringLiteral"><span class="k">UnicodeStringLiteral</span></a><span class="o">+</span><span class="o">;</span></pre>
+<pre ebnf-snippet="UnicodeStringLiterals" style="display: none;"><span class="cm">(* Introduced in 0.7.0 *)</span><br /><a href="#UnicodeStringLiterals"><span class="k">UnicodeStringLiterals</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#UnicodeStringLiteral"><span class="k">UnicodeStringLiteral</span></a><span class="o">+</span><span class="o">;</span></pre>
 
 ```{ .ebnf #UnicodeStringLiteral }
 
 ```
 
-<pre ebnf-snippet="UnicodeStringLiteral" style="display: none;"><span class="cm">(* Introduced in 0.7.0 *)</span><br /><a href="#UnicodeStringLiteral"><span class="k">UnicodeStringLiteral</span></a><span class="o"> = </span><a href="#SingleQuotedUnicodeStringLiteral"><span class="k">SINGLE_QUOTED_UNICODE_STRING_LITERAL</span></a><br /><span class="o">                     | </span><a href="#DoubleQuotedUnicodeStringLiteral"><span class="k">DOUBLE_QUOTED_UNICODE_STRING_LITERAL</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="UnicodeStringLiteral" style="display: none;"><span class="cm">(* Introduced in 0.7.0 *)</span><br /><a href="#UnicodeStringLiteral"><span class="k">UnicodeStringLiteral</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#SingleQuotedUnicodeStringLiteral"><span class="k">SINGLE_QUOTED_UNICODE_STRING_LITERAL</span></a><br /><span class="o">                     | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#DoubleQuotedUnicodeStringLiteral"><span class="k">DOUBLE_QUOTED_UNICODE_STRING_LITERAL</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #SingleQuotedUnicodeStringLiteral }
 
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/06-identifiers.md b/crates/solidity/outputs/spec/generated/public/05-expressions/06-identifiers.md
index 50316aa50e..4fa5c5132e 100644
--- a/crates/solidity/outputs/spec/generated/public/05-expressions/06-identifiers.md
+++ b/crates/solidity/outputs/spec/generated/public/05-expressions/06-identifiers.md
@@ -8,7 +8,7 @@
 
 ```
 
-<pre ebnf-snippet="IdentifierPath" style="display: none;"><a href="#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o"> = </span><a href="#Identifier"><span class="k">IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Period"><span class="k">PERIOD</span></a><span class="o"> </span><a href="#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="IdentifierPath" style="display: none;"><a href="#IdentifierPath"><span class="k">IdentifierPath</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#Identifier"><span class="k">IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Period"><span class="k">PERIOD</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#Identifier"><span class="k">IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #Identifier }
 
diff --git a/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md b/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md
index 4d942aad02..31d9746b5f 100644
--- a/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md
+++ b/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md
@@ -8,144 +8,144 @@
 
 ```
 
-<pre ebnf-snippet="YulBlock" style="display: none;"><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">           </span><a href="#YulStatements"><span class="k">YulStatements</span></a><br /><span class="o">           </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulBlock" style="display: none;"><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o"> = </span><span class="cm">(* open_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenBrace"><span class="k">OPEN_BRACE</span></a><br /><span class="o">           </span><span class="cm">(* statements: *)</span><span class="o"> </span><a href="#YulStatements"><span class="k">YulStatements</span></a><br /><span class="o">           </span><span class="cm">(* close_brace: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseBrace"><span class="k">CLOSE_BRACE</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulStatements }
 
 ```
 
-<pre ebnf-snippet="YulStatements" style="display: none;"><a href="#YulStatements"><span class="k">YulStatements</span></a><span class="o"> = </span><a href="#YulStatement"><span class="k">YulStatement</span></a><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulStatements" style="display: none;"><a href="#YulStatements"><span class="k">YulStatements</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulStatement"><span class="k">YulStatement</span></a><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulStatement }
 
 ```
 
-<pre ebnf-snippet="YulStatement" style="display: none;"><a href="#YulStatement"><span class="k">YulStatement</span></a><span class="o"> = </span><a href="#YulBlock"><span class="k">YulBlock</span></a><br /><span class="o">             | </span><a href="#YulFunctionDefinition"><span class="k">YulFunctionDefinition</span></a><br /><span class="o">             | </span><a href="#YulVariableDeclarationStatement"><span class="k">YulVariableDeclarationStatement</span></a><br /><span class="o">             | </span><a href="#YulAssignmentStatement"><span class="k">YulAssignmentStatement</span></a><br /><span class="o">             | </span><a href="#YulIfStatement"><span class="k">YulIfStatement</span></a><br /><span class="o">             | </span><a href="#YulForStatement"><span class="k">YulForStatement</span></a><br /><span class="o">             | </span><a href="#YulSwitchStatement"><span class="k">YulSwitchStatement</span></a><br /><span class="o">             | </span><a href="#YulLeaveStatement"><span class="k">YulLeaveStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">             | </span><a href="#YulBreakStatement"><span class="k">YulBreakStatement</span></a><br /><span class="o">             | </span><a href="#YulContinueStatement"><span class="k">YulContinueStatement</span></a><br /><span class="o">             | </span><a href="#YulLabel"><span class="k">YulLabel</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">             | </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulStatement" style="display: none;"><a href="#YulStatement"><span class="k">YulStatement</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulFunctionDefinition"><span class="k">YulFunctionDefinition</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulVariableDeclarationStatement"><span class="k">YulVariableDeclarationStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulAssignmentStatement"><span class="k">YulAssignmentStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulIfStatement"><span class="k">YulIfStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulForStatement"><span class="k">YulForStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulSwitchStatement"><span class="k">YulSwitchStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulLeaveStatement"><span class="k">YulLeaveStatement</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.6.0 *)</span><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulBreakStatement"><span class="k">YulBreakStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulContinueStatement"><span class="k">YulContinueStatement</span></a><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulLabel"><span class="k">YulLabel</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">             | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulFunctionDefinition }
 
 ```
 
-<pre ebnf-snippet="YulFunctionDefinition" style="display: none;"><a href="#YulFunctionDefinition"><span class="k">YulFunctionDefinition</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulFunctionKeyword"><span class="k">YUL_FUNCTION_KEYWORD</span></a><br /><span class="o">                        </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">                        </span><a href="#YulParametersDeclaration"><span class="k">YulParametersDeclaration</span></a><br /><span class="o">                        </span><a href="#YulReturnsDeclaration"><span class="k">YulReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">                        </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulFunctionDefinition" style="display: none;"><a href="#YulFunctionDefinition"><span class="k">YulFunctionDefinition</span></a><span class="o"> = </span><span class="cm">(* function_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulFunctionKeyword"><span class="k">YUL_FUNCTION_KEYWORD</span></a><br /><span class="o">                        </span><span class="cm">(* name: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">                        </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#YulParametersDeclaration"><span class="k">YulParametersDeclaration</span></a><br /><span class="o">                        </span><span class="cm">(* returns: *)</span><span class="o"> </span><a href="#YulReturnsDeclaration"><span class="k">YulReturnsDeclaration</span></a><span class="o">?</span><br /><span class="o">                        </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulParametersDeclaration }
 
 ```
 
-<pre ebnf-snippet="YulParametersDeclaration" style="display: none;"><a href="#YulParametersDeclaration"><span class="k">YulParametersDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                           </span><a href="#YulParameters"><span class="k">YulParameters</span></a><br /><span class="o">                           </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulParametersDeclaration" style="display: none;"><a href="#YulParametersDeclaration"><span class="k">YulParametersDeclaration</span></a><span class="o"> = </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                           </span><span class="cm">(* parameters: *)</span><span class="o"> </span><a href="#YulParameters"><span class="k">YulParameters</span></a><br /><span class="o">                           </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulParameters }
 
 ```
 
-<pre ebnf-snippet="YulParameters" style="display: none;"><a href="#YulParameters"><span class="k">YulParameters</span></a><span class="o"> = </span><span class="o">(</span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulParameters" style="display: none;"><a href="#YulParameters"><span class="k">YulParameters</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulReturnsDeclaration }
 
 ```
 
-<pre ebnf-snippet="YulReturnsDeclaration" style="display: none;"><a href="#YulReturnsDeclaration"><span class="k">YulReturnsDeclaration</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#MinusGreaterThan"><span class="k">MINUS_GREATER_THAN</span></a><br /><span class="o">                        </span><a href="#YulReturnVariables"><span class="k">YulReturnVariables</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulReturnsDeclaration" style="display: none;"><a href="#YulReturnsDeclaration"><span class="k">YulReturnsDeclaration</span></a><span class="o"> = </span><span class="cm">(* minus_greater_than: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#MinusGreaterThan"><span class="k">MINUS_GREATER_THAN</span></a><br /><span class="o">                        </span><span class="cm">(* variables: *)</span><span class="o"> </span><a href="#YulReturnVariables"><span class="k">YulReturnVariables</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulReturnVariables }
 
 ```
 
-<pre ebnf-snippet="YulReturnVariables" style="display: none;"><a href="#YulReturnVariables"><span class="k">YulReturnVariables</span></a><span class="o"> = </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulReturnVariables" style="display: none;"><a href="#YulReturnVariables"><span class="k">YulReturnVariables</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulVariableDeclarationStatement }
 
 ```
 
-<pre ebnf-snippet="YulVariableDeclarationStatement" style="display: none;"><a href="#YulVariableDeclarationStatement"><span class="k">YulVariableDeclarationStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulLetKeyword"><span class="k">YUL_LET_KEYWORD</span></a><br /><span class="o">                                  </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">                                  </span><a href="#YulVariableDeclarationValue"><span class="k">YulVariableDeclarationValue</span></a><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulVariableDeclarationStatement" style="display: none;"><a href="#YulVariableDeclarationStatement"><span class="k">YulVariableDeclarationStatement</span></a><span class="o"> = </span><span class="cm">(* let_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLetKeyword"><span class="k">YUL_LET_KEYWORD</span></a><br /><span class="o">                                  </span><span class="cm">(* names: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">                                  </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="#YulVariableDeclarationValue"><span class="k">YulVariableDeclarationValue</span></a><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulVariableDeclarationValue }
 
 ```
 
-<pre ebnf-snippet="YulVariableDeclarationValue" style="display: none;"><a href="#YulVariableDeclarationValue"><span class="k">YulVariableDeclarationValue</span></a><span class="o"> = </span><a href="#YulAssignmentOperator"><span class="k">YulAssignmentOperator</span></a><br /><span class="o">                              </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulVariableDeclarationValue" style="display: none;"><a href="#YulVariableDeclarationValue"><span class="k">YulVariableDeclarationValue</span></a><span class="o"> = </span><span class="cm">(* assignment: *)</span><span class="o"> </span><a href="#YulAssignmentOperator"><span class="k">YulAssignmentOperator</span></a><br /><span class="o">                              </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulAssignmentStatement }
 
 ```
 
-<pre ebnf-snippet="YulAssignmentStatement" style="display: none;"><a href="#YulAssignmentStatement"><span class="k">YulAssignmentStatement</span></a><span class="o"> = </span><a href="../02-yul-expressions#YulPaths"><span class="k">YulPaths</span></a><br /><span class="o">                         </span><a href="#YulAssignmentOperator"><span class="k">YulAssignmentOperator</span></a><br /><span class="o">                         </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulAssignmentStatement" style="display: none;"><a href="#YulAssignmentStatement"><span class="k">YulAssignmentStatement</span></a><span class="o"> = </span><span class="cm">(* names: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulPaths"><span class="k">YulPaths</span></a><br /><span class="o">                         </span><span class="cm">(* assignment: *)</span><span class="o"> </span><a href="#YulAssignmentOperator"><span class="k">YulAssignmentOperator</span></a><br /><span class="o">                         </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulAssignmentOperator }
 
 ```
 
-<pre ebnf-snippet="YulAssignmentOperator" style="display: none;"><a href="#YulAssignmentOperator"><span class="k">YulAssignmentOperator</span></a><span class="o"> = </span><a href="#YulColonAndEqual"><span class="k">YulColonAndEqual</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.5 *)</span><br /><span class="o">                      | </span><a href="../../01-file-structure/09-punctuation#ColonEqual"><span class="k">COLON_EQUAL</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulAssignmentOperator" style="display: none;"><a href="#YulAssignmentOperator"><span class="k">YulAssignmentOperator</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulColonAndEqual"><span class="k">YulColonAndEqual</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.5 *)</span><br /><span class="o">                      | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#ColonEqual"><span class="k">COLON_EQUAL</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulColonAndEqual }
 
 ```
 
-<pre ebnf-snippet="YulColonAndEqual" style="display: none;"><span class="cm">(* Deprecated in 0.5.5 *)</span><br /><a href="#YulColonAndEqual"><span class="k">YulColonAndEqual</span></a><span class="o"> = </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                   </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulColonAndEqual" style="display: none;"><span class="cm">(* Deprecated in 0.5.5 *)</span><br /><a href="#YulColonAndEqual"><span class="k">YulColonAndEqual</span></a><span class="o"> = </span><span class="cm">(* colon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><br /><span class="o">                   </span><span class="cm">(* equal: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Equal"><span class="k">EQUAL</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulIfStatement }
 
 ```
 
-<pre ebnf-snippet="YulIfStatement" style="display: none;"><a href="#YulIfStatement"><span class="k">YulIfStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulIfKeyword"><span class="k">YUL_IF_KEYWORD</span></a><br /><span class="o">                 </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                 </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulIfStatement" style="display: none;"><a href="#YulIfStatement"><span class="k">YulIfStatement</span></a><span class="o"> = </span><span class="cm">(* if_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulIfKeyword"><span class="k">YUL_IF_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* condition: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                 </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulForStatement }
 
 ```
 
-<pre ebnf-snippet="YulForStatement" style="display: none;"><a href="#YulForStatement"><span class="k">YulForStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulForKeyword"><span class="k">YUL_FOR_KEYWORD</span></a><br /><span class="o">                  </span><a href="#YulBlock"><span class="k">YulBlock</span></a><br /><span class="o">                  </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                  </span><a href="#YulBlock"><span class="k">YulBlock</span></a><br /><span class="o">                  </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulForStatement" style="display: none;"><a href="#YulForStatement"><span class="k">YulForStatement</span></a><span class="o"> = </span><span class="cm">(* for_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulForKeyword"><span class="k">YUL_FOR_KEYWORD</span></a><br /><span class="o">                  </span><span class="cm">(* initialization: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><br /><span class="o">                  </span><span class="cm">(* condition: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                  </span><span class="cm">(* iterator: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><br /><span class="o">                  </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulSwitchStatement }
 
 ```
 
-<pre ebnf-snippet="YulSwitchStatement" style="display: none;"><a href="#YulSwitchStatement"><span class="k">YulSwitchStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulSwitchKeyword"><span class="k">YUL_SWITCH_KEYWORD</span></a><br /><span class="o">                     </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                     </span><a href="#YulSwitchCases"><span class="k">YulSwitchCases</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulSwitchStatement" style="display: none;"><a href="#YulSwitchStatement"><span class="k">YulSwitchStatement</span></a><span class="o"> = </span><span class="cm">(* switch_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSwitchKeyword"><span class="k">YUL_SWITCH_KEYWORD</span></a><br /><span class="o">                     </span><span class="cm">(* expression: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                     </span><span class="cm">(* cases: *)</span><span class="o"> </span><a href="#YulSwitchCases"><span class="k">YulSwitchCases</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulSwitchCases }
 
 ```
 
-<pre ebnf-snippet="YulSwitchCases" style="display: none;"><a href="#YulSwitchCases"><span class="k">YulSwitchCases</span></a><span class="o"> = </span><a href="#YulSwitchCase"><span class="k">YulSwitchCase</span></a><span class="o">+</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulSwitchCases" style="display: none;"><a href="#YulSwitchCases"><span class="k">YulSwitchCases</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulSwitchCase"><span class="k">YulSwitchCase</span></a><span class="o">+</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulSwitchCase }
 
 ```
 
-<pre ebnf-snippet="YulSwitchCase" style="display: none;"><a href="#YulSwitchCase"><span class="k">YulSwitchCase</span></a><span class="o"> = </span><a href="#YulDefaultCase"><span class="k">YulDefaultCase</span></a><br /><span class="o">              | </span><a href="#YulValueCase"><span class="k">YulValueCase</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulSwitchCase" style="display: none;"><a href="#YulSwitchCase"><span class="k">YulSwitchCase</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulDefaultCase"><span class="k">YulDefaultCase</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulValueCase"><span class="k">YulValueCase</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulDefaultCase }
 
 ```
 
-<pre ebnf-snippet="YulDefaultCase" style="display: none;"><a href="#YulDefaultCase"><span class="k">YulDefaultCase</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulDefaultKeyword"><span class="k">YUL_DEFAULT_KEYWORD</span></a><br /><span class="o">                 </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulDefaultCase" style="display: none;"><a href="#YulDefaultCase"><span class="k">YulDefaultCase</span></a><span class="o"> = </span><span class="cm">(* default_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulDefaultKeyword"><span class="k">YUL_DEFAULT_KEYWORD</span></a><br /><span class="o">                 </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulValueCase }
 
 ```
 
-<pre ebnf-snippet="YulValueCase" style="display: none;"><a href="#YulValueCase"><span class="k">YulValueCase</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulCaseKeyword"><span class="k">YUL_CASE_KEYWORD</span></a><br /><span class="o">               </span><a href="../02-yul-expressions#YulLiteral"><span class="k">YulLiteral</span></a><br /><span class="o">               </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulValueCase" style="display: none;"><a href="#YulValueCase"><span class="k">YulValueCase</span></a><span class="o"> = </span><span class="cm">(* case_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCaseKeyword"><span class="k">YUL_CASE_KEYWORD</span></a><br /><span class="o">               </span><span class="cm">(* value: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulLiteral"><span class="k">YulLiteral</span></a><br /><span class="o">               </span><span class="cm">(* body: *)</span><span class="o"> </span><a href="#YulBlock"><span class="k">YulBlock</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulLeaveStatement }
 
 ```
 
-<pre ebnf-snippet="YulLeaveStatement" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#YulLeaveStatement"><span class="k">YulLeaveStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulLeaveKeyword"><span class="k">YUL_LEAVE_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulLeaveStatement" style="display: none;"><span class="cm">(* Introduced in 0.6.0 *)</span><br /><a href="#YulLeaveStatement"><span class="k">YulLeaveStatement</span></a><span class="o"> = </span><span class="cm">(* leave_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLeaveKeyword"><span class="k">YUL_LEAVE_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulBreakStatement }
 
 ```
 
-<pre ebnf-snippet="YulBreakStatement" style="display: none;"><a href="#YulBreakStatement"><span class="k">YulBreakStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulBreakKeyword"><span class="k">YUL_BREAK_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulBreakStatement" style="display: none;"><a href="#YulBreakStatement"><span class="k">YulBreakStatement</span></a><span class="o"> = </span><span class="cm">(* break_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulBreakKeyword"><span class="k">YUL_BREAK_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulContinueStatement }
 
 ```
 
-<pre ebnf-snippet="YulContinueStatement" style="display: none;"><a href="#YulContinueStatement"><span class="k">YulContinueStatement</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulContinueKeyword"><span class="k">YUL_CONTINUE_KEYWORD</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulContinueStatement" style="display: none;"><a href="#YulContinueStatement"><span class="k">YulContinueStatement</span></a><span class="o"> = </span><span class="cm">(* continue_keyword: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulContinueKeyword"><span class="k">YUL_CONTINUE_KEYWORD</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulLabel }
 
 ```
 
-<pre ebnf-snippet="YulLabel" style="display: none;"><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><a href="#YulLabel"><span class="k">YulLabel</span></a><span class="o"> = </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">           </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulLabel" style="display: none;"><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><a href="#YulLabel"><span class="k">YulLabel</span></a><span class="o"> = </span><span class="cm">(* label: *)</span><span class="o"> </span><a href="../02-yul-expressions#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">           </span><span class="cm">(* colon: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Colon"><span class="k">COLON</span></a><span class="o">;</span></pre>
 
 --8<-- "crates/solidity/inputs/language/docs/06-yul/01-yul-statements.md"
diff --git a/crates/solidity/outputs/spec/generated/public/06-yul/02-yul-expressions.md b/crates/solidity/outputs/spec/generated/public/06-yul/02-yul-expressions.md
index b7fe61a77b..5f18e8cc23 100644
--- a/crates/solidity/outputs/spec/generated/public/06-yul/02-yul-expressions.md
+++ b/crates/solidity/outputs/spec/generated/public/06-yul/02-yul-expressions.md
@@ -8,31 +8,37 @@
 
 ```
 
-<pre ebnf-snippet="YulExpression" style="display: none;"><a href="#YulExpression"><span class="k">YulExpression</span></a><span class="o"> = </span><a href="#YulFunctionCallExpression"><span class="k">YulFunctionCallExpression</span></a><br /><span class="o">              | </span><a href="#YulLiteral"><span class="k">YulLiteral</span></a><br /><span class="o">              | </span><a href="#YulBuiltInFunction"><span class="k">YulBuiltInFunction</span></a><br /><span class="o">              | </span><a href="#YulPath"><span class="k">YulPath</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulExpression" style="display: none;"><a href="#YulExpression"><span class="k">YulExpression</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulFunctionCallExpression"><span class="k">YulFunctionCallExpression</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulLiteral"><span class="k">YulLiteral</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulBuiltInFunction"><span class="k">YulBuiltInFunction</span></a><br /><span class="o">              | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulPath"><span class="k">YulPath</span></a><span class="o">;</span></pre>
+
+```{ .ebnf #YulFunctionCallExpression }
+
+```
+
+<pre ebnf-snippet="YulFunctionCallExpression" style="display: none;"><span class="cm">(* Postfix unary operator *)</span><br /><a href="#YulFunctionCallExpression"><span class="k">YulFunctionCallExpression</span></a><span class="o"> = </span><span class="cm">(* operand: *)</span><span class="o"> </span><a href="#YulExpression"><span class="k">YulExpression</span></a><br /><span class="o">                            </span><span class="cm">(* open_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#OpenParen"><span class="k">OPEN_PAREN</span></a><br /><span class="o">                            </span><span class="cm">(* arguments: *)</span><span class="o"> </span><a href="#YulArguments"><span class="k">YulArguments</span></a><br /><span class="o">                            </span><span class="cm">(* close_paren: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#CloseParen"><span class="k">CLOSE_PAREN</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulArguments }
 
 ```
 
-<pre ebnf-snippet="YulArguments" style="display: none;"><a href="#YulArguments"><span class="k">YulArguments</span></a><span class="o"> = </span><span class="o">(</span><a href="#YulExpression"><span class="k">YulExpression</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#YulExpression"><span class="k">YulExpression</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulArguments" style="display: none;"><a href="#YulArguments"><span class="k">YulArguments</span></a><span class="o"> = </span><span class="o">(</span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulExpression"><span class="k">YulExpression</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulExpression"><span class="k">YulExpression</span></a><span class="o">)</span><span class="o">*</span><span class="o">)</span><span class="o">?</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulPaths }
 
 ```
 
-<pre ebnf-snippet="YulPaths" style="display: none;"><a href="#YulPaths"><span class="k">YulPaths</span></a><span class="o"> = </span><a href="#YulPath"><span class="k">YulPath</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><a href="#YulPath"><span class="k">YulPath</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulPaths" style="display: none;"><a href="#YulPaths"><span class="k">YulPaths</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulPath"><span class="k">YulPath</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Comma"><span class="k">COMMA</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulPath"><span class="k">YulPath</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulPath }
 
 ```
 
-<pre ebnf-snippet="YulPath" style="display: none;"><a href="#YulPath"><span class="k">YulPath</span></a><span class="o"> = </span><a href="#YulPathComponent"><span class="k">YulPathComponent</span></a><span class="o"> </span><span class="o">(</span><a href="../../01-file-structure/09-punctuation#Period"><span class="k">PERIOD</span></a><span class="o"> </span><a href="#YulPathComponent"><span class="k">YulPathComponent</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
+<pre ebnf-snippet="YulPath" style="display: none;"><a href="#YulPath"><span class="k">YulPath</span></a><span class="o"> = </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulPathComponent"><span class="k">YulPathComponent</span></a><span class="o"> </span><span class="o">(</span><span class="cm">(* separator: *)</span><span class="o"> </span><a href="../../01-file-structure/09-punctuation#Period"><span class="k">PERIOD</span></a><span class="o"> </span><span class="cm">(* item: *)</span><span class="o"> </span><a href="#YulPathComponent"><span class="k">YulPathComponent</span></a><span class="o">)</span><span class="o">*</span><span class="o">;</span></pre>
 
 ```{ .ebnf #YulPathComponent }
 
 ```
 
-<pre ebnf-snippet="YulPathComponent" style="display: none;"><a href="#YulPathComponent"><span class="k">YulPathComponent</span></a><span class="o"> = </span><a href="#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">                 | </span><a href="../03-yul-keywords#YulAddressKeyword"><span class="k">YUL_ADDRESS_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.10 *)</span></pre>
+<pre ebnf-snippet="YulPathComponent" style="display: none;"><a href="#YulPathComponent"><span class="k">YulPathComponent</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulIdentifier"><span class="k">YUL_IDENTIFIER</span></a><br /><span class="o">                 | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulAddressKeyword"><span class="k">YUL_ADDRESS_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.10 *)</span></pre>
 
 ```{ .ebnf #YulIdentifier }
 
@@ -44,13 +50,13 @@
 
 ```
 
-<pre ebnf-snippet="YulBuiltInFunction" style="display: none;"><a href="#YulBuiltInFunction"><span class="k">YulBuiltInFunction</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulAddKeyword"><span class="k">YUL_ADD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulAddModKeyword"><span class="k">YUL_ADD_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulAddressKeyword"><span class="k">YUL_ADDRESS_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulAndKeyword"><span class="k">YUL_AND_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulBalanceKeyword"><span class="k">YUL_BALANCE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulBlockHashKeyword"><span class="k">YUL_BLOCK_HASH_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulByteKeyword"><span class="k">YUL_BYTE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallCodeKeyword"><span class="k">YUL_CALL_CODE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallDataCopyKeyword"><span class="k">YUL_CALL_DATA_COPY_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallDataLoadKeyword"><span class="k">YUL_CALL_DATA_LOAD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallDataSizeKeyword"><span class="k">YUL_CALL_DATA_SIZE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallerKeyword"><span class="k">YUL_CALLER_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallKeyword"><span class="k">YUL_CALL_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCallValueKeyword"><span class="k">YUL_CALL_VALUE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCoinBaseKeyword"><span class="k">YUL_COIN_BASE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCreateKeyword"><span class="k">YUL_CREATE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulDelegateCallKeyword"><span class="k">YUL_DELEGATE_CALL_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulDivKeyword"><span class="k">YUL_DIV_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulEqKeyword"><span class="k">YUL_EQ_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulExpKeyword"><span class="k">YUL_EXP_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulExtCodeCopyKeyword"><span class="k">YUL_EXT_CODE_COPY_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulExtCodeSizeKeyword"><span class="k">YUL_EXT_CODE_SIZE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulGasKeyword"><span class="k">YUL_GAS_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulGasLimitKeyword"><span class="k">YUL_GAS_LIMIT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulGasPriceKeyword"><span class="k">YUL_GAS_PRICE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulGtKeyword"><span class="k">YUL_GT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulInvalidKeyword"><span class="k">YUL_INVALID_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulIsZeroKeyword"><span class="k">YUL_IS_ZERO_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulLog0Keyword"><span class="k">YUL_LOG_0_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulLog1Keyword"><span class="k">YUL_LOG_1_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulLog2Keyword"><span class="k">YUL_LOG_2_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulLog3Keyword"><span class="k">YUL_LOG_3_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulLog4Keyword"><span class="k">YUL_LOG_4_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulLtKeyword"><span class="k">YUL_LT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMLoadKeyword"><span class="k">YUL_M_LOAD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulModKeyword"><span class="k">YUL_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMSizeKeyword"><span class="k">YUL_M_SIZE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMStore8Keyword"><span class="k">YUL_M_STORE_8_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMStoreKeyword"><span class="k">YUL_M_STORE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMulKeyword"><span class="k">YUL_MUL_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMulModKeyword"><span class="k">YUL_MUL_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulNotKeyword"><span class="k">YUL_NOT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulNumberKeyword"><span class="k">YUL_NUMBER_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulOriginKeyword"><span class="k">YUL_ORIGIN_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulOrKeyword"><span class="k">YUL_OR_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulPopKeyword"><span class="k">YUL_POP_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulReturnKeyword"><span class="k">YUL_RETURN_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulRevertKeyword"><span class="k">YUL_REVERT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSDivKeyword"><span class="k">YUL_S_DIV_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSelfDestructKeyword"><span class="k">YUL_SELF_DESTRUCT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSgtKeyword"><span class="k">YUL_SGT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSignExtendKeyword"><span class="k">YUL_SIGN_EXTEND_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSLoadKeyword"><span class="k">YUL_S_LOAD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSltKeyword"><span class="k">YUL_SLT_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSModKeyword"><span class="k">YUL_S_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSStoreKeyword"><span class="k">YUL_S_STORE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulStopKeyword"><span class="k">YUL_STOP_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSubKeyword"><span class="k">YUL_SUB_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulTimestampKeyword"><span class="k">YUL_TIMESTAMP_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulXorKeyword"><span class="k">YUL_XOR_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulKeccak256Keyword"><span class="k">YUL_KECCAK_256_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSha3Keyword"><span class="k">YUL_SHA_3_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSuicideKeyword"><span class="k">YUL_SUICIDE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulReturnDataCopyKeyword"><span class="k">YUL_RETURN_DATA_COPY_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulReturnDataSizeKeyword"><span class="k">YUL_RETURN_DATA_SIZE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulStaticCallKeyword"><span class="k">YUL_STATIC_CALL_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulCreate2Keyword"><span class="k">YUL_CREATE_2_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulExtCodeHashKeyword"><span class="k">YUL_EXT_CODE_HASH_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.0 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSarKeyword"><span class="k">YUL_SAR_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulShlKeyword"><span class="k">YUL_SHL_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulShrKeyword"><span class="k">YUL_SHR_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulChainIdKeyword"><span class="k">YUL_CHAIN_ID_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulSelfBalanceKeyword"><span class="k">YUL_SELF_BALANCE_KEYWORD</span></a><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulBaseFeeKeyword"><span class="k">YUL_BASE_FEE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.7 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulDifficultyKeyword"><span class="k">YUL_DIFFICULTY_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.8.18 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulPrevRandaoKeyword"><span class="k">YUL_PREV_RANDAO_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.18 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulBlobBaseFeeKeyword"><span class="k">YUL_BLOB_BASE_FEE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulBlobHashKeyword"><span class="k">YUL_BLOB_HASH_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulTLoadKeyword"><span class="k">YUL_T_LOAD_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulTStoreKeyword"><span class="k">YUL_T_STORE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><a href="../03-yul-keywords#YulMCopyKeyword"><span class="k">YUL_M_COPY_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span></pre>
+<pre ebnf-snippet="YulBuiltInFunction" style="display: none;"><a href="#YulBuiltInFunction"><span class="k">YulBuiltInFunction</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulAddKeyword"><span class="k">YUL_ADD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulAddModKeyword"><span class="k">YUL_ADD_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulAddressKeyword"><span class="k">YUL_ADDRESS_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulAndKeyword"><span class="k">YUL_AND_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulBalanceKeyword"><span class="k">YUL_BALANCE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulBlockHashKeyword"><span class="k">YUL_BLOCK_HASH_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulByteKeyword"><span class="k">YUL_BYTE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallCodeKeyword"><span class="k">YUL_CALL_CODE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallDataCopyKeyword"><span class="k">YUL_CALL_DATA_COPY_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallDataLoadKeyword"><span class="k">YUL_CALL_DATA_LOAD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallDataSizeKeyword"><span class="k">YUL_CALL_DATA_SIZE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallerKeyword"><span class="k">YUL_CALLER_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallKeyword"><span class="k">YUL_CALL_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCallValueKeyword"><span class="k">YUL_CALL_VALUE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCoinBaseKeyword"><span class="k">YUL_COIN_BASE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCreateKeyword"><span class="k">YUL_CREATE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulDelegateCallKeyword"><span class="k">YUL_DELEGATE_CALL_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulDivKeyword"><span class="k">YUL_DIV_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulEqKeyword"><span class="k">YUL_EQ_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulExpKeyword"><span class="k">YUL_EXP_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulExtCodeCopyKeyword"><span class="k">YUL_EXT_CODE_COPY_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulExtCodeSizeKeyword"><span class="k">YUL_EXT_CODE_SIZE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulGasKeyword"><span class="k">YUL_GAS_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulGasLimitKeyword"><span class="k">YUL_GAS_LIMIT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulGasPriceKeyword"><span class="k">YUL_GAS_PRICE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulGtKeyword"><span class="k">YUL_GT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulInvalidKeyword"><span class="k">YUL_INVALID_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulIsZeroKeyword"><span class="k">YUL_IS_ZERO_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLog0Keyword"><span class="k">YUL_LOG_0_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLog1Keyword"><span class="k">YUL_LOG_1_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLog2Keyword"><span class="k">YUL_LOG_2_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLog3Keyword"><span class="k">YUL_LOG_3_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLog4Keyword"><span class="k">YUL_LOG_4_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulLtKeyword"><span class="k">YUL_LT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMLoadKeyword"><span class="k">YUL_M_LOAD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulModKeyword"><span class="k">YUL_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMSizeKeyword"><span class="k">YUL_M_SIZE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMStore8Keyword"><span class="k">YUL_M_STORE_8_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMStoreKeyword"><span class="k">YUL_M_STORE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMulKeyword"><span class="k">YUL_MUL_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMulModKeyword"><span class="k">YUL_MUL_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulNotKeyword"><span class="k">YUL_NOT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulNumberKeyword"><span class="k">YUL_NUMBER_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulOriginKeyword"><span class="k">YUL_ORIGIN_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulOrKeyword"><span class="k">YUL_OR_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulPopKeyword"><span class="k">YUL_POP_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulReturnKeyword"><span class="k">YUL_RETURN_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulRevertKeyword"><span class="k">YUL_REVERT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSDivKeyword"><span class="k">YUL_S_DIV_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSelfDestructKeyword"><span class="k">YUL_SELF_DESTRUCT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSgtKeyword"><span class="k">YUL_SGT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSignExtendKeyword"><span class="k">YUL_SIGN_EXTEND_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSLoadKeyword"><span class="k">YUL_S_LOAD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSltKeyword"><span class="k">YUL_SLT_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSModKeyword"><span class="k">YUL_S_MOD_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSStoreKeyword"><span class="k">YUL_S_STORE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulStopKeyword"><span class="k">YUL_STOP_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSubKeyword"><span class="k">YUL_SUB_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulTimestampKeyword"><span class="k">YUL_TIMESTAMP_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulXorKeyword"><span class="k">YUL_XOR_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulKeccak256Keyword"><span class="k">YUL_KECCAK_256_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSha3Keyword"><span class="k">YUL_SHA_3_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSuicideKeyword"><span class="k">YUL_SUICIDE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.5.0 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulReturnDataCopyKeyword"><span class="k">YUL_RETURN_DATA_COPY_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulReturnDataSizeKeyword"><span class="k">YUL_RETURN_DATA_SIZE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulStaticCallKeyword"><span class="k">YUL_STATIC_CALL_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulCreate2Keyword"><span class="k">YUL_CREATE_2_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.4.12 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulExtCodeHashKeyword"><span class="k">YUL_EXT_CODE_HASH_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.5.0 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSarKeyword"><span class="k">YUL_SAR_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulShlKeyword"><span class="k">YUL_SHL_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulShrKeyword"><span class="k">YUL_SHR_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulChainIdKeyword"><span class="k">YUL_CHAIN_ID_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulSelfBalanceKeyword"><span class="k">YUL_SELF_BALANCE_KEYWORD</span></a><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulBaseFeeKeyword"><span class="k">YUL_BASE_FEE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.7 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulDifficultyKeyword"><span class="k">YUL_DIFFICULTY_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Deprecated in 0.8.18 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulPrevRandaoKeyword"><span class="k">YUL_PREV_RANDAO_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.18 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulBlobBaseFeeKeyword"><span class="k">YUL_BLOB_BASE_FEE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulBlobHashKeyword"><span class="k">YUL_BLOB_HASH_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulTLoadKeyword"><span class="k">YUL_T_LOAD_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulTStoreKeyword"><span class="k">YUL_T_STORE_KEYWORD</span></a><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span><br /><span class="o">                   | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulMCopyKeyword"><span class="k">YUL_M_COPY_KEYWORD</span></a><span class="o">;</span><span class="o"> </span><span class="cm">(* Introduced in 0.8.24 *)</span></pre>
 
 ```{ .ebnf #YulLiteral }
 
 ```
 
-<pre ebnf-snippet="YulLiteral" style="display: none;"><a href="#YulLiteral"><span class="k">YulLiteral</span></a><span class="o"> = </span><a href="../03-yul-keywords#YulTrueKeyword"><span class="k">YUL_TRUE_KEYWORD</span></a><br /><span class="o">           | </span><a href="../03-yul-keywords#YulFalseKeyword"><span class="k">YUL_FALSE_KEYWORD</span></a><br /><span class="o">           | </span><a href="#YulDecimalLiteral"><span class="k">YUL_DECIMAL_LITERAL</span></a><br /><span class="o">           | </span><a href="#YulHexLiteral"><span class="k">YUL_HEX_LITERAL</span></a><br /><span class="o">           | </span><a href="../../05-expressions/05-strings#HexStringLiteral"><span class="k">HexStringLiteral</span></a><br /><span class="o">           | </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
+<pre ebnf-snippet="YulLiteral" style="display: none;"><a href="#YulLiteral"><span class="k">YulLiteral</span></a><span class="o"> = </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulTrueKeyword"><span class="k">YUL_TRUE_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../03-yul-keywords#YulFalseKeyword"><span class="k">YUL_FALSE_KEYWORD</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulDecimalLiteral"><span class="k">YUL_DECIMAL_LITERAL</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="#YulHexLiteral"><span class="k">YUL_HEX_LITERAL</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#HexStringLiteral"><span class="k">HexStringLiteral</span></a><br /><span class="o">           | </span><span class="cm">(* variant: *)</span><span class="o"> </span><a href="../../05-expressions/05-strings#StringLiteral"><span class="k">StringLiteral</span></a><span class="o">;</span></pre>
 
 ```{ .ebnf #YulDecimalLiteral }