mondo: this is the way

This commit is contained in:
Felix Roos
2025-03-26 03:55:00 +01:00
parent 7716fdb98e
commit abc7a1e48d
2 changed files with 12 additions and 10 deletions
+7 -10
View File
@@ -207,11 +207,6 @@ export class MondoParser {
while (chunks.length > 1) {
let [left, right, ...rest] = chunks;
if (right.length && right[0].type === 'list') {
// x.(y) => not allowed anymore for now..
const snip = this.get_code_snippet(right[0]);
throw new Error(`${this.errorhead(right[0])} cannot apply list: expected "(${snip})" to be a word`);
}
if (!left.length) {
const arg = { type: 'plain', value: '_' };
return this.get_lambda([arg], [arg, ...children]);
@@ -342,11 +337,13 @@ export class MondoRunner {
// is list
// the first element is expected to be the function name
const first = ast.children[0];
const name = first.value;
this.assert(
first?.type === 'plain',
`${this.parser.errorhead(first)} expected function name, got ${first.type}${name ? ` "${name}"` : ''}.`,
);
let name;
if (first?.type !== 'list') {
name = first.value; // regular function call e.g. (fast 2 (s bd))
} else {
// dynamic function name e.g. "(<speed fast> 2 (s bd))"
name = this.evaluate(first);
}
if (name === 'lambda') {
const [_, args, body] = ast.children;
+5
View File
@@ -11,6 +11,7 @@ import {
chooseIn,
degradeBy,
silence,
isPattern,
} from '@strudel/core';
import { registerLanguage } from '@strudel/transpiler';
import { MondoRunner } from '../mondo/mondo.mjs';
@@ -42,6 +43,10 @@ lib['or'] = (...children) => chooseIn(...children); // always has structure but
let runner = new MondoRunner({
call(name, args, scope) {
if (isPattern(name)) {
// patterned function name, e.g. "s bd . <speed fast> 2"
return name.fmap((fn) => fn(...args)).innerJoin();
}
const fn = lib[name] || strudelScope[name];
if (!fn) {
throw new Error(`[moundough]: unknown function "${name}"`);