removing YulAssignmentOperator, YulLiteral, YulStackAssignmentOperator, and YulSwitchCase from the AST tree

Author: Janther

src/slang-nodes/YulAssignmentOperator.ts

@@ -2,13 +2,13 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { YulColonAndEqual } from './YulColonAndEqual.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 
-export class YulAssignmentOperator extends PolymorphicNode {
+export class YulAssignmentOperator extends SlangNode {
   readonly kind = NonterminalKind.YulAssignmentOperator;
 
   variant: YulColonAndEqual | TerminalNode;

src/slang-nodes/YulExpression.ts

@@ -1,5 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { PolymorphicNode } from './PolymorphicNode.js';
 import { YulFunctionCallExpression } from './YulFunctionCallExpression.js';
 import { YulLiteral } from './YulLiteral.js';
@@ -16,7 +17,7 @@ function createNonterminalVariant(
     return new YulFunctionCallExpression(variant, options);
   }
   if (variant instanceof ast.YulLiteral) {
-    return new YulLiteral(variant, options);
+    return extractVariant(new YulLiteral(variant, options));
   }
   if (variant instanceof ast.YulPath) {
     return new YulPath(variant);
@@ -28,7 +29,7 @@ function createNonterminalVariant(
 export class YulExpression extends PolymorphicNode {
   readonly kind = NonterminalKind.YulExpression;
 
-  variant: YulFunctionCallExpression | YulLiteral | YulPath;
+  variant: YulFunctionCallExpression | YulLiteral['variant'] | YulPath;
 
   constructor(ast: ast.YulExpression, options: ParserOptions<AstNode>) {
     super(ast);

src/slang-nodes/YulLiteral.ts

@@ -3,7 +3,7 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { HexStringLiteral } from './HexStringLiteral.js';
 import { StringLiteral } from './StringLiteral.js';
 import { TerminalNode } from './TerminalNode.js';
@@ -25,7 +25,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class YulLiteral extends PolymorphicNode {
+export class YulLiteral extends SlangNode {
   readonly kind = NonterminalKind.YulLiteral;
 
   variant: HexStringLiteral | StringLiteral | TerminalNode;

src/slang-nodes/YulStackAssignmentOperator.ts

@@ -2,13 +2,13 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { YulEqualAndColon } from './YulEqualAndColon.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 
-export class YulStackAssignmentOperator extends PolymorphicNode {
+export class YulStackAssignmentOperator extends SlangNode {
   readonly kind = NonterminalKind.YulStackAssignmentOperator;
 
   variant: YulEqualAndColon | TerminalNode;

src/slang-nodes/YulStackAssignmentStatement.ts

@@ -1,7 +1,7 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulStackAssignmentOperator } from './YulStackAssignmentOperator.js';
 import { TerminalNode } from './TerminalNode.js';
@@ -15,22 +15,24 @@ const { line } = doc.builders;
 export class YulStackAssignmentStatement extends SlangNode {
   readonly kind = NonterminalKind.YulStackAssignmentStatement;
 
-  assignment: YulStackAssignmentOperator;
+  assignment: YulStackAssignmentOperator['variant'];
 
   variable: TerminalNode;
 
   constructor(ast: ast.YulStackAssignmentStatement) {
     super(ast);
 
-    this.assignment = new YulStackAssignmentOperator(ast.assignment);
+    this.assignment = extractVariant(
+      new YulStackAssignmentOperator(ast.assignment)
+    );
     this.variable = new TerminalNode(ast.variable);
 
     this.updateMetadata(this.assignment);
   }
 
   print(path: AstPath<YulStackAssignmentStatement>, print: PrintFunction): Doc {
     return [
-      path.call(printVariant(print), 'assignment'),
+      path.call(print, 'assignment'),
       printSeparatedItem(path.call(print, 'variable'), {
         firstSeparator: line,
         lastSeparator: ''

src/slang-nodes/YulSwitchCase.ts

@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { YulDefaultCase } from './YulDefaultCase.js';
 import { YulValueCase } from './YulValueCase.js';
 
@@ -21,7 +21,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class YulSwitchCase extends PolymorphicNode {
+export class YulSwitchCase extends SlangNode {
   readonly kind = NonterminalKind.YulSwitchCase;
 
   variant: YulDefaultCase | YulValueCase;

src/slang-nodes/YulSwitchCases.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulSwitchCase } from './YulSwitchCase.js';
 
@@ -14,15 +14,17 @@ const { hardline, join } = doc.builders;
 export class YulSwitchCases extends SlangNode {
   readonly kind = NonterminalKind.YulSwitchCases;
 
-  items: YulSwitchCase[];
+  items: YulSwitchCase['variant'][];
 
   constructor(ast: ast.YulSwitchCases, options: ParserOptions<AstNode>) {
     super(ast, true);
 
-    this.items = ast.items.map((item) => new YulSwitchCase(item, options));
+    this.items = ast.items.map((item) =>
+      extractVariant(new YulSwitchCase(item, options))
+    );
   }
 
   print(path: AstPath<YulSwitchCases>, print: PrintFunction): Doc {
-    return join(hardline, path.map(printVariant(print), 'items'));
+    return join(hardline, path.map(print, 'items'));
   }
 }

src/slang-nodes/YulValueCase.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulLiteral } from './YulLiteral.js';
 import { YulBlock } from './YulBlock.js';
@@ -12,25 +12,20 @@ import type { AstNode } from './types.d.ts';
 export class YulValueCase extends SlangNode {
   readonly kind = NonterminalKind.YulValueCase;
 
-  value: YulLiteral;
+  value: YulLiteral['variant'];
 
   body: YulBlock;
 
   constructor(ast: ast.YulValueCase, options: ParserOptions<AstNode>) {
     super(ast);
 
-    this.value = new YulLiteral(ast.value, options);
+    this.value = extractVariant(new YulLiteral(ast.value, options));
     this.body = new YulBlock(ast.body, options);
 
     this.updateMetadata(this.value, this.body);
   }
 
   print(path: AstPath<YulValueCase>, print: PrintFunction): Doc {
-    return [
-      'case ',
-      path.call(printVariant(print), 'value'),
-      ' ',
-      path.call(print, 'body')
-    ];
+    return ['case ', path.call(print, 'value'), ' ', path.call(print, 'body')];
   }
 }

src/slang-nodes/YulVariableAssignmentStatement.ts

@@ -1,6 +1,7 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulPaths } from './YulPaths.js';
 import { YulAssignmentOperator } from './YulAssignmentOperator.js';
@@ -18,7 +19,7 @@ export class YulVariableAssignmentStatement extends SlangNode {
 
   variables: YulPaths;
 
-  assignment: YulAssignmentOperator;
+  assignment: YulAssignmentOperator['variant'];
 
   expression: YulExpression;
 
@@ -29,7 +30,7 @@ export class YulVariableAssignmentStatement extends SlangNode {
     super(ast);
 
     this.variables = new YulPaths(ast.variables);
-    this.assignment = new YulAssignmentOperator(ast.assignment);
+    this.assignment = extractVariant(new YulAssignmentOperator(ast.assignment));
     this.expression = new YulExpression(ast.expression, options);
 
     this.updateMetadata(this.variables, this.assignment, this.expression);
@@ -41,7 +42,7 @@ export class YulVariableAssignmentStatement extends SlangNode {
   ): Doc {
     return join(' ', [
       path.call(print, 'variables'),
-      path.call(printVariant(print), 'assignment'),
+      path.call(print, 'assignment'),
       path.call(printVariant(print), 'expression')
     ]);
   }

src/slang-nodes/YulVariableDeclarationValue.ts

@@ -1,5 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulAssignmentOperator } from './YulAssignmentOperator.js';
 import { YulExpression } from './YulExpression.js';
@@ -12,7 +13,7 @@ import type { AstNode } from './types.d.ts';
 export class YulVariableDeclarationValue extends SlangNode {
   readonly kind = NonterminalKind.YulVariableDeclarationValue;
 
-  assignment: YulAssignmentOperator;
+  assignment: YulAssignmentOperator['variant'];
 
   expression: YulExpression;
 
@@ -22,15 +23,15 @@ export class YulVariableDeclarationValue extends SlangNode {
   ) {
     super(ast);
 
-    this.assignment = new YulAssignmentOperator(ast.assignment);
+    this.assignment = extractVariant(new YulAssignmentOperator(ast.assignment));
     this.expression = new YulExpression(ast.expression, options);
 
     this.updateMetadata(this.assignment, this.expression);
   }
 
   print(path: AstPath<YulVariableDeclarationValue>, print: PrintFunction): Doc {
     return [
-      path.call(printVariant(print), 'assignment'),
+      path.call(print, 'assignment'),
       ' ',
       path.call(printVariant(print), 'expression')
     ];