hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify mondo: ":" is just another operator

Browse source
This commit is contained in:
Felix Roos 2025-03-20 09:09:29 +01:00
parent e04f250adb
commit 208706fb52
No known key found for this signature in database
2 changed files with 8 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

42
packages/mondo/mondo.mjs
View file

@ -19,8 +19,7 @@ export class MondoParser {
number: /^-?[0-9]*\.?[0-9]+/, // before pipe! number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
pipe: /^\./, pipe: /^\./,
stack: /^[,$]/, stack: /^[,$]/,
op: /^[*/]/, op: /^[*/:]/,
tail: /^:/,
plain: /^[a-zA-Z0-9-~_^]+/, plain: /^[a-zA-Z0-9-~_^]+/,
}; };
// matches next token // matches next token
@ -97,7 +96,6 @@ export class MondoParser {
return this.consume(next); return this.consume(next);
} }
desugar_children(children) { desugar_children(children) {
children = this.resolve_tails(children);
children = this.resolve_ops(children); children = this.resolve_ops(children);
children = this.resolve_pipes(children); children = this.resolve_pipes(children);
return children; return children;
@ -146,32 +144,10 @@ export class MondoParser {
}); });
return [{ type: 'plain', value: 'stack' }, ...args]; return [{ type: 'plain', value: 'stack' }, ...args];
} }
resolve_tails(children) { // prevents to get a list, e.g. ((x y)) => (x y)
while (true) { unwrap_children(children) {
let opIndex = children.findIndex((child) => child.type === 'tail'); if (children.length === 1) {
if (opIndex === -1) break; return children[0].children;
const op = { type: 'plain', value: children[opIndex].value };
if (opIndex === children.length - 1) {
throw new Error(`cannot use operator as last child.`);
}
if (opIndex === 0) {
// regular function call (assuming each operator exists as function)
children[opIndex] = op;
continue;
}
const left = children[opIndex - 1];
const right = children[opIndex + 1];
// convert infix to prefix notation
const call = { type: 'list', children: [op, left, right] };
// insert call while keeping other siblings
children = [...children.slice(0, opIndex - 1), call, ...children.slice(opIndex + 2)];
// unwrap double list.. e.g. (s jazz) * 2
if (children.length === 1) {
// there might be a cleaner solution
children = children[0].children;
}
} }
return children; return children;
} }
@ -188,6 +164,7 @@ export class MondoParser {
children[opIndex] = op; children[opIndex] = op;
continue; continue;
} }
// convert infix to prefix notation
const left = children[opIndex - 1]; const left = children[opIndex - 1];
const right = children[opIndex + 1]; const right = children[opIndex + 1];
if (left.type === 'pipe') { if (left.type === 'pipe') {
@ -195,15 +172,10 @@ export class MondoParser {
children[opIndex] = op; children[opIndex] = op;
continue; continue;
} }
// convert infix to prefix notation
const call = { type: 'list', children: [op, left, right] }; const call = { type: 'list', children: [op, left, right] };
// insert call while keeping other siblings // insert call while keeping other siblings
children = [...children.slice(0, opIndex - 1), call, ...children.slice(opIndex + 2)]; children = [...children.slice(0, opIndex - 1), call, ...children.slice(opIndex + 2)];
// unwrap double list.. e.g. (s jazz) * 2 children = this.unwrap_children(children);
if (children.length === 1) {
// there might be a cleaner solution
children = children[0].children;
}
} }
return children; return children;
} }

1
packages/mondo/test/mondo.test.mjs
View file

@ -101,6 +101,7 @@ describe('mondo sugar', () => {
it('should desugar []*x', () => expect(desguar('[a [b c]*3]')).toEqual('(seq a (* (seq b c) 3))')); it('should desugar []*x', () => expect(desguar('[a [b c]*3]')).toEqual('(seq a (* (seq b c) 3))'));
it('should desugar x:y', () => expect(desguar('x:y')).toEqual('(: x y)')); it('should desugar x:y', () => expect(desguar('x:y')).toEqual('(: x y)'));
it('should desugar x:y:z', () => expect(desguar('x:y:z')).toEqual('(: (: x y) z)')); it('should desugar x:y:z', () => expect(desguar('x:y:z')).toEqual('(: (: x y) z)'));
it('should desugar x:y*x', () => expect(desguar('bd:0*2')).toEqual('(* (: bd 0) 2)'));
it('should desugar README example', () => it('should desugar README example', () =>
expect(desguar('s [bd hh*2 cp.(crush 4) <mt ht lt>] . speed .8')).toEqual( expect(desguar('s [bd hh*2 cp.(crush 4) <mt ht lt>] . speed .8')).toEqual(