elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-24 20:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

get rid of asNumber on arithmetic functions

Browse Source
This commit is contained in:
Felix Roos 2022-11-01 21:38:16 +01:00
parent e128b02da1
commit fbf7c6293f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/core/pattern.mjs
View File

@ -1391,9 +1391,6 @@ function _composeOp(a, b, func) {
// Make composers // Make composers
(function () { (function () {
const num = (pat) => pat._asNumber();
// const numOrString = (pat) => pat._asNumber(false, true); // was used for add
// pattern composers // pattern composers
const composers = { const composers = {
set: [(a, b) => b], set: [(a, b) => b],
@ -1417,7 +1414,7 @@ function _composeOp(a, b, func) {
* // Behind the scenes, the notes are converted to midi numbers: * // Behind the scenes, the notes are converted to midi numbers:
* // "48 52 55".add("<0 5 7 0>").note() * // "48 52 55".add("<0 5 7 0>").note()
*/ */
add: [numeralArgs((a, b) => a + b), num], // support string concatenation add: [numeralArgs((a, b) => a + b)], // support string concatenation
/** /**
* *
* Like add, but the given numbers are subtracted. * Like add, but the given numbers are subtracted.
@ -1427,7 +1424,7 @@ function _composeOp(a, b, func) {
* "0 2 4".sub("<0 1 2 3>").scale('C4 minor').note() * "0 2 4".sub("<0 1 2 3>").scale('C4 minor').note()
* // See add for more information. * // See add for more information.
*/ */
sub: [numeralArgs((a, b) => a - b), num], sub: [numeralArgs((a, b) => a - b)],
/** /**
* *
* Multiplies each number by the given factor. * Multiplies each number by the given factor.
@ -1436,21 +1433,21 @@ function _composeOp(a, b, func) {
* @example * @example
* "1 1.5 [1.66, <2 2.33>]".mul(150).freq() * "1 1.5 [1.66, <2 2.33>]".mul(150).freq()
*/ */
mul: [numeralArgs((a, b) => a * b), num], mul: [numeralArgs((a, b) => a * b)],
/** /**
* *
* Divides each number by the given factor. * Divides each number by the given factor.
* @name div * @name div
* @memberof Pattern * @memberof Pattern
*/ */
div: [numeralArgs((a, b) => a / b), num], div: [numeralArgs((a, b) => a / b)],
mod: [mod, num], mod: [numeralArgs(mod)],
pow: [Math.pow, num], pow: [numeralArgs(Math.pow)],
_and: [(a, b) => a & b, num], _and: [numeralArgs((a, b) => a & b)],
_or: [(a, b) => a | b, num], _or: [numeralArgs((a, b) => a | b)],
_xor: [(a, b) => a ^ b, num], _xor: [numeralArgs((a, b) => a ^ b)],
_lshift: [(a, b) => a << b, num], _lshift: [numeralArgs((a, b) => a << b)],
_rshift: [(a, b) => a >> b, num], _rshift: [numeralArgs((a, b) => a >> b)],
// TODO - force numerical comparison if both look like numbers? // TODO - force numerical comparison if both look like numbers?
lt: [(a, b) => a < b], lt: [(a, b) => a < b],