takomusic 1.2.0 → 1.3.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/dist/__tests__/checker.test.js +9 -6
- package/dist/__tests__/checker.test.js.map +1 -1
- package/dist/checker/checker.d.ts +2 -0
- package/dist/checker/checker.d.ts.map +1 -1
- package/dist/checker/checker.js +125 -7
- package/dist/checker/checker.js.map +1 -1
- package/dist/compiler/compiler.d.ts.map +1 -1
- package/dist/compiler/compiler.js +45 -14
- package/dist/compiler/compiler.js.map +1 -1
- package/dist/formatter/formatter.d.ts +1 -0
- package/dist/formatter/formatter.d.ts.map +1 -1
- package/dist/formatter/formatter.js +78 -8
- package/dist/formatter/formatter.js.map +1 -1
- package/dist/interpreter/interpreter.d.ts +2 -0
- package/dist/interpreter/interpreter.d.ts.map +1 -1
- package/dist/interpreter/interpreter.js +158 -16
- package/dist/interpreter/interpreter.js.map +1 -1
- package/dist/interpreter/runtime.d.ts +2 -1
- package/dist/interpreter/runtime.d.ts.map +1 -1
- package/dist/interpreter/runtime.js +6 -2
- package/dist/interpreter/runtime.js.map +1 -1
- package/dist/lexer/lexer.d.ts +4 -0
- package/dist/lexer/lexer.d.ts.map +1 -1
- package/dist/lexer/lexer.js +215 -14
- package/dist/lexer/lexer.js.map +1 -1
- package/dist/parser/parser.d.ts +19 -0
- package/dist/parser/parser.d.ts.map +1 -1
- package/dist/parser/parser.js +389 -26
- package/dist/parser/parser.js.map +1 -1
- package/dist/types/ast.d.ts +34 -3
- package/dist/types/ast.d.ts.map +1 -1
- package/dist/types/token.d.ts +25 -0
- package/dist/types/token.d.ts.map +1 -1
- package/dist/types/token.js +33 -0
- package/dist/types/token.js.map +1 -1
- package/package.json +1 -1
|
@@ -37,7 +37,12 @@ export class Formatter {
|
|
|
37
37
|
formatStatement(stmt) {
|
|
38
38
|
switch (stmt.kind) {
|
|
39
39
|
case 'ImportStatement':
|
|
40
|
-
|
|
40
|
+
if (stmt.namespace) {
|
|
41
|
+
this.line(`import * as ${stmt.namespace} from "${stmt.path}";`);
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
this.line(`import { ${stmt.imports.join(', ')} } from "${stmt.path}";`);
|
|
45
|
+
}
|
|
41
46
|
break;
|
|
42
47
|
case 'ExportStatement':
|
|
43
48
|
this.formatExport(stmt.declaration);
|
|
@@ -63,14 +68,50 @@ export class Formatter {
|
|
|
63
68
|
}
|
|
64
69
|
this.indent--;
|
|
65
70
|
if (stmt.alternate) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
this.
|
|
71
|
+
if (Array.isArray(stmt.alternate)) {
|
|
72
|
+
// else: alternate is Statement[]
|
|
73
|
+
this.line('} else {');
|
|
74
|
+
this.indent++;
|
|
75
|
+
for (const s of stmt.alternate) {
|
|
76
|
+
this.formatStatement(s);
|
|
77
|
+
}
|
|
78
|
+
this.indent--;
|
|
79
|
+
this.line('}');
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
// else if: alternate is a single IfStatement
|
|
83
|
+
// Format as "} else if (...) {"
|
|
84
|
+
const indentStr = ' '.repeat(this.indent);
|
|
85
|
+
this.output.push(`${indentStr}} else if (${this.formatExpr(stmt.alternate.condition)}) {`);
|
|
86
|
+
this.indent++;
|
|
87
|
+
for (const s of stmt.alternate.consequent) {
|
|
88
|
+
this.formatStatement(s);
|
|
89
|
+
}
|
|
90
|
+
this.indent--;
|
|
91
|
+
// Handle the else if's alternate recursively
|
|
92
|
+
if (stmt.alternate.alternate) {
|
|
93
|
+
if (Array.isArray(stmt.alternate.alternate)) {
|
|
94
|
+
this.line('} else {');
|
|
95
|
+
this.indent++;
|
|
96
|
+
for (const s of stmt.alternate.alternate) {
|
|
97
|
+
this.formatStatement(s);
|
|
98
|
+
}
|
|
99
|
+
this.indent--;
|
|
100
|
+
this.line('}');
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
// More else if chains - use recursion via a helper
|
|
104
|
+
this.formatElseIf(stmt.alternate.alternate);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
this.line('}');
|
|
109
|
+
}
|
|
70
110
|
}
|
|
71
|
-
this.indent--;
|
|
72
111
|
}
|
|
73
|
-
|
|
112
|
+
else {
|
|
113
|
+
this.line('}');
|
|
114
|
+
}
|
|
74
115
|
break;
|
|
75
116
|
case 'ForStatement':
|
|
76
117
|
const rangeOp = stmt.range.inclusive ? '..=' : '..';
|
|
@@ -164,10 +205,12 @@ export class Formatter {
|
|
|
164
205
|
return `"${this.escapeString(expr.value)}"`;
|
|
165
206
|
case 'BoolLiteral':
|
|
166
207
|
return expr.value ? 'true' : 'false';
|
|
208
|
+
case 'NullLiteral':
|
|
209
|
+
return 'null';
|
|
167
210
|
case 'PitchLiteral':
|
|
168
211
|
return `${expr.note}${expr.octave}`;
|
|
169
212
|
case 'DurLiteral':
|
|
170
|
-
return `${expr.numerator}/${expr.denominator}`;
|
|
213
|
+
return `${expr.numerator}/${expr.denominator}${'.'.repeat(expr.dots)}`;
|
|
171
214
|
case 'TimeLiteral':
|
|
172
215
|
if (expr.sub === 0) {
|
|
173
216
|
return `${expr.bar}:${expr.beat}`;
|
|
@@ -238,5 +281,32 @@ export class Formatter {
|
|
|
238
281
|
const indentStr = ' '.repeat(this.indent);
|
|
239
282
|
this.output.push(indentStr + text);
|
|
240
283
|
}
|
|
284
|
+
formatElseIf(stmt) {
|
|
285
|
+
const indentStr = ' '.repeat(this.indent);
|
|
286
|
+
this.output.push(`${indentStr}} else if (${this.formatExpr(stmt.condition)}) {`);
|
|
287
|
+
this.indent++;
|
|
288
|
+
for (const s of stmt.consequent) {
|
|
289
|
+
this.formatStatement(s);
|
|
290
|
+
}
|
|
291
|
+
this.indent--;
|
|
292
|
+
if (stmt.alternate) {
|
|
293
|
+
if (Array.isArray(stmt.alternate)) {
|
|
294
|
+
this.line('} else {');
|
|
295
|
+
this.indent++;
|
|
296
|
+
for (const s of stmt.alternate) {
|
|
297
|
+
this.formatStatement(s);
|
|
298
|
+
}
|
|
299
|
+
this.indent--;
|
|
300
|
+
this.line('}');
|
|
301
|
+
}
|
|
302
|
+
else {
|
|
303
|
+
// More else if chains
|
|
304
|
+
this.formatElseIf(stmt.alternate);
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
else {
|
|
308
|
+
this.line('}');
|
|
309
|
+
}
|
|
310
|
+
}
|
|
241
311
|
}
|
|
242
312
|
//# sourceMappingURL=formatter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/formatter/formatter.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAShC,MAAM,OAAO,SAAS;IACZ,MAAM,GAAW,CAAC,CAAC;IACnB,MAAM,GAAa,EAAE,CAAC;IAE9B,MAAM,CAAC,OAAgB;QACrB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QAEjB,mBAAmB;QACnB,MAAM,OAAO,GAAgB,EAAE,CAAC;QAChC,MAAM,MAAM,GAAgB,EAAE,CAAC;QAE/B,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QAED,gDAAgD;QAChD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvB,CAAC;QAED,0BAA0B;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,gDAAgD;YAChD,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACvC,CAAC;IAEO,eAAe,CAAC,IAAe;QACrC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,iBAAiB;gBACpB,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;gBACxE,MAAM;YAER,KAAK,iBAAiB;gBACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACpC,MAAM;YAER,KAAK,iBAAiB;gBACpB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClE,MAAM;YAER,KAAK,kBAAkB;gBACrB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,SAAS,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChF,MAAM;YAER,KAAK,gBAAgB;gBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChE,MAAM;YAER,KAAK,qBAAqB;gBACxB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC5D,MAAM;YAER,KAAK,aAAa;gBAChB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACvD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACtB,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;wBAC/B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;oBAC1B,CAAC;oBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM;YAER,KAAK,cAAc;gBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpD,IAAI,CAAC,IAAI,CACP,QAAQ,IAAI,CAAC,QAAQ,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAC/G,CAAC;gBACF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM;YAER,KAAK,gBAAgB;gBACnB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM;YAER,KAAK,kBAAkB;gBACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC3E,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM;YAER,KAAK,iBAAiB;gBACpB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtD,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvB,CAAC;gBACD,MAAM;YAER,KAAK,gBAAgB;gBACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpB,MAAM;YAER,KAAK,mBAAmB;gBACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACvB,MAAM;YAER,KAAK,0BAA0B;gBAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/G,MAAM;YAER,KAAK,YAAY;gBACf,IAAI,SAAS,GAAG,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;gBAChD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACjB,SAAS,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpD,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,SAAS,SAAS,KAAK,CAAC,CAAC;gBACnC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM;YAER,KAAK,qBAAqB;gBACxB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAClD,MAAM;QACV,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,IAAkE;QACrF,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,IAAY,EAAE,MAAmB,EAAE,IAAiB,EAAE,QAAiB;QACxF,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,QAAQ,IAAI,IAAI,QAAQ,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAEO,UAAU,CAAC,IAAgB;QACjC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,YAAY;gBACf,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAE/B,KAAK,cAAc;gBACjB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAE/B,KAAK,eAAe;gBAClB,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAE9C,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAEvC,KAAK,cAAc;gBACjB,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAEtC,KAAK,YAAY;gBACf,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAEjD,KAAK,aAAa;gBAChB,IAAI,IAAI,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;oBACnB,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACpC,CAAC;gBACD,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YAEhD,KAAK,YAAY;gBACf,OAAO,IAAI,CAAC,IAAI,CAAC;YAEnB,KAAK,kBAAkB;gBACrB,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAEzF,KAAK,iBAAiB;gBACpB,OAAO,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAE5D,KAAK,gBAAgB;gBACnB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACvC,IAAI,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;wBAC/B,OAAO,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC7C,CAAC;oBACD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACd,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,CAAC;YAEpC,KAAK,iBAAiB;gBACpB,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAE3E,KAAK,kBAAkB;gBACrB,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE5D,KAAK,cAAc;gBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACtC,IAAI,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;wBAC/B,OAAO,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC7C,CAAC;oBACD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACd,OAAO,IAAI,OAAO,GAAG,CAAC;YAExB,KAAK,eAAe;gBAClB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACtC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACxB,OAAO,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC7C,CAAC;oBACD,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;wBAChB,OAAO,CAAC,CAAC,GAAG,CAAC;oBACf,CAAC;oBACD,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjD,CAAC,CAAC,CAAC;gBACH,OAAO,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAEnC,KAAK,eAAe;gBAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC7B,OAAO,IAAI,QAAQ,cAAc,CAAC;gBACpC,CAAC;gBACD,OAAO,IAAI,QAAQ,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAE1D,KAAK,eAAe;gBAClB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAEhD,KAAK,iBAAiB;gBACpB,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;gBACzC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAE3E;gBACE,OAAO,aAAc,IAAmB,CAAC,IAAI,GAAG,CAAC;QACrD,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,CAAS;QAC5B,OAAO,CAAC;aACL,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;aACtB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;aACpB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;aACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;aACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3B,CAAC;IAEO,IAAI,CAAC,IAAY;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/formatter/formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Program, ProcDeclaration } from '../types/ast.js';
|
|
2
2
|
import type { SongIR } from '../types/ir.js';
|
|
3
3
|
import { RuntimeValue } from './runtime.js';
|
|
4
|
+
import { Scope } from './scope.js';
|
|
4
5
|
export declare class Interpreter {
|
|
5
6
|
private ir;
|
|
6
7
|
private scope;
|
|
@@ -13,6 +14,7 @@ export declare class Interpreter {
|
|
|
13
14
|
constructor(filePath?: string);
|
|
14
15
|
registerProc(proc: ProcDeclaration): void;
|
|
15
16
|
registerConst(name: string, value: RuntimeValue): void;
|
|
17
|
+
getGlobalScope(): Scope;
|
|
16
18
|
execute(program: Program): SongIR;
|
|
17
19
|
private executeStatements;
|
|
18
20
|
private executeStatement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interpreter.d.ts","sourceRoot":"","sources":["../../src/interpreter/interpreter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,OAAO,EAGP,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,MAAM,EAqSP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,YAAY,EAgBb,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"interpreter.d.ts","sourceRoot":"","sources":["../../src/interpreter/interpreter.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,6 +94,10 @@ export class Interpreter {
|
|
|
94
94
|
registerConst(name, value) {
|
|
95
95
|
this.scope.defineConst(name, value);
|
|
96
96
|
}
|
|
97
|
+
// Get the global scope (for namespace imports)
|
|
98
|
+
getGlobalScope() {
|
|
99
|
+
return this.scope;
|
|
100
|
+
}
|
|
97
101
|
execute(program) {
|
|
98
102
|
// First pass: collect all proc declarations from this module
|
|
99
103
|
for (const stmt of program.statements) {
|
|
@@ -156,11 +160,18 @@ export class Interpreter {
|
|
|
156
160
|
this.scope = oldScope;
|
|
157
161
|
}
|
|
158
162
|
else if (stmt.alternate) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
163
|
+
if (Array.isArray(stmt.alternate)) {
|
|
164
|
+
// else: alternate is Statement[]
|
|
165
|
+
const childScope = this.scope.createChild();
|
|
166
|
+
const oldScope = this.scope;
|
|
167
|
+
this.scope = childScope;
|
|
168
|
+
this.executeStatements(stmt.alternate);
|
|
169
|
+
this.scope = oldScope;
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
// else if: alternate is a single IfStatement
|
|
173
|
+
this.executeStatement(stmt.alternate);
|
|
174
|
+
}
|
|
164
175
|
}
|
|
165
176
|
break;
|
|
166
177
|
}
|
|
@@ -229,6 +240,46 @@ export class Interpreter {
|
|
|
229
240
|
}
|
|
230
241
|
break;
|
|
231
242
|
}
|
|
243
|
+
case 'MatchStatement': {
|
|
244
|
+
const matchValue = this.evaluate(stmt.expression);
|
|
245
|
+
let matched = false;
|
|
246
|
+
let defaultCase = null;
|
|
247
|
+
for (const matchCase of stmt.cases) {
|
|
248
|
+
if (matchCase.pattern === null) {
|
|
249
|
+
// Store default case for later
|
|
250
|
+
defaultCase = matchCase;
|
|
251
|
+
continue;
|
|
252
|
+
}
|
|
253
|
+
const caseValue = this.evaluate(matchCase.pattern);
|
|
254
|
+
if (this.valuesEqual(matchValue, caseValue)) {
|
|
255
|
+
// Execute the matching case
|
|
256
|
+
const childScope = this.scope.createChild();
|
|
257
|
+
const oldScope = this.scope;
|
|
258
|
+
this.scope = childScope;
|
|
259
|
+
try {
|
|
260
|
+
this.executeStatements(matchCase.body);
|
|
261
|
+
}
|
|
262
|
+
finally {
|
|
263
|
+
this.scope = oldScope;
|
|
264
|
+
}
|
|
265
|
+
matched = true;
|
|
266
|
+
break;
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
// If no case matched, execute default case if present
|
|
270
|
+
if (!matched && defaultCase) {
|
|
271
|
+
const childScope = this.scope.createChild();
|
|
272
|
+
const oldScope = this.scope;
|
|
273
|
+
this.scope = childScope;
|
|
274
|
+
try {
|
|
275
|
+
this.executeStatements(defaultCase.body);
|
|
276
|
+
}
|
|
277
|
+
finally {
|
|
278
|
+
this.scope = oldScope;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
break;
|
|
282
|
+
}
|
|
232
283
|
case 'ReturnStatement': {
|
|
233
284
|
const value = stmt.value ? this.evaluate(stmt.value) : makeNull();
|
|
234
285
|
throw new ReturnSignal(value);
|
|
@@ -271,10 +322,23 @@ export class Interpreter {
|
|
|
271
322
|
}
|
|
272
323
|
case 'ForEachStatement': {
|
|
273
324
|
const iterable = this.evaluate(stmt.iterable);
|
|
274
|
-
|
|
275
|
-
|
|
325
|
+
// Build the list of elements to iterate over
|
|
326
|
+
let elements = [];
|
|
327
|
+
if (iterable.type === 'array') {
|
|
328
|
+
elements = iterable.elements;
|
|
329
|
+
}
|
|
330
|
+
else if (iterable.type === 'string') {
|
|
331
|
+
// Iterate over characters
|
|
332
|
+
elements = [...iterable.value].map(c => makeString(c));
|
|
333
|
+
}
|
|
334
|
+
else if (iterable.type === 'object') {
|
|
335
|
+
// Iterate over keys
|
|
336
|
+
elements = [...iterable.properties.keys()].map(k => makeString(k));
|
|
276
337
|
}
|
|
277
|
-
|
|
338
|
+
else {
|
|
339
|
+
throw createError('E400', `Cannot iterate over type '${iterable.type}'`, stmt.position, this.filePath);
|
|
340
|
+
}
|
|
341
|
+
for (const element of elements) {
|
|
278
342
|
const childScope = this.scope.createChild();
|
|
279
343
|
childScope.defineConst(stmt.variable, element);
|
|
280
344
|
const oldScope = this.scope;
|
|
@@ -389,6 +453,8 @@ export class Interpreter {
|
|
|
389
453
|
return makeString(expr.value);
|
|
390
454
|
case 'BoolLiteral':
|
|
391
455
|
return makeBool(expr.value);
|
|
456
|
+
case 'NullLiteral':
|
|
457
|
+
return makeNull();
|
|
392
458
|
case 'PitchLiteral':
|
|
393
459
|
return makePitch(expr.midi);
|
|
394
460
|
case 'DurLiteral':
|
|
@@ -396,7 +462,7 @@ export class Interpreter {
|
|
|
396
462
|
if (expr.numerator <= 0 || expr.denominator <= 0) {
|
|
397
463
|
throw new MFError('E101', `Invalid duration: ${expr.numerator}/${expr.denominator} (must be positive)`, expr.position, this.filePath);
|
|
398
464
|
}
|
|
399
|
-
return makeDur(expr.numerator, expr.denominator);
|
|
465
|
+
return makeDur(expr.numerator, expr.denominator, expr.dots);
|
|
400
466
|
case 'TimeLiteral':
|
|
401
467
|
return makeTime(expr.bar, expr.beat, expr.sub);
|
|
402
468
|
case 'ArrayLiteral': {
|
|
@@ -430,6 +496,10 @@ export class Interpreter {
|
|
|
430
496
|
return this.evaluateCall(expr.callee, expr.arguments, expr.position);
|
|
431
497
|
case 'IndexExpression': {
|
|
432
498
|
const obj = this.evaluate(expr.object);
|
|
499
|
+
// Optional chaining: return null if object is null
|
|
500
|
+
if (expr.optional && obj.type === 'null') {
|
|
501
|
+
return makeNull();
|
|
502
|
+
}
|
|
433
503
|
const idx = this.evaluate(expr.index);
|
|
434
504
|
if (obj.type === 'array') {
|
|
435
505
|
if (idx.type !== 'int') {
|
|
@@ -482,6 +552,10 @@ export class Interpreter {
|
|
|
482
552
|
}
|
|
483
553
|
case 'MemberExpression': {
|
|
484
554
|
const obj = this.evaluate(expr.object);
|
|
555
|
+
// Optional chaining: return null if object is null
|
|
556
|
+
if (expr.optional && obj.type === 'null') {
|
|
557
|
+
return makeNull();
|
|
558
|
+
}
|
|
485
559
|
if (obj.type === 'object') {
|
|
486
560
|
const value = obj.properties.get(expr.property);
|
|
487
561
|
return value ?? makeNull();
|
|
@@ -500,6 +574,27 @@ export class Interpreter {
|
|
|
500
574
|
throw createError('E400', 'Spread element not allowed here', expr.position, this.filePath);
|
|
501
575
|
case 'RangeExpression':
|
|
502
576
|
throw new Error(`${expr.kind} cannot be evaluated as expression`);
|
|
577
|
+
case 'ConditionalExpression':
|
|
578
|
+
// Ternary operator: condition ? consequent : alternate
|
|
579
|
+
return isTruthy(this.evaluate(expr.condition))
|
|
580
|
+
? this.evaluate(expr.consequent)
|
|
581
|
+
: this.evaluate(expr.alternate);
|
|
582
|
+
case 'TemplateLiteral': {
|
|
583
|
+
// Template literal: `Hello ${name}!`
|
|
584
|
+
let result = '';
|
|
585
|
+
for (let i = 0; i < expr.quasis.length; i++) {
|
|
586
|
+
result += expr.quasis[i];
|
|
587
|
+
if (i < expr.expressions.length) {
|
|
588
|
+
const val = this.evaluate(expr.expressions[i]);
|
|
589
|
+
result += toString(val);
|
|
590
|
+
}
|
|
591
|
+
}
|
|
592
|
+
return makeString(result);
|
|
593
|
+
}
|
|
594
|
+
case 'TypeofExpression': {
|
|
595
|
+
const val = this.evaluate(expr.operand);
|
|
596
|
+
return makeString(val.type);
|
|
597
|
+
}
|
|
503
598
|
default:
|
|
504
599
|
throw new Error(`Unknown expression kind: ${expr.kind}`);
|
|
505
600
|
}
|
|
@@ -514,6 +609,10 @@ export class Interpreter {
|
|
|
514
609
|
if (op === '||') {
|
|
515
610
|
return makeBool(isTruthy(left) || isTruthy(right));
|
|
516
611
|
}
|
|
612
|
+
// Nullish coalescing: return left if not null/undefined, else right
|
|
613
|
+
if (op === '??') {
|
|
614
|
+
return left.type === 'null' ? right : left;
|
|
615
|
+
}
|
|
517
616
|
// Comparison operators
|
|
518
617
|
if (op === '==' || op === '!=') {
|
|
519
618
|
const equal = this.valuesEqual(left, right);
|
|
@@ -613,6 +712,32 @@ export class Interpreter {
|
|
|
613
712
|
}
|
|
614
713
|
return makeFloat(l % r);
|
|
615
714
|
}
|
|
715
|
+
// Bitwise operators (only work on integers)
|
|
716
|
+
if (op === '&') {
|
|
717
|
+
const l = Math.trunc(toNumber(left));
|
|
718
|
+
const r = Math.trunc(toNumber(right));
|
|
719
|
+
return makeInt(l & r);
|
|
720
|
+
}
|
|
721
|
+
if (op === '|') {
|
|
722
|
+
const l = Math.trunc(toNumber(left));
|
|
723
|
+
const r = Math.trunc(toNumber(right));
|
|
724
|
+
return makeInt(l | r);
|
|
725
|
+
}
|
|
726
|
+
if (op === '^') {
|
|
727
|
+
const l = Math.trunc(toNumber(left));
|
|
728
|
+
const r = Math.trunc(toNumber(right));
|
|
729
|
+
return makeInt(l ^ r);
|
|
730
|
+
}
|
|
731
|
+
if (op === '<<') {
|
|
732
|
+
const l = Math.trunc(toNumber(left));
|
|
733
|
+
const r = Math.trunc(toNumber(right));
|
|
734
|
+
return makeInt(l << r);
|
|
735
|
+
}
|
|
736
|
+
if (op === '>>') {
|
|
737
|
+
const l = Math.trunc(toNumber(left));
|
|
738
|
+
const r = Math.trunc(toNumber(right));
|
|
739
|
+
return makeInt(l >> r);
|
|
740
|
+
}
|
|
616
741
|
throw new Error(`Unknown binary operator: ${op}`);
|
|
617
742
|
}
|
|
618
743
|
evaluateUnary(op, operandExpr) {
|
|
@@ -624,6 +749,10 @@ export class Interpreter {
|
|
|
624
749
|
const n = toNumber(operand);
|
|
625
750
|
return operand.type === 'float' ? makeFloat(-n) : makeInt(-n);
|
|
626
751
|
}
|
|
752
|
+
if (op === '~') {
|
|
753
|
+
const n = Math.trunc(toNumber(operand));
|
|
754
|
+
return makeInt(~n);
|
|
755
|
+
}
|
|
627
756
|
throw new Error(`Unknown unary operator: ${op}`);
|
|
628
757
|
}
|
|
629
758
|
evaluateCall(calleeExpr, args, position) {
|
|
@@ -2306,10 +2435,10 @@ export class Interpreter {
|
|
|
2306
2435
|
// User-defined proc
|
|
2307
2436
|
const proc = this.scope.lookupProc(callee);
|
|
2308
2437
|
if (proc) {
|
|
2309
|
-
// Track recursion depth
|
|
2438
|
+
// Track recursion depth (relaxed from 100 to 1000)
|
|
2310
2439
|
const currentDepth = this.callStack.get(callee) || 0;
|
|
2311
|
-
if (currentDepth >=
|
|
2312
|
-
throw
|
|
2440
|
+
if (currentDepth >= 1000) {
|
|
2441
|
+
throw new MFError('E310', `Maximum recursion depth (1000) exceeded in '${callee}'`, position, this.filePath);
|
|
2313
2442
|
}
|
|
2314
2443
|
this.callStack.set(callee, currentDepth + 1);
|
|
2315
2444
|
// Create scope with parameters
|
|
@@ -2359,7 +2488,10 @@ export class Interpreter {
|
|
|
2359
2488
|
callFunctionValue(fn, evalArgs, position) {
|
|
2360
2489
|
// Create new scope chained to closure scope (not current scope!)
|
|
2361
2490
|
const callScope = fn.closure.createChild();
|
|
2362
|
-
// Bind parameters
|
|
2491
|
+
// Bind parameters (with default value support)
|
|
2492
|
+
// We need to evaluate defaults in the call scope so they can reference earlier params
|
|
2493
|
+
const oldScope = this.scope;
|
|
2494
|
+
this.scope = callScope;
|
|
2363
2495
|
for (let i = 0; i < fn.params.length; i++) {
|
|
2364
2496
|
const param = fn.params[i];
|
|
2365
2497
|
if (param.rest) {
|
|
@@ -2367,11 +2499,21 @@ export class Interpreter {
|
|
|
2367
2499
|
callScope.defineConst(param.name, makeArray(evalArgs.slice(i)));
|
|
2368
2500
|
break;
|
|
2369
2501
|
}
|
|
2370
|
-
|
|
2502
|
+
let value;
|
|
2503
|
+
if (i < evalArgs.length) {
|
|
2504
|
+
value = evalArgs[i];
|
|
2505
|
+
}
|
|
2506
|
+
else if (param.defaultValue) {
|
|
2507
|
+
// Evaluate default value in call scope (can reference earlier params)
|
|
2508
|
+
value = this.evaluate(param.defaultValue);
|
|
2509
|
+
}
|
|
2510
|
+
else {
|
|
2511
|
+
value = makeNull();
|
|
2512
|
+
}
|
|
2371
2513
|
callScope.defineConst(param.name, value);
|
|
2372
2514
|
}
|
|
2373
|
-
|
|
2374
|
-
|
|
2515
|
+
// Scope is already set to callScope for default value evaluation
|
|
2516
|
+
// Keep it that way for body execution
|
|
2375
2517
|
let result = makeNull();
|
|
2376
2518
|
try {
|
|
2377
2519
|
if (Array.isArray(fn.body)) {
|