Clear names

Author: Janther

src/slang-utils/create-nonterminal-variant-creator.ts

@@ -6,7 +6,7 @@ import type { AstNode, StrictPolymorphicNode } from '../slang-nodes/types.d.ts';
 import type {
   CollectedMetadata,
   SlangAstNode,
-  SlangAstNodeConstructors
+  TypeOfSlangAstNode
 } from '../types.d.ts';
 
 type Constructor<T> = new (...args: any) => T;
@@ -26,14 +26,11 @@ export function createNonterminalVariantSimpleCreator<
   U extends SlangPolymorphicNode,
   T extends StrictPolymorphicNode
 >(
-  constructors: [
-    SlangAstNodeConstructors,
-    ConstructorsFromInstances<T['variant']>
-  ][]
+  constructors: [TypeOfSlangAstNode, ConstructorsFromInstances<T['variant']>][]
 ): NonterminalVariantFactory<U, T> {
   return (variant, collected, options?) => {
-    for (const [instance, constructor] of constructors) {
-      if (variant instanceof instance)
+    for (const [slangAstClass, constructor] of constructors) {
+      if (variant instanceof slangAstClass)
         return new constructor(variant, collected, options);
     }
 
@@ -45,12 +42,9 @@ export function createNonterminalVariantCreator<
   U extends SlangPolymorphicNode,
   T extends StrictPolymorphicNode
 >(
-  constructors: [
-    SlangAstNodeConstructors,
-    ConstructorsFromInstances<T['variant']>
-  ][],
+  constructors: [TypeOfSlangAstNode, ConstructorsFromInstances<T['variant']>][],
   extractVariantConstructors: [
-    SlangAstNodeConstructors,
+    TypeOfSlangAstNode,
     ConstructorsFromInstances<StrictPolymorphicNode>
   ][]
 ): NonterminalVariantFactory<U, T> {
@@ -59,8 +53,8 @@ export function createNonterminalVariantCreator<
   );
 
   return (variant, collected, options?) => {
-    for (const [instance, constructor] of extractVariantConstructors) {
-      if (variant instanceof instance)
+    for (const [slangAstClass, constructor] of extractVariantConstructors) {
+      if (variant instanceof slangAstClass)
         return extractVariant(new constructor(variant, collected, options));
     }
 

src/types.d.ts

@@ -32,4 +32,4 @@ type KeyOfAst = keyof TypeOfAst;
 type ValuesOf<E> = E[keyof E];
 
 type SlangAstNode = { [k in KeyOfAst]: ValuesOf<TypeOfAst[k]> }[KeyOfAst];
-type SlangAstNodeConstructors = { [k in KeyOfAst]: TypeOfAst[k] }[KeyOfAst];
+type TypeOfSlangAstNode = { [k in KeyOfAst]: TypeOfAst[k] }[KeyOfAst];