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

Make set work for primative patterns, allow ops accept sequence

Browse source
This commit is contained in:
alex 2022-04-22 09:26:39 +01:00
parent 3ae6443c59
commit b510ab0371
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
packages/core/pattern.mjs
View file

@ -718,7 +718,23 @@ export class Pattern {
// pattern composers // pattern composers
const composers = { const composers = {
set: [(a) => (b) => Object.assign({}, a, b), id], set: [
(a) => (b) => {
// If an object is involved, do a union, discarding matching keys from a.
// Otherwise, just return b.
if (a instanceof Object || b instanceof Object) {
if (!a instanceof Object) {
a = { value: a };
}
if (!b instanceof Object) {
b = { value: b };
}
return Object.assign({}, a, b);
}
return b;
},
id,
],
add: [(a) => (b) => a + b, (x) => x._asNumber()], add: [(a) => (b) => a + b, (x) => x._asNumber()],
sub: [(a) => (b) => a - b, (x) => x._asNumber()], sub: [(a) => (b) => a - b, (x) => x._asNumber()],
mul: [(a) => (b) => a * b, (x) => x._asNumber()], mul: [(a) => (b) => a * b, (x) => x._asNumber()],
@ -726,17 +742,17 @@ const composers = {
}; };
for (const [name, op] of Object.entries(composers)) { for (const [name, op] of Object.entries(composers)) {
Pattern.prototype[name] = function (other) { Pattern.prototype[name] = function (...other) {
return op[1](this)._opLeft(other, op[0]); return op[1](this)._opLeft(sequence(other), op[0]);
}; };
Pattern.prototype[name + 'Flip'] = function (other) { Pattern.prototype[name + 'Flip'] = function (...other) {
return op[1](this)._opRight(other, op[0]); return op[1](this)._opRight(sequence(other), op[0]);
}; };
Pattern.prototype[name + 'Sect'] = function (other) { Pattern.prototype[name + 'Sect'] = function (...other) {
return op[1](this)._opBoth(other, op[0]); return op[1](this)._opBoth(sequence(other), op[0]);
}; };
Pattern.prototype[name + 'Squeeze'] = function (other) { Pattern.prototype[name + 'Squeeze'] = function (...other) {
return op[1](this)._opSqueeze(other, op[0]); return op[1](this)._opSqueeze(sequence(other), op[0]);
}; };
} }