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

mondolang function for mondo repl + fix rests

Browse source
This commit is contained in:
Felix Roos 2025-03-23 22:49:03 +01:00
parent 5eabcf0618
commit 51e3aa257c
No known key found for this signature in database
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
packages/mondough/mondough.mjs
View file

@ -10,6 +10,7 @@ import {
pace, pace,
chooseIn, chooseIn,
degradeBy, degradeBy,
silence,
} from '@strudel/core'; } from '@strudel/core';
import { registerLanguage } from '@strudel/transpiler'; import { registerLanguage } from '@strudel/transpiler';
import { MondoRunner } from '../mondo/mondo.mjs'; import { MondoRunner } from '../mondo/mondo.mjs';
@ -20,9 +21,11 @@ const arrayRange = (start, stop, step = 1) =>
Array.from({ length: Math.abs(stop - start) / step + 1 }, (_, index) => Array.from({ length: Math.abs(stop - start) / step + 1 }, (_, index) =>
start < stop ? start + index * step : start - index * step, start < stop ? start + index * step : start - index * step,
); );
const range = (min, max) => min.squeezeBind((a) => max.bind((b) => seq(...arrayRange(a, b)))); const range = (max, min) => min.squeezeBind((a) => max.bind((b) => seq(...arrayRange(a, b))));
let lib = {}; let lib = {};
lib['-'] = silence;
lib['~'] = silence;
lib.curly = stepcat; lib.curly = stepcat;
lib.square = (...args) => stepcat(...args).setSteps(1); lib.square = (...args) => stepcat(...args).setSteps(1);
lib.angle = (...args) => stepcat(...args).pace(1); lib.angle = (...args) => stepcat(...args).pace(1);
@ -46,14 +49,15 @@ let runner = new MondoRunner({
return fn(...args); return fn(...args);
}, },
leaf(token, scope) { leaf(token, scope) {
let { value } = token; let { value, type } = token;
// local scope // local scope
if (token.type === 'plain' && scope[value]) { if (type === 'plain' && scope[value]) {
return reify(scope[value]); // -> local scope has no location return reify(scope[value]); // -> local scope has no location
} }
const [from, to] = token.loc; const [from, to] = token.loc;
if (token.type === 'plain' && strudelScope[value]) { const variable = lib[value] ?? strudelScope[value];
// what if we want a string that happens to also be a variable name? 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 // example: "s sine" -> sine is also a variable
return reify(strudelScope[value]).withLoc(from, to); return reify(strudelScope[value]).withLoc(from, to);
} }
@ -66,7 +70,7 @@ export function mondo(code, offset = 0) {
code = code.join(''); code = code.join('');
} }
const pat = runner.run(code, offset); const pat = runner.run(code, offset);
return pat.markcss('color: var(--foreground);text-decoration:underline'); return pat.markcss('color: var(--caret,--foreground);text-decoration:underline');
} }
let getLocations = (code, offset) => runner.parser.get_locations(code, offset); let getLocations = (code, offset) => runner.parser.get_locations(code, offset);
@ -80,6 +84,12 @@ export const mondi = (str, offset) => {
registerLanguage('mondo', { registerLanguage('mondo', {
getLocations, getLocations,
}); });
// this is like mondo, but with a zero offset
export const mondolang = (code) => mondo(code, 0);
registerLanguage('mondolang', {
getLocations: (code) => getLocations(code, 0),
});
// uncomment the following to use mondo as mini notation language // uncomment the following to use mondo as mini notation language
/* registerLanguage('minilang', { /* registerLanguage('minilang', {
name: 'mondi', name: 'mondi',