removing FunctionName from the AST tree

Author: Janther

src/slang-nodes/ContractDefinition.ts

@@ -44,7 +44,7 @@ export class ContractDefinition extends SlangNode {
       for (const member of this.members.items) {
         if (
           member.kind === NonterminalKind.FunctionDefinition &&
-          member.name.variant.value !== this.name.value
+          member.name.value !== this.name.value
         ) {
           member.cleanModifierInvocationArguments();
         }

src/slang-nodes/FunctionDefinition.ts

@@ -1,7 +1,6 @@
 import { satisfies } from 'semver';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunctionWithBody } from '../slang-printers/print-function.js';
-import { printVariant } from '../slang-printers/print-variant.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { FunctionName } from './FunctionName.js';
@@ -18,7 +17,7 @@ import type { AstNode } from './types.d.ts';
 export class FunctionDefinition extends SlangNode {
   readonly kind = NonterminalKind.FunctionDefinition;
 
-  name: FunctionName;
+  name: FunctionName['variant'];
 
   parameters: ParametersDeclaration;
 
@@ -31,7 +30,7 @@ export class FunctionDefinition extends SlangNode {
   constructor(ast: ast.FunctionDefinition, options: ParserOptions<AstNode>) {
     super(ast);
 
-    this.name = new FunctionName(ast.name);
+    this.name = extractVariant(new FunctionName(ast.name));
     this.parameters = new ParametersDeclaration(ast.parameters, options);
     this.attributes = new FunctionAttributes(ast.attributes, options);
     if (ast.returns) {
@@ -67,7 +66,7 @@ export class FunctionDefinition extends SlangNode {
 
   print(path: AstPath<FunctionDefinition>, print: PrintFunction): Doc {
     return printFunctionWithBody(
-      ['function ', path.call(printVariant(print), 'name')],
+      ['function ', path.call(print, 'name')],
       this,
       path,
       print

src/slang-nodes/FunctionName.ts

@@ -1,10 +1,10 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 
-export class FunctionName extends PolymorphicNode {
+export class FunctionName extends SlangNode {
   readonly kind = NonterminalKind.FunctionName;
 
   variant: TerminalNode;

src/slangPrinter.ts

@@ -24,6 +24,7 @@ import type { Expression } from './slang-nodes/Expression.js';
 import type { ForStatementInitialization } from './slang-nodes/ForStatementInitialization.js';
 import type { ForStatementCondition } from './slang-nodes/ForStatementCondition.js';
 import type { FunctionBody } from './slang-nodes/FunctionBody.js';
+import type { FunctionName } from './slang-nodes/FunctionName.js';
 
 function hasNodeIgnoreComment({ comments }: StrictAstNode): boolean {
   // Prettier sets SourceUnit's comments to undefined after assigning comments
@@ -96,6 +97,7 @@ function genericPrint(
       | ForStatementInitialization
       | ForStatementCondition
       | FunctionBody
+      | FunctionName
     >
   >,
   options: ParserOptions<AstNode>,