key, value pair in the same array

Author: Janther

src/slang-nodes/ArgumentsDeclaration.ts

@@ -12,10 +12,10 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   ArgumentsDeclaration,
   ast.ArgumentsDeclaration
->(
-  [ast.PositionalArgumentsDeclaration, ast.NamedArgumentsDeclaration],
-  [PositionalArgumentsDeclaration, NamedArgumentsDeclaration]
-);
+>([
+  [ast.PositionalArgumentsDeclaration, PositionalArgumentsDeclaration],
+  [ast.NamedArgumentsDeclaration, NamedArgumentsDeclaration]
+]);
 
 export class ArgumentsDeclaration extends SlangNode {
   readonly kind = NonterminalKind.ArgumentsDeclaration;

src/slang-nodes/ContractMember.ts

@@ -23,38 +23,21 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   ContractMember,
   ast.ContractMember
->(
-  [
-    ast.UsingDirective,
-    ast.FunctionDefinition,
-    ast.ConstructorDefinition,
-    ast.ReceiveFunctionDefinition,
-    ast.FallbackFunctionDefinition,
-    ast.UnnamedFunctionDefinition,
-    ast.ModifierDefinition,
-    ast.StructDefinition,
-    ast.EnumDefinition,
-    ast.EventDefinition,
-    ast.StateVariableDefinition,
-    ast.ErrorDefinition,
-    ast.UserDefinedValueTypeDefinition
-  ],
-  [
-    UsingDirective,
-    FunctionDefinition,
-    ConstructorDefinition,
-    ReceiveFunctionDefinition,
-    FallbackFunctionDefinition,
-    UnnamedFunctionDefinition,
-    ModifierDefinition,
-    StructDefinition,
-    EnumDefinition,
-    EventDefinition,
-    StateVariableDefinition,
-    ErrorDefinition,
-    UserDefinedValueTypeDefinition
-  ]
-);
+>([
+  [ast.UsingDirective, UsingDirective],
+  [ast.FunctionDefinition, FunctionDefinition],
+  [ast.ConstructorDefinition, ConstructorDefinition],
+  [ast.ReceiveFunctionDefinition, ReceiveFunctionDefinition],
+  [ast.FallbackFunctionDefinition, FallbackFunctionDefinition],
+  [ast.UnnamedFunctionDefinition, UnnamedFunctionDefinition],
+  [ast.ModifierDefinition, ModifierDefinition],
+  [ast.StructDefinition, StructDefinition],
+  [ast.EnumDefinition, EnumDefinition],
+  [ast.EventDefinition, EventDefinition],
+  [ast.StateVariableDefinition, StateVariableDefinition],
+  [ast.ErrorDefinition, ErrorDefinition],
+  [ast.UserDefinedValueTypeDefinition, UserDefinedValueTypeDefinition]
+]);
 
 export class ContractMember extends SlangNode {
   readonly kind = NonterminalKind.ContractMember;

src/slang-nodes/ContractSpecifier.ts

@@ -12,10 +12,10 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   ContractSpecifier,
   ast.ContractSpecifier
->(
-  [ast.InheritanceSpecifier, ast.StorageLayoutSpecifier],
-  [InheritanceSpecifier, StorageLayoutSpecifier]
-);
+>([
+  [ast.InheritanceSpecifier, InheritanceSpecifier],
+  [ast.StorageLayoutSpecifier, StorageLayoutSpecifier]
+]);
 
 export class ContractSpecifier extends SlangNode {
   readonly kind = NonterminalKind.ContractSpecifier;

src/slang-nodes/Expression.ts

@@ -43,61 +43,36 @@ const createNonterminalVariant = createNonterminalVariantCreator<
   ast.Expression
 >(
   [
-    ast.AssignmentExpression,
-    ast.ConditionalExpression,
-    ast.OrExpression,
-    ast.AndExpression,
-    ast.EqualityExpression,
-    ast.InequalityExpression,
-    ast.BitwiseOrExpression,
-    ast.BitwiseXorExpression,
-    ast.BitwiseAndExpression,
-    ast.ShiftExpression,
-    ast.AdditiveExpression,
-    ast.MultiplicativeExpression,
-    ast.ExponentiationExpression,
-    ast.PostfixExpression,
-    ast.PrefixExpression,
-    ast.FunctionCallExpression,
-    ast.CallOptionsExpression,
-    ast.MemberAccessExpression,
-    ast.IndexAccessExpression,
-    ast.NewExpression,
-    ast.TupleExpression,
-    ast.TypeExpression,
-    ast.ArrayExpression,
-    ast.HexNumberExpression,
-    ast.DecimalNumberExpression
+    [ast.AssignmentExpression, AssignmentExpression],
+    [ast.ConditionalExpression, ConditionalExpression],
+    [ast.OrExpression, OrExpression],
+    [ast.AndExpression, AndExpression],
+    [ast.EqualityExpression, EqualityExpression],
+    [ast.InequalityExpression, InequalityExpression],
+    [ast.BitwiseOrExpression, BitwiseOrExpression],
+    [ast.BitwiseXorExpression, BitwiseXorExpression],
+    [ast.BitwiseAndExpression, BitwiseAndExpression],
+    [ast.ShiftExpression, ShiftExpression],
+    [ast.AdditiveExpression, AdditiveExpression],
+    [ast.MultiplicativeExpression, MultiplicativeExpression],
+    [ast.ExponentiationExpression, ExponentiationExpression],
+    [ast.PostfixExpression, PostfixExpression],
+    [ast.PrefixExpression, PrefixExpression],
+    [ast.FunctionCallExpression, FunctionCallExpression],
+    [ast.CallOptionsExpression, CallOptionsExpression],
+    [ast.MemberAccessExpression, MemberAccessExpression],
+    [ast.IndexAccessExpression, IndexAccessExpression],
+    [ast.NewExpression, NewExpression],
+    [ast.TupleExpression, TupleExpression],
+    [ast.TypeExpression, TypeExpression],
+    [ast.ArrayExpression, ArrayExpression],
+    [ast.HexNumberExpression, HexNumberExpression],
+    [ast.DecimalNumberExpression, DecimalNumberExpression]
   ],
   [
-    AssignmentExpression,
-    ConditionalExpression,
-    OrExpression,
-    AndExpression,
-    EqualityExpression,
-    InequalityExpression,
-    BitwiseOrExpression,
-    BitwiseXorExpression,
-    BitwiseAndExpression,
-    ShiftExpression,
-    AdditiveExpression,
-    MultiplicativeExpression,
-    ExponentiationExpression,
-    PostfixExpression,
-    PrefixExpression,
-    FunctionCallExpression,
-    CallOptionsExpression,
-    MemberAccessExpression,
-    IndexAccessExpression,
-    NewExpression,
-    TupleExpression,
-    TypeExpression,
-    ArrayExpression,
-    HexNumberExpression,
-    DecimalNumberExpression
-  ],
-  [ast.StringExpression, ast.ElementaryType],
-  [StringExpression, ElementaryType]
+    [ast.StringExpression, StringExpression],
+    [ast.ElementaryType, ElementaryType]
+  ]
 );
 
 export class Expression extends SlangNode {

src/slang-nodes/FallbackFunctionAttribute.ts

@@ -16,10 +16,10 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   FallbackFunctionAttribute,
   ast.FallbackFunctionAttribute
->(
-  [ast.ModifierInvocation, ast.OverrideSpecifier],
-  [ModifierInvocation, OverrideSpecifier]
-);
+>([
+  [ast.ModifierInvocation, ModifierInvocation],
+  [ast.OverrideSpecifier, OverrideSpecifier]
+]);
 
 export class FallbackFunctionAttribute extends SlangNode {
   readonly kind = NonterminalKind.FallbackFunctionAttribute;

src/slang-nodes/ForStatementInitialization.ts

@@ -17,18 +17,11 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   ForStatementInitialization,
   ast.ForStatementInitialization
->(
-  [
-    ast.ExpressionStatement,
-    ast.VariableDeclarationStatement,
-    ast.TupleDeconstructionStatement
-  ],
-  [
-    ExpressionStatement,
-    VariableDeclarationStatement,
-    TupleDeconstructionStatement
-  ]
-);
+>([
+  [ast.ExpressionStatement, ExpressionStatement],
+  [ast.VariableDeclarationStatement, VariableDeclarationStatement],
+  [ast.TupleDeconstructionStatement, TupleDeconstructionStatement]
+]);
 
 export class ForStatementInitialization extends SlangNode {
   readonly kind = NonterminalKind.ForStatementInitialization;

src/slang-nodes/FunctionAttribute.ts

@@ -16,10 +16,10 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   FunctionAttribute,
   ast.FunctionAttribute
->(
-  [ast.ModifierInvocation, ast.OverrideSpecifier],
-  [ModifierInvocation, OverrideSpecifier]
-);
+>([
+  [ast.ModifierInvocation, ModifierInvocation],
+  [ast.OverrideSpecifier, OverrideSpecifier]
+]);
 
 export class FunctionAttribute extends SlangNode {
   readonly kind = NonterminalKind.FunctionAttribute;

src/slang-nodes/ImportClause.ts

@@ -13,10 +13,11 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   ImportClause,
   ast.ImportClause
->(
-  [ast.PathImport, ast.NamedImport, ast.ImportDeconstruction],
-  [PathImport, NamedImport, ImportDeconstruction]
-);
+>([
+  [ast.PathImport, PathImport],
+  [ast.NamedImport, NamedImport],
+  [ast.ImportDeconstruction, ImportDeconstruction]
+]);
 
 export class ImportClause extends SlangNode {
   readonly kind = NonterminalKind.ImportClause;

src/slang-nodes/MappingKeyType.ts

@@ -11,10 +11,8 @@ const createNonterminalVariant = createNonterminalVariantCreator<
   MappingKeyType,
   ast.MappingKeyType
 >(
-  [ast.IdentifierPath],
-  [IdentifierPath],
-  [ast.ElementaryType],
-  [ElementaryType]
+  [[ast.IdentifierPath, IdentifierPath]],
+  [[ast.ElementaryType, ElementaryType]]
 );
 
 export class MappingKeyType extends SlangNode {

src/slang-nodes/Pragma.ts

@@ -13,10 +13,11 @@ import type { AstNode } from './types.d.ts';
 const createNonterminalVariant = createNonterminalVariantCreator<
   Pragma,
   ast.Pragma
->(
-  [ast.AbicoderPragma, ast.ExperimentalPragma, ast.VersionPragma],
-  [AbicoderPragma, ExperimentalPragma, VersionPragma]
-);
+>([
+  [ast.AbicoderPragma, AbicoderPragma],
+  [ast.ExperimentalPragma, ExperimentalPragma],
+  [ast.VersionPragma, VersionPragma]
+]);
 
 export class Pragma extends SlangNode {
   readonly kind = NonterminalKind.Pragma;