Skip to content

Commit

Permalink
chore: export type and value as same name
Browse files Browse the repository at this point in the history
  • Loading branch information
jeasonstudio committed Jan 15, 2024
1 parent bdb6a2c commit 0080566
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 32 deletions.
6 changes: 2 additions & 4 deletions src/ast/expression/expression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ import { BaseNodeUnion } from '../base';
import { ExpressionContext, SolidityParserVisitor } from '../../antlr4';
import { ExpressionNode } from './index';

// @ts-expect-error
export type Expression = ExpressionNode;

// @ts-expect-error
export class Expression extends BaseNodeUnion {
export const Expression = class extends BaseNodeUnion {
// type = 'Expression' as any;
constructor(ctx: ExpressionContext, visitor: SolidityParserVisitor<any>) {
super(ctx, ctx.children, visitor);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/expression/inline-array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ import { BaseNodeUnion } from '../base';
import { InlineArrayContext, SolidityParserVisitor } from '../../antlr4';
import { InlineArrayExpression } from './inline-array-expression';

// @ts-expect-error
export type InlineArray = InlineArrayExpression;

// @ts-expect-error
export class InlineArray extends BaseNodeUnion<InlineArrayExpression> {
export const InlineArray = class extends BaseNodeUnion<InlineArrayExpression> {
// type = 'InlineArray' as const;
constructor(ctx: InlineArrayContext, visitor: SolidityParserVisitor<any>) {
super(ctx, [ctx.inlineArrayExpression()], visitor);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/expression/literal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ import { BooleanLiteral } from './boolean-literal';
import { HexStringLiteral } from './hex-string-literal';
import { UnicodeStringLiteral } from './unicode-string-literal';

// @ts-expect-error
export type Literal =
| StringLiteral
| NumberLiteral
| BooleanLiteral
| HexStringLiteral
| UnicodeStringLiteral;

// @ts-expect-error
export class Literal extends BaseNodeUnion<
export const Literal = class extends BaseNodeUnion<
StringLiteral | NumberLiteral | BooleanLiteral | HexStringLiteral | UnicodeStringLiteral
> {
// type = 'Literal' as const;
Expand All @@ -32,4 +30,4 @@ export class Literal extends BaseNodeUnion<
visitor,
);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/expression/primary-expression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ import { Literal } from './literal';
import { ElementaryTypeName } from '../type';
import { Identifier } from './identifier';

// @ts-expect-error
export type PrimaryExpression =
| LiteralWithSubDenomination
| Literal
| ElementaryTypeName
| Identifier;

// @ts-expect-error
export class PrimaryExpression extends BaseNodeUnion<
export const PrimaryExpression = class extends BaseNodeUnion<
LiteralWithSubDenomination | Literal | ElementaryTypeName | Identifier
> {
// type = 'PrimaryExpression' as const;
Expand All @@ -24,4 +22,4 @@ export class PrimaryExpression extends BaseNodeUnion<
visitor,
);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/expression/tuple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ import { BaseNodeUnion } from '../base';
import { TupleContext, SolidityParserVisitor } from '../../antlr4';
import { TupleExpression } from './tuple-expression';

// @ts-expect-error
export type Tuple = TupleExpression;

// @ts-expect-error
export class Tuple extends BaseNodeUnion<TupleExpression> {
export const Tuple = class extends BaseNodeUnion<TupleExpression> {
// type = 'Tuple' as const;
constructor(ctx: TupleContext, visitor: SolidityParserVisitor<any>) {
super(ctx, [ctx.tupleExpression()], visitor);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/statement/simple-statement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ import { SimpleStatementContext, SolidityParserVisitor } from '../../antlr4';
import { VariableDeclarationStatement } from './variable-declaration-statement';
import { ExpressionStatement } from './expression-statement';

// @ts-expect-error
export type SimpleStatement = VariableDeclarationStatement | ExpressionStatement;

// @ts-expect-error
export class SimpleStatement extends BaseNodeUnion<
export const SimpleStatement = class extends BaseNodeUnion<
VariableDeclarationStatement | ExpressionStatement
> {
// type = 'SimpleStatement' as const;
constructor(ctx: SimpleStatementContext, visitor: SolidityParserVisitor<any>) {
super(ctx, [ctx.variableDeclarationStatement(), ctx.expressionStatement()], visitor);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/statement/statement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { EmitStatement } from './emit-statement';
import { RevertStatement } from './revert-statement';
import { AssemblyStatement } from './assembly-statement';

// @ts-expect-error
export type Statement =
| Block
| SimpleStatement
Expand All @@ -30,8 +29,7 @@ export type Statement =
| RevertStatement
| AssemblyStatement;

// @ts-expect-error
export class Statement extends BaseNodeUnion<
export const Statement = class extends BaseNodeUnion<
| Block
| SimpleStatement
| IfStatement
Expand Down Expand Up @@ -68,4 +66,4 @@ export class Statement extends BaseNodeUnion<
visitor,
);
}
}
};
6 changes: 2 additions & 4 deletions src/ast/yul/yul-expression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ import { YulFunctionCall } from './yul-function-call';
import { YulPath } from './yul-path';
import { YulLiteral } from './yul-literal';

// @ts-expect-error
export type YulExpression = YulFunctionCall | YulPath | YulLiteral;

// @ts-expect-error
export class YulExpression extends BaseNodeUnion<YulFunctionCall | YulPath | YulLiteral> {
export const YulExpression = class extends BaseNodeUnion<YulFunctionCall | YulPath | YulLiteral> {
// type = 'YulExpression' as const;
constructor(ctx: YulExpressionContext, visitor: SolidityParserVisitor<any>) {
super(ctx, [ctx.yulPath(), ctx.yulFunctionCall(), ctx.yulLiteral()], visitor);
}
}
};

0 comments on commit 0080566

Please sign in to comment.