mirror of
https://codeberg.org/uzu/strudel
synced 2026-07-31 13:21:52 -04:00
mondo: add .. operator
This commit is contained in:
@@ -17,9 +17,9 @@ export class MondoParser {
|
||||
open_seq: /^\[/,
|
||||
close_seq: /^\]/,
|
||||
number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
|
||||
op: /^[*\/:]|^\.{2}/, // * / : ..
|
||||
pipe: /^\./,
|
||||
stack: /^[,$]/,
|
||||
op: /^[*/:]/,
|
||||
plain: /^[a-zA-Z0-9-~_^]+/,
|
||||
};
|
||||
// matches next token
|
||||
|
||||
@@ -102,6 +102,7 @@ describe('mondo sugar', () => {
|
||||
it('should desugar x:y', () => expect(desguar('x:y')).toEqual('(: x y)'));
|
||||
it('should desugar x:y:z', () => expect(desguar('x:y:z')).toEqual('(: (: x y) z)'));
|
||||
it('should desugar x:y*x', () => expect(desguar('bd:0*2')).toEqual('(* (: bd 0) 2)'));
|
||||
it('should desugar a..b', () => expect(desguar('0..2')).toEqual('(.. 0 2)'));
|
||||
|
||||
it('should desugar README example', () =>
|
||||
expect(desguar('s [bd hh*2 cp.(crush 4) <mt ht lt>] . speed .8')).toEqual(
|
||||
|
||||
@@ -21,7 +21,7 @@ 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];
|
||||
}
|
||||
return fn(...args);
|
||||
@@ -30,9 +30,18 @@ strudelScope.call = (fn, args, name) => {
|
||||
strudelScope['*'] = fast;
|
||||
strudelScope['/'] = slow;
|
||||
|
||||
// : operator
|
||||
const tail = (pat, friend) => pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend);
|
||||
strudelScope[':'] = tail;
|
||||
|
||||
// .. operator
|
||||
const arrayRange = (start, stop, step = 1) =>
|
||||
Array.from({ length: Math.abs(stop - start) / step + 1 }, (_, index) =>
|
||||
start < stop ? start + index * step : start - index * step,
|
||||
);
|
||||
const range = (min, max) => min.squeezeBind((a) => max.bind((b) => seq(...arrayRange(a, b))));
|
||||
strudelScope['..'] = range;
|
||||
|
||||
export function mondo(code, offset = 0) {
|
||||
if (Array.isArray(code)) {
|
||||
code = code.join('');
|
||||
|
||||
Reference in New Issue
Block a user