Inline the (Yul)Statement parser in v0/v1

NomicFoundation · Nov 15, 2023 · 94380bc · 94380bc
1 parent 5aa988f
commit 94380bc
Show file tree

Hide file tree

Showing 74 changed files with 2,118 additions and 1,805 deletions.
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
@@ -20,6 +20,7 @@
 
 - name: "Statement"
   kind: "Parser"
+  inlined: true
   versioned:
     0.4.11:
       choice:

diff --git a/crates/solidity/inputs/language/definition/06-yul/02-yul-statements/productions.yml b/crates/solidity/inputs/language/definition/06-yul/02-yul-statements/productions.yml
@@ -20,6 +20,7 @@
 
 - name: "YulStatement"
   kind: "Parser"
+  inlined: true
   versioned:
     0.4.11:
       choice:

diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs
@@ -491,7 +491,7 @@ slang_grammar! {
 
         parser StateVariableDefinition = ((TypeName (StateVariableAttributesList ?) Identifier ((Equal Expression) ?)) terminated by Semicolon) ;
 
-        parser Statement = (
+        inline parser Statement = (
             SimpleStatement | ControlStatement | AssemblyStatement | Block | { introduced in "0.8.0" UncheckedBlock }
         ) ;
 
@@ -666,7 +666,7 @@ slang_grammar! {
 
         parser YulReturnsDeclaration = (MinusGreaterThan YulIdentifiersList) ;
 
-        parser YulStatement = (
+        inline parser YulStatement = (
             YulBlock | YulFunctionDefinition | YulDeclarationStatement | YulAssignmentStatement | YulIfStatement |
             YulForStatement | YulSwitchStatement | { introduced in "0.6.0" YulLeaveStatement } |
             YulBreakStatement | YulContinueStatement | YulExpression

diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/ThrowStatement.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/ThrowStatement.rs
diff --git a/...sts/src/cst_output/generated/Statement.rs → .../src/cst_output/generated/TryStatement.rs b/...sts/src/cst_output/generated/Statement.rs → .../src/cst_output/generated/TryStatement.rs
diff --git a/.../src/cst_output/generated/YulStatement.rs → ...cst_output/generated/YulLeaveStatement.rs b/.../src/cst_output/generated/YulStatement.rs → ...cst_output/generated/YulLeaveStatement.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs
diff --git a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs