refactor: typed errors

knip.json

@@ -5,6 +5,8 @@
   "ignore": [
     "src/grammar/ast.ts",
     "src/prettyPrinter.ts",
+    "src/error/display-to-json.ts",
+    "src/grammar/src-info.ts",
     ".github/workflows/tact*.yml"
   ],
   "ignoreDependencies": ["@tact-lang/ton-abi"]

src/error/display-to-json.ts

@@ -0,0 +1,67 @@
+/**
+ * Render error message to JSON for tests
+ */
+
+import { throwInternalCompilerError } from "../errors";
+import { SrcInfo } from "../grammar";
+import { srcInfoEqual } from "../grammar/src-info";
+import { ErrorDisplay } from "./display";
+
+export type ErrorJson = ErrorSub | ErrorText | ErrorLink | ErrorAt;
+
+export type ErrorText = { kind: "text"; text: string };
+export type ErrorSub = { kind: "sub"; parts: string[]; subst: ErrorJson[] };
+export type ErrorLink = { kind: "link"; text: string; loc: SrcInfo };
+export type ErrorAt = { kind: "at"; body: ErrorJson; loc: SrcInfo };
+
+export const errorJsonEqual = (left: ErrorJson, right: ErrorJson): boolean => {
+    switch (left.kind) {
+        case "link": {
+            return (
+                left.kind === right.kind &&
+                left.text === right.text &&
+                srcInfoEqual(left.loc, right.loc)
+            );
+        }
+        case "at": {
+            return (
+                left.kind === right.kind &&
+                errorJsonEqual(left.body, right.body) &&
+                srcInfoEqual(left.loc, right.loc)
+            );
+        }
+        case "text": {
+            return left.kind === right.kind && left.text === right.text;
+        }
+        case "sub": {
+            if (left.kind !== right.kind) {
+                return false;
+            }
+            if (left.parts.length !== right.parts.length) {
+                return false;
+            }
+            if (left.parts.some((part, index) => part != right.parts[index])) {
+                return false;
+            }
+            if (left.subst.length !== right.subst.length) {
+                return false;
+            }
+            return left.subst.every((leftChild, index) => {
+                const rightChild = right.subst[index];
+                if (typeof rightChild === "undefined") {
+                    throwInternalCompilerError(
+                        "Impossible: by this moment array lengths must match",
+                    );
+                }
+                return errorJsonEqual(leftChild, rightChild);
+            });
+        }
+    }
+};
+
+export const displayToJson: ErrorDisplay<ErrorJson> = {
+    text: (text) => ({ kind: "text", text }),
+    sub: (parts, ...subst) => ({ kind: "sub", parts: [...parts], subst }),
+    link: (text, loc) => ({ kind: "link", text, loc }),
+    at: (loc, body) => ({ kind: "at", body, loc }),
+};

src/error/display-to-string.ts

@@ -0,0 +1,24 @@
+/**
+ * Render error message to string for compiler CLI
+ */
+
+import { ErrorDisplay } from "./display";
+import { locationStr } from "../errors";
+
+export const displayToString: ErrorDisplay<string> = {
+    text: (text) => text,
+    sub: (parts, ...subst) => {
+        const [head, ...tail] = parts;
+        if (!head) {
+            return "";
+        }
+        return tail.reduce((acc, part, index) => {
+            const sub = subst[index];
+            return acc + sub + part;
+        }, head);
+    },
+    link: (text, _loc) => text,
+    at: (loc, body) => {
+        return `${locationStr(loc)}${body}\n${loc.interval.getLineAndColumnMessage()}`;
+    },
+};

src/error/display.ts

@@ -0,0 +1,19 @@
+/**
+ * Describes DSL for displaying errors
+ */
+
+import { SrcInfo } from "../grammar";
+
+export interface ErrorDisplay<T> {
+    // Specify main error location
+    at: (loc: SrcInfo, body: T) => T;
+
+    // Regular string
+    text: (text: string) => T;
+
+    // Text with substitutions
+    sub: (text: TemplateStringsArray, ...subst: T[]) => T;
+
+    // Reference some code location
+    link: (text: string, loc: SrcInfo) => T;
+}

src/errors.ts

@@ -1,9 +1,7 @@
-import { MatchResult } from "ohm-js";
 import path from "path";
 import { cwd } from "process";
 import { AstFuncId, AstId, AstTypeId } from "./grammar/ast";
-import { ItemOrigin, SrcInfo } from "./grammar";
-import { getSrcInfoFromOhm } from "./grammar/src-info";
+import { SrcInfo } from "./grammar";
 
 export class TactError extends Error {
     readonly loc?: SrcInfo;
@@ -13,19 +11,8 @@ export class TactError extends Error {
     }
 }
 
-export class TactParseError extends TactError {
-    constructor(message: string, loc: SrcInfo) {
-        super(message, loc);
-    }
-}
-
-export class TactSyntaxError extends TactError {
-    constructor(message: string, loc: SrcInfo) {
-        super(message, loc);
-    }
-}
-
-/// This will be split at least into two categories: typechecking and codegen errors
+// Any regular compilation error shown to user:
+// parsing, typechecking, code generation
 export class TactCompilationError extends TactError {
     constructor(message: string, loc?: SrcInfo) {
         super(message, loc);
@@ -46,7 +33,7 @@ export class TactConstEvalError extends TactCompilationError {
     }
 }
 
-function locationStr(sourceInfo: SrcInfo): string {
+export function locationStr(sourceInfo: SrcInfo): string {
     if (sourceInfo.file) {
         const loc = sourceInfo.interval.getLineAndColumn() as {
             lineNum: number;
@@ -59,28 +46,6 @@ function locationStr(sourceInfo: SrcInfo): string {
     }
 }
 
-export function throwParseError(
-    matchResult: MatchResult,
-    path: string,
-    origin: ItemOrigin,
-): never {
-    const interval = matchResult.getInterval();
-    const source = getSrcInfoFromOhm(interval, path, origin);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const message = `Parse error: expected ${(matchResult as any).getExpectedText()}\n`;
-    throw new TactParseError(
-        `${locationStr(source)}${message}\n${interval.getLineAndColumnMessage()}`,
-        source,
-    );
-}
-
-export function throwSyntaxError(message: string, source: SrcInfo): never {
-    throw new TactSyntaxError(
-        `Syntax error: ${locationStr(source)}${message}\n${source.interval.getLineAndColumnMessage()}`,
-        source,
-    );
-}
-
 export function throwCompilationError(
     message: string,
     source?: SrcInfo,
@@ -128,8 +93,6 @@ export function idTextErr(
 
 export type TactErrorCollection =
     | Error
-    | TactParseError
-    | TactSyntaxError
     | TactCompilationError
     | TactInternalCompilerError
     | TactConstEvalError;