add ThisKeyword and SuperKeyword (#1138)

add `ThisKeyword` and `SuperKeyword` to the grammar, instead of parsing
them as identifiers.

.changeset/metal-yaks-pump.md

@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+add `ThisKeyword` and `SuperKeyword` to the grammar, instead of parsing them as identifiers.

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

@@ -1778,8 +1778,10 @@ inherit .parent_scope
   edge @expr.lexical_scope -> @tuple_expr.lexical_scope
 }
 
-;; Identifier expressions
-@expr [Expression @name variant: [Identifier]] {
+;; primary expressions
+@expr [Expression @name (
+  variant: [Identifier] | variant: [SuperKeyword] | variant: [ThisKeyword] 
+)] {
   node ref
   attr (ref) node_reference = @name
   attr (ref) parents = [@expr.enclosing_def]
@@ -1809,7 +1811,7 @@ inherit .parent_scope
 ;; Special case: member accesses to `super` are tagged with "super" to rank
 ;; virtual methods correctly
 [MemberAccessExpression
-    operand: [Expression ["super"]]
+    operand: [Expression [SuperKeyword]]
     @name member: [Identifier]
 ] {
   attr (@name.ref) tag = "super"

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

@@ -1392,6 +1392,11 @@ codegen_language_macros::compile!(Language(
                             identifier = Identifier,
                             definitions = [KeywordDefinition(value = Atom("struct"))]
                         ),
+                        Keyword(
+                            name = SuperKeyword,
+                            identifier = Identifier,
+                            definitions = [KeywordDefinition(value = Atom("super"))]
+                        ),
                         Keyword(
                             name = SupportsKeyword,
                             identifier = Identifier,
@@ -1416,6 +1421,11 @@ codegen_language_macros::compile!(Language(
                                 value = Atom("szabo")
                             )]
                         ),
+                        Keyword(
+                            name = ThisKeyword,
+                            identifier = Identifier,
+                            definitions = [KeywordDefinition(value = Atom("this"))]
+                        ),
                         Keyword(
                             name = ThrowKeyword,
                             identifier = Identifier,
@@ -3504,6 +3514,8 @@ codegen_language_macros::compile!(Language(
                                     reference = PayableKeyword,
                                     enabled = From("0.6.0")
                                 ),
+                                PrimaryExpression(reference = ThisKeyword),
+                                PrimaryExpression(reference = SuperKeyword),
                                 PrimaryExpression(reference = TrueKeyword),
                                 PrimaryExpression(reference = FalseKeyword),
                                 PrimaryExpression(reference = Identifier)
@@ -6081,6 +6093,12 @@ codegen_language_macros::compile!(Language(
                                 value = Atom("suicide")
                             )]
                         ),
+                        Keyword(
+                            name = YulSuperKeyword,
+                            identifier = YulIdentifier,
+                            definitions =
+                                [KeywordDefinition(enabled = Never, value = Atom("super"))]
+                        ),
                         Keyword(
                             name = YulSupportsKeyword,
                             identifier = YulIdentifier,
@@ -6109,6 +6127,12 @@ codegen_language_macros::compile!(Language(
                             identifier = YulIdentifier,
                             definitions = [KeywordDefinition(value = Atom("timestamp"))]
                         ),
+                        Keyword(
+                            name = YulThisKeyword,
+                            identifier = YulIdentifier,
+                            definitions =
+                                [KeywordDefinition(enabled = Never, value = Atom("this"))]
+                        ),
                         Keyword(
                             name = YulThrowKeyword,
                             identifier = YulIdentifier,