fix: some identifier issue

src/ast/base.ts

@@ -1,6 +1,14 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import { SyntaxNodeType } from './index';
 import { ParseTree, ParserRuleContext, SolidityParserVisitor } from '../antlr4';
+import type { AstPath, ParserOptions, Doc } from 'prettier';
+
+export type SyntaxPrint<T extends BaseNode> = (params: {
+  path: AstPath<T>;
+  options: ParserOptions<T>;
+  print: (path: AstPath<T>) => Doc;
+  args?: unknown;
+}) => Doc;
 
 export class Position {
   static create(line: number, column: number): Position {
@@ -34,7 +42,7 @@ export const isSyntaxNode = <T extends any>(node: T): boolean => {
 };
 
 export const keysInNode = <T extends BaseNode>(node: T): string[] => {
-  const forbiddenKeys = ['context', 'serialize'];
+  const forbiddenKeys = ['context', 'serialize', 'print'];
   const keys: string[] = [];
 
   for (const key in node) {
@@ -66,6 +74,9 @@ export abstract class BaseNode {
 
   /** @ignore */
   // context: ParserRuleContext;
+
+  /** @ignore */
+  // print?: SyntaxPrint<typeof this>;
 }
 
 export abstract class BaseNodeList<T extends any = BaseNode> extends Array<T> {

src/ast/declaration/error-definition.ts

@@ -1,14 +1,15 @@
 import { BaseNode } from '../base';
 import { ErrorDefinitionContext, SolidityParserVisitor } from '../../antlr4';
 import { ErrorParameter } from './variable-declaration';
+import { Identifier } from '../expression';
 
 export class ErrorDefinition extends BaseNode {
   type = 'ErrorDefinition' as const;
-  name: string;
+  name: Identifier;
   parameters: ErrorParameter[];
   constructor(ctx: ErrorDefinitionContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, visitor);
-    this.name = ctx.identifier().getText();
+    this.name = ctx.identifier().accept(visitor);
     this.parameters = ctx.errorParameter().map((param) => param.accept(visitor));
   }
 }

src/ast/declaration/event-definition.ts

@@ -1,15 +1,16 @@
 import { BaseNode } from '../base';
 import { EventDefinitionContext, SolidityParserVisitor } from '../../antlr4';
 import { EventParameter } from './variable-declaration';
+import { Identifier } from '../expression';
 
 export class EventDefinition extends BaseNode {
   type = 'EventDefinition' as const;
-  name: string;
+  name: Identifier;
   anonymous: boolean;
   parameters: EventParameter[] = [];
   constructor(ctx: EventDefinitionContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, visitor);
-    this.name = ctx.identifier().getText();
+    this.name = ctx.identifier().accept(visitor);
     this.anonymous = !!ctx.Anonymous();
     this.parameters = ctx.eventParameter().map((param) => param.accept(visitor));
   }

src/ast/meta/import-directive.ts

@@ -1,11 +1,12 @@
 import { BaseNode } from '../base';
-import { ImportDirectiveContext, PathContext, SolidityParserVisitor } from '../../antlr4';
+import { ImportDirectiveContext, SolidityParserVisitor } from '../../antlr4';
 import { SymbolAliases } from './symbol-aliases';
 import { Identifier } from '../expression';
+import { Path } from './path';
 
 export class ImportDirective extends BaseNode {
   type = 'ImportDirective' as const;
-  path: PathContext;
+  path: Path;
   unitAlias: Identifier | null = null;
   symbolAliases: SymbolAliases[] = [];
   constructor(ctx: ImportDirectiveContext, visitor: SolidityParserVisitor<any>) {

src/parser/parse.ts

@@ -1,5 +1,5 @@
 import { SolidityASTBuilder } from '../ast/builder';
-import { SyntaxNode } from '../ast';
+import { SourceUnit, SyntaxNode } from '../ast';
 import { SolidityParser, ParseTree, SolidityLexer, CommonTokenStream, CharStream } from '../antlr4';
 import { ParseError, SolidityErrorListener } from './error-listener';
 
@@ -13,8 +13,11 @@ export const defaultParseOption: ParseOptions = {
   selector: (p) => p.sourceUnit(),
 };
 
-export const parse = (source: string, _options?: ParseOptions): SyntaxNode => {
-  let syntaxTree: SyntaxNode;
+export const parse = <T extends SyntaxNode = SourceUnit>(
+  source: string,
+  _options?: ParseOptions,
+): T => {
+  let syntaxTree: T;
   const options: ParseOptions = Object.assign({}, defaultParseOption, _options);
   const listener = new SolidityErrorListener();
 
@@ -28,7 +31,7 @@ export const parse = (source: string, _options?: ParseOptions): SyntaxNode => {
 
     const visitor = new SolidityASTBuilder();
     const parseTree = options.selector!(parser);
-    syntaxTree = parseTree.accept(visitor)! as SyntaxNode;
+    syntaxTree = parseTree.accept(visitor)! as T;
   } catch (error) {
     if (error instanceof ParseError) {
     } else {