redscript-mc 1.2.29 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude/commands/build-test.md +10 -0
- package/.claude/commands/deploy-demo.md +12 -0
- package/.claude/commands/stage-status.md +13 -0
- package/.claude/settings.json +12 -0
- package/.github/workflows/ci.yml +1 -0
- package/CLAUDE.md +231 -0
- package/README.md +29 -28
- package/README.zh.md +28 -28
- package/demo.gif +0 -0
- package/dist/cli.js +2 -554
- package/dist/compile.js +2 -266
- package/dist/index.js +2 -159
- package/dist/lexer/index.js +9 -1
- package/dist/lowering/index.js +22 -5
- package/dist/src/__tests__/cli.test.d.ts +1 -0
- package/dist/src/__tests__/cli.test.js +104 -0
- package/dist/src/__tests__/codegen.test.d.ts +1 -0
- package/dist/src/__tests__/codegen.test.js +152 -0
- package/dist/src/__tests__/compile-all.test.d.ts +10 -0
- package/dist/src/__tests__/compile-all.test.js +108 -0
- package/dist/src/__tests__/dce.test.d.ts +1 -0
- package/dist/src/__tests__/dce.test.js +102 -0
- package/dist/src/__tests__/diagnostics.test.d.ts +4 -0
- package/dist/src/__tests__/diagnostics.test.js +177 -0
- package/dist/src/__tests__/e2e.test.d.ts +6 -0
- package/dist/src/__tests__/e2e.test.js +1789 -0
- package/dist/src/__tests__/entity-types.test.d.ts +1 -0
- package/dist/src/__tests__/entity-types.test.js +203 -0
- package/dist/src/__tests__/formatter.test.d.ts +1 -0
- package/dist/src/__tests__/formatter.test.js +40 -0
- package/dist/src/__tests__/lexer.test.d.ts +1 -0
- package/dist/src/__tests__/lexer.test.js +343 -0
- package/dist/src/__tests__/lowering.test.d.ts +1 -0
- package/dist/src/__tests__/lowering.test.js +1015 -0
- package/dist/src/__tests__/macro.test.d.ts +8 -0
- package/dist/src/__tests__/macro.test.js +306 -0
- package/dist/src/__tests__/mc-integration.test.d.ts +12 -0
- package/dist/src/__tests__/mc-integration.test.js +817 -0
- package/dist/src/__tests__/mc-syntax.test.d.ts +1 -0
- package/dist/src/__tests__/mc-syntax.test.js +124 -0
- package/dist/src/__tests__/nbt.test.d.ts +1 -0
- package/dist/src/__tests__/nbt.test.js +82 -0
- package/dist/src/__tests__/optimizer-advanced.test.d.ts +1 -0
- package/dist/src/__tests__/optimizer-advanced.test.js +124 -0
- package/dist/src/__tests__/optimizer.test.d.ts +1 -0
- package/dist/src/__tests__/optimizer.test.js +149 -0
- package/dist/src/__tests__/parser.test.d.ts +1 -0
- package/dist/src/__tests__/parser.test.js +807 -0
- package/dist/src/__tests__/repl.test.d.ts +1 -0
- package/dist/src/__tests__/repl.test.js +27 -0
- package/dist/src/__tests__/runtime.test.d.ts +1 -0
- package/dist/src/__tests__/runtime.test.js +289 -0
- package/dist/src/__tests__/stdlib-advanced.test.d.ts +4 -0
- package/dist/src/__tests__/stdlib-advanced.test.js +374 -0
- package/dist/src/__tests__/stdlib-bigint.test.d.ts +7 -0
- package/dist/src/__tests__/stdlib-bigint.test.js +426 -0
- package/dist/src/__tests__/stdlib-math.test.d.ts +7 -0
- package/dist/src/__tests__/stdlib-math.test.js +351 -0
- package/dist/src/__tests__/stdlib-vec.test.d.ts +4 -0
- package/dist/src/__tests__/stdlib-vec.test.js +263 -0
- package/dist/src/__tests__/structure-optimizer.test.d.ts +1 -0
- package/dist/src/__tests__/structure-optimizer.test.js +33 -0
- package/dist/src/__tests__/typechecker.test.d.ts +1 -0
- package/dist/src/__tests__/typechecker.test.js +552 -0
- package/dist/src/__tests__/var-allocator.test.d.ts +1 -0
- package/dist/src/__tests__/var-allocator.test.js +69 -0
- package/dist/src/ast/types.d.ts +515 -0
- package/dist/src/ast/types.js +9 -0
- package/dist/src/builtins/metadata.d.ts +36 -0
- package/dist/src/builtins/metadata.js +1014 -0
- package/dist/src/cli.d.ts +11 -0
- package/dist/src/cli.js +443 -0
- package/dist/src/codegen/cmdblock/index.d.ts +26 -0
- package/dist/src/codegen/cmdblock/index.js +45 -0
- package/dist/src/codegen/mcfunction/index.d.ts +40 -0
- package/dist/src/codegen/mcfunction/index.js +606 -0
- package/dist/src/codegen/structure/index.d.ts +24 -0
- package/dist/src/codegen/structure/index.js +279 -0
- package/dist/src/codegen/var-allocator.d.ts +45 -0
- package/dist/src/codegen/var-allocator.js +104 -0
- package/dist/src/compile.d.ts +37 -0
- package/dist/src/compile.js +165 -0
- package/dist/src/diagnostics/index.d.ts +44 -0
- package/dist/src/diagnostics/index.js +140 -0
- package/dist/src/events/types.d.ts +35 -0
- package/dist/src/events/types.js +59 -0
- package/dist/src/formatter/index.d.ts +1 -0
- package/dist/src/formatter/index.js +26 -0
- package/dist/src/index.d.ts +22 -0
- package/dist/src/index.js +45 -0
- package/dist/src/ir/builder.d.ts +33 -0
- package/dist/src/ir/builder.js +99 -0
- package/dist/src/ir/types.d.ts +132 -0
- package/dist/src/ir/types.js +15 -0
- package/dist/src/lexer/index.d.ts +37 -0
- package/dist/src/lexer/index.js +569 -0
- package/dist/src/lowering/index.d.ts +188 -0
- package/dist/src/lowering/index.js +3405 -0
- package/dist/src/mc-test/client.d.ts +128 -0
- package/dist/src/mc-test/client.js +174 -0
- package/dist/src/mc-test/runner.d.ts +28 -0
- package/dist/src/mc-test/runner.js +151 -0
- package/dist/src/mc-test/setup.d.ts +11 -0
- package/dist/src/mc-test/setup.js +98 -0
- package/dist/src/mc-validator/index.d.ts +17 -0
- package/dist/src/mc-validator/index.js +322 -0
- package/dist/src/nbt/index.d.ts +86 -0
- package/dist/src/nbt/index.js +250 -0
- package/dist/src/optimizer/commands.d.ts +38 -0
- package/dist/src/optimizer/commands.js +451 -0
- package/dist/src/optimizer/dce.d.ts +34 -0
- package/dist/src/optimizer/dce.js +639 -0
- package/dist/src/optimizer/passes.d.ts +34 -0
- package/dist/src/optimizer/passes.js +243 -0
- package/dist/src/optimizer/structure.d.ts +9 -0
- package/dist/src/optimizer/structure.js +356 -0
- package/dist/src/parser/index.d.ts +93 -0
- package/dist/src/parser/index.js +1687 -0
- package/dist/src/repl.d.ts +16 -0
- package/dist/src/repl.js +165 -0
- package/dist/src/runtime/index.d.ts +107 -0
- package/dist/src/runtime/index.js +1409 -0
- package/dist/src/typechecker/index.d.ts +61 -0
- package/dist/src/typechecker/index.js +1034 -0
- package/dist/src/types/entity-hierarchy.d.ts +29 -0
- package/dist/src/types/entity-hierarchy.js +107 -0
- package/dist/src2/__tests__/e2e/basic.test.d.ts +8 -0
- package/dist/src2/__tests__/e2e/basic.test.js +140 -0
- package/dist/src2/__tests__/e2e/macros.test.d.ts +9 -0
- package/dist/src2/__tests__/e2e/macros.test.js +182 -0
- package/dist/src2/__tests__/e2e/migrate.test.d.ts +13 -0
- package/dist/src2/__tests__/e2e/migrate.test.js +2739 -0
- package/dist/src2/__tests__/hir/desugar.test.d.ts +1 -0
- package/dist/src2/__tests__/hir/desugar.test.js +234 -0
- package/dist/src2/__tests__/lir/lower.test.d.ts +1 -0
- package/dist/src2/__tests__/lir/lower.test.js +559 -0
- package/dist/src2/__tests__/lir/types.test.d.ts +1 -0
- package/dist/src2/__tests__/lir/types.test.js +185 -0
- package/dist/src2/__tests__/lir/verify.test.d.ts +1 -0
- package/dist/src2/__tests__/lir/verify.test.js +221 -0
- package/dist/src2/__tests__/mir/arithmetic.test.d.ts +1 -0
- package/dist/src2/__tests__/mir/arithmetic.test.js +130 -0
- package/dist/src2/__tests__/mir/control-flow.test.d.ts +1 -0
- package/dist/src2/__tests__/mir/control-flow.test.js +205 -0
- package/dist/src2/__tests__/mir/verify.test.d.ts +1 -0
- package/dist/src2/__tests__/mir/verify.test.js +223 -0
- package/dist/src2/__tests__/optimizer/block_merge.test.d.ts +1 -0
- package/dist/src2/__tests__/optimizer/block_merge.test.js +78 -0
- package/dist/src2/__tests__/optimizer/branch_simplify.test.d.ts +1 -0
- package/dist/src2/__tests__/optimizer/branch_simplify.test.js +58 -0
- package/dist/src2/__tests__/optimizer/constant_fold.test.d.ts +1 -0
- package/dist/src2/__tests__/optimizer/constant_fold.test.js +131 -0
- package/dist/src2/__tests__/optimizer/copy_prop.test.d.ts +1 -0
- package/dist/src2/__tests__/optimizer/copy_prop.test.js +91 -0
- package/dist/src2/__tests__/optimizer/dce.test.d.ts +1 -0
- package/dist/src2/__tests__/optimizer/dce.test.js +76 -0
- package/dist/src2/__tests__/optimizer/pipeline.test.d.ts +1 -0
- package/dist/src2/__tests__/optimizer/pipeline.test.js +102 -0
- package/dist/src2/emit/compile.d.ts +19 -0
- package/dist/src2/emit/compile.js +80 -0
- package/dist/src2/emit/index.d.ts +17 -0
- package/dist/src2/emit/index.js +172 -0
- package/dist/src2/hir/lower.d.ts +15 -0
- package/dist/src2/hir/lower.js +378 -0
- package/dist/src2/hir/types.d.ts +373 -0
- package/dist/src2/hir/types.js +16 -0
- package/dist/src2/lir/lower.d.ts +15 -0
- package/dist/src2/lir/lower.js +453 -0
- package/dist/src2/lir/types.d.ts +136 -0
- package/dist/src2/lir/types.js +11 -0
- package/dist/src2/lir/verify.d.ts +14 -0
- package/dist/src2/lir/verify.js +113 -0
- package/dist/src2/mir/lower.d.ts +9 -0
- package/dist/src2/mir/lower.js +1030 -0
- package/dist/src2/mir/macro.d.ts +22 -0
- package/dist/src2/mir/macro.js +168 -0
- package/dist/src2/mir/types.d.ts +183 -0
- package/dist/src2/mir/types.js +11 -0
- package/dist/src2/mir/verify.d.ts +16 -0
- package/dist/src2/mir/verify.js +216 -0
- package/dist/src2/optimizer/block_merge.d.ts +12 -0
- package/dist/src2/optimizer/block_merge.js +84 -0
- package/dist/src2/optimizer/branch_simplify.d.ts +9 -0
- package/dist/src2/optimizer/branch_simplify.js +28 -0
- package/dist/src2/optimizer/constant_fold.d.ts +10 -0
- package/dist/src2/optimizer/constant_fold.js +85 -0
- package/dist/src2/optimizer/copy_prop.d.ts +9 -0
- package/dist/src2/optimizer/copy_prop.js +113 -0
- package/dist/src2/optimizer/dce.d.ts +8 -0
- package/dist/src2/optimizer/dce.js +155 -0
- package/dist/src2/optimizer/pipeline.d.ts +10 -0
- package/dist/src2/optimizer/pipeline.js +42 -0
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/docs/compiler-pipeline-redesign.md +2243 -0
- package/docs/optimization-ideas.md +1076 -0
- package/editors/vscode/package-lock.json +3 -3
- package/editors/vscode/package.json +1 -1
- package/examples/readme-demo.mcrs +44 -66
- package/jest.config.js +1 -1
- package/package.json +6 -5
- package/scripts/postbuild.js +15 -0
- package/src/__tests__/cli.test.ts +8 -220
- package/src/__tests__/dce.test.ts +11 -56
- package/src/__tests__/diagnostics.test.ts +59 -38
- package/src/__tests__/mc-integration.test.ts +1 -2
- package/src/ast/types.ts +6 -1
- package/src/cli.ts +29 -156
- package/src/compile.ts +6 -162
- package/src/index.ts +14 -178
- package/src/lexer/index.ts +9 -1
- package/src/mc-test/runner.ts +4 -3
- package/src/parser/index.ts +1 -1
- package/src/repl.ts +1 -1
- package/src/runtime/index.ts +1 -1
- package/src2/__tests__/e2e/basic.test.ts +154 -0
- package/src2/__tests__/e2e/macros.test.ts +199 -0
- package/src2/__tests__/e2e/migrate.test.ts +3008 -0
- package/src2/__tests__/hir/desugar.test.ts +263 -0
- package/src2/__tests__/lir/lower.test.ts +619 -0
- package/src2/__tests__/lir/types.test.ts +207 -0
- package/src2/__tests__/lir/verify.test.ts +249 -0
- package/src2/__tests__/mir/arithmetic.test.ts +156 -0
- package/src2/__tests__/mir/control-flow.test.ts +242 -0
- package/src2/__tests__/mir/verify.test.ts +254 -0
- package/src2/__tests__/optimizer/block_merge.test.ts +84 -0
- package/src2/__tests__/optimizer/branch_simplify.test.ts +64 -0
- package/src2/__tests__/optimizer/constant_fold.test.ts +145 -0
- package/src2/__tests__/optimizer/copy_prop.test.ts +99 -0
- package/src2/__tests__/optimizer/dce.test.ts +83 -0
- package/src2/__tests__/optimizer/pipeline.test.ts +116 -0
- package/src2/emit/compile.ts +99 -0
- package/src2/emit/index.ts +222 -0
- package/src2/hir/lower.ts +428 -0
- package/src2/hir/types.ts +216 -0
- package/src2/lir/lower.ts +556 -0
- package/src2/lir/types.ts +109 -0
- package/src2/lir/verify.ts +129 -0
- package/src2/mir/lower.ts +1160 -0
- package/src2/mir/macro.ts +167 -0
- package/src2/mir/types.ts +106 -0
- package/src2/mir/verify.ts +218 -0
- package/src2/optimizer/block_merge.ts +93 -0
- package/src2/optimizer/branch_simplify.ts +27 -0
- package/src2/optimizer/constant_fold.ts +88 -0
- package/src2/optimizer/copy_prop.ts +106 -0
- package/src2/optimizer/dce.ts +133 -0
- package/src2/optimizer/pipeline.ts +44 -0
- package/tsconfig.json +2 -2
- package/src/__tests__/codegen.test.ts +0 -161
- package/src/__tests__/e2e.test.ts +0 -2039
- package/src/__tests__/entity-types.test.ts +0 -236
- package/src/__tests__/lowering.test.ts +0 -1185
- package/src/__tests__/macro.test.ts +0 -343
- package/src/__tests__/nbt.test.ts +0 -58
- package/src/__tests__/optimizer-advanced.test.ts +0 -144
- package/src/__tests__/optimizer.test.ts +0 -162
- package/src/__tests__/runtime.test.ts +0 -305
- package/src/__tests__/stdlib-advanced.test.ts +0 -379
- package/src/__tests__/stdlib-bigint.test.ts +0 -427
- package/src/__tests__/stdlib-math.test.ts +0 -374
- package/src/__tests__/stdlib-vec.test.ts +0 -259
- package/src/__tests__/structure-optimizer.test.ts +0 -38
- package/src/__tests__/var-allocator.test.ts +0 -75
- package/src/codegen/cmdblock/index.ts +0 -63
- package/src/codegen/mcfunction/index.ts +0 -662
- package/src/codegen/structure/index.ts +0 -346
- package/src/codegen/var-allocator.ts +0 -104
- package/src/ir/builder.ts +0 -116
- package/src/ir/types.ts +0 -134
- package/src/lowering/index.ts +0 -3860
- package/src/optimizer/commands.ts +0 -534
- package/src/optimizer/dce.ts +0 -679
- package/src/optimizer/passes.ts +0 -250
- package/src/optimizer/structure.ts +0 -450
|
@@ -0,0 +1,619 @@
|
|
|
1
|
+
import { lowerToLIR } from '../../lir/lower'
|
|
2
|
+
import type { MIRModule, MIRFunction, MIRBlock, MIRInstr, Operand } from '../../mir/types'
|
|
3
|
+
import type { LIRInstr, Slot } from '../../lir/types'
|
|
4
|
+
|
|
5
|
+
// ---------------------------------------------------------------------------
|
|
6
|
+
// Helpers
|
|
7
|
+
// ---------------------------------------------------------------------------
|
|
8
|
+
|
|
9
|
+
const OBJ = '__test'
|
|
10
|
+
const NS = 'test'
|
|
11
|
+
|
|
12
|
+
function mkModule(functions: MIRFunction[]): MIRModule {
|
|
13
|
+
return { functions, namespace: NS, objective: OBJ }
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
function mkFn(
|
|
17
|
+
name: string,
|
|
18
|
+
blocks: MIRBlock[],
|
|
19
|
+
params: MIRFunction['params'] = [],
|
|
20
|
+
isMacro = false,
|
|
21
|
+
): MIRFunction {
|
|
22
|
+
return { name, params, blocks, entry: 'entry', isMacro }
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function mkBlock(id: string, instrs: MIRInstr[], term: MIRInstr, preds: string[] = []): MIRBlock {
|
|
26
|
+
return { id, instrs, term, preds }
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const c = (v: number): Operand => ({ kind: 'const', value: v })
|
|
30
|
+
const t = (n: string): Operand => ({ kind: 'temp', name: n })
|
|
31
|
+
|
|
32
|
+
/** Build a slot with the function-name prefix that LIR lowering adds */
|
|
33
|
+
function slot(name: string, fn = 'main'): Slot {
|
|
34
|
+
return { player: `$${fn}_${name}`, obj: OBJ }
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function findInstr(instrs: LIRInstr[], kind: string): LIRInstr | undefined {
|
|
38
|
+
return instrs.find(i => i.kind === kind)
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function findAllInstrs(instrs: LIRInstr[], kind: string): LIRInstr[] {
|
|
42
|
+
return instrs.filter(i => i.kind === kind)
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// ---------------------------------------------------------------------------
|
|
46
|
+
// Constant lowering
|
|
47
|
+
// ---------------------------------------------------------------------------
|
|
48
|
+
|
|
49
|
+
describe('MIR→LIR lowering — constants', () => {
|
|
50
|
+
test('const → score_set', () => {
|
|
51
|
+
const mod = mkModule([
|
|
52
|
+
mkFn('main', [
|
|
53
|
+
mkBlock('entry', [
|
|
54
|
+
{ kind: 'const', dst: 't0', value: 42 },
|
|
55
|
+
], { kind: 'return', value: null }),
|
|
56
|
+
]),
|
|
57
|
+
])
|
|
58
|
+
const lir = lowerToLIR(mod)
|
|
59
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
60
|
+
expect(main.instructions[0]).toEqual({
|
|
61
|
+
kind: 'score_set',
|
|
62
|
+
dst: slot('t0'),
|
|
63
|
+
value: 42,
|
|
64
|
+
})
|
|
65
|
+
})
|
|
66
|
+
})
|
|
67
|
+
|
|
68
|
+
// ---------------------------------------------------------------------------
|
|
69
|
+
// Copy lowering
|
|
70
|
+
// ---------------------------------------------------------------------------
|
|
71
|
+
|
|
72
|
+
describe('MIR→LIR lowering — copy', () => {
|
|
73
|
+
test('copy temp → score_copy', () => {
|
|
74
|
+
const mod = mkModule([
|
|
75
|
+
mkFn('main', [
|
|
76
|
+
mkBlock('entry', [
|
|
77
|
+
{ kind: 'const', dst: 't0', value: 5 },
|
|
78
|
+
{ kind: 'copy', dst: 't1', src: t('t0') },
|
|
79
|
+
], { kind: 'return', value: null }),
|
|
80
|
+
]),
|
|
81
|
+
])
|
|
82
|
+
const lir = lowerToLIR(mod)
|
|
83
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
84
|
+
expect(main.instructions[1]).toEqual({
|
|
85
|
+
kind: 'score_copy',
|
|
86
|
+
dst: slot('t1'),
|
|
87
|
+
src: slot('t0'),
|
|
88
|
+
})
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
test('copy const → score_set', () => {
|
|
92
|
+
const mod = mkModule([
|
|
93
|
+
mkFn('main', [
|
|
94
|
+
mkBlock('entry', [
|
|
95
|
+
{ kind: 'copy', dst: 't0', src: c(10) },
|
|
96
|
+
], { kind: 'return', value: null }),
|
|
97
|
+
]),
|
|
98
|
+
])
|
|
99
|
+
const lir = lowerToLIR(mod)
|
|
100
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
101
|
+
expect(main.instructions[0]).toEqual({
|
|
102
|
+
kind: 'score_set',
|
|
103
|
+
dst: slot('t0'),
|
|
104
|
+
value: 10,
|
|
105
|
+
})
|
|
106
|
+
})
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
// ---------------------------------------------------------------------------
|
|
110
|
+
// Arithmetic lowering
|
|
111
|
+
// ---------------------------------------------------------------------------
|
|
112
|
+
|
|
113
|
+
describe('MIR→LIR lowering — arithmetic', () => {
|
|
114
|
+
test('add temps → score_copy + score_add', () => {
|
|
115
|
+
const mod = mkModule([
|
|
116
|
+
mkFn('main', [
|
|
117
|
+
mkBlock('entry', [
|
|
118
|
+
{ kind: 'const', dst: 'a', value: 3 },
|
|
119
|
+
{ kind: 'const', dst: 'b', value: 4 },
|
|
120
|
+
{ kind: 'add', dst: 'r', a: t('a'), b: t('b') },
|
|
121
|
+
], { kind: 'return', value: null }),
|
|
122
|
+
]),
|
|
123
|
+
])
|
|
124
|
+
const lir = lowerToLIR(mod)
|
|
125
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
126
|
+
// After two score_sets for a and b, we should see:
|
|
127
|
+
// score_copy $r = $a
|
|
128
|
+
// score_add $r += $b
|
|
129
|
+
const instrs = main.instructions
|
|
130
|
+
expect(instrs[2]).toEqual({ kind: 'score_copy', dst: slot('r'), src: slot('a') })
|
|
131
|
+
expect(instrs[3]).toEqual({ kind: 'score_add', dst: slot('r'), src: slot('b') })
|
|
132
|
+
})
|
|
133
|
+
|
|
134
|
+
test('add with const operand → score_set + score_copy + score_set const + score_add', () => {
|
|
135
|
+
const mod = mkModule([
|
|
136
|
+
mkFn('main', [
|
|
137
|
+
mkBlock('entry', [
|
|
138
|
+
{ kind: 'const', dst: 'a', value: 3 },
|
|
139
|
+
{ kind: 'add', dst: 'r', a: t('a'), b: c(7) },
|
|
140
|
+
], { kind: 'return', value: null }),
|
|
141
|
+
]),
|
|
142
|
+
])
|
|
143
|
+
const lir = lowerToLIR(mod)
|
|
144
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
145
|
+
const instrs = main.instructions
|
|
146
|
+
// score_set $a 3
|
|
147
|
+
// score_copy $r = $a
|
|
148
|
+
// score_set $__const_7 7
|
|
149
|
+
// score_add $r += $__const_7
|
|
150
|
+
expect(instrs[1]).toEqual({ kind: 'score_copy', dst: slot('r'), src: slot('a') })
|
|
151
|
+
expect(instrs[2]).toEqual({ kind: 'score_set', dst: { player: '$__const_7', obj: OBJ }, value: 7 })
|
|
152
|
+
expect(instrs[3]).toEqual({ kind: 'score_add', dst: slot('r'), src: { player: '$__const_7', obj: OBJ } })
|
|
153
|
+
})
|
|
154
|
+
|
|
155
|
+
test('sub, mul, div, mod all produce correct score ops', () => {
|
|
156
|
+
const ops = ['sub', 'mul', 'div', 'mod'] as const
|
|
157
|
+
const scoreOps = ['score_sub', 'score_mul', 'score_div', 'score_mod'] as const
|
|
158
|
+
|
|
159
|
+
for (let i = 0; i < ops.length; i++) {
|
|
160
|
+
const mod = mkModule([
|
|
161
|
+
mkFn('main', [
|
|
162
|
+
mkBlock('entry', [
|
|
163
|
+
{ kind: 'const', dst: 'a', value: 10 },
|
|
164
|
+
{ kind: 'const', dst: 'b', value: 3 },
|
|
165
|
+
{ kind: ops[i], dst: 'r', a: t('a'), b: t('b') } as MIRInstr,
|
|
166
|
+
], { kind: 'return', value: null }),
|
|
167
|
+
]),
|
|
168
|
+
])
|
|
169
|
+
const lir = lowerToLIR(mod)
|
|
170
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
171
|
+
const instrs = main.instructions
|
|
172
|
+
expect(instrs[2]).toEqual({ kind: 'score_copy', dst: slot('r'), src: slot('a') })
|
|
173
|
+
expect(instrs[3]).toEqual({ kind: scoreOps[i], dst: slot('r'), src: slot('b') })
|
|
174
|
+
}
|
|
175
|
+
})
|
|
176
|
+
})
|
|
177
|
+
|
|
178
|
+
// ---------------------------------------------------------------------------
|
|
179
|
+
// Negation
|
|
180
|
+
// ---------------------------------------------------------------------------
|
|
181
|
+
|
|
182
|
+
describe('MIR→LIR lowering — negation', () => {
|
|
183
|
+
test('neg → score_set 0, score_sub', () => {
|
|
184
|
+
const mod = mkModule([
|
|
185
|
+
mkFn('main', [
|
|
186
|
+
mkBlock('entry', [
|
|
187
|
+
{ kind: 'const', dst: 'x', value: 5 },
|
|
188
|
+
{ kind: 'neg', dst: 'r', src: t('x') },
|
|
189
|
+
], { kind: 'return', value: null }),
|
|
190
|
+
]),
|
|
191
|
+
])
|
|
192
|
+
const lir = lowerToLIR(mod)
|
|
193
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
194
|
+
const instrs = main.instructions
|
|
195
|
+
// score_set $x 5
|
|
196
|
+
// score_set $r 0
|
|
197
|
+
// score_sub $r -= $x
|
|
198
|
+
expect(instrs[1]).toEqual({ kind: 'score_set', dst: slot('r'), value: 0 })
|
|
199
|
+
expect(instrs[2]).toEqual({ kind: 'score_sub', dst: slot('r'), src: slot('x') })
|
|
200
|
+
})
|
|
201
|
+
})
|
|
202
|
+
|
|
203
|
+
// ---------------------------------------------------------------------------
|
|
204
|
+
// Comparison
|
|
205
|
+
// ---------------------------------------------------------------------------
|
|
206
|
+
|
|
207
|
+
describe('MIR→LIR lowering — comparison', () => {
|
|
208
|
+
test('cmp eq → score_set 0, raw execute if score', () => {
|
|
209
|
+
const mod = mkModule([
|
|
210
|
+
mkFn('main', [
|
|
211
|
+
mkBlock('entry', [
|
|
212
|
+
{ kind: 'const', dst: 'a', value: 1 },
|
|
213
|
+
{ kind: 'const', dst: 'b', value: 2 },
|
|
214
|
+
{ kind: 'cmp', dst: 'r', op: 'eq', a: t('a'), b: t('b') },
|
|
215
|
+
], { kind: 'return', value: null }),
|
|
216
|
+
]),
|
|
217
|
+
])
|
|
218
|
+
const lir = lowerToLIR(mod)
|
|
219
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
220
|
+
const instrs = main.instructions
|
|
221
|
+
// score_set $r 0, then raw execute if score
|
|
222
|
+
const setCmp = instrs.find(i => i.kind === 'score_set' && (i as any).dst.player === '$main_r')
|
|
223
|
+
expect(setCmp).toEqual({ kind: 'score_set', dst: slot('r'), value: 0 })
|
|
224
|
+
const raw = instrs.find(i => i.kind === 'raw') as any
|
|
225
|
+
expect(raw).toBeDefined()
|
|
226
|
+
expect(raw.cmd).toContain('execute if score')
|
|
227
|
+
expect(raw.cmd).toContain('$main_a')
|
|
228
|
+
expect(raw.cmd).toContain('$main_b')
|
|
229
|
+
expect(raw.cmd).toContain('scoreboard players set $main_r')
|
|
230
|
+
})
|
|
231
|
+
})
|
|
232
|
+
|
|
233
|
+
// ---------------------------------------------------------------------------
|
|
234
|
+
// Boolean logic
|
|
235
|
+
// ---------------------------------------------------------------------------
|
|
236
|
+
|
|
237
|
+
describe('MIR→LIR lowering — boolean logic', () => {
|
|
238
|
+
test('and → score_copy + score_mul', () => {
|
|
239
|
+
const mod = mkModule([
|
|
240
|
+
mkFn('main', [
|
|
241
|
+
mkBlock('entry', [
|
|
242
|
+
{ kind: 'const', dst: 'a', value: 1 },
|
|
243
|
+
{ kind: 'const', dst: 'b', value: 1 },
|
|
244
|
+
{ kind: 'and', dst: 'r', a: t('a'), b: t('b') },
|
|
245
|
+
], { kind: 'return', value: null }),
|
|
246
|
+
]),
|
|
247
|
+
])
|
|
248
|
+
const lir = lowerToLIR(mod)
|
|
249
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
250
|
+
const instrs = main.instructions
|
|
251
|
+
expect(instrs[2]).toEqual({ kind: 'score_copy', dst: slot('r'), src: slot('a') })
|
|
252
|
+
expect(instrs[3]).toEqual({ kind: 'score_mul', dst: slot('r'), src: slot('b') })
|
|
253
|
+
})
|
|
254
|
+
|
|
255
|
+
test('not → score_set 1, score_sub', () => {
|
|
256
|
+
const mod = mkModule([
|
|
257
|
+
mkFn('main', [
|
|
258
|
+
mkBlock('entry', [
|
|
259
|
+
{ kind: 'const', dst: 'x', value: 1 },
|
|
260
|
+
{ kind: 'not', dst: 'r', src: t('x') },
|
|
261
|
+
], { kind: 'return', value: null }),
|
|
262
|
+
]),
|
|
263
|
+
])
|
|
264
|
+
const lir = lowerToLIR(mod)
|
|
265
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
266
|
+
const instrs = main.instructions
|
|
267
|
+
// score_set $x 1
|
|
268
|
+
// score_set $r 1
|
|
269
|
+
// score_sub $r -= $x
|
|
270
|
+
expect(instrs[1]).toEqual({ kind: 'score_set', dst: slot('r'), value: 1 })
|
|
271
|
+
expect(instrs[2]).toEqual({ kind: 'score_sub', dst: slot('r'), src: slot('x') })
|
|
272
|
+
})
|
|
273
|
+
|
|
274
|
+
test('or → score_copy + score_add + score_min(1)', () => {
|
|
275
|
+
const mod = mkModule([
|
|
276
|
+
mkFn('main', [
|
|
277
|
+
mkBlock('entry', [
|
|
278
|
+
{ kind: 'const', dst: 'a', value: 1 },
|
|
279
|
+
{ kind: 'const', dst: 'b', value: 0 },
|
|
280
|
+
{ kind: 'or', dst: 'r', a: t('a'), b: t('b') },
|
|
281
|
+
], { kind: 'return', value: null }),
|
|
282
|
+
]),
|
|
283
|
+
])
|
|
284
|
+
const lir = lowerToLIR(mod)
|
|
285
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
286
|
+
const instrs = main.instructions
|
|
287
|
+
// score_set $a 1, score_set $b 0
|
|
288
|
+
// score_copy $r = $a
|
|
289
|
+
// score_add $r += $b
|
|
290
|
+
// score_set $__const_1 1
|
|
291
|
+
// score_min $r, $__const_1
|
|
292
|
+
expect(instrs[2]).toEqual({ kind: 'score_copy', dst: slot('r'), src: slot('a') })
|
|
293
|
+
expect(instrs[3]).toEqual({ kind: 'score_add', dst: slot('r'), src: slot('b') })
|
|
294
|
+
const minInstr = instrs.find(i => i.kind === 'score_min') as any
|
|
295
|
+
expect(minInstr).toBeDefined()
|
|
296
|
+
expect(minInstr.dst).toEqual(slot('r'))
|
|
297
|
+
})
|
|
298
|
+
})
|
|
299
|
+
|
|
300
|
+
// ---------------------------------------------------------------------------
|
|
301
|
+
// NBT operations
|
|
302
|
+
// ---------------------------------------------------------------------------
|
|
303
|
+
|
|
304
|
+
describe('MIR→LIR lowering — NBT', () => {
|
|
305
|
+
test('nbt_read → store_nbt_to_score', () => {
|
|
306
|
+
const mod = mkModule([
|
|
307
|
+
mkFn('main', [
|
|
308
|
+
mkBlock('entry', [
|
|
309
|
+
{ kind: 'nbt_read', dst: 't0', ns: 'rs:data', path: 'val', scale: 1 },
|
|
310
|
+
], { kind: 'return', value: null }),
|
|
311
|
+
]),
|
|
312
|
+
])
|
|
313
|
+
const lir = lowerToLIR(mod)
|
|
314
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
315
|
+
expect(main.instructions[0]).toEqual({
|
|
316
|
+
kind: 'store_nbt_to_score',
|
|
317
|
+
dst: slot('t0'),
|
|
318
|
+
ns: 'rs:data',
|
|
319
|
+
path: 'val',
|
|
320
|
+
scale: 1,
|
|
321
|
+
})
|
|
322
|
+
})
|
|
323
|
+
|
|
324
|
+
test('nbt_write → store_score_to_nbt', () => {
|
|
325
|
+
const mod = mkModule([
|
|
326
|
+
mkFn('main', [
|
|
327
|
+
mkBlock('entry', [
|
|
328
|
+
{ kind: 'const', dst: 't0', value: 10 },
|
|
329
|
+
{ kind: 'nbt_write', ns: 'rs:data', path: 'val', type: 'int', scale: 1, src: t('t0') },
|
|
330
|
+
], { kind: 'return', value: null }),
|
|
331
|
+
]),
|
|
332
|
+
])
|
|
333
|
+
const lir = lowerToLIR(mod)
|
|
334
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
335
|
+
expect(main.instructions[1]).toEqual({
|
|
336
|
+
kind: 'store_score_to_nbt',
|
|
337
|
+
ns: 'rs:data',
|
|
338
|
+
path: 'val',
|
|
339
|
+
type: 'int',
|
|
340
|
+
scale: 1,
|
|
341
|
+
src: slot('t0'),
|
|
342
|
+
})
|
|
343
|
+
})
|
|
344
|
+
})
|
|
345
|
+
|
|
346
|
+
// ---------------------------------------------------------------------------
|
|
347
|
+
// Function calls
|
|
348
|
+
// ---------------------------------------------------------------------------
|
|
349
|
+
|
|
350
|
+
describe('MIR→LIR lowering — calls', () => {
|
|
351
|
+
test('call with args → set $p0, $p1, call, copy $ret', () => {
|
|
352
|
+
const mod = mkModule([
|
|
353
|
+
mkFn('main', [
|
|
354
|
+
mkBlock('entry', [
|
|
355
|
+
{ kind: 'const', dst: 'a', value: 1 },
|
|
356
|
+
{ kind: 'const', dst: 'b', value: 2 },
|
|
357
|
+
{ kind: 'call', dst: 'r', fn: 'add', args: [t('a'), t('b')] },
|
|
358
|
+
], { kind: 'return', value: null }),
|
|
359
|
+
]),
|
|
360
|
+
mkFn('add', [
|
|
361
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
362
|
+
]),
|
|
363
|
+
])
|
|
364
|
+
const lir = lowerToLIR(mod)
|
|
365
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
366
|
+
const instrs = main.instructions
|
|
367
|
+
|
|
368
|
+
// $p0 = $a
|
|
369
|
+
expect(instrs[2]).toEqual({
|
|
370
|
+
kind: 'score_copy',
|
|
371
|
+
dst: { player: '$p0', obj: OBJ },
|
|
372
|
+
src: slot('a'),
|
|
373
|
+
})
|
|
374
|
+
// $p1 = $b
|
|
375
|
+
expect(instrs[3]).toEqual({
|
|
376
|
+
kind: 'score_copy',
|
|
377
|
+
dst: { player: '$p1', obj: OBJ },
|
|
378
|
+
src: slot('b'),
|
|
379
|
+
})
|
|
380
|
+
// call test:add
|
|
381
|
+
expect(instrs[4]).toEqual({ kind: 'call', fn: 'test:add' })
|
|
382
|
+
// $r = $ret
|
|
383
|
+
expect(instrs[5]).toEqual({
|
|
384
|
+
kind: 'score_copy',
|
|
385
|
+
dst: slot('r'),
|
|
386
|
+
src: { player: '$ret', obj: OBJ },
|
|
387
|
+
})
|
|
388
|
+
})
|
|
389
|
+
|
|
390
|
+
test('call with no dst does not copy $ret', () => {
|
|
391
|
+
const mod = mkModule([
|
|
392
|
+
mkFn('main', [
|
|
393
|
+
mkBlock('entry', [
|
|
394
|
+
{ kind: 'call', dst: null, fn: 'side_effect', args: [] },
|
|
395
|
+
], { kind: 'return', value: null }),
|
|
396
|
+
]),
|
|
397
|
+
mkFn('side_effect', [
|
|
398
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
399
|
+
]),
|
|
400
|
+
])
|
|
401
|
+
const lir = lowerToLIR(mod)
|
|
402
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
403
|
+
expect(main.instructions).toEqual([
|
|
404
|
+
{ kind: 'call', fn: 'test:side_effect' },
|
|
405
|
+
])
|
|
406
|
+
})
|
|
407
|
+
|
|
408
|
+
test('raw command via __raw: prefix', () => {
|
|
409
|
+
const mod = mkModule([
|
|
410
|
+
mkFn('main', [
|
|
411
|
+
mkBlock('entry', [
|
|
412
|
+
{ kind: 'call', dst: null, fn: '__raw:say hello', args: [] },
|
|
413
|
+
], { kind: 'return', value: null }),
|
|
414
|
+
]),
|
|
415
|
+
])
|
|
416
|
+
const lir = lowerToLIR(mod)
|
|
417
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
418
|
+
expect(main.instructions[0]).toEqual({ kind: 'raw', cmd: 'say hello' })
|
|
419
|
+
})
|
|
420
|
+
})
|
|
421
|
+
|
|
422
|
+
// ---------------------------------------------------------------------------
|
|
423
|
+
// Macro calls
|
|
424
|
+
// ---------------------------------------------------------------------------
|
|
425
|
+
|
|
426
|
+
describe('MIR→LIR lowering — macro calls', () => {
|
|
427
|
+
test('call_macro → store args to NBT + call_macro', () => {
|
|
428
|
+
const mod = mkModule([
|
|
429
|
+
mkFn('main', [
|
|
430
|
+
mkBlock('entry', [
|
|
431
|
+
{ kind: 'const', dst: 'px', value: 100 },
|
|
432
|
+
{
|
|
433
|
+
kind: 'call_macro',
|
|
434
|
+
dst: null,
|
|
435
|
+
fn: 'draw_pt',
|
|
436
|
+
args: [{ name: 'px', value: t('px'), type: 'int' as const, scale: 1 }],
|
|
437
|
+
},
|
|
438
|
+
], { kind: 'return', value: null }),
|
|
439
|
+
]),
|
|
440
|
+
mkFn('draw_pt', [
|
|
441
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
442
|
+
], [{ name: 'px', isMacroParam: true }], true),
|
|
443
|
+
])
|
|
444
|
+
const lir = lowerToLIR(mod)
|
|
445
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
446
|
+
const instrs = main.instructions
|
|
447
|
+
|
|
448
|
+
// store_score_to_nbt for px
|
|
449
|
+
const storeNbt = instrs.find(i => i.kind === 'store_score_to_nbt') as any
|
|
450
|
+
expect(storeNbt).toBeDefined()
|
|
451
|
+
expect(storeNbt.ns).toBe('rs:macro_args')
|
|
452
|
+
expect(storeNbt.path).toBe('px')
|
|
453
|
+
|
|
454
|
+
// call_macro
|
|
455
|
+
const callMacro = instrs.find(i => i.kind === 'call_macro') as any
|
|
456
|
+
expect(callMacro).toBeDefined()
|
|
457
|
+
expect(callMacro.fn).toBe('test:draw_pt')
|
|
458
|
+
expect(callMacro.storage).toBe('rs:macro_args')
|
|
459
|
+
})
|
|
460
|
+
})
|
|
461
|
+
|
|
462
|
+
// ---------------------------------------------------------------------------
|
|
463
|
+
// Context calls
|
|
464
|
+
// ---------------------------------------------------------------------------
|
|
465
|
+
|
|
466
|
+
describe('MIR→LIR lowering — context calls', () => {
|
|
467
|
+
test('call_context → call_context with qualified name', () => {
|
|
468
|
+
const mod = mkModule([
|
|
469
|
+
mkFn('main', [
|
|
470
|
+
mkBlock('entry', [
|
|
471
|
+
{
|
|
472
|
+
kind: 'call_context',
|
|
473
|
+
fn: 'helper',
|
|
474
|
+
subcommands: [{ kind: 'as', selector: '@e[tag=foo]' }, { kind: 'at_self' }],
|
|
475
|
+
},
|
|
476
|
+
], { kind: 'return', value: null }),
|
|
477
|
+
]),
|
|
478
|
+
mkFn('helper', [
|
|
479
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
480
|
+
]),
|
|
481
|
+
])
|
|
482
|
+
const lir = lowerToLIR(mod)
|
|
483
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
484
|
+
expect(main.instructions[0]).toEqual({
|
|
485
|
+
kind: 'call_context',
|
|
486
|
+
fn: 'test:helper',
|
|
487
|
+
subcommands: [{ kind: 'as', selector: '@e[tag=foo]' }, { kind: 'at_self' }],
|
|
488
|
+
})
|
|
489
|
+
})
|
|
490
|
+
})
|
|
491
|
+
|
|
492
|
+
// ---------------------------------------------------------------------------
|
|
493
|
+
// Return
|
|
494
|
+
// ---------------------------------------------------------------------------
|
|
495
|
+
|
|
496
|
+
describe('MIR→LIR lowering — return', () => {
|
|
497
|
+
test('return with value → return_value', () => {
|
|
498
|
+
const mod = mkModule([
|
|
499
|
+
mkFn('main', [
|
|
500
|
+
mkBlock('entry', [
|
|
501
|
+
{ kind: 'const', dst: 't0', value: 42 },
|
|
502
|
+
], { kind: 'return', value: t('t0') }),
|
|
503
|
+
]),
|
|
504
|
+
])
|
|
505
|
+
const lir = lowerToLIR(mod)
|
|
506
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
507
|
+
const ret = main.instructions.find(i => i.kind === 'return_value') as any
|
|
508
|
+
expect(ret).toBeDefined()
|
|
509
|
+
expect(ret.slot).toEqual(slot('t0'))
|
|
510
|
+
})
|
|
511
|
+
|
|
512
|
+
test('return void → no return_value instruction', () => {
|
|
513
|
+
const mod = mkModule([
|
|
514
|
+
mkFn('main', [
|
|
515
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
516
|
+
]),
|
|
517
|
+
])
|
|
518
|
+
const lir = lowerToLIR(mod)
|
|
519
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
520
|
+
expect(main.instructions.find(i => i.kind === 'return_value')).toBeUndefined()
|
|
521
|
+
})
|
|
522
|
+
})
|
|
523
|
+
|
|
524
|
+
// ---------------------------------------------------------------------------
|
|
525
|
+
// Control flow — jump
|
|
526
|
+
// ---------------------------------------------------------------------------
|
|
527
|
+
|
|
528
|
+
describe('MIR→LIR lowering — jump (inlining)', () => {
|
|
529
|
+
test('jump to single-pred block inlines instructions', () => {
|
|
530
|
+
const mod = mkModule([
|
|
531
|
+
mkFn('main', [
|
|
532
|
+
mkBlock('entry', [
|
|
533
|
+
{ kind: 'const', dst: 't0', value: 1 },
|
|
534
|
+
], { kind: 'jump', target: 'next' }),
|
|
535
|
+
mkBlock('next', [
|
|
536
|
+
{ kind: 'const', dst: 't1', value: 2 },
|
|
537
|
+
], { kind: 'return', value: null }),
|
|
538
|
+
]),
|
|
539
|
+
])
|
|
540
|
+
const lir = lowerToLIR(mod)
|
|
541
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
542
|
+
// Both blocks inlined: score_set t0, score_set t1
|
|
543
|
+
expect(main.instructions).toEqual([
|
|
544
|
+
{ kind: 'score_set', dst: slot('t0'), value: 1 },
|
|
545
|
+
{ kind: 'score_set', dst: slot('t1'), value: 2 },
|
|
546
|
+
])
|
|
547
|
+
})
|
|
548
|
+
})
|
|
549
|
+
|
|
550
|
+
// ---------------------------------------------------------------------------
|
|
551
|
+
// Control flow — branch
|
|
552
|
+
// ---------------------------------------------------------------------------
|
|
553
|
+
|
|
554
|
+
describe('MIR→LIR lowering — branch', () => {
|
|
555
|
+
test('branch emits call_if_matches and call_unless_matches', () => {
|
|
556
|
+
const mod = mkModule([
|
|
557
|
+
mkFn('main', [
|
|
558
|
+
mkBlock('entry', [
|
|
559
|
+
{ kind: 'const', dst: 'cond', value: 1 },
|
|
560
|
+
], { kind: 'branch', cond: t('cond'), then: 'yes', else: 'no' }),
|
|
561
|
+
mkBlock('yes', [
|
|
562
|
+
{ kind: 'const', dst: 'a', value: 10 },
|
|
563
|
+
], { kind: 'return', value: null }),
|
|
564
|
+
mkBlock('no', [
|
|
565
|
+
{ kind: 'const', dst: 'b', value: 20 },
|
|
566
|
+
], { kind: 'return', value: null }),
|
|
567
|
+
]),
|
|
568
|
+
])
|
|
569
|
+
const lir = lowerToLIR(mod)
|
|
570
|
+
const main = lir.functions.find(f => f.name === 'main')!
|
|
571
|
+
|
|
572
|
+
// Then-branch uses `return run function` (raw instruction) to prevent
|
|
573
|
+
// fallthrough when recursive calls clobber the condition slot.
|
|
574
|
+
const rawReturn = main.instructions.find(
|
|
575
|
+
i => i.kind === 'raw' && (i as any).cmd.includes('return run function'),
|
|
576
|
+
) as any
|
|
577
|
+
expect(rawReturn).toBeDefined()
|
|
578
|
+
expect(rawReturn.cmd).toContain('matches 1')
|
|
579
|
+
|
|
580
|
+
// Else-branch is an unconditional call (fallthrough only reached when cond≠1)
|
|
581
|
+
const elseCall = main.instructions.find(i => i.kind === 'call') as any
|
|
582
|
+
expect(elseCall).toBeDefined()
|
|
583
|
+
|
|
584
|
+
// The then/else blocks should be separate functions
|
|
585
|
+
const yesFn = lir.functions.find(f => f.name.includes('yes'))
|
|
586
|
+
const noFn = lir.functions.find(f => f.name.includes('no'))
|
|
587
|
+
expect(yesFn).toBeDefined()
|
|
588
|
+
expect(noFn).toBeDefined()
|
|
589
|
+
})
|
|
590
|
+
})
|
|
591
|
+
|
|
592
|
+
// ---------------------------------------------------------------------------
|
|
593
|
+
// Module structure
|
|
594
|
+
// ---------------------------------------------------------------------------
|
|
595
|
+
|
|
596
|
+
describe('MIR→LIR lowering — module', () => {
|
|
597
|
+
test('preserves namespace and objective', () => {
|
|
598
|
+
const mod = mkModule([
|
|
599
|
+
mkFn('main', [
|
|
600
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
601
|
+
]),
|
|
602
|
+
])
|
|
603
|
+
const lir = lowerToLIR(mod)
|
|
604
|
+
expect(lir.namespace).toBe(NS)
|
|
605
|
+
expect(lir.objective).toBe(OBJ)
|
|
606
|
+
})
|
|
607
|
+
|
|
608
|
+
test('macro function carries isMacro and macroParams', () => {
|
|
609
|
+
const mod = mkModule([
|
|
610
|
+
mkFn('draw', [
|
|
611
|
+
mkBlock('entry', [], { kind: 'return', value: null }),
|
|
612
|
+
], [{ name: 'px', isMacroParam: true }, { name: 'py', isMacroParam: true }], true),
|
|
613
|
+
])
|
|
614
|
+
const lir = lowerToLIR(mod)
|
|
615
|
+
const drawFn = lir.functions.find(f => f.name === 'draw')!
|
|
616
|
+
expect(drawFn.isMacro).toBe(true)
|
|
617
|
+
expect(drawFn.macroParams).toEqual(['px', 'py'])
|
|
618
|
+
})
|
|
619
|
+
})
|