refactor: change long imports for AST to * as A imports (#1457)

tact-lang · Jan 21, 2025 · 8dbe087 · 8dbe087
1 parent c0a3a5a
commit 8dbe087
Show file tree

Hide file tree

Showing 8 changed files with 467 additions and 529 deletions.
diff --git a/src/context/store.ts b/src/context/store.ts
@@ -1,11 +1,4 @@
-import {
-    AstModule,
-    AstConstantDef,
-    AstFunctionDef,
-    AstNativeFunctionDecl,
-    AstTypeDecl,
-    AstAsmFunctionDef,
-} from "../ast/ast";
+import * as A from "../ast/ast";
 import { throwInternalCompilerError } from "../error/errors";
 import { CompilerContext, createContextStore } from "./context";
 import { ItemOrigin } from "../grammar/src-info";
@@ -26,9 +19,13 @@ export type TactSource = { code: string; path: string; origin: ItemOrigin };
 export type AstStore = {
     sources: TactSource[];
     funcSources: { code: string; path: string }[];
-    functions: (AstFunctionDef | AstNativeFunctionDecl | AstAsmFunctionDef)[];
-    constants: AstConstantDef[];
-    types: AstTypeDecl[];
+    functions: (
+        | A.AstFunctionDef
+        | A.AstNativeFunctionDecl
+        | A.AstAsmFunctionDef
+    )[];
+    constants: A.AstConstantDef[];
+    types: A.AstTypeDecl[];
 };
 
 const store = createContextStore<AstStore>();
@@ -55,7 +52,7 @@ export function getRawAST(ctx: CompilerContext): AstStore {
 export function parseModules(
     sources: TactSource[],
     parser: Parser,
-): AstModule[] {
+): A.AstModule[] {
     return sources.map((source) =>
         parser.parse(source.code, source.path, source.origin),
     );
@@ -73,18 +70,18 @@ export function openContext(
     sources: TactSource[],
     funcSources: { code: string; path: string }[],
     parser: Parser,
-    parsedModules?: AstModule[],
+    parsedModules?: A.AstModule[],
 ): CompilerContext {
     const modules = parsedModules
         ? parsedModules
         : parseModules(sources, parser);
-    const types: AstTypeDecl[] = [];
+    const types: A.AstTypeDecl[] = [];
     const functions: (
-        | AstNativeFunctionDecl
-        | AstFunctionDef
-        | AstAsmFunctionDef
+        | A.AstNativeFunctionDecl
+        | A.AstFunctionDef
+        | A.AstAsmFunctionDef
     )[] = [];
-    const constants: AstConstantDef[] = [];
+    const constants: A.AstConstantDef[] = [];
     for (const module of modules) {
         for (const item of module.items) {
             switch (item.kind) {

diff --git a/src/grammar/grammar.ts b/src/grammar/grammar.ts
@@ -1,23 +1,26 @@
 import { getParser as getParserNext } from "./next";
 
-import { AstExpression, AstImport, AstModule, FactoryAst } from "../ast/ast";
+import * as A from "../ast/ast";
 
 import { getParser as getParserPrev } from "./prev/grammar";
 import { ItemOrigin } from "./src-info";
 
 export type Parser = {
-    parse: (src: string, path: string, origin: ItemOrigin) => AstModule;
-    parseExpression: (sourceCode: string) => AstExpression;
+    parse: (src: string, path: string, origin: ItemOrigin) => A.AstModule;
+    parseExpression: (sourceCode: string) => A.AstExpression;
     parseImports: (
         src: string,
         path: string,
         origin: ItemOrigin,
-    ) => AstImport[];
+    ) => A.AstImport[];
 };
 
 export const defaultParser = "new";
 
-export const getParser = (ast: FactoryAst, version: "old" | "new"): Parser => {
+export const getParser = (
+    ast: A.FactoryAst,
+    version: "old" | "new",
+): Parser => {
     if (version === "new") {
         return getParserNext(ast);
     } else {