fix: Don't consume the dot in decimal literals if not followed by dig…

…it since 0.5.0 (#891) See ethereum/solidity#4172. This unblocks parsing member access expressions where the primary expression can't consume the dot in order to parse the `.member` postfix expression.
NomicFoundation · Mar 19, 2024 · 70c9d7d · 70c9d7d
1 parent 1ff8599
commit 70c9d7d
Show file tree

Hide file tree

Showing 34 changed files with 480 additions and 32 deletions.
diff --git a/.changeset/two-bears-cover.md b/.changeset/two-bears-cover.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+Fix parsing `<NUMBER>.member` member access expression
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -3675,7 +3675,18 @@ codegen_language_macros::compile!(Language(
                         Token(
                             name = DecimalLiteral,
                             definitions = [
-                                // An integer (without a dot or a fraction) is enabled in all versions:
+                                // A dot and a fraction (without an integer) is enabled in all versions:
+                                TokenDefinition(
+                                    scanner = TrailingContext(
+                                        scanner = Sequence([
+                                            Atom("."),
+                                            Fragment(DecimalDigits),
+                                            Optional(Fragment(DecimalExponent))
+                                        ]),
+                                        not_followed_by = Fragment(IdentifierStart)
+                                    )
+                                ),
+                                // A bare integer (without a dot or a fraction) is enabled in all versions:
                                 TokenDefinition(
                                     scanner = TrailingContext(
                                         scanner = Sequence([
@@ -3688,7 +3699,7 @@ codegen_language_macros::compile!(Language(
                                         not_followed_by = Fragment(IdentifierStart)
                                     )
                                 ),
-                                // An integer and a dot (without a fraction) is disabled in "0.5.0"
+                                // Till 0.5.0, the following lone dot was considered a part of the literal:
                                 TokenDefinition(
                                     enabled = Till("0.5.0"),
                                     scanner = TrailingContext(
@@ -3703,24 +3714,30 @@ codegen_language_macros::compile!(Language(
                                         not_followed_by = Fragment(IdentifierStart)
                                     )
                                 ),
-                                // A dot and a fraction (without an integer) is enabled in all versions:
+                                // As well as the full form of digits followed by a dot followed by digits...
                                 TokenDefinition(
+                                    enabled = Till("0.5.0"),
                                     scanner = TrailingContext(
                                         scanner = Sequence([
+                                            Fragment(DecimalDigits),
                                             Atom("."),
                                             Fragment(DecimalDigits),
                                             Optional(Fragment(DecimalExponent))
                                         ]),
                                         not_followed_by = Fragment(IdentifierStart)
                                     )
                                 ),
-                                // An integer, a dot, and a fraction is enabled in all versions:
+                                // ...both of which was subsumed by a more general form that only included
+                                // the dot if it was followed by a fraction:
                                 TokenDefinition(
+                                    enabled = From("0.5.0"),
                                     scanner = TrailingContext(
                                         scanner = Sequence([
                                             Fragment(DecimalDigits),
-                                            Atom("."),
-                                            Fragment(DecimalDigits),
+                                            Optional(Sequence([
+                                                Atom("."),
+                                                Fragment(DecimalDigits)
+                                            ])),
                                             Optional(Fragment(DecimalExponent))
                                         ]),
                                         not_followed_by = Fragment(IdentifierStart)

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)