Skip to content

Commit add5a4f

Browse files
committed
remove "dedent"
1 parent 710f860 commit add5a4f

10 files changed

+32
-47
lines changed

TODO.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
remove "dedent"
2-
31
# bug
42

53
[bug] `(assert-equal fibonacci fibonacci/1)` fail
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[assert-equal] fail:
22
lhs: (lambda (x y) (x y))
33
rhs: (lambda (x y) (y x))
4+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[assert-not-equal] fail:
22
lhs: (lambda (x y) (x y))
33
rhs: (lambda (y x) (y x))
4+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[assert-not-same] fail:
22
lhs: (lambda (x y) (x y))
33
rhs: (lambda (y x) (y x))
4+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[assert-same] fail:
22
lhs: id1
33
rhs: id2
4+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[load] I find undefined name: g
22
defining: f
33
to: : (lambda (x) (g x))
4+

package-lock.json

Lines changed: 1 addition & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@xieyuheng/commander.js": "^0.1.3",
26-
"@xieyuheng/x-data.js": "^0.1.7",
27-
"dedent": "^1.6.0"
26+
"@xieyuheng/x-data.js": "^0.1.7"
2827
},
2928
"devDependencies": {
3029
"@types/node": "^24.1.0",

src/lang/load/handleEffect.ts

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import dedent from "dedent"
21
import { emptyEnv } from "../env/index.ts"
32
import { equal } from "../equal/index.ts"
43
import { evaluate } from "../evaluate/index.ts"
@@ -19,11 +18,11 @@ export async function handleEffect(mod: Mod, stmt: Stmt): Promise<void> {
1918
return
2019
}
2120

22-
throw new Error(dedent`
23-
[assert-equal] fail:
24-
lhs: ${formatExp(stmt.lhs)}
25-
rhs: ${formatExp(stmt.rhs)}
26-
`)
21+
throw new Error(
22+
`[assert-equal] fail:\n` +
23+
` lhs: ${formatExp(stmt.lhs)}\n` +
24+
` rhs: ${formatExp(stmt.rhs)}\n`,
25+
)
2726
}
2827

2928
if (stmt.kind === "AssertNotEqual") {
@@ -36,11 +35,11 @@ export async function handleEffect(mod: Mod, stmt: Stmt): Promise<void> {
3635
return
3736
}
3837

39-
throw new Error(dedent`
40-
[assert-not-equal] fail:
41-
lhs: ${formatExp(stmt.lhs)}
42-
rhs: ${formatExp(stmt.rhs)}
43-
`)
38+
throw new Error(
39+
`[assert-not-equal] fail:\n` +
40+
` lhs: ${formatExp(stmt.lhs)}\n` +
41+
` rhs: ${formatExp(stmt.rhs)}\n`,
42+
)
4443
}
4544

4645
if (stmt.kind === "AssertSame") {
@@ -53,11 +52,11 @@ export async function handleEffect(mod: Mod, stmt: Stmt): Promise<void> {
5352
return
5453
}
5554

56-
throw new Error(dedent`
57-
[assert-same] fail:
58-
lhs: ${formatExp(stmt.lhs)}
59-
rhs: ${formatExp(stmt.rhs)}
60-
`)
55+
throw new Error(
56+
`[assert-same] fail:\n` +
57+
` lhs: ${formatExp(stmt.lhs)}\n` +
58+
` rhs: ${formatExp(stmt.rhs)}\n`,
59+
)
6160
}
6261

6362
if (stmt.kind === "AssertNotSame") {
@@ -70,11 +69,11 @@ export async function handleEffect(mod: Mod, stmt: Stmt): Promise<void> {
7069
return
7170
}
7271

73-
throw new Error(dedent`
74-
[assert-not-same] fail:
75-
lhs: ${formatExp(stmt.lhs)}
76-
rhs: ${formatExp(stmt.rhs)}
77-
`)
72+
throw new Error(
73+
`[assert-not-same] fail:\n` +
74+
` lhs: ${formatExp(stmt.lhs)}\n` +
75+
` rhs: ${formatExp(stmt.rhs)}\n`,
76+
)
7877
}
7978

8079
if (stmt.kind === "Compute") {

src/lang/load/load.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ParsingError } from "@xieyuheng/x-data.js"
2-
import dedent from "dedent"
32
import assert from "node:assert"
43
import fs from "node:fs"
54
import { expFreeNames } from "../exp/expFreeNames.ts"
@@ -55,11 +54,11 @@ function postprocess(mod: Mod): void {
5554
assert(def.freeNames)
5655
for (const name of def.freeNames) {
5756
if (!modFind(mod, name)) {
58-
throw new Error(dedent`
59-
[load] I find undefined name: ${name}
60-
defining: ${def.name}
61-
to: : ${formatExp(def.exp)}
62-
`)
57+
throw new Error(
58+
`[load] I find undefined name: ${name}\n` +
59+
` defining: ${def.name}\n` +
60+
` to: : ${formatExp(def.exp)}\n`,
61+
)
6362
}
6463
}
6564
}

0 commit comments

Comments
 (0)