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

mondo: support ! and @, also express seq and cat with stepcat

Browse source
This commit is contained in:
Felix Roos 2025-03-20 13:15:48 +01:00
parent d2e93a99f1
commit 432e8dcccc
No known key found for this signature in database
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/mondo/mondo.mjs
View file

@ -17,7 +17,7 @@ export class MondoParser {
open_seq: /^\[/, open_seq: /^\[/,
close_seq: /^\]/, close_seq: /^\]/,
number: /^-?[0-9]*\.?[0-9]+/, // before pipe! number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
op: /^[*/:]|^\.{2}/, // * / : .. op: /^[*/:!@]|^\.{2}/, // * / : ..
pipe: /^\./, pipe: /^\./,
stack: /^[,$]/, stack: /^[,$]/,
plain: /^[a-zA-Z0-9-~_^]+/, plain: /^[a-zA-Z0-9-~_^]+/,

10
packages/mondough/mondough.mjs
View file

@ -21,14 +21,22 @@ strudelScope.leaf = (token, scope) => {
strudelScope.call = (fn, args, name) => { strudelScope.call = (fn, args, name) => {
const [pat, ...rest] = args; const [pat, ...rest] = args;
if (!['seq', 'cat', 'stack', ':', '..'].includes(name)) { if (!['seq', 'cat', 'stack', ':', '..', '!', '@'].includes(name)) {
args = [...rest, pat]; args = [...rest, pat];
} }
if (name === 'seq') {
return stepcat(...args).setSteps(1);
}
if (name === 'cat') {
return stepcat(...args).pace(1);
}
return fn(...args); return fn(...args);
}; };
strudelScope['*'] = fast; strudelScope['*'] = fast;
strudelScope['/'] = slow; strudelScope['/'] = slow;
strudelScope['!'] = (pat, n) => pat.extend(n);
strudelScope['@'] = (pat, n) => pat.expand(n);
// : operator // : operator
const tail = (pat, friend) => pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend); const tail = (pat, friend) => pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend);