getting rid of all print functions of classes that only print a variant

Author: Janther

src/slang-nodes/ArgumentsDeclaration.ts

@@ -4,9 +4,8 @@ import { SlangNode } from './SlangNode.js';
 import { PositionalArgumentsDeclaration } from './PositionalArgumentsDeclaration.js';
 import { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration.js';
 
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 function createNonterminalVariant(
   variant: ast.ArgumentsDeclaration['variant'],
@@ -34,8 +33,4 @@ export class ArgumentsDeclaration extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ArgumentsDeclaration>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/ConstructorAttribute.ts

@@ -7,9 +7,8 @@ import { ModifierInvocation } from './ModifierInvocation.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 export class ConstructorAttribute extends SlangNode {
   readonly kind = NonterminalKind.ConstructorAttribute;
@@ -28,8 +27,4 @@ export class ConstructorAttribute extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ConstructorAttribute>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/ContractDefinition.ts

@@ -41,12 +41,12 @@ export class ContractDefinition extends SlangNode {
     // Older versions of Solidity defined a constructor as a function having
     // the same name as the contract.
     if (!satisfies(options.compiler, '>=0.5.0')) {
-      for (const { variant: member } of this.members.items) {
+      for (const { variant } of this.members.items) {
         if (
-          member.kind === NonterminalKind.FunctionDefinition &&
-          member.name.variant.value !== this.name.value
+          variant.kind === NonterminalKind.FunctionDefinition &&
+          variant.name.variant.value !== this.name.value
         ) {
-          member.cleanModifierInvocationArguments();
+          variant.cleanModifierInvocationArguments();
         }
       }
     }

src/slang-nodes/ContractMember.ts

@@ -15,9 +15,8 @@ import { StateVariableDefinition } from './StateVariableDefinition.js';
 import { ErrorDefinition } from './ErrorDefinition.js';
 import { UserDefinedValueTypeDefinition } from './UserDefinedValueTypeDefinition.js';
 
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 function createNonterminalVariant(
   variant: ast.ContractMember['variant'],
@@ -91,8 +90,4 @@ export class ContractMember extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ContractMember>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/ContractSpecifier.ts

@@ -4,9 +4,8 @@ import { SlangNode } from './SlangNode.js';
 import { InheritanceSpecifier } from './InheritanceSpecifier.js';
 import { StorageLayoutSpecifier } from './StorageLayoutSpecifier.js';
 
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 function createNonterminalVariant(
   variant: ast.ContractSpecifier['variant'],
@@ -34,8 +33,4 @@ export class ContractSpecifier extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ContractSpecifier>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/ElementaryType.ts

@@ -7,8 +7,6 @@ import { AddressType } from './AddressType.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction } from '../types.d.ts';
 
 export class ElementaryType extends SlangNode {
   readonly kind = NonterminalKind.ElementaryType;
@@ -27,8 +25,4 @@ export class ElementaryType extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ElementaryType>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/ExperimentalFeature.ts

@@ -7,9 +7,8 @@ import { StringLiteral } from './StringLiteral.js';
 import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 export class ExperimentalFeature extends SlangNode {
   readonly kind = NonterminalKind.ExperimentalFeature;
@@ -28,8 +27,4 @@ export class ExperimentalFeature extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ExperimentalFeature>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/Expression.ts

@@ -33,9 +33,8 @@ import { StringExpression } from './StringExpression.js';
 import { ElementaryType } from './ElementaryType.js';
 import { TerminalNode } from './TerminalNode.js';
 
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 function createNonterminalVariant(
   variant: Exclude<ast.Expression['variant'], SlangTerminalNode>,
@@ -171,8 +170,4 @@ export class Expression extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<Expression>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/FallbackFunctionAttribute.ts

@@ -8,9 +8,8 @@ import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 import { TerminalNode } from './TerminalNode.js';
 
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
 
 function createNonterminalVariant(
   variant: Exclude<ast.FallbackFunctionAttribute['variant'], SlangTerminalNode>,
@@ -46,8 +45,4 @@ export class FallbackFunctionAttribute extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<FallbackFunctionAttribute>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }

src/slang-nodes/ForStatementCondition.ts

@@ -4,12 +4,11 @@ import {
 } from '@nomicfoundation/slang/cst';
 import { SlangNode } from './SlangNode.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
+import { TerminalNode } from './TerminalNode.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
-import type { PrintFunction } from '../types.d.ts';
-import { TerminalNode } from './TerminalNode.js';
 
 export class ForStatementCondition extends SlangNode {
   readonly kind = NonterminalKind.ForStatementCondition;
@@ -28,8 +27,4 @@ export class ForStatementCondition extends SlangNode {
 
     this.updateMetadata(this.variant);
   }
-
-  print(path: AstPath<ForStatementCondition>, print: PrintFunction): Doc {
-    return path.call(print, 'variant');
-  }
 }