unreserve AddressKeyword and allow it to be used as a field name (#…

…1134)

.changeset/clever-crabs-grow.md

@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+remove `YulPathComponent` and just use `YulIdentifier` instead.

.changeset/selfish-adults-wave.md

@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+unreserve `AddressKeyword`, and let it be used for `MemberAccessExpression`, `StructMember`, etc...

crates/solidity/inputs/language/bindings/rules.msgb

@@ -2113,7 +2113,7 @@ inherit .parent_scope
   edge @path.lexical_scope -> @expr.lexical_scope
 }
 
-@path [YulPath . [YulPathComponent @name [YulIdentifier]]] {
+@path [YulPath @name [YulIdentifier]] {
   node @path.lexical_scope
 
   node ref

crates/solidity/inputs/language/src/definition.rs

@@ -486,7 +486,8 @@ codegen_language_macros::compile!(Language(
                         Keyword(
                             name = AddressKeyword,
                             identifier = Identifier,
-                            definitions = [KeywordDefinition(value = Atom("address"))]
+                            definitions =
+                                [KeywordDefinition(reserved = Never, value = Atom("address"))]
                         ),
                         Keyword(
                             name = AfterKeyword,
@@ -3460,22 +3461,13 @@ codegen_language_macros::compile!(Language(
                                 ),
                                 PrecedenceExpression(
                                     name = MemberAccessExpression,
-                                    operators = [
-                                        PrecedenceOperator(
-                                            model = Postfix,
-                                            fields = (
-                                                period = Required(Period),
-                                                member = Required(Identifier)
-                                            )
-                                        ),
-                                        PrecedenceOperator(
-                                            model = Postfix,
-                                            fields = (
-                                                period = Required(Period),
-                                                member = Required(AddressKeyword)
-                                            )
+                                    operators = [PrecedenceOperator(
+                                        model = Postfix,
+                                        fields = (
+                                            period = Required(Period),
+                                            member = Required(Identifier)
                                         )
-                                    ]
+                                    )]
                                 ),
                                 PrecedenceExpression(
                                     name = IndexAccessExpression,
@@ -4381,20 +4373,9 @@ codegen_language_macros::compile!(Language(
                         Separated(name = YulPaths, reference = YulPath, separator = Comma),
                         Separated(
                             name = YulPath,
-                            reference = YulPathComponent,
+                            reference = YulIdentifier,
                             separator = Period
                         ),
-                        Enum(
-                            name = YulPathComponent,
-                            variants = [
-                                EnumVariant(reference = YulIdentifier),
-                                EnumVariant(
-                                    // Upstream grammar accepts built-ins but only `address` is valid:
-                                    reference = YulAddressKeyword,
-                                    enabled = From("0.8.10")
-                                )
-                            ]
-                        ),
                         Token(
                             name = YulIdentifier,
                             definitions = [
@@ -4604,7 +4585,8 @@ codegen_language_macros::compile!(Language(
                         Keyword(
                             name = YulAddressKeyword,
                             identifier = YulIdentifier,
-                            definitions = [KeywordDefinition(value = Atom("address"))]
+                            definitions =
+                                [KeywordDefinition(reserved = Never, value = Atom("address"))]
                         ),
                         Keyword(
                             name = YulAfterKeyword,