removing ExperimentalFeature from the AST tree

Author: Janther

src/slang-nodes/ExperimentalFeature.ts

@@ -2,15 +2,15 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { StringLiteral } from './StringLiteral.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
 
-export class ExperimentalFeature extends PolymorphicNode {
+export class ExperimentalFeature extends SlangNode {
   readonly kind = NonterminalKind.ExperimentalFeature;
 
   variant: StringLiteral | TerminalNode;

src/slang-nodes/ExperimentalPragma.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 { ExperimentalFeature } from './ExperimentalFeature.js';
 
@@ -11,17 +11,19 @@ import type { AstNode } from './types.d.ts';
 export class ExperimentalPragma extends SlangNode {
   readonly kind = NonterminalKind.ExperimentalPragma;
 
-  feature: ExperimentalFeature;
+  feature: ExperimentalFeature['variant'];
 
   constructor(ast: ast.ExperimentalPragma, options: ParserOptions<AstNode>) {
     super(ast);
 
-    this.feature = new ExperimentalFeature(ast.feature, options);
+    this.feature = extractVariant(
+      new ExperimentalFeature(ast.feature, options)
+    );
 
     this.updateMetadata(this.feature);
   }
 
   print(path: AstPath<ExperimentalPragma>, print: PrintFunction): Doc {
-    return ['experimental ', path.call(printVariant(print), 'feature')];
+    return ['experimental ', path.call(print, 'feature')];
   }
 }

src/slangPrinter.ts

@@ -19,6 +19,7 @@ import type { Statement } from './slang-nodes/Statement.js';
 import type { YulStatement } from './slang-nodes/YulStatement.js';
 import type { ContractSpecifier } from './slang-nodes/ContractSpecifier.js';
 import type { ElementaryType } from './slang-nodes/ElementaryType.js';
+import type { ExperimentalFeature } from './slang-nodes/ExperimentalFeature.js';
 
 function hasNodeIgnoreComment({ comments }: StrictAstNode): boolean {
   // Prettier sets SourceUnit's comments to undefined after assigning comments
@@ -86,6 +87,7 @@ function genericPrint(
       | YulStatement
       | ContractSpecifier
       | ElementaryType
+      | ExperimentalFeature
     >
   >,
   options: ParserOptions<AstNode>,