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

fix: ! and @ operators

Browse source
This commit is contained in:
Felix Roos 2025-05-02 15:13:04 +02:00
parent 7565354274
commit 4208c79c09
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
packages/mondough/mondough.mjs
View file

@ -49,6 +49,10 @@ function evaluator(node, scope) {
if (type === 'list') {
const { children } = node;
const [name, ...args] = children;
// some functions wont be reified to make sure they work (e.g. see extend below)
if (typeof name === 'function') {
return name(...args);
}
if (name.value === 'def') {
return silence;
}
@ -56,7 +60,7 @@ function evaluator(node, scope) {
const first = name.firstCycle(true)[0];
const type = typeof first?.value;
if (type !== 'function') {
throw new Error(`[mondough] "${first}" is not a function, got ${type} ...`);
throw new Error(`[mondough] expected function, got "${first?.value}"`);
}
return name
.fmap((fn) => {
@ -73,10 +77,14 @@ function evaluator(node, scope) {
return reify(scope[value]); // -> local scope has no location
}
const variable = lib[value] ?? strudelScope[value];
// problem: collisions when we want a string that happens to also be a variable name
// example: "s sine" -> sine is also a variable
let pat;
if (type === 'plain' && typeof variable !== 'undefined') {
// problem: collisions when we want a string that happens to also be a variable name
// example: "s sine" -> sine is also a variable
// some function names are not patternable, so we skip reification here
if (['!', 'extend', '@', 'expand'].includes(value)) {
return variable;
}
pat = reify(variable);
} else {
pat = reify(value);