Split the NumericExpression CST tests

Now that we can't reliably expose this parser starting from DSL v2, let's test individual choices
NomicFoundation · Nov 15, 2023 · 9246eb0 · 9246eb0
1 parent 05203a5
commit 9246eb0
Show file tree

Hide file tree

Showing 54 changed files with 160 additions and 154 deletions.
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/DecimalNumberExpression.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/DecimalNumberExpression.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexNumberExpression.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexNumberExpression.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/NumericExpression.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/NumericExpression.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/tests/src/tests/cst-cursor.ts b/crates/solidity/outputs/npm/tests/src/tests/cst-cursor.ts
@@ -61,7 +61,7 @@ test("use cursor", () => {
   expectRule(cursor.node(), RuleKind.Expression);
   expect(cursor.goToNext()).toBe(true);
 
-  expectRule(cursor.node(), RuleKind.NumericExpression);
+  expectRule(cursor.node(), RuleKind.DecimalNumberExpression);
   expect(cursor.goToNext()).toBe(true);
 
   expectRule(cursor.node(), RuleKind.LeadingTrivia);
@@ -85,7 +85,7 @@ test("use cursor", () => {
   expectRule(cursor.node(), RuleKind.Expression);
   expect(cursor.goToNext()).toBe(true);
 
-  expectRule(cursor.node(), RuleKind.NumericExpression);
+  expectRule(cursor.node(), RuleKind.DecimalNumberExpression);
   expect(cursor.goToNext()).toBe(true);
 
   expectRule(cursor.node(), RuleKind.LeadingTrivia);

diff --git a/crates/solidity/outputs/npm/tests/src/tests/cst-output.ts b/crates/solidity/outputs/npm/tests/src/tests/cst-output.ts
@@ -6,8 +6,8 @@ test("parse token", () => {
   const source = "5_286_981";
   const language = new Language("0.8.1");
 
-  const parseTree = language.parse(ProductionKind.NumericExpression, source).tree();
-  expectRule(parseTree, RuleKind.NumericExpression);
+  const parseTree = language.parse(ProductionKind.DecimalNumberExpression, source).tree();
+  expectRule(parseTree, RuleKind.DecimalNumberExpression);
 
   const children = parseTree.children();
   expect(children).toHaveLength(1);

diff --git a/...on/days_unit/generated/0.4.11-success.yml → ...on/days_unit/generated/0.4.11-success.yml b/...on/days_unit/generated/0.4.11-success.yml → ...on/days_unit/generated/0.4.11-success.yml
@@ -6,6 +6,6 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..7 "10 days"
+  - DecimalNumberExpression (Rule): # 0..7 "10 days"
       - DecimalLiteral (Token): "10" # 0..2
       - DaysKeyword (Token): "days" # 3..7
diff --git a/...put/NumericExpression/days_unit/input.sol → ...cimalNumberExpression/days_unit/input.sol b/...put/NumericExpression/days_unit/input.sol → ...cimalNumberExpression/days_unit/input.sol
diff --git a/...imal_no_unit/generated/0.4.11-success.yml → ...imal_no_unit/generated/0.4.11-success.yml b/...imal_no_unit/generated/0.4.11-success.yml → ...imal_no_unit/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..9 "123456789"
+  - DecimalNumberExpression (Rule): # 0..9 "123456789"
       - DecimalLiteral (Token): "123456789" # 0..9
diff --git a/...mericExpression/decimal_no_unit/input.sol → ...umberExpression/decimal_no_unit/input.sol b/...mericExpression/decimal_no_unit/input.sol → ...umberExpression/decimal_no_unit/input.sol
diff --git a/..._ident_start/generated/0.4.11-failure.yml → ..._ident_start/generated/0.4.11-failure.yml b/..._ident_start/generated/0.4.11-failure.yml → ..._ident_start/generated/0.4.11-failure.yml
@@ -5,8 +5,8 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected DecimalLiteral or HexLiteral.
-       ╭─[crates/solidity/testing/snapshots/cst_output/NumericExpression/decimal_trailing_ident_start/input.sol:1:1]
+    Error: Expected DecimalLiteral.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/decimal_trailing_ident_start/input.sol:1:1]
        │
      1 │ 1a
        │ ─┬─  

diff --git a/...on/decimal_trailing_ident_start/input.sol → ...on/decimal_trailing_ident_start/input.sol b/...on/decimal_trailing_ident_start/input.sol → ...on/decimal_trailing_ident_start/input.sol
diff --git a/...n/ether_unit/generated/0.4.11-success.yml → ...n/ether_unit/generated/0.4.11-success.yml b/...n/ether_unit/generated/0.4.11-success.yml → ...n/ether_unit/generated/0.4.11-success.yml
@@ -6,6 +6,6 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..8 "10 ether"
+  - DecimalNumberExpression (Rule): # 0..8 "10 ether"
       - DecimalLiteral (Token): "10" # 0..2
       - EtherKeyword (Token): "ether" # 3..8
diff --git a/...ut/NumericExpression/ether_unit/input.sol → ...imalNumberExpression/ether_unit/input.sol b/...ut/NumericExpression/ether_unit/input.sol → ...imalNumberExpression/ether_unit/input.sol
diff --git a/...ession/float/generated/0.4.11-success.yml → ...ession/float/generated/0.4.11-success.yml b/...ession/float/generated/0.4.11-success.yml → ...ession/float/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..3 "1.2"
+  - DecimalNumberExpression (Rule): # 0..3 "1.2"
       - DecimalLiteral (Token): "1.2" # 0..3
diff --git a/..._output/NumericExpression/float/input.sol → ...t/DecimalNumberExpression/float/input.sol b/..._output/NumericExpression/float/input.sol → ...t/DecimalNumberExpression/float/input.sol
diff --git a/..._no_fraction/generated/0.4.11-success.yml → ..._no_fraction/generated/0.4.11-success.yml b/..._no_fraction/generated/0.4.11-success.yml → ..._no_fraction/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..2 "1."
+  - DecimalNumberExpression (Rule): # 0..2 "1."
       - DecimalLiteral (Token): "1." # 0..2
diff --git a/...t_no_fraction/generated/0.5.0-failure.yml → ...t_no_fraction/generated/0.5.0-failure.yml b/...t_no_fraction/generated/0.5.0-failure.yml → ...t_no_fraction/generated/0.5.0-failure.yml
@@ -5,8 +5,8 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected DecimalLiteral or HexLiteral.
-       ╭─[crates/solidity/testing/snapshots/cst_output/NumericExpression/float_no_fraction/input.sol:1:1]
+    Error: Expected DecimalLiteral.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_no_fraction/input.sol:1:1]
        │
      1 │ 1.
        │ ─┬  

diff --git a/...ricExpression/float_no_fraction/input.sol → ...berExpression/float_no_fraction/input.sol b/...ricExpression/float_no_fraction/input.sol → ...berExpression/float_no_fraction/input.sol
diff --git a/..._no_mantissa/generated/0.4.11-success.yml → ..._no_mantissa/generated/0.4.11-success.yml b/..._no_mantissa/generated/0.4.11-success.yml → ..._no_mantissa/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..2 ".2"
+  - DecimalNumberExpression (Rule): # 0..2 ".2"
       - DecimalLiteral (Token): ".2" # 0..2
diff --git a/...ricExpression/float_no_mantissa/input.sol → ...berExpression/float_no_mantissa/input.sol b/...ricExpression/float_no_mantissa/input.sol → ...berExpression/float_no_mantissa/input.sol
diff --git a/...sion/integer/generated/0.4.11-success.yml → ...sion/integer/generated/0.4.11-success.yml b/...sion/integer/generated/0.4.11-success.yml → ...sion/integer/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..3 "123"
+  - DecimalNumberExpression (Rule): # 0..3 "123"
       - DecimalLiteral (Token): "123" # 0..3
diff --git a/...utput/NumericExpression/integer/input.sol → ...DecimalNumberExpression/integer/input.sol b/...utput/NumericExpression/integer/input.sol → ...DecimalNumberExpression/integer/input.sol
diff --git a/...ith_exponent/generated/0.4.11-success.yml → ...ith_exponent/generated/0.4.11-success.yml b/...ith_exponent/generated/0.4.11-success.yml → ...ith_exponent/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..3 "1e2"
+  - DecimalNumberExpression (Rule): # 0..3 "1e2"
       - DecimalLiteral (Token): "1e2" # 0..3
diff --git a/...xpression/integer_with_exponent/input.sol → ...xpression/integer_with_exponent/input.sol b/...xpression/integer_with_exponent/input.sol → ...xpression/integer_with_exponent/input.sol
diff --git a/...h_separators/generated/0.4.11-success.yml → ...h_separators/generated/0.4.11-success.yml b/...h_separators/generated/0.4.11-success.yml → ...h_separators/generated/0.4.11-success.yml
@@ -6,5 +6,5 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..5 "1_2_3"
+  - DecimalNumberExpression (Rule): # 0..5 "1_2_3"
       - DecimalLiteral (Token): "1_2_3" # 0..5
diff --git a/...ression/integer_with_separators/input.sol → ...ression/integer_with_separators/input.sol b/...ression/integer_with_separators/input.sol → ...ression/integer_with_separators/input.sol
diff --git a/...n/years_unit/generated/0.4.11-success.yml → ...n/years_unit/generated/0.4.11-success.yml b/...n/years_unit/generated/0.4.11-success.yml → ...n/years_unit/generated/0.4.11-success.yml
@@ -6,6 +6,6 @@ Source: >
 Errors: []
 
 Tree:
-  - NumericExpression (Rule): # 0..9 "10 years\n"
+  - DecimalNumberExpression (Rule): # 0..9 "10 years\n"
       - DecimalLiteral (Token): "10" # 0..2
       - YearsKeyword (Token): "years" # 3..8
diff --git a/...on/years_unit/generated/0.5.0-failure.yml → ...on/years_unit/generated/0.5.0-failure.yml b/...on/years_unit/generated/0.5.0-failure.yml → ...on/years_unit/generated/0.5.0-failure.yml
@@ -6,14 +6,14 @@ Source: >
 Errors: # 1 total
   - >
     Error: Expected DaysKeyword or EtherKeyword or FinneyKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or SzaboKeyword or WeeksKeyword or WeiKeyword.
-       ╭─[crates/solidity/testing/snapshots/cst_output/NumericExpression/years_unit/input.sol:1:3]
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/input.sol:1:3]
        │
      1 │ 10 years
        │   ───┬───  
        │      ╰───── Error occurred here.
     ───╯
 
 Tree:
-  - NumericExpression (Rule): # 0..9 "10 years\n"
+  - DecimalNumberExpression (Rule): # 0..9 "10 years\n"
       - DecimalLiteral (Token): "10" # 0..2
       - SKIPPED (Token): " years\n" # 2..9