From 4bbad48d45ae7bde8a22198b33f790b7c792b319 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Fri, 22 Sep 2023 20:56:43 +0200
Subject: [PATCH] Update keyword versions (#599)

Non-controversial bits separated from #598.

This updates versions for the `revert` keyword (and the associated
statement, introduced in 0.8.4) and the `global` (introduced in 0.8.13
for the using directive) contextual keywords in both the new DSL and our
old YAML spec.

---------

Co-authored-by: Omar Tawfik <15987992+OmarTawfik@users.noreply.github.com>
---
 .changeset/rich-fans-mate.md                  |  5 ++
 .../04-imports/productions.yml                | 48 ++++++++-----
 .../07-keywords/productions.yml               | 26 +++----
 .../04-statements/01-blocks/productions.yml   | 16 ++++-
 .../04-error-handling/productions.yml         | 21 +++---
 crates/solidity/inputs/language/src/dsl.rs    | 22 +++---
 .../cargo/crate/src/generated/language.rs     | 34 ++++++---
 .../npm/crate/src/generated/language.rs       | 34 ++++++---
 .../04-imports/using-directive/0.4.11.md      |  5 ++
 .../{unversioned.md => 0.8.13.md}             |  0
 .../{unversioned.md => 0.8.13.md}             |  0
 .../{unversioned.md => 0.8.4.md}              |  0
 .../01-blocks/control-statement/0.4.11.md     |  1 -
 .../01-blocks/control-statement/0.4.21.md     |  1 -
 .../01-blocks/control-statement/0.5.0.md      |  1 -
 .../01-blocks/control-statement/0.6.0.md      |  1 -
 .../01-blocks/control-statement/0.8.4.md      | 15 ++++
 .../{unversioned.md => 0.8.4.md}              |  0
 .../generated/public/grammar/v0.4.11/index.md |  5 +-
 .../generated/public/grammar/v0.4.21/index.md |  5 +-
 .../generated/public/grammar/v0.4.22/index.md |  5 +-
 .../generated/public/grammar/v0.5.0/index.md  |  8 +--
 .../generated/public/grammar/v0.5.3/index.md  |  8 +--
 .../generated/public/grammar/v0.6.0/index.md  |  5 +-
 .../generated/public/grammar/v0.6.11/index.md |  5 +-
 .../generated/public/grammar/v0.6.2/index.md  |  5 +-
 .../generated/public/grammar/v0.6.5/index.md  |  5 +-
 .../generated/public/grammar/v0.7.0/index.md  |  5 +-
 .../generated/public/grammar/v0.7.1/index.md  |  5 +-
 .../generated/public/grammar/v0.7.4/index.md  |  5 +-
 .../generated/public/grammar/v0.8.0/index.md  |  5 +-
 .../generated/public/grammar/v0.8.13/index.md | 10 +--
 .../generated/public/grammar/v0.8.18/index.md | 10 +--
 .../generated/public/grammar/v0.8.19/index.md | 10 +--
 .../generated/public/grammar/v0.8.4/index.md  |  9 ++-
 .../generated/public/grammar/v0.8.8/index.md  |  9 ++-
 .../generated/0.4.11-failure.yml              |  2 +-
 .../generated/0.4.21-failure.yml              |  2 +-
 .../generated/0.5.0-failure.yml               |  2 +-
 .../generated/0.5.3-failure.yml               |  2 +-
 .../generated/0.6.0-failure.yml               |  2 +-
 .../generated/0.7.0-failure.yml               |  2 +-
 .../generated/0.8.0-failure.yml               |  2 +-
 .../generated/0.8.4-failure.yml               | 69 +++++++++++++++++++
 .../throw/generated/0.5.0-failure.yml         |  2 +-
 .../throw/generated/0.5.3-failure.yml         |  2 +-
 .../throw/generated/0.6.0-failure.yml         |  2 +-
 .../throw/generated/0.7.0-failure.yml         |  2 +-
 .../throw/generated/0.8.0-failure.yml         |  2 +-
 .../throw/generated/0.8.4-failure.yml         | 17 +++++
 .../generated/0.5.0-failure.yml               |  2 +-
 .../generated/0.5.3-failure.yml               |  2 +-
 .../generated/0.6.0-failure.yml               |  2 +-
 .../generated/0.7.0-failure.yml               |  2 +-
 .../generated/0.8.0-failure.yml               |  2 +-
 .../generated/0.8.4-failure.yml               | 21 ++++++
 .../generated/0.4.11-failure.yml              | 12 +++-
 .../generated/0.8.13-failure.yml              | 32 +++++++++
 .../generated/0.4.11-failure.yml              | 31 +++++++++
 ...{0.4.11-success.yml => 0.8.13-success.yml} |  0
 .../path_named/generated/0.4.11-failure.yml   | 27 ++++++++
 ...{0.4.11-success.yml => 0.8.13-success.yml} |  0
 .../generated/0.4.11-failure.yml              | 12 +++-
 .../generated/0.8.13-failure.yml              | 32 +++++++++
 64 files changed, 460 insertions(+), 176 deletions(-)
 create mode 100644 .changeset/rich-fans-mate.md
 create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md
 rename crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/{unversioned.md => 0.8.13.md} (100%)
 rename crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/{unversioned.md => 0.8.13.md} (100%)
 rename crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/{unversioned.md => 0.8.4.md} (100%)
 create mode 100644 crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md
 rename crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/{unversioned.md => 0.8.4.md} (100%)
 create mode 100644 crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml
 create mode 100644 crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.4-failure.yml
 create mode 100644 crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml
 create mode 100644 crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml
 create mode 100644 crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml
 rename crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/{0.4.11-success.yml => 0.8.13-success.yml} (100%)
 create mode 100644 crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml
 rename crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/{0.4.11-success.yml => 0.8.13-success.yml} (100%)
 create mode 100644 crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml

diff --git a/.changeset/rich-fans-mate.md b/.changeset/rich-fans-mate.md
new file mode 100644
index 0000000000..74b2bd6cb8
--- /dev/null
+++ b/.changeset/rich-fans-mate.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+Use correct versions for the `revert` and `global` keywords
diff --git a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
index 893c09c963..905b286e3a 100644
--- a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
+++ b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
@@ -69,22 +69,38 @@
 
 - name: "UsingDirective"
   kind: "Parser"
-  unversioned:
-    terminatedBy:
-      parser:
-        sequence:
-          - reference: "UsingKeyword"
-          - choice:
-              - reference: "UsingDirectivePath"
-              - reference: "UsingDirectiveDeconstruction"
-          - reference: "ForKeyword"
-          - choice:
-              - reference: "Asterisk"
-              - reference: "TypeName"
-          - optional:
-              reference: "GlobalKeyword"
-      terminator:
-        reference: "Semicolon"
+  versioned:
+    0.4.11:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "UsingKeyword"
+            - choice:
+                - reference: "UsingDirectivePath"
+                - reference: "UsingDirectiveDeconstruction"
+            - reference: "ForKeyword"
+            - choice:
+                - reference: "Asterisk"
+                - reference: "TypeName"
+        terminator:
+          reference: "Semicolon"
+    # Added an optional `global` keyword
+    0.8.13:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "UsingKeyword"
+            - choice:
+                - reference: "UsingDirectivePath"
+                - reference: "UsingDirectiveDeconstruction"
+            - reference: "ForKeyword"
+            - choice:
+                - reference: "Asterisk"
+                - reference: "TypeName"
+            - optional:
+                reference: "GlobalKeyword"
+        terminator:
+          reference: "Semicolon"
 
 - name: "UsingDirectivePath"
   kind: "Parser"
diff --git a/crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml
index 98800bbb79..0161499271 100644
--- a/crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml
+++ b/crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml
@@ -316,12 +316,13 @@
 
 - name: "GlobalKeyword"
   kind: "Scanner"
-  unversioned:
-    trailingContext:
-      scanner:
-        terminal: "global"
-      notFollowedBy:
-        reference: "IdentifierPart"
+  versioned:
+    0.8.13:
+      trailingContext:
+        scanner:
+          terminal: "global"
+        notFollowedBy:
+          reference: "IdentifierPart"
 
 - name: "GweiKeyword"
   kind: "Scanner"
@@ -562,12 +563,13 @@
 
 - name: "RevertKeyword"
   kind: "Scanner"
-  unversioned:
-    trailingContext:
-      scanner:
-        terminal: "revert"
-      notFollowedBy:
-        reference: "IdentifierPart"
+  versioned:
+    0.8.4:
+      trailingContext:
+        scanner:
+          terminal: "revert"
+        notFollowedBy:
+          reference: "IdentifierPart"
 
 - name: "SecondsKeyword"
   kind: "Scanner"
diff --git a/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml b/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml
index a858b15315..0b44122bba 100644
--- a/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml
+++ b/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml
@@ -50,7 +50,6 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "ThrowStatement"
     0.4.21:
       choice:
@@ -63,7 +62,6 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "ThrowStatement"
         - reference: "EmitStatement"
     0.5.0:
@@ -77,7 +75,6 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "EmitStatement"
     0.6.0:
       choice:
@@ -90,6 +87,19 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
+        - reference: "EmitStatement"
+        - reference: "TryStatement"
+    0.8.4:
+      choice:
+        # added: "RevertStatement"
+        - reference: "IfStatement"
+        - reference: "ForStatement"
+        - reference: "WhileStatement"
+        - reference: "DoWhileStatement"
+        - reference: "ContinueStatement"
+        - reference: "BreakStatement"
+        - reference: "DeleteStatement"
+        - reference: "ReturnStatement"
         - reference: "RevertStatement"
         - reference: "EmitStatement"
         - reference: "TryStatement"
diff --git a/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml b/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml
index bcd771264c..3b352691c5 100644
--- a/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml
+++ b/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml
@@ -40,16 +40,17 @@
 
 - name: "RevertStatement"
   kind: "Parser"
-  unversioned:
-    terminatedBy:
-      parser:
-        sequence:
-          - reference: "RevertKeyword"
-          - optional:
-              reference: "IdentifierPath"
-          - reference: "ArgumentsDeclaration"
-      terminator:
-        reference: "Semicolon"
+  versioned:
+    0.8.4:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "RevertKeyword"
+            - optional:
+                reference: "IdentifierPath"
+            - reference: "ArgumentsDeclaration"
+        terminator:
+          reference: "Semicolon"
 
 - name: "ThrowStatement"
   kind: "Parser"
diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs
index 96b38f224d..92a07cd413 100644
--- a/crates/solidity/inputs/language/src/dsl.rs
+++ b/crates/solidity/inputs/language/src/dsl.rs
@@ -66,7 +66,6 @@ slang_grammar! {
             | ForKeyword
             | FromKeyword
             | FunctionKeyword
-            | GlobalKeyword
             | HexKeyword
             | HoursKeyword
             | IfKeyword
@@ -97,7 +96,6 @@ slang_grammar! {
             | RelocatableKeyword
             | ReturnKeyword
             | ReturnsKeyword
-            | RevertKeyword
             | SecondsKeyword
             | SolidityKeyword
             | StaticKeyword
@@ -160,6 +158,10 @@ slang_grammar! {
 
             // Introduced in 0.8.4
             | ErrorKeyword
+            | RevertKeyword
+
+            // Introduced in 0.8.13
+            | GlobalKeyword
         ) ;
 
         parser ABICoderPragma = (ABICoderKeyword Identifier) ;
@@ -235,10 +237,11 @@ slang_grammar! {
         parser ContractMembersList = (ContractMember +) ;
 
         inline parser ControlStatement = (
-            IfStatement | ForStatement | WhileStatement | DoWhileStatement | ContinueStatement | BreakStatement | DeleteStatement | ReturnStatement | RevertStatement |
-            { introduced in "0.4.21" EmitStatement} |
+            IfStatement | ForStatement | WhileStatement | DoWhileStatement | ContinueStatement | BreakStatement | DeleteStatement | ReturnStatement |
+            { introduced in "0.4.21" EmitStatement } |
             { removed in "0.5.0"     ThrowStatement } |
-            { introduced in "0.6.0"  TryStatement}
+            { introduced in "0.6.0"  TryStatement } |
+            { introduced in "0.8.4"  RevertStatement }
         ) ;
 
         inline parser DataLocation = (
@@ -539,7 +542,7 @@ slang_grammar! {
 
         parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ;
 
-        parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) (GlobalKeyword ?)) terminated by Semicolon) ;
+        parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;
 
         parser UsingDirectiveDeconstruction = (UsingDirectiveSymbolsList delimited by OpenBrace and CloseBrace) ;
 
@@ -887,7 +890,6 @@ slang_grammar! {
     scanner ForKeyword = "for" ;
     scanner FromKeyword = "from" ;
     scanner FunctionKeyword = "function" ;
-    scanner GlobalKeyword = "global" ;
     scanner HexKeyword = "hex" ;
     scanner HoursKeyword = "hours" ;
     scanner IfKeyword = "if" ;
@@ -918,7 +920,6 @@ slang_grammar! {
     scanner RelocatableKeyword = "relocatable" ;
     scanner ReturnKeyword = "return" ;
     scanner ReturnsKeyword = "returns" ;
-    scanner RevertKeyword = "revert" ;
     scanner SecondsKeyword = "seconds" ;
     scanner SolidityKeyword = "solidity" ;
     scanner StaticKeyword = "static" ;
@@ -979,6 +980,9 @@ slang_grammar! {
     scanner UncheckedKeyword = { introduced in "0.8.0" "unchecked" } ;
 
     // Introduced in 0.8.4
-    scanner ErrorKeyword = { introduced in "0.8.4" "error" } ;
+    scanner ErrorKeyword =  { introduced in "0.8.4" "error" } ;
+    scanner RevertKeyword = { introduced in "0.8.4" "revert" } ;
 
+    // Introduced in 0.8.13
+    scanner GlobalKeyword = { introduced in "0.8.13" "global" } ;
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs
index 9d9eccc3d5..b65091b227 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/language.rs
+++ b/crates/solidity/outputs/cargo/crate/src/generated/language.rs
@@ -2886,8 +2886,6 @@ impl Language {
                 choice.consider(input, result)?;
                 let result = self.return_statement(input);
                 choice.consider(input, result)?;
-                let result = self.revert_statement(input);
-                choice.consider(input, result)?;
                 if self.version_is_at_least_0_4_21 {
                     let result = self.emit_statement(input);
                     choice.consider(input, result)?;
@@ -2900,6 +2898,10 @@ impl Language {
                     let result = self.try_statement(input);
                     choice.consider(input, result)?;
                 }
+                if self.version_is_at_least_0_8_4 {
+                    let result = self.revert_statement(input);
+                    choice.consider(input, result)?;
+                }
                 choice.finish(input)
             });
             choice.consider(input, result)?;
@@ -3491,9 +3493,11 @@ impl Language {
                         choice.consider(input, result)?;
                         choice.finish(input)
                     }))?;
-                    seq.elem(OptionalHelper::transform(
-                        self.default_parse_token_with_trivia(input, TokenKind::GlobalKeyword),
-                    ))?;
+                    if self.version_is_at_least_0_8_13 {
+                        seq.elem(OptionalHelper::transform(
+                            self.default_parse_token_with_trivia(input, TokenKind::GlobalKeyword),
+                        ))?;
+                    }
                     seq.finish()
                 })
                 .recover_until_with_nested_delims(
@@ -5349,8 +5353,14 @@ impl Lexer for Language {
                         None => None,
                     },
                     Some('g') => match input.next() {
-                        Some('l') => scan_chars!(input, 'o', 'b', 'a', 'l')
-                            .then_some(TokenKind::GlobalKeyword),
+                        Some('l') => {
+                            if self.version_is_at_least_0_8_13 {
+                                scan_chars!(input, 'o', 'b', 'a', 'l')
+                                    .then_some(TokenKind::GlobalKeyword)
+                            } else {
+                                None
+                            }
+                        }
                         Some('w') => {
                             if self.version_is_at_least_0_6_11 {
                                 scan_chars!(input, 'e', 'i').then_some(TokenKind::GweiKeyword)
@@ -5612,8 +5622,14 @@ impl Lexer for Language {
                                         None
                                     }
                                 }
-                                Some('v') => scan_chars!(input, 'e', 'r', 't')
-                                    .then_some(TokenKind::RevertKeyword),
+                                Some('v') => {
+                                    if self.version_is_at_least_0_8_4 {
+                                        scan_chars!(input, 'e', 'r', 't')
+                                            .then_some(TokenKind::RevertKeyword)
+                                    } else {
+                                        None
+                                    }
+                                }
                                 Some(_) => {
                                     input.undo();
                                     None
diff --git a/crates/solidity/outputs/npm/crate/src/generated/language.rs b/crates/solidity/outputs/npm/crate/src/generated/language.rs
index 9d9eccc3d5..b65091b227 100644
--- a/crates/solidity/outputs/npm/crate/src/generated/language.rs
+++ b/crates/solidity/outputs/npm/crate/src/generated/language.rs
@@ -2886,8 +2886,6 @@ impl Language {
                 choice.consider(input, result)?;
                 let result = self.return_statement(input);
                 choice.consider(input, result)?;
-                let result = self.revert_statement(input);
-                choice.consider(input, result)?;
                 if self.version_is_at_least_0_4_21 {
                     let result = self.emit_statement(input);
                     choice.consider(input, result)?;
@@ -2900,6 +2898,10 @@ impl Language {
                     let result = self.try_statement(input);
                     choice.consider(input, result)?;
                 }
+                if self.version_is_at_least_0_8_4 {
+                    let result = self.revert_statement(input);
+                    choice.consider(input, result)?;
+                }
                 choice.finish(input)
             });
             choice.consider(input, result)?;
@@ -3491,9 +3493,11 @@ impl Language {
                         choice.consider(input, result)?;
                         choice.finish(input)
                     }))?;
-                    seq.elem(OptionalHelper::transform(
-                        self.default_parse_token_with_trivia(input, TokenKind::GlobalKeyword),
-                    ))?;
+                    if self.version_is_at_least_0_8_13 {
+                        seq.elem(OptionalHelper::transform(
+                            self.default_parse_token_with_trivia(input, TokenKind::GlobalKeyword),
+                        ))?;
+                    }
                     seq.finish()
                 })
                 .recover_until_with_nested_delims(
@@ -5349,8 +5353,14 @@ impl Lexer for Language {
                         None => None,
                     },
                     Some('g') => match input.next() {
-                        Some('l') => scan_chars!(input, 'o', 'b', 'a', 'l')
-                            .then_some(TokenKind::GlobalKeyword),
+                        Some('l') => {
+                            if self.version_is_at_least_0_8_13 {
+                                scan_chars!(input, 'o', 'b', 'a', 'l')
+                                    .then_some(TokenKind::GlobalKeyword)
+                            } else {
+                                None
+                            }
+                        }
                         Some('w') => {
                             if self.version_is_at_least_0_6_11 {
                                 scan_chars!(input, 'e', 'i').then_some(TokenKind::GweiKeyword)
@@ -5612,8 +5622,14 @@ impl Lexer for Language {
                                         None
                                     }
                                 }
-                                Some('v') => scan_chars!(input, 'e', 'r', 't')
-                                    .then_some(TokenKind::RevertKeyword),
+                                Some('v') => {
+                                    if self.version_is_at_least_0_8_4 {
+                                        scan_chars!(input, 'e', 'r', 't')
+                                            .then_some(TokenKind::RevertKeyword)
+                                    } else {
+                                        None
+                                    }
+                                }
                                 Some(_) => {
                                     input.undo();
                                     None
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md
new file mode 100644
index 0000000000..b5ace54ca0
--- /dev/null
+++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md
@@ -0,0 +1,5 @@
+<!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
+
+```{ .ebnf .slang-ebnf #UsingDirective }
+UsingDirective = USING_KEYWORD (UsingDirectivePath | UsingDirectiveDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) SEMICOLON;
+```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md
similarity index 100%
rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md
rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/0.8.13.md
similarity index 100%
rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md
rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/0.8.13.md
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md
similarity index 100%
rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md
rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.11.md
index c44a3ca248..94eac997b9 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.11.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.11.md
@@ -9,6 +9,5 @@
                    | BreakStatement
                    | DeleteStatement
                    | ReturnStatement
-                   | RevertStatement
                    | ThrowStatement;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.21.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.21.md
index b06ce615c4..47c92d6521 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.21.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.21.md
@@ -9,7 +9,6 @@
                    | BreakStatement
                    | DeleteStatement
                    | ReturnStatement
-                   | RevertStatement
                    | ThrowStatement
                    | EmitStatement;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.5.0.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.5.0.md
index 1546d36778..f2dd12d9f6 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.5.0.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.5.0.md
@@ -9,6 +9,5 @@
                    | BreakStatement
                    | DeleteStatement
                    | ReturnStatement
-                   | RevertStatement
                    | EmitStatement;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md
index c59144ce13..268794fa4b 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md
@@ -9,7 +9,6 @@
                    | BreakStatement
                    | DeleteStatement
                    | ReturnStatement
-                   | RevertStatement
                    | EmitStatement
                    | TryStatement;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md
new file mode 100644
index 0000000000..c59144ce13
--- /dev/null
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md
@@ -0,0 +1,15 @@
+<!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
+
+```{ .ebnf .slang-ebnf #ControlStatement }
+«ControlStatement» = IfStatement
+                   | ForStatement
+                   | WhileStatement
+                   | DoWhileStatement
+                   | ContinueStatement
+                   | BreakStatement
+                   | DeleteStatement
+                   | ReturnStatement
+                   | RevertStatement
+                   | EmitStatement
+                   | TryStatement;
+```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md
similarity index 100%
rename from crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md
rename to crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md
index a1ff66c742..62792c7b43 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -78,7 +78,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -102,7 +101,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -296,7 +294,6 @@
 
 ### 4.4. Error Handling
 
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/throw-statement/0.4.11.md"
 
 ## 5. Expressions
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md
index bdf253439d..ae9e7aeee8 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -79,7 +79,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -103,7 +102,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -298,7 +296,6 @@
 
 ### 4.4. Error Handling
 
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/throw-statement/0.4.11.md"
 
 ## 5. Expressions
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md
index 95ba163d1f..03e8b891de 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -80,7 +80,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -104,7 +103,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -302,7 +300,6 @@
 
 ### 4.4. Error Handling
 
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/throw-statement/0.4.11.md"
 
 ## 5. Expressions
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md
index 068f6c01ba..75f5a29065 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -81,7 +81,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -105,7 +104,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -298,10 +296,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/03-control-statements/emit-statement/0.4.21.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/03-control-statements/delete-statement/unversioned.md"
 
-### 4.4. Error Handling
-
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
-
 ## 5. Expressions
 
 ### 5.1. Base Expressions
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md
index e0f7a4a8e1..d947c08bf8 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -81,7 +81,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -105,7 +104,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -299,10 +297,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/03-control-statements/emit-statement/0.4.21.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/03-control-statements/delete-statement/unversioned.md"
 
-### 4.4. Error Handling
-
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
-
 ## 5. Expressions
 
 ### 5.1. Base Expressions
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md
index f303a90afd..ec3f673c9c 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -83,7 +83,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -108,7 +107,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -313,7 +311,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md
index 0a29717cc0..48fe5df771 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -83,7 +83,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -110,7 +109,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -315,7 +313,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md
index a60d5dbc7a..bb82c3ae39 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -83,7 +83,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/import-keyword/unversioned.md"
@@ -108,7 +107,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -313,7 +311,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md
index ffb804fdba..9eb94e705f 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -83,7 +83,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/immutable-keyword/0.6.5.md"
@@ -109,7 +108,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -314,7 +312,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md
index 35120d5136..968d646bc5 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +108,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -313,7 +311,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md
index 22ab9053de..88f48ef828 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +108,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -313,7 +311,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md
index 946d51a290..044a2c9423 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +108,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -317,7 +315,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md
index 2c3b0e3892..0a6544243f 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -81,7 +81,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -108,7 +107,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -318,7 +316,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md
index 15d31895cd..bfd4f5248a 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +109,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -297,7 +297,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/expression-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/unchecked-block/0.8.0.md"
@@ -329,7 +329,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md
index 0b801bcb29..ba6cdd2bd2 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +109,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -297,7 +297,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/expression-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/unchecked-block/0.8.0.md"
@@ -329,7 +329,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md
index 7621dc54b9..f58c99a45f 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -83,7 +83,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -110,7 +110,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -298,7 +298,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/expression-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/unchecked-block/0.8.0.md"
@@ -330,7 +330,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md
index 2d4fd13d81..477d0890ea 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +108,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -293,7 +292,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/expression-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/unchecked-block/0.8.0.md"
@@ -325,7 +324,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md
index e81900e822..655748badb 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md
@@ -32,7 +32,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/unversioned.md"
@@ -82,7 +82,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/for-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/from-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/function-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/global-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/gwei-keyword/0.6.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/hours-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/if-keyword/unversioned.md"
@@ -109,7 +108,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/receive-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/return-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/returns-keyword/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/revert-keyword/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/seconds-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/solidity-keyword/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/07-keywords/storage-keyword/unversioned.md"
@@ -297,7 +296,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/expression-statement/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/unchecked-block/0.8.0.md"
@@ -329,7 +328,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/unversioned.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md"
 
 ## 5. Expressions
 
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml
index ed2cb06a10..3e0eb63032 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or ThrowKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or VarKeyword or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or ThrowKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or VarKeyword or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml
index 6db8a7025b..7a9ed5c3be 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or ThrowKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or VarKeyword or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or ThrowKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or VarKeyword or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml
index f190785f69..845262152f 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml
index 631a41103e..315b52aec8 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml
index 0149fa40f4..f12f9bd170 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml
index b2f05e1b18..cceec63bfa 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml
index 7a6dc64944..16467394a4 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml
@@ -18,7 +18,7 @@ Errors: # 2 total
        │ ╰──────────── Error occurred here.
     ───╯
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
        │
      4 │     })
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml
new file mode 100644
index 0000000000..7a6dc64944
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml
@@ -0,0 +1,69 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ function someFunc() public {                                                     │ 0..28
+  2  │     {                                                                            │ 29..34
+  3  │         uint256 arg = (1 + 2;                                                    │ 35..64
+  4  │     })                                                                           │ 65..71
+  5  │ }                                                                                │ 72..73
+
+Errors: # 2 total
+  - >
+    Error: Expected CloseParen or Comma.
+       ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29]
+       │
+     3 │ ╭─▶         uint256 arg = (1 + 2;
+     4 │ ├─▶     })
+       │ │            
+       │ ╰──────────── Error occurred here.
+    ───╯
+  - >
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6]
+       │
+     4 │     })
+       │      ─┬  
+       │       ╰── Error occurred here.
+    ───╯
+
+Tree:
+  - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n    {\n        uint256..."
+      - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n    {\n        uint256..."
+          - FunctionKeyword (Token): "function" # 0..8
+          - Identifier (Token): "someFunc" # 9..17
+          - ParametersDeclaration (Rule): # 17..19 "()"
+              - OpenParen (Token): "(" # 17..18
+              - CloseParen (Token): ")" # 18..19
+          - FunctionAttributesList (Rule): # 19..26 " public"
+              - PublicKeyword (Token): "public" # 20..26
+          - Block (Rule): # 26..74 " {\n    {\n        uint256 arg = (1 + 2;\n    })\n}\n"
+              - OpenBrace (Token): "{" # 27..28
+              - StatementsList (Rule): # 29..70 "    {\n        uint256 arg = (1 + 2;\n    }"
+                  - Statement (Rule): # 29..70 "    {\n        uint256 arg = (1 + 2;\n    }"
+                      - Block (Rule): # 29..70 "    {\n        uint256 arg = (1 + 2;\n    }"
+                          - OpenBrace (Token): "{" # 33..34
+                          - StatementsList (Rule): # 35..63 "        uint256 arg = (1 + 2"
+                              - Statement (Rule): # 35..63 "        uint256 arg = (1 + 2"
+                                  - VariableDeclarationStatement (Rule): # 35..63 "        uint256 arg = (1 + 2"
+                                      - VariableDeclaration (Rule): # 35..54 "        uint256 arg"
+                                          - TypeName (Rule): # 35..50 "        uint256"
+                                              - UnsignedIntegerType (Token): "uint256" # 43..50
+                                          - Identifier (Token): "arg" # 51..54
+                                      - Equal (Token): "=" # 55..56
+                                      - Expression (Rule): # 56..63 " (1 + 2"
+                                          - TupleExpression (Rule): # 56..63 " (1 + 2"
+                                              - OpenParen (Token): "(" # 57..58
+                                              - TupleValuesList (Rule): # 58..63 "1 + 2"
+                                                  - Expression (Rule): # 58..63 "1 + 2"
+                                                      - BinaryExpression (Rule): # 58..63 "1 + 2"
+                                                          - Expression (Rule): # 58..59 "1"
+                                                              - NumericExpression (Rule): # 58..59 "1"
+                                                                  - DecimalLiteral (Token): "1" # 58..59
+                                                          - Plus (Token): "+" # 60..61
+                                                          - Expression (Rule): # 61..63 " 2"
+                                                              - NumericExpression (Rule): # 61..63 " 2"
+                                                                  - DecimalLiteral (Token): "2" # 62..63
+                          - SKIPPED (Token): ";\n    " # 63..69
+                          - CloseBrace (Token): "}" # 69..70
+              - SKIPPED (Token): ")\n" # 70..72
+              - CloseBrace (Token): "}" # 72..73
diff --git a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.0-failure.yml
index 792741d506..e4823e05c0 100644
--- a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.0-failure.yml
@@ -5,7 +5,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/Statement/throw/input.sol:1:1]
        │
      1 │ throw;
diff --git a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.3-failure.yml
index 08a3c6493f..bf79d5d864 100644
--- a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.3-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.5.3-failure.yml
@@ -5,7 +5,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/Statement/throw/input.sol:1:1]
        │
      1 │ throw;
diff --git a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.6.0-failure.yml
index 9709cb9d10..4f682bf08a 100644
--- a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.6.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.6.0-failure.yml
@@ -5,7 +5,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/Statement/throw/input.sol:1:1]
        │
      1 │ throw;
diff --git a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.7.0-failure.yml
index 348a357708..022ddc0b29 100644
--- a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.7.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.7.0-failure.yml
@@ -5,7 +5,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/Statement/throw/input.sol:1:1]
        │
      1 │ throw;
diff --git a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.0-failure.yml
index 29a0d7262f..d4980c6f25 100644
--- a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.0-failure.yml
@@ -5,7 +5,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/Statement/throw/input.sol:1:1]
        │
      1 │ throw;
diff --git a/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.4-failure.yml
new file mode 100644
index 0000000000..29a0d7262f
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/Statement/throw/generated/0.8.4-failure.yml
@@ -0,0 +1,17 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ throw;                                                                           │ 0..6
+
+Errors: # 1 total
+  - >
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/Statement/throw/input.sol:1:1]
+       │
+     1 │ throw;
+       │ ───┬──  
+       │    ╰──── Error occurred here.
+    ───╯
+
+Tree:
+  - SKIPPED (Token): "throw;" # 0..6
diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml
index 128b2180dc..d72fc195d9 100644
--- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml
@@ -7,7 +7,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1]
        │
      1 │ ╭─▶ 
diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml
index 8f96802e9d..436b161b09 100644
--- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml
@@ -7,7 +7,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1]
        │
      1 │ ╭─▶ 
diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml
index 6899bab91e..aaba004eb5 100644
--- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml
@@ -7,7 +7,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1]
        │
      1 │ ╭─▶ 
diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml
index 69576a0465..49eb0859f7 100644
--- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml
@@ -7,7 +7,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1]
        │
      1 │ ╭─▶ 
diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml
index 7e1c46db26..6b2868ad1b 100644
--- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml
@@ -7,7 +7,7 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
        ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1]
        │
      1 │ ╭─▶ 
diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml
new file mode 100644
index 0000000000..7e1c46db26
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml
@@ -0,0 +1,21 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │                                                                                  │ 0..0
+  2  │ throw invalid ;                                                                  │ 1..16
+  3  │ { 1 * 2; 3 * b invalid; }                                                        │ 17..42
+
+Errors: # 1 total
+  - >
+    Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1]
+       │
+     1 │ ╭─▶ 
+       ┆ ┆   
+     3 │ ├─▶ { 1 * 2; 3 * b invalid; }
+       │ │                               
+       │ ╰─────────────────────────────── Error occurred here.
+    ───╯
+
+Tree:
+  - SKIPPED (Token): "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # 0..43
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml
index ce5ecd3db2..83b7c99b99 100644
--- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml
@@ -3,7 +3,7 @@
 Source: >
   1  │ using {add as +, sub, mul, div as /} for Int global;                             │ 0..52
 
-Errors: # 1 total
+Errors: # 2 total
   - >
     Error: Expected CloseBrace or Comma.
        ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/input.sol:1:12]
@@ -12,6 +12,14 @@ Errors: # 1 total
        │            ────────────┬───────────  
        │                        ╰───────────── Error occurred here.
     ───╯
+  - >
+    Error: Expected OpenBracket or Semicolon.
+       ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/input.sol:1:46]
+       │
+     1 │ using {add as +, sub, mul, div as /} for Int global;
+       │                                              ───┬──  
+       │                                                 ╰──── Error occurred here.
+    ───╯
 
 Tree:
   - UsingDirective (Rule): # 0..52 "using {add as +, sub, mul, div as /} for Int globa..."
@@ -28,5 +36,5 @@ Tree:
       - TypeName (Rule): # 40..44 " Int"
           - IdentifierPath (Rule): # 40..44 " Int"
               - Identifier (Token): "Int" # 41..44
-      - GlobalKeyword (Token): "global" # 45..51
+      - SKIPPED (Token): "global" # 45..51
       - Semicolon (Token): ";" # 51..52
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml
new file mode 100644
index 0000000000..ce5ecd3db2
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml
@@ -0,0 +1,32 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ using {add as +, sub, mul, div as /} for Int global;                             │ 0..52
+
+Errors: # 1 total
+  - >
+    Error: Expected CloseBrace or Comma.
+       ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/input.sol:1:12]
+       │
+     1 │ using {add as +, sub, mul, div as /} for Int global;
+       │            ────────────┬───────────  
+       │                        ╰───────────── Error occurred here.
+    ───╯
+
+Tree:
+  - UsingDirective (Rule): # 0..52 "using {add as +, sub, mul, div as /} for Int globa..."
+      - UsingKeyword (Token): "using" # 0..5
+      - UsingDirectiveDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}"
+          - OpenBrace (Token): "{" # 6..7
+          - UsingDirectiveSymbolsList (Rule): # 7..10 "add"
+              - UsingDirectiveSymbol (Rule): # 7..10 "add"
+                  - IdentifierPath (Rule): # 7..10 "add"
+                      - Identifier (Token): "add" # 7..10
+          - SKIPPED (Token): "as +, sub, mul, div as /" # 11..35
+          - CloseBrace (Token): "}" # 35..36
+      - ForKeyword (Token): "for" # 37..40
+      - TypeName (Rule): # 40..44 " Int"
+          - IdentifierPath (Rule): # 40..44 " Int"
+              - Identifier (Token): "Int" # 41..44
+      - GlobalKeyword (Token): "global" # 45..51
+      - Semicolon (Token): ";" # 51..52
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml
new file mode 100644
index 0000000000..125e8d1e4d
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml
@@ -0,0 +1,31 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ using {add} for Int global;                                                      │ 0..27
+
+Errors: # 1 total
+  - >
+    Error: Expected OpenBracket or Semicolon.
+       ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/input.sol:1:21]
+       │
+     1 │ using {add} for Int global;
+       │                     ───┬──  
+       │                        ╰──── Error occurred here.
+    ───╯
+
+Tree:
+  - UsingDirective (Rule): # 0..27 "using {add} for Int global;"
+      - UsingKeyword (Token): "using" # 0..5
+      - UsingDirectiveDeconstruction (Rule): # 5..11 " {add}"
+          - OpenBrace (Token): "{" # 6..7
+          - UsingDirectiveSymbolsList (Rule): # 7..10 "add"
+              - UsingDirectiveSymbol (Rule): # 7..10 "add"
+                  - IdentifierPath (Rule): # 7..10 "add"
+                      - Identifier (Token): "add" # 7..10
+          - CloseBrace (Token): "}" # 10..11
+      - ForKeyword (Token): "for" # 12..15
+      - TypeName (Rule): # 15..19 " Int"
+          - IdentifierPath (Rule): # 15..19 " Int"
+              - Identifier (Token): "Int" # 16..19
+      - SKIPPED (Token): "global" # 20..26
+      - Semicolon (Token): ";" # 26..27
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.8.13-success.yml
similarity index 100%
rename from crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-success.yml
rename to crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.8.13-success.yml
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml
new file mode 100644
index 0000000000..d4a79bcd2d
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml
@@ -0,0 +1,27 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ using foo for bar global;                                                        │ 0..25
+
+Errors: # 1 total
+  - >
+    Error: Expected OpenBracket or Semicolon.
+       ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/input.sol:1:19]
+       │
+     1 │ using foo for bar global;
+       │                   ───┬──  
+       │                      ╰──── Error occurred here.
+    ───╯
+
+Tree:
+  - UsingDirective (Rule): # 0..25 "using foo for bar global;"
+      - UsingKeyword (Token): "using" # 0..5
+      - UsingDirectivePath (Rule): # 5..9 " foo"
+          - IdentifierPath (Rule): # 5..9 " foo"
+              - Identifier (Token): "foo" # 6..9
+      - ForKeyword (Token): "for" # 10..13
+      - TypeName (Rule): # 13..17 " bar"
+          - IdentifierPath (Rule): # 13..17 " bar"
+              - Identifier (Token): "bar" # 14..17
+      - SKIPPED (Token): "global" # 18..24
+      - Semicolon (Token): ";" # 24..25
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml
similarity index 100%
rename from crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-success.yml
rename to crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml
index bc1b7ac2a0..9fb9e654a4 100644
--- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml
@@ -3,7 +3,7 @@
 Source: >
   1  │ using {div as /} for Int global;                                                 │ 0..32
 
-Errors: # 1 total
+Errors: # 2 total
   - >
     Error: Expected CloseBrace or Comma.
        ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/input.sol:1:12]
@@ -12,6 +12,14 @@ Errors: # 1 total
        │            ──┬─  
        │              ╰─── Error occurred here.
     ───╯
+  - >
+    Error: Expected OpenBracket or Semicolon.
+       ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/input.sol:1:26]
+       │
+     1 │ using {div as /} for Int global;
+       │                          ───┬──  
+       │                             ╰──── Error occurred here.
+    ───╯
 
 Tree:
   - UsingDirective (Rule): # 0..32 "using {div as /} for Int global;"
@@ -28,5 +36,5 @@ Tree:
       - TypeName (Rule): # 20..24 " Int"
           - IdentifierPath (Rule): # 20..24 " Int"
               - Identifier (Token): "Int" # 21..24
-      - GlobalKeyword (Token): "global" # 25..31
+      - SKIPPED (Token): "global" # 25..31
       - Semicolon (Token): ";" # 31..32
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml
new file mode 100644
index 0000000000..bc1b7ac2a0
--- /dev/null
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml
@@ -0,0 +1,32 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ using {div as /} for Int global;                                                 │ 0..32
+
+Errors: # 1 total
+  - >
+    Error: Expected CloseBrace or Comma.
+       ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/input.sol:1:12]
+       │
+     1 │ using {div as /} for Int global;
+       │            ──┬─  
+       │              ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - UsingDirective (Rule): # 0..32 "using {div as /} for Int global;"
+      - UsingKeyword (Token): "using" # 0..5
+      - UsingDirectiveDeconstruction (Rule): # 5..16 " {div as /}"
+          - OpenBrace (Token): "{" # 6..7
+          - UsingDirectiveSymbolsList (Rule): # 7..10 "div"
+              - UsingDirectiveSymbol (Rule): # 7..10 "div"
+                  - IdentifierPath (Rule): # 7..10 "div"
+                      - Identifier (Token): "div" # 7..10
+          - SKIPPED (Token): "as /" # 11..15
+          - CloseBrace (Token): "}" # 15..16
+      - ForKeyword (Token): "for" # 17..20
+      - TypeName (Rule): # 20..24 " Int"
+          - IdentifierPath (Rule): # 20..24 " Int"
+              - Identifier (Token): "Int" # 21..24
+      - GlobalKeyword (Token): "global" # 25..31
+      - Semicolon (Token): ";" # 31..32