Drop List suffix from some repeated nodes in v0/v1 (#660)

Part of #652
NomicFoundation · Nov 20, 2023 · 9702899 · 9702899
1 parent bea802f
commit 9702899
Show file tree

Hide file tree

Showing 326 changed files with 2,293 additions and 2,331 deletions.
diff --git a/.changeset/little-berries-approve.md b/.changeset/little-berries-approve.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+Drop List suffix from collection grammar rule names
diff --git a/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml
@@ -5,11 +5,11 @@
   unversioned:
     sequence:
       - optional:
-          reference: "SourceUnitMembersList"
+          reference: "SourceUnitMembers"
       - optional:
           reference: "EndOfFileTrivia"
 
-- name: "SourceUnitMembersList"
+- name: "SourceUnitMembers"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/01-file-structure/03-pragmas/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/03-pragmas/productions.yml
@@ -36,9 +36,9 @@
   unversioned:
     sequence:
       - reference: "SolidityKeyword"
-      - reference: "VersionPragmaExpressionsList"
+      - reference: "VersionPragmaExpressions"
 
-- name: "VersionPragmaExpressionsList"
+- name: "VersionPragmaExpressions"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
@@ -42,13 +42,13 @@
           open:
             reference: "OpenBrace"
           parser:
-            reference: "DeconstructionImportSymbolsList"
+            reference: "DeconstructionImportSymbols"
           close:
             reference: "CloseBrace"
       - reference: "FromKeyword"
       - reference: "AsciiStringLiteral"
 
-- name: "DeconstructionImportSymbolsList"
+- name: "DeconstructionImportSymbols"
   kind: "Parser"
   unversioned:
     separatedBy:
@@ -108,11 +108,11 @@
         open:
           reference: "OpenBrace"
         parser:
-          reference: "UsingDirectiveSymbolsList"
+          reference: "UsingDirectiveSymbols"
         close:
           reference: "CloseBrace"
 
-- name: "UsingDirectiveSymbolsList"
+- name: "UsingDirectiveSymbols"
   kind: "Parser"
   versioned:
     0.8.13:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml
@@ -14,7 +14,7 @@
               reference: "OpenBrace"
             parser:
               optional:
-                reference: "ContractMembersList"
+                reference: "ContractMembers"
             close:
               reference: "CloseBrace"
     0.6.0:
@@ -31,7 +31,7 @@
               reference: "OpenBrace"
             parser:
               optional:
-                reference: "ContractMembersList"
+                reference: "ContractMembers"
             close:
               reference: "CloseBrace"
 
@@ -40,9 +40,9 @@
   unversioned:
     sequence:
       - reference: "IsKeyword"
-      - reference: "InheritanceTypesList"
+      - reference: "InheritanceTypes"
 
-- name: "InheritanceTypesList"
+- name: "InheritanceTypes"
   kind: "Parser"
   unversioned:
     separatedBy:
@@ -59,7 +59,7 @@
       - optional:
           reference: "ArgumentsDeclaration"
 
-- name: "ContractMembersList"
+- name: "ContractMembers"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/02-interfaces/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/02-interfaces/productions.yml
@@ -13,11 +13,11 @@
             reference: "OpenBrace"
           parser:
             optional:
-              reference: "InterfaceMembersList"
+              reference: "InterfaceMembers"
           close:
             reference: "CloseBrace"
 
-- name: "InterfaceMembersList"
+- name: "InterfaceMembers"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/03-libraries/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/03-libraries/productions.yml
@@ -11,11 +11,11 @@
             reference: "OpenBrace"
           parser:
             optional:
-              reference: "LibraryMembersList"
+              reference: "LibraryMembers"
           close:
             reference: "CloseBrace"
 
-- name: "LibraryMembersList"
+- name: "LibraryMembers"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/04-structs/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/04-structs/productions.yml
@@ -11,11 +11,11 @@
             reference: "OpenBrace"
           parser:
             optional:
-              reference: "StructMembersList"
+              reference: "StructMembers"
           close:
             reference: "CloseBrace"
 
-- name: "StructMembersList"
+- name: "StructMembers"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/05-enums/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/05-enums/productions.yml
@@ -11,6 +11,15 @@
             reference: "OpenBrace"
           parser:
             optional:
-              reference: "IdentifiersList"
+              reference: "EnumMembers"
           close:
             reference: "CloseBrace"
+
+- name: "EnumMembers"
+  kind: "Parser"
+  unversioned:
+    separatedBy:
+      separator:
+        reference: "Comma"
+      parser:
+        reference: "Identifier"
diff --git a/crates/solidity/inputs/language/definition/02-definitions/07-state-variables/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/07-state-variables/productions.yml
@@ -8,7 +8,7 @@
         sequence:
           - reference: "TypeName"
           - optional:
-              reference: "StateVariableAttributesList"
+              reference: "StateVariableAttributes"
           - reference: "Identifier"
           - optional:
               sequence:
@@ -17,7 +17,7 @@
       terminator:
         reference: "Semicolon"
 
-- name: "StateVariableAttributesList"
+- name: "StateVariableAttributes"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/08-functions/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/08-functions/productions.yml
@@ -11,7 +11,7 @@
           - reference: "ReceiveKeyword"
       - reference: "ParametersDeclaration"
       - optional:
-          reference: "FunctionAttributesList"
+          reference: "FunctionAttributes"
       - optional:
           reference: "ReturnsDeclaration"
       - choice:
@@ -25,7 +25,7 @@
       - reference: "ReturnsKeyword"
       - reference: "ParametersDeclaration"
 
-- name: "FunctionAttributesList"
+- name: "FunctionAttributes"
   kind: "Parser"
   unversioned:
     oneOrMore:
@@ -84,10 +84,19 @@
               reference: "OpenParen"
             parser:
               optional:
-                reference: "IdentifierPathsList"
+                reference: "OverridePaths"
             close:
               reference: "CloseParen"
 
+- name: "OverridePaths"
+  kind: "Parser"
+  unversioned:
+    separatedBy:
+      separator:
+        reference: "Comma"
+      parser:
+        reference: "IdentifierPath"
+
 - name: "ParametersDeclaration"
   kind: "Parser"
   unversioned:
@@ -96,11 +105,11 @@
         reference: "OpenParen"
       parser:
         optional:
-          reference: "ParametersList"
+          reference: "Parameters"
       close:
         reference: "CloseParen"
 
-- name: "ParametersList"
+- name: "Parameters"
   kind: "Parser"
   unversioned:
     separatedBy:
@@ -127,10 +136,10 @@
         - reference: "ConstructorKeyword"
         - reference: "ParametersDeclaration"
         - optional:
-            reference: "ConstructorAttributesList"
+            reference: "ConstructorAttributes"
         - reference: "Block"
 
-- name: "ConstructorAttributesList"
+- name: "ConstructorAttributes"
   kind: "Parser"
   versioned:
     0.4.22:
@@ -156,13 +165,13 @@
         - reference: "FunctionKeyword"
         - reference: "ParametersDeclaration"
         - optional:
-            reference: "UnnamedFunctionAttributesList"
+            reference: "UnnamedFunctionAttributes"
         - choice:
             - reference: "Semicolon"
             - reference: "Block"
     0.6.0: null
 
-- name: "UnnamedFunctionAttributesList"
+- name: "UnnamedFunctionAttributes"
   kind: "Parser"
   versioned:
     0.4.11:
@@ -192,14 +201,14 @@
         - reference: "FallbackKeyword"
         - reference: "ParametersDeclaration"
         - optional:
-            reference: "FallbackFunctionAttributesList"
+            reference: "FallbackFunctionAttributes"
         - optional:
             reference: "ReturnsDeclaration"
         - choice:
             - reference: "Semicolon"
             - reference: "Block"
 
-- name: "FallbackFunctionAttributesList"
+- name: "FallbackFunctionAttributes"
   kind: "Parser"
   versioned:
     0.6.0:
@@ -228,12 +237,12 @@
         - reference: "ReceiveKeyword"
         - reference: "ParametersDeclaration"
         - optional:
-            reference: "ReceiveFunctionAttributesList"
+            reference: "ReceiveFunctionAttributes"
         - choice:
             - reference: "Semicolon"
             - reference: "Block"
 
-- name: "ReceiveFunctionAttributesList"
+- name: "ReceiveFunctionAttributes"
   kind: "Parser"
   versioned:
     0.6.0:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/09-modifiers/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/09-modifiers/productions.yml
@@ -9,12 +9,12 @@
       - optional:
           reference: "ParametersDeclaration"
       - optional:
-          reference: "ModifierAttributesList"
+          reference: "ModifierAttributes"
       - choice:
           - reference: "Semicolon"
           - reference: "Block"
 
-- name: "ModifierAttributesList"
+- name: "ModifierAttributes"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml
@@ -22,11 +22,11 @@
         reference: "OpenParen"
       parser:
         optional:
-          reference: "EventParametersList"
+          reference: "EventParameters"
       close:
         reference: "CloseParen"
 
-- name: "EventParametersList"
+- name: "EventParameters"
   kind: "Parser"
   unversioned:
     separatedBy:

diff --git a/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml
@@ -22,11 +22,11 @@
           reference: "OpenParen"
         parser:
           optional:
-            reference: "ErrorParametersList"
+            reference: "ErrorParameters"
         close:
           reference: "CloseParen"
 
-- name: "ErrorParametersList"
+- name: "ErrorParameters"
   kind: "Parser"
   versioned:
     0.8.4:

diff --git a/crates/solidity/inputs/language/definition/03-types/01-advanced-types/productions.yml b/crates/solidity/inputs/language/definition/03-types/01-advanced-types/productions.yml
@@ -36,11 +36,11 @@
       - reference: "FunctionKeyword"
       - reference: "ParametersDeclaration"
       - optional:
-          reference: "FunctionTypeAttributesList"
+          reference: "FunctionTypeAttributes"
       - optional:
           reference: "ReturnsDeclaration"
 
-- name: "FunctionTypeAttributesList"
+- name: "FunctionTypeAttributes"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml b/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml
@@ -8,11 +8,11 @@
         reference: "OpenBrace"
       parser:
         optional:
-          reference: "StatementsList"
+          reference: "Statements"
       close:
         reference: "CloseBrace"
 
-- name: "StatementsList"
+- name: "Statements"
   kind: "Parser"
   unversioned:
     oneOrMore:

diff --git a/...lidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml b/...lidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml
@@ -11,15 +11,15 @@
                 reference: "OpenParen"
               parser:
                 optional:
-                  reference: "TupleMembersList"
+                  reference: "TupleMembers"
               close:
                 reference: "CloseParen"
           - reference: "Equal"
           - reference: "Expression"
       terminator:
         reference: "Semicolon"
 
-- name: "TupleMembersList"
+- name: "TupleMembers"
   kind: "Parser"
   unversioned:
     separatedBy:

diff --git a/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml b/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml
@@ -10,9 +10,9 @@
         - optional:
             reference: "ReturnsDeclaration"
         - reference: "Block"
-        - reference: "CatchClausesList"
+        - reference: "CatchClauses"
 
-- name: "CatchClausesList"
+- name: "CatchClauses"
   kind: "Parser"
   versioned:
     0.6.0: