mirror of
https://codeberg.org/uzu/strudel
synced 2026-08-09 07:49:31 -04:00
mondo: support ! and @, also express seq and cat with stepcat
This commit is contained in:
@@ -17,7 +17,7 @@ export class MondoParser {
|
||||
open_seq: /^\[/,
|
||||
close_seq: /^\]/,
|
||||
number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
|
||||
op: /^[*/:]|^\.{2}/, // * / : ..
|
||||
op: /^[*/:!@]|^\.{2}/, // * / : ..
|
||||
pipe: /^\./,
|
||||
stack: /^[,$]/,
|
||||
plain: /^[a-zA-Z0-9-~_^]+/,
|
||||
|
||||
@@ -21,14 +21,22 @@ strudelScope.leaf = (token, scope) => {
|
||||
|
||||
strudelScope.call = (fn, args, name) => {
|
||||
const [pat, ...rest] = args;
|
||||
if (!['seq', 'cat', 'stack', ':', '..'].includes(name)) {
|
||||
if (!['seq', 'cat', 'stack', ':', '..', '!', '@'].includes(name)) {
|
||||
args = [...rest, pat];
|
||||
}
|
||||
if (name === 'seq') {
|
||||
return stepcat(...args).setSteps(1);
|
||||
}
|
||||
if (name === 'cat') {
|
||||
return stepcat(...args).pace(1);
|
||||
}
|
||||
return fn(...args);
|
||||
};
|
||||
|
||||
strudelScope['*'] = fast;
|
||||
strudelScope['/'] = slow;
|
||||
strudelScope['!'] = (pat, n) => pat.extend(n);
|
||||
strudelScope['@'] = (pat, n) => pat.expand(n);
|
||||
|
||||
// : operator
|
||||
const tail = (pat, friend) => pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend);
|
||||
|
||||
Reference in New Issue
Block a user