From a4d5d4241360b4b20dcf4de075f99d7121ee086d Mon Sep 17 00:00:00 2001 From: Xie Yuheng Date: Thu, 28 Mar 2024 22:42:14 +0800 Subject: [PATCH] [lang1] & [lang0] use upstream `ParsingError` --- src/lang0/errors/ParsingError.ts | 1 - src/lang0/errors/index.ts | 1 - src/lang0/run/load.ts | 3 ++- src/lang1/errors/ParsingError.ts | 1 - src/lang1/errors/index.ts | 1 - src/lang1/run/load.ts | 3 ++- 6 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/lang0/errors/ParsingError.ts delete mode 100644 src/lang1/errors/ParsingError.ts diff --git a/src/lang0/errors/ParsingError.ts b/src/lang0/errors/ParsingError.ts deleted file mode 100644 index 0daafed..0000000 --- a/src/lang0/errors/ParsingError.ts +++ /dev/null @@ -1 +0,0 @@ -export { ParsingError } from "@cicada-lang/sexp" diff --git a/src/lang0/errors/index.ts b/src/lang0/errors/index.ts index 16d7079..0c64caa 100644 --- a/src/lang0/errors/index.ts +++ b/src/lang0/errors/index.ts @@ -1,3 +1,2 @@ -export { ParsingError } from "@cicada-lang/sexp" export * from "./ErrorReport.js" export * from "./LangError.js" diff --git a/src/lang0/run/load.ts b/src/lang0/run/load.ts index b60df49..3aa7687 100644 --- a/src/lang0/run/load.ts +++ b/src/lang0/run/load.ts @@ -1,4 +1,5 @@ import { Fetcher } from "@cicada-lang/framework/lib/fetcher/index.js" +import { ParsingError } from "@cicada-lang/sexp" import fs from "node:fs" import * as Errors from "../errors/index.js" import { createMod, modResolve, type Mod } from "../mod/index.js" @@ -34,7 +35,7 @@ export async function load( return mod } catch (error) { - if (error instanceof Errors.ParsingError) { + if (error instanceof ParsingError) { throw new Errors.ErrorReport(error.report(text)) } diff --git a/src/lang1/errors/ParsingError.ts b/src/lang1/errors/ParsingError.ts deleted file mode 100644 index 0daafed..0000000 --- a/src/lang1/errors/ParsingError.ts +++ /dev/null @@ -1 +0,0 @@ -export { ParsingError } from "@cicada-lang/sexp" diff --git a/src/lang1/errors/index.ts b/src/lang1/errors/index.ts index 16d7079..0c64caa 100644 --- a/src/lang1/errors/index.ts +++ b/src/lang1/errors/index.ts @@ -1,3 +1,2 @@ -export { ParsingError } from "@cicada-lang/sexp" export * from "./ErrorReport.js" export * from "./LangError.js" diff --git a/src/lang1/run/load.ts b/src/lang1/run/load.ts index 5a1c904..87108b6 100644 --- a/src/lang1/run/load.ts +++ b/src/lang1/run/load.ts @@ -1,4 +1,5 @@ import { Fetcher } from "@cicada-lang/framework/lib/fetcher/index.js" +import { ParsingError } from "@cicada-lang/sexp" import fs from "node:fs" import * as Errors from "../errors/index.js" import { createMod, type Mod } from "../mod/index.js" @@ -34,7 +35,7 @@ export async function load( return mod } catch (error) { - if (error instanceof Errors.ParsingError) { + if (error instanceof ParsingError) { throw new Errors.ErrorReport(error.report(text)) }