elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-26 13:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup / allow ops to target node types

Browse Source
This commit is contained in:
Felix Roos 2024-05-17 23:11:23 +02:00
parent 3b4ae44fb3
commit 5fb3aadad9
1 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/tidal/tidal.mjs
View File

@ -1,5 +1,5 @@
import { reify } from '@strudel/core'; import { reify } from '@strudel/core';
import { loadParser, run, parse } from 'hs2js'; import { loadParser, evaluate } from 'hs2js';
function getInfixOperators() { function getInfixOperators() {
let operators = { let operators = {
@ -30,6 +30,7 @@ function getInfixOperators() {
ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right? ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
ops['string'] = (node) => { ops['string'] = (node) => {
const str = node.text.slice(1, -1); const str = node.text.slice(1, -1);
console.log('string node', node);
return m(str, 1); return m(str, 1);
}; };
return ops; return ops;
@ -47,10 +48,6 @@ export async function initTidal() {
window.d7 = (pat) => pat.p('d7'); window.d7 = (pat) => pat.p('d7');
window.d8 = (pat) => pat.p('d8'); window.d8 = (pat) => pat.p('d8');
window.d9 = (pat) => pat.p('d9'); window.d9 = (pat) => pat.p('d9');
window.minicurry = (str) => (loc) => {
console.log('minicurry', str, loc);
return m(str, loc);
};
return loadParser(); return loadParser();
} }
@ -58,50 +55,5 @@ export function tidal(code) {
if (Array.isArray(code)) { if (Array.isArray(code)) {
code = code.join(''); code = code.join('');
} }
let ast = parse(code).rootNode; return evaluate(code, window, ops);
// ast = transpile(ast);
console.log('ast', ast);
return run(ast, window, ops);
}
function edit(ast, options) {
if (!ast || ast.skip) {
return ast;
}
const { enter, leave } = options;
ast = enter?.(ast);
if (!ast.skip && ast.children) {
const children = ast.children.map((child) => edit(child, options));
ast = { type: ast.type, text: ast.text, children };
}
leave?.(ast);
return ast;
}
function transpile(ast) {
return edit(ast, {
enter: (node) => {
if (node.type === 'literal' && node.children[0].type === 'string') {
return miniWithLocation(node.text, 1);
}
return node;
},
});
}
function miniWithLocation(string, loc) {
return {
type: 'apply',
children: [
{
type: 'apply',
skip: true,
children: [
{ type: 'variable', text: 'minicurry', children: [] },
{ type: 'string', text: string, children: [] },
],
},
{ type: 'float', text: loc + '', children: [] },
],
};
} }