reversing the order of the parameter types to match the key, value order in the Map

Janther · Janther · commit da9a920bd576 · 2026-02-12T11:26:47.000-03:00
diff --git a/src/slang-nodes/ArgumentsDeclaration.ts b/src/slang-nodes/ArgumentsDeclaration.ts
@@ -10,8 +10,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  ArgumentsDeclaration,
-  ast.ArgumentsDeclaration
+  ast.ArgumentsDeclaration,
+  ArgumentsDeclaration
 >([
   [ast.PositionalArgumentsDeclaration, PositionalArgumentsDeclaration],
   [ast.NamedArgumentsDeclaration, NamedArgumentsDeclaration]
diff --git a/src/slang-nodes/ContractMember.ts b/src/slang-nodes/ContractMember.ts
@@ -21,8 +21,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  ContractMember,
-  ast.ContractMember
+  ast.ContractMember,
+  ContractMember
 >([
   [ast.UsingDirective, UsingDirective],
   [ast.FunctionDefinition, FunctionDefinition],
diff --git a/src/slang-nodes/ContractSpecifier.ts b/src/slang-nodes/ContractSpecifier.ts
@@ -10,8 +10,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  ContractSpecifier,
-  ast.ContractSpecifier
+  ast.ContractSpecifier,
+  ContractSpecifier
 >([
   [ast.InheritanceSpecifier, InheritanceSpecifier],
   [ast.StorageLayoutSpecifier, StorageLayoutSpecifier]
diff --git a/src/slang-nodes/Expression.ts b/src/slang-nodes/Expression.ts
@@ -39,8 +39,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  Expression,
-  ast.Expression
+  ast.Expression,
+  Expression
 >(
   [
     [ast.AssignmentExpression, AssignmentExpression],
diff --git a/src/slang-nodes/FallbackFunctionAttribute.ts b/src/slang-nodes/FallbackFunctionAttribute.ts
@@ -14,8 +14,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  FallbackFunctionAttribute,
-  ast.FallbackFunctionAttribute
+  ast.FallbackFunctionAttribute,
+  FallbackFunctionAttribute
 >([
   [ast.ModifierInvocation, ModifierInvocation],
   [ast.OverrideSpecifier, OverrideSpecifier]
diff --git a/src/slang-nodes/ForStatementInitialization.ts b/src/slang-nodes/ForStatementInitialization.ts
@@ -15,8 +15,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  ForStatementInitialization,
-  ast.ForStatementInitialization
+  ast.ForStatementInitialization,
+  ForStatementInitialization
 >([
   [ast.ExpressionStatement, ExpressionStatement],
   [ast.VariableDeclarationStatement, VariableDeclarationStatement],
diff --git a/src/slang-nodes/FunctionAttribute.ts b/src/slang-nodes/FunctionAttribute.ts
@@ -14,8 +14,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  FunctionAttribute,
-  ast.FunctionAttribute
+  ast.FunctionAttribute,
+  FunctionAttribute
 >([
   [ast.ModifierInvocation, ModifierInvocation],
   [ast.OverrideSpecifier, OverrideSpecifier]
diff --git a/src/slang-nodes/ImportClause.ts b/src/slang-nodes/ImportClause.ts
@@ -11,8 +11,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  ImportClause,
-  ast.ImportClause
+  ast.ImportClause,
+  ImportClause
 >([
   [ast.PathImport, PathImport],
   [ast.NamedImport, NamedImport],
diff --git a/src/slang-nodes/MappingKeyType.ts b/src/slang-nodes/MappingKeyType.ts
@@ -8,8 +8,8 @@ import { IdentifierPath } from './IdentifierPath.js';
 import type { CollectedMetadata } from '../types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  MappingKeyType,
-  ast.MappingKeyType
+  ast.MappingKeyType,
+  MappingKeyType
 >(
   [[ast.IdentifierPath, IdentifierPath]],
   [[ast.ElementaryType, ElementaryType]]
diff --git a/src/slang-nodes/Pragma.ts b/src/slang-nodes/Pragma.ts
@@ -11,8 +11,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  Pragma,
-  ast.Pragma
+  ast.Pragma,
+  Pragma
 >([
   [ast.AbicoderPragma, AbicoderPragma],
   [ast.ExperimentalPragma, ExperimentalPragma],
diff --git a/src/slang-nodes/ReceiveFunctionAttribute.ts b/src/slang-nodes/ReceiveFunctionAttribute.ts
@@ -14,8 +14,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  ReceiveFunctionAttribute,
-  ast.ReceiveFunctionAttribute
+  ast.ReceiveFunctionAttribute,
+  ReceiveFunctionAttribute
 >([
   [ast.ModifierInvocation, ModifierInvocation],
   [ast.OverrideSpecifier, OverrideSpecifier]
diff --git a/src/slang-nodes/SourceUnitMember.ts b/src/slang-nodes/SourceUnitMember.ts
@@ -21,8 +21,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  SourceUnitMember,
-  ast.SourceUnitMember
+  ast.SourceUnitMember,
+  SourceUnitMember
 >([
   [ast.PragmaDirective, PragmaDirective],
   [ast.ImportDirective, ImportDirective],
diff --git a/src/slang-nodes/Statement.ts b/src/slang-nodes/Statement.ts
@@ -25,8 +25,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariantInternal = createNonterminalVariantCreator<
-  Statement,
-  ast.Statement
+  ast.Statement,
+  Statement
 >([
   [ast.ExpressionStatement, ExpressionStatement],
   [ast.VariableDeclarationStatement, VariableDeclarationStatement],
diff --git a/src/slang-nodes/StringExpression.ts b/src/slang-nodes/StringExpression.ts
@@ -13,8 +13,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  StringExpression,
-  ast.StringExpression
+  ast.StringExpression,
+  StringExpression
 >([
   [ast.StringLiteral, StringLiteral],
   [ast.StringLiterals, StringLiterals],
diff --git a/src/slang-nodes/TupleMember.ts b/src/slang-nodes/TupleMember.ts
@@ -10,8 +10,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  TupleMember,
-  ast.TupleMember
+  ast.TupleMember,
+  TupleMember
 >([
   [ast.TypedTupleMember, TypedTupleMember],
   [ast.UntypedTupleMember, UntypedTupleMember]
diff --git a/src/slang-nodes/TypeName.ts b/src/slang-nodes/TypeName.ts
@@ -13,8 +13,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  TypeName,
-  ast.TypeName
+  ast.TypeName,
+  TypeName
 >(
   [
     [ast.ArrayTypeName, ArrayTypeName],
diff --git a/src/slang-nodes/UsingClause.ts b/src/slang-nodes/UsingClause.ts
@@ -8,8 +8,8 @@ import { UsingDeconstruction } from './UsingDeconstruction.js';
 import type { CollectedMetadata } from '../types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  UsingClause,
-  ast.UsingClause
+  ast.UsingClause,
+  UsingClause
 >([
   [ast.IdentifierPath, IdentifierPath],
   [ast.UsingDeconstruction, UsingDeconstruction]
diff --git a/src/slang-nodes/VersionExpression.ts b/src/slang-nodes/VersionExpression.ts
@@ -8,8 +8,8 @@ import { VersionTerm } from './VersionTerm.js';
 import type { CollectedMetadata } from '../types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  VersionExpression,
-  ast.VersionExpression
+  ast.VersionExpression,
+  VersionExpression
 >([
   [ast.VersionRange, VersionRange],
   [ast.VersionTerm, VersionTerm]
diff --git a/src/slang-nodes/YulExpression.ts b/src/slang-nodes/YulExpression.ts
@@ -11,8 +11,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  YulExpression,
-  ast.YulExpression
+  ast.YulExpression,
+  YulExpression
 >(
   [
     [ast.YulFunctionCallExpression, YulFunctionCallExpression],
diff --git a/src/slang-nodes/YulLiteral.ts b/src/slang-nodes/YulLiteral.ts
@@ -14,8 +14,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  YulLiteral,
-  ast.YulLiteral
+  ast.YulLiteral,
+  YulLiteral
 >([
   [ast.HexStringLiteral, HexStringLiteral],
   [ast.StringLiteral, StringLiteral]
diff --git a/src/slang-nodes/YulStatement.ts b/src/slang-nodes/YulStatement.ts
@@ -21,8 +21,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariantInternal = createNonterminalVariantCreator<
-  YulStatement,
-  ast.YulStatement
+  ast.YulStatement,
+  YulStatement
 >(
   [
     [ast.YulFunctionDefinition, YulFunctionDefinition],
diff --git a/src/slang-nodes/YulSwitchCase.ts b/src/slang-nodes/YulSwitchCase.ts
@@ -10,8 +10,8 @@ import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
 const createNonterminalVariant = createNonterminalVariantCreator<
-  YulSwitchCase,
-  ast.YulSwitchCase
+  ast.YulSwitchCase,
+  YulSwitchCase
 >([
   [ast.YulDefaultCase, YulDefaultCase],
   [ast.YulValueCase, YulValueCase]
diff --git a/src/slang-utils/create-nonterminal-variant-creator.ts b/src/slang-utils/create-nonterminal-variant-creator.ts
@@ -17,8 +17,8 @@ type GenericFunction<U> = U extends any
 type SlangPolymorphicNode = Extract<SlangAstNode, { variant: unknown }>;
 
 export function createNonterminalVariantCreator<
-  T extends StrictPolymorphicNode,
-  U extends SlangPolymorphicNode
+  U extends SlangPolymorphicNode,
+  T extends StrictPolymorphicNode
 >(
   constructors: [
     GenericFunction<U['variant']>,
