fix tuple members grammar (#677)

Use the same names across all three grammars, and make sure
`TupleMember` refers to the deconstructed (optional) symbol, not the
potentially empty parent (that is now called `DeconstructionElement`).

Ref #652

crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml

@@ -10,38 +10,47 @@
               open:
                 reference: "OpenParen"
               parser:
-                optional:
-                  reference: "TupleMembers"
+                reference: "TupleDeconstructionElements"
               close:
                 reference: "CloseParen"
           - reference: "Equal"
           - reference: "Expression"
       terminator:
         reference: "Semicolon"
 
-- name: "TupleMembers"
+- name: "TupleDeconstructionElements"
   kind: "Parser"
   unversioned:
     separatedBy:
       separator:
         reference: "Comma"
       parser:
-        reference: "TupleMember"
+        reference: "TupleDeconstructionElement"
 
-- name: "TupleMember"
+- name: "TupleDeconstructionElement"
   kind: "Parser"
   unversioned:
     optional:
       choice:
-        - sequence:
-            - reference: "TypeName"
-            - optional:
-                reference: "DataLocation"
-            - reference: "Identifier"
-        - sequence:
-            - optional:
-                reference: "DataLocation"
-            - reference: "Identifier"
+        - reference: "TypedTupleMember"
+        - reference: "UntypedTupleMember"
+
+- name: "TypedTupleMember"
+  kind: "Parser"
+  unversioned:
+    sequence:
+      - reference: "TypeName"
+      - optional:
+          reference: "DataLocation"
+      - reference: "Identifier"
+
+- name: "UntypedTupleMember"
+  kind: "Parser"
+  unversioned:
+    sequence:
+      - optional:
+          reference: "DataLocation"
+      - reference: "Identifier"
 
 - name: "VariableDeclarationStatement"
   kind: "Parser"

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

@@ -2898,20 +2898,20 @@ codegen_language_macros::compile!(Language(
                             ),
                             fields = (
                                 open_paren = Required(Terminal([OpenParen])),
-                                members = Required(NonTerminal(TupleMembersDeconstruction)),
+                                elements = Required(NonTerminal(TupleDeconstructionElements)),
                                 close_paren = Required(Terminal([CloseParen])),
                                 equal = Required(Terminal([Equal])),
                                 expression = Required(NonTerminal(Expression)),
                                 semicolon = Required(Terminal([Semicolon]))
                             )
                         ),
                         Separated(
-                            name = TupleMembersDeconstruction,
-                            separated = TupleMemberDeconstruction,
+                            name = TupleDeconstructionElements,
+                            separated = TupleDeconstructionElement,
                             separator = Comma
                         ),
                         Struct(
-                            name = TupleMemberDeconstruction,
+                            name = TupleDeconstructionElement,
                             fields = (member = Optional(kind = NonTerminal(TupleMember)))
                         ),
                         Enum(

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

@@ -513,18 +513,20 @@ slang_grammar! {
 
         parser TryStatement = { introduced in "0.6.0" (TryKeyword Expression (ReturnsDeclaration ?) Block CatchClauses) } ;
 
-        parser TupleDeconstructionStatement = ((((TupleMembers ?) delimited by OpenParen and CloseParen) Equal Expression) terminated by Semicolon) ;
+        parser TupleDeconstructionStatement = (((TupleDeconstructionElements delimited by OpenParen and CloseParen) Equal Expression) terminated by Semicolon) ;
 
         parser TupleExpression = (TupleValues delimited by OpenParen and CloseParen) ;
 
-        parser TupleMember = (((TypeName (DataLocation ?) Identifier) | ((DataLocation ?) Identifier)) ?) ;
+        parser TupleDeconstructionElement = ((TypedTupleMember | UntypedTupleMember) ?) ;
 
-        parser TupleMembers = (TupleMember separated by Comma) ;
+        parser TupleDeconstructionElements = (TupleDeconstructionElement separated by Comma) ;
 
         parser TupleValues = ((Expression ?) separated by Comma) ;
 
         parser TypeExpression = { introduced in "0.5.3" (TypeKeyword (TypeName delimited by OpenParen and CloseParen)) } ;
 
+        parser TypedTupleMember = (TypeName (DataLocation ?) Identifier) ;
+
         precedence parser TypeName = (
             [
                 postfix ArrayTypeNameOperator as ArrayTypeName
@@ -548,6 +550,8 @@ slang_grammar! {
 
         parser UnnamedFunctionDefinition = { removed in "0.6.0" (FunctionKeyword ParametersDeclaration (UnnamedFunctionAttributes ?) (Semicolon | Block)) } ;
 
+        parser UntypedTupleMember = ((DataLocation ?) Identifier) ;
+
         parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ;
 
         parser UsingDirective = ((UsingKeyword (IdentifierPath | { introduced in "0.8.13" UsingDeconstruction }) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;