Merge branch 'parse-numeric-methods' into sanctuary-fixes

Xanewok · Mar 9, 2024 · aad75bf · aad75bf
2 parents 6cc963c + 788f76d
commit aad75bf
Show file tree

Hide file tree

Showing 33 changed files with 441 additions and 5 deletions.
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -3703,6 +3703,21 @@ codegen_language_macros::compile!(Language(
                                         not_followed_by = Fragment(IdentifierStart)
                                     )
                                 ),
+                                // Since 0.5.0, only consume a dot if it's followed by a digit:
+                                TokenDefinition(
+                                    enabled = From("0.5.0"),
+                                    scanner = TrailingContext(
+                                        scanner = Sequence([
+                                            Fragment(DecimalDigits),
+                                            Optional(Sequence([
+                                                Atom("."),
+                                                Fragment(DecimalDigits)
+                                            ])),
+                                            Optional(Fragment(DecimalExponent))
+                                        ]),
+                                        not_followed_by = Fragment(IdentifierStart)
+                                    )
+                                ),
                                 // A dot and a fraction (without an integer) is enabled in all versions:
                                 TokenDefinition(
                                     scanner = TrailingContext(

diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/decimal_number_expression.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/decimal_number_expression.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/expression.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/expression.rs
diff --git a/crates/solidity/outputs/spec/generated/grammar.ebnf b/crates/solidity/outputs/spec/generated/grammar.ebnf
diff --git a/crates/solidity/outputs/spec/generated/public/05-expressions/04-numbers.md b/crates/solidity/outputs/spec/generated/public/05-expressions/04-numbers.md
diff --git a/.../cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.4.11-failure.yml b/.../cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.4.11-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.2.a                                                                            │ 0..5
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or FinneyKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or SzaboKeyword or WeeksKeyword or WeiKeyword or YearsKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_ident_after_period/input.sol:1:4]
+       │
+     1 │ 1.2.a
+       │    ─┬─  
+       │     ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.2.a\n" (0..6)
+      - (literal꞉ DecimalLiteral): "1.2" # (0..3)
+      - (SKIPPED): ".a\n" # (3..6)
diff --git a/...s/cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.5.0-failure.yml b/...s/cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.5.0-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.2.a                                                                            │ 0..5
+
+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/DecimalNumberExpression/float_ident_after_period/input.sol:1:4]
+       │
+     1 │ 1.2.a
+       │    ─┬─  
+       │     ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.2.a\n" (0..6)
+      - (literal꞉ DecimalLiteral): "1.2" # (0..3)
+      - (SKIPPED): ".a\n" # (3..6)
diff --git a/.../cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.6.11-failure.yml b/.../cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.6.11-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.2.a                                                                            │ 0..5
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or FinneyKeyword or GweiKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or SzaboKeyword or WeeksKeyword or WeiKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_ident_after_period/input.sol:1:4]
+       │
+     1 │ 1.2.a
+       │    ─┬─  
+       │     ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.2.a\n" (0..6)
+      - (literal꞉ DecimalLiteral): "1.2" # (0..3)
+      - (SKIPPED): ".a\n" # (3..6)
diff --git a/...s/cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.7.0-failure.yml b/...s/cst_output/DecimalNumberExpression/float_ident_after_period/generated/0.7.0-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.2.a                                                                            │ 0..5
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or GweiKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or WeeksKeyword or WeiKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_ident_after_period/input.sol:1:4]
+       │
+     1 │ 1.2.a
+       │    ─┬─  
+       │     ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.2.a\n" (0..6)
+      - (literal꞉ DecimalLiteral): "1.2" # (0..3)
+      - (SKIPPED): ".a\n" # (3..6)
diff --git a/...y/testing/snapshots/cst_output/DecimalNumberExpression/float_ident_after_period/input.sol b/...y/testing/snapshots/cst_output/DecimalNumberExpression/float_ident_after_period/input.sol
@@ -0,0 +1 @@
+1.2.a
diff --git a/...napshots/cst_output/DecimalNumberExpression/float_no_fraction/generated/0.5.0-failure.yml b/...napshots/cst_output/DecimalNumberExpression/float_no_fraction/generated/0.5.0-failure.yml
@@ -5,13 +5,15 @@ Source: >
 
 Errors: # 1 total
   - >
-    Error: Expected DecimalLiteral.
-       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_no_fraction/input.sol:1:1]
+    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/DecimalNumberExpression/float_no_fraction/input.sol:1:2]
        │
      1 │ 1.
-       │ ─┬  
+       │  ┬  
        │  ╰── Error occurred here.
     ───╯
 
 Tree:
-  - (SKIPPED): "1." # (0..2)
+  - (DecimalNumberExpression): # "1." (0..2)
+      - (literal꞉ DecimalLiteral): "1" # (0..1)
+      - (SKIPPED): "." # (1..2)
diff --git a/...apshots/cst_output/DecimalNumberExpression/float_no_fraction/generated/0.6.11-failure.yml b/...apshots/cst_output/DecimalNumberExpression/float_no_fraction/generated/0.6.11-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.                                                                               │ 0..2
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or FinneyKeyword or GweiKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or SzaboKeyword or WeeksKeyword or WeiKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_no_fraction/input.sol:1:2]
+       │
+     1 │ 1.
+       │  ┬  
+       │  ╰── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1." (0..2)
+      - (literal꞉ DecimalLiteral): "1" # (0..1)
+      - (SKIPPED): "." # (1..2)
diff --git a/...napshots/cst_output/DecimalNumberExpression/float_no_fraction/generated/0.7.0-failure.yml b/...napshots/cst_output/DecimalNumberExpression/float_no_fraction/generated/0.7.0-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.                                                                               │ 0..2
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or GweiKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or WeeksKeyword or WeiKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/float_no_fraction/input.sol:1:2]
+       │
+     1 │ 1.
+       │  ┬  
+       │  ╰── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1." (0..2)
+      - (literal꞉ DecimalLiteral): "1" # (0..1)
+      - (SKIPPED): "." # (1..2)
diff --git a/...st_output/DecimalNumberExpression/integer_ident_after_period/generated/0.4.11-failure.yml b/...st_output/DecimalNumberExpression/integer_ident_after_period/generated/0.4.11-failure.yml
@@ -0,0 +1,17 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.a                                                                              │ 0..3
+
+Errors: # 1 total
+  - >
+    Error: Expected DecimalLiteral.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/integer_ident_after_period/input.sol:1:1]
+       │
+     1 │ 1.a
+       │ ──┬─  
+       │   ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (SKIPPED): "1.a\n" # (0..4)
diff --git a/...cst_output/DecimalNumberExpression/integer_ident_after_period/generated/0.5.0-failure.yml b/...cst_output/DecimalNumberExpression/integer_ident_after_period/generated/0.5.0-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.a                                                                              │ 0..3
+
+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/DecimalNumberExpression/integer_ident_after_period/input.sol:1:2]
+       │
+     1 │ 1.a
+       │  ─┬─  
+       │   ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.a\n" (0..4)
+      - (literal꞉ DecimalLiteral): "1" # (0..1)
+      - (SKIPPED): ".a\n" # (1..4)
diff --git a/...st_output/DecimalNumberExpression/integer_ident_after_period/generated/0.6.11-failure.yml b/...st_output/DecimalNumberExpression/integer_ident_after_period/generated/0.6.11-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.a                                                                              │ 0..3
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or FinneyKeyword or GweiKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or SzaboKeyword or WeeksKeyword or WeiKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/integer_ident_after_period/input.sol:1:2]
+       │
+     1 │ 1.a
+       │  ─┬─  
+       │   ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.a\n" (0..4)
+      - (literal꞉ DecimalLiteral): "1" # (0..1)
+      - (SKIPPED): ".a\n" # (1..4)
diff --git a/...cst_output/DecimalNumberExpression/integer_ident_after_period/generated/0.7.0-failure.yml b/...cst_output/DecimalNumberExpression/integer_ident_after_period/generated/0.7.0-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ 1.a                                                                              │ 0..3
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or GweiKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or WeeksKeyword or WeiKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/integer_ident_after_period/input.sol:1:2]
+       │
+     1 │ 1.a
+       │  ─┬─  
+       │   ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # "1.a\n" (0..4)
+      - (literal꞉ DecimalLiteral): "1" # (0..1)
+      - (SKIPPED): ".a\n" # (1..4)
diff --git a/...testing/snapshots/cst_output/DecimalNumberExpression/integer_ident_after_period/input.sol b/...testing/snapshots/cst_output/DecimalNumberExpression/integer_ident_after_period/input.sol
@@ -0,0 +1 @@
+1.a
diff --git a/...t/DecimalNumberExpression/leading_period_ident_after_decimal/generated/0.4.11-failure.yml b/...t/DecimalNumberExpression/leading_period_ident_after_decimal/generated/0.4.11-failure.yml
@@ -0,0 +1,17 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ .1a                                                                              │ 0..3
+
+Errors: # 1 total
+  - >
+    Error: Expected DecimalLiteral.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/leading_period_ident_after_decimal/input.sol:1:1]
+       │
+     1 │ .1a
+       │ ──┬─  
+       │   ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (SKIPPED): ".1a\n" # (0..4)
diff --git a/...snapshots/cst_output/DecimalNumberExpression/leading_period_ident_after_decimal/input.sol b/...snapshots/cst_output/DecimalNumberExpression/leading_period_ident_after_decimal/input.sol
@@ -0,0 +1 @@
+.1a
diff --git a/...ut/DecimalNumberExpression/leading_period_ident_after_period/generated/0.4.11-failure.yml b/...ut/DecimalNumberExpression/leading_period_ident_after_period/generated/0.4.11-failure.yml
@@ -0,0 +1,19 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Source: >
+  1  │ .1.a                                                                             │ 0..4
+
+Errors: # 1 total
+  - >
+    Error: Expected DaysKeyword or EtherKeyword or FinneyKeyword or HoursKeyword or MinutesKeyword or SecondsKeyword or SzaboKeyword or WeeksKeyword or WeiKeyword or YearsKeyword.
+       ╭─[crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/leading_period_ident_after_period/input.sol:1:3]
+       │
+     1 │ .1.a
+       │   ─┬─  
+       │    ╰─── Error occurred here.
+    ───╯
+
+Tree:
+  - (DecimalNumberExpression): # ".1.a\n" (0..5)
+      - (literal꞉ DecimalLiteral): ".1" # (0..2)
+      - (SKIPPED): ".a\n" # (2..5)