diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2020-05-27 11:09:15 +0000 |
|---|---|---|
| committer | s-ol <s+removethis@s-ol.nu> | 2025-03-02 14:24:49 +0000 |
| commit | 7c060bf6524ce63e34fe27a594851c295bed1231 (patch) | |
| tree | 59b98be32a06dd2371af876504f0a46f106b434b /alv-lib | |
| parent | allow > and < in symbol names (diff) | |
| download | alive-7c060bf6524ce63e34fe27a594851c295bed1231.tar.gz alive-7c060bf6524ce63e34fe27a594851c295bed1231.zip | |
rename base.match.val → base.match.sig
Diffstat (limited to 'alv-lib')
| -rw-r--r-- | alv-lib/logic.moon | 4 | ||||
| -rw-r--r-- | alv-lib/math.moon | 4 | ||||
| -rw-r--r-- | alv-lib/midi.moon | 8 | ||||
| -rw-r--r-- | alv-lib/midi/core.moon | 8 | ||||
| -rw-r--r-- | alv-lib/midi/launchctl.moon | 10 | ||||
| -rw-r--r-- | alv-lib/osc.moon | 8 | ||||
| -rw-r--r-- | alv-lib/pilot.moon | 6 | ||||
| -rw-r--r-- | alv-lib/random.moon | 4 | ||||
| -rw-r--r-- | alv-lib/rhythm.moon | 6 | ||||
| -rw-r--r-- | alv-lib/sc.moon | 6 | ||||
| -rw-r--r-- | alv-lib/string.moon | 4 | ||||
| -rw-r--r-- | alv-lib/time.moon | 18 | ||||
| -rw-r--r-- | alv-lib/util.moon | 8 |
13 files changed, 47 insertions, 47 deletions
diff --git a/alv-lib/logic.moon b/alv-lib/logic.moon index 5ca4e68..1d853dc 100644 --- a/alv-lib/logic.moon +++ b/alv-lib/logic.moon @@ -1,4 +1,4 @@ -import PureOp, Constant, T, val, evt from require 'alv.base' +import PureOp, Constant, T, sig, evt from require 'alv.base' all_same = (first, list) -> for v in *list @@ -14,7 +14,7 @@ tobool = (val) -> else true -any = val! / evt! +any = sig! / evt! class ReduceOp extends PureOp pattern: any\rep 2, nil diff --git a/alv-lib/math.moon b/alv-lib/math.moon index b51718a..8475742 100644 --- a/alv-lib/math.moon +++ b/alv-lib/math.moon @@ -1,7 +1,7 @@ -import PureOp, Constant, T, val, evt from require 'alv.base' +import PureOp, Constant, T, sig, evt from require 'alv.base' unpack or= table.unpack -num = val.num / evt.num +num = sig.num / evt.num class ReduceOp extends PureOp pattern: num\rep 2, nil diff --git a/alv-lib/midi.moon b/alv-lib/midi.moon index 503b91c..fc28f2e 100644 --- a/alv-lib/midi.moon +++ b/alv-lib/midi.moon @@ -1,4 +1,4 @@ -import Constant, Op, Input, T, val, evt from require 'alv.base' +import Constant, Op, Input, T, sig, evt from require 'alv.base' import input, output, inout, apply_range from require 'alv-lib.midi.core' gate = Constant.meta @@ -8,7 +8,7 @@ gate = Constant.meta examples: { '(midi/gate [port] note [chan])' } value: class extends Op - pattern = -evt['midi/port'] + val.num -val.num + pattern = -evt['midi/port'] + sig.num -sig.num setup: (inputs, scope) => @out or= T.bool\mk_sig! { port, note, chan } = pattern\match inputs @@ -37,7 +37,7 @@ trig = Constant.meta examples: { '(midi/trig [port] note [chan])' } value: class extends Op - pattern = -evt['midi/port'] + val.num -val.num + pattern = -evt['midi/port'] + sig.num -sig.num setup: (inputs, scope) => @out or= T.bang\mk_evt! { port, note, chan } = pattern\match inputs @@ -69,7 +69,7 @@ cc = Constant.meta - (num) [ 0 - num[" value: class extends Op - pattern = -evt['midi/port'] + val.num + -val.num + -val.num + pattern = -evt['midi/port'] + sig.num + -sig.num + -sig.num setup: (inputs, scope) => { port, cc, chan, range } = pattern\match inputs super diff --git a/alv-lib/midi/core.moon b/alv-lib/midi/core.moon index 71d1e9f..15ae3d6 100644 --- a/alv-lib/midi/core.moon +++ b/alv-lib/midi/core.moon @@ -1,4 +1,4 @@ -import Constant, IOStream, Op, Input, T, Error, val from require 'alv.base' +import Constant, IOStream, Op, Input, T, Error, sig from require 'alv.base' import RtMidiIn, RtMidiOut, RtMidi from require 'luartmidi' bit = do @@ -71,7 +71,7 @@ input = Constant.meta value: class extends PortOp setup: (inputs) => - name = val.str\match inputs + name = sig.str\match inputs super inp: Input.hot name output = Constant.meta @@ -82,7 +82,7 @@ output = Constant.meta value: class extends PortOp setup: (inputs) => - name = val.str\match inputs + name = sig.str\match inputs super out: Input.hot name inout = Constant.meta @@ -93,7 +93,7 @@ inout = Constant.meta value: class extends PortOp setup: (inputs) => - { inp, out } = (val.str + val.str)\match inputs + { inp, out } = (sig.str + sig.str)\match inputs super inp: Input.hot inp out: Input.hot out diff --git a/alv-lib/midi/launchctl.moon b/alv-lib/midi/launchctl.moon index f3c0295..69d96ff 100644 --- a/alv-lib/midi/launchctl.moon +++ b/alv-lib/midi/launchctl.moon @@ -1,4 +1,4 @@ -import Constant, Op, Input, T, val, evt from require 'alv.base' +import Constant, Op, Input, T, sig, evt from require 'alv.base' import apply_range, bit from require 'alv-lib.midi.core' import bor, lshift from bit @@ -22,8 +22,8 @@ range can be one of: - (num) [ 0 - num[" value: class extends Op - num = val.num - pattern = -evt['midi/port'] + num + num + num + -num + -(val.str + num) + num = sig.num + pattern = -evt['midi/port'] + num + num + num + -num + -(sig.str + num) setup: (inputs, scope) => { port, i, start, chan, steps, range } = pattern\match inputs @@ -68,7 +68,7 @@ Send `true` or `false` for the `i`-th note-button (MIDI-notes starting from `start`). `steps` defaults to 8." value: class extends Op - pattern = -evt['midi/port'] + val.num + val.num + val.num + -val.num + pattern = -evt['midi/port'] + sig.num + sig.num + sig.num + -sig.num setup: (inputs, scope) => @out or= T.bool\mk_sig! @state or= {} @@ -130,7 +130,7 @@ Send bangs for the `i`-th note-button (MIDI-notes starting from `start`). `steps` defaults to 8." value: class extends Op - pattern = -evt['midi/port'] + val.num + val.num + val.num + -val.num + pattern = -evt['midi/port'] + sig.num + sig.num + sig.num + -sig.num setup: (inputs, scope) => @out or= T.bang\mk_evt! @state or= {} diff --git a/alv-lib/osc.moon b/alv-lib/osc.moon index 05ac357..ff58c94 100644 --- a/alv-lib/osc.moon +++ b/alv-lib/osc.moon @@ -1,4 +1,4 @@ -import Op, Constant, SigStream, Input, T, val, evt from require 'alv.base' +import Op, Constant, SigStream, Input, T, sig, evt from require 'alv.base' import pack from require 'osc' import dns, udp from require 'socket' @@ -11,7 +11,7 @@ connect = Constant.meta examples: { '(osc/connect host port)' } value: class extends Op - pattern = val.str + val.num + pattern = sig.str + sig.num setup: (inputs) => @out or= SigStream T['udp/socket'] { host, port } = pattern\match inputs @@ -38,7 +38,7 @@ send = Constant.meta - `path` is the OSC path to send the message to. It should be a string-value. - `evt` is the argument to send. It should be an event stream." value: class extends Op - pattern = -val['udp/socket'] + val.str + evt! + pattern = -sig['udp/socket'] + sig.str + evt! setup: (inputs, scope) => { socket, path, value } = pattern\match inputs super @@ -67,7 +67,7 @@ of the arguments change. - `val` is the value to Synchronize. It should be a value stream." value: class extends Op - pattern = -val['udp/socket'] + val.str + val! + pattern = -sig['udp/socket'] + sig.str + sig! setup: (inputs, scope) => { socket, path, value } = pattern\match inputs super diff --git a/alv-lib/pilot.moon b/alv-lib/pilot.moon index fb68121..1f14c73 100644 --- a/alv-lib/pilot.moon +++ b/alv-lib/pilot.moon @@ -1,4 +1,4 @@ -import Op, Constant, Input, val, evt from require 'alv.base' +import Op, Constant, Input, sig, evt from require 'alv.base' import udp from require 'socket' local conn @@ -20,7 +20,7 @@ send = (...) -> conn or= udp! conn\sendto str, '127.0.0.1', 49161 -arg = val.num / val.str +arg = sig.num / sig.str play = Constant.meta meta: @@ -69,7 +69,7 @@ effect = Constant.meta description: "`effect` should be one of 'DIS', 'CHO', 'REV' or 'FEE'" value: class extends Op - pattern = val.str + arg + arg + pattern = sig.str + arg + arg setup: (inputs) => { which, a, b } = pattern\match inputs super { diff --git a/alv-lib/random.moon b/alv-lib/random.moon index a2e4c60..8092f4f 100644 --- a/alv-lib/random.moon +++ b/alv-lib/random.moon @@ -1,4 +1,4 @@ -import Constant, Error, Op, Input, T, Array, val, evt from require 'alv.base' +import Constant, Error, Op, Input, T, Array, sig, evt from require 'alv.base' apply_range = (range, val) -> if range\type! == T.str @@ -22,7 +22,7 @@ range can be one of: - 'deg' [ 0 - 360[ - (num) [ 0 - num[" -pattern = -evt.bang + -(val.num / val.str) +pattern = -evt.bang + -(sig.num / sig.str) num = Constant.meta meta: diff --git a/alv-lib/rhythm.moon b/alv-lib/rhythm.moon index d4d4e6c..19dbdeb 100644 --- a/alv-lib/rhythm.moon +++ b/alv-lib/rhythm.moon @@ -1,4 +1,4 @@ -import Constant, Op, Input, T, val, evt from require 'alv.base' +import Constant, Op, Input, T, sig, evt from require 'alv.base' -- slower reference implementation bjorklund = (n, k) -> @@ -46,7 +46,7 @@ When fed a bang! trigger, steps forward to the next step on each trigger. When fed a num~ or num! stream, outputs a bang if the corresponding step is on." value: class extends Op - pattern = (evt.bang / val.num / evt.num) + val.num + val.num + pattern = (evt.bang / sig.num / evt.num) + sig.num + sig.num setup: (inputs) => { trig, n, k } = pattern\match inputs @@ -89,7 +89,7 @@ When fed a bang! trigger, steps forward to the next step on each trigger. When fed a num~ or num! stream, outputs a bang if the corresponding step is on." value: class extends Op - pattern = (evt.bang / val.num / evt.num) + val.bool*0 + pattern = (evt.bang / sig.num / evt.num) + sig.bool*0 setup: (inputs) => { trig, steps } = pattern\match inputs diff --git a/alv-lib/sc.moon b/alv-lib/sc.moon index 7e4c711..f4aac65 100644 --- a/alv-lib/sc.moon +++ b/alv-lib/sc.moon @@ -1,4 +1,4 @@ -import Op, Constant, Input, val, evt from require 'alv.base' +import Op, Constant, Input, sig, evt from require 'alv.base' import pack from require 'osc' import dns, udp from require 'socket' @@ -18,7 +18,7 @@ Plays the synth `synth` on the `udp/socket` `socket` whenever `trig` is live. - `trig` is the trigger signal. It should be a stream of bang-events. - `param` is the name of a synthdef parameter. It should be a string-value." value: class extends Op - pattern = -val['udp/socket'] + val.str + evt.bang + (val.str + val.num)\rep 0 + pattern = -sig['udp/socket'] + sig.str + evt.bang + (sig.str + sig.num)\rep 0 setup: (inputs, scope) => { socket, synth, trig, ctrls } = pattern\match inputs @@ -55,7 +55,7 @@ Plays the synth `synth` on the `udp/socket` `socket` whenever any `evt` is live. streams. Incoming events will cause a note to be played, while value changes will not." value: class extends Op - pattern = -val['udp/socket'] + val.str + (val.str + (val.num / evt.num))\rep 0 + pattern = -sig['udp/socket'] + sig.str + (sig.str + (sig.num / evt.num))\rep 0 setup: (inputs, scope) => { socket, synth, trig, ctrls } = pattern\match inputs diff --git a/alv-lib/string.moon b/alv-lib/string.moon index 24a2a1b..37810a4 100644 --- a/alv-lib/string.moon +++ b/alv-lib/string.moon @@ -1,6 +1,6 @@ -import PureOp, Constant, Input, T, val, evt from require 'alv.base' +import PureOp, Constant, Input, T, sig, evt from require 'alv.base' -any = val! / evt! +any = sig! / evt! str = Constant.meta meta: diff --git a/alv-lib/time.moon b/alv-lib/time.moon index c79c430..09cc068 100644 --- a/alv-lib/time.moon +++ b/alv-lib/time.moon @@ -1,4 +1,4 @@ -import Constant, EvtStream, IOStream, Error, Op, Input, T, val, evt +import Constant, EvtStream, IOStream, Error, Op, Input, T, sig, evt from require 'alv.base' import monotime from require 'system' @@ -38,7 +38,7 @@ frame rate. @out or= Clock! setup: (inputs) => - fps = (-val.num)\match inputs + fps = (-sig.num)\match inputs super fps: Input.hot fps or Constant.num 60 @out.frametime = 1 / @inputs.fps! @@ -60,7 +60,7 @@ scale_time = Constant.meta super ... @out or= T.clock\mk_evt! - pattern = -evt.clock + val.num + -val.str + pattern = -evt.clock + sig.num + -sig.str setup: (inputs, scope) => { clock, scale } = pattern\match inputs super @@ -92,7 +92,7 @@ lfo = Constant.meta @out or= T.num\mk_sig! default_wave = Constant.str 'sin' - pattern = -evt.clock + val.num + -val.str + pattern = -evt.clock + sig.num + -sig.str setup: (inputs, scope) => { clock, freq, wave } = pattern\match inputs super @@ -128,7 +128,7 @@ ramp = Constant.meta @state or= 0 @out or= T.num\mk_sig! - pattern = -evt.clock + val.num + -val.num + pattern = -evt.clock + sig.num + -sig.num setup: (inputs, scope) => { clock, period, max } = pattern\match inputs super @@ -163,7 +163,7 @@ tick = Constant.meta @state or= { phase: 0, count: 0 } @out or= T.num\mk_sig @state.count - pattern = -evt.clock + val.num + pattern = -evt.clock + sig.num setup: (inputs, scope) => { clock, period } = pattern\match inputs super @@ -195,7 +195,7 @@ every = Constant.meta super ... @state or= 0 - pattern = -evt.clock + val.num + -val! + pattern = -evt.clock + sig.num + -sig! setup: (inputs, scope) => { clock, period, evt } = pattern\match inputs super @@ -229,8 +229,8 @@ Emits `evt1`, `evt2`, … as events with delays `delay0`, `delay1`, … in betwe super ... @state or= { i: 1, t: 0 } - pair = (val! + val.num)\named('value', 'delay') - pattern = -evt.clock + val.num + pair*0 + pair = (sig! + sig.num)\named('value', 'delay') + pattern = -evt.clock + sig.num + pair*0 inputify = (step) -> { diff --git a/alv-lib/util.moon b/alv-lib/util.moon index 350c087..a2142fa 100644 --- a/alv-lib/util.moon +++ b/alv-lib/util.moon @@ -1,4 +1,4 @@ -import Constant, Op, Input, T, val, evt from require 'alv.base' +import Constant, Op, Input, T, sig, evt from require 'alv.base' all_same = (list) -> for v in *list[2,] @@ -19,8 +19,8 @@ switch_ = Constant.meta (indexed starting from 0) is reproduced." value: class extends Op - val_or_evt = (val! / evt!)! - pattern = (val.num / val.bool) + val_or_evt*0 + val_or_evt = (sig! / evt!)! + pattern = (sig.num / sig.bool) + val_or_evt*0 setup: (inputs) => { i, values } = pattern\match inputs @@ -55,7 +55,7 @@ edge = Constant.meta value: class extends Op setup: (inputs) => @out or= T.bang\mk_evt! - value = val.bool\match inputs + value = sig.bool\match inputs super value: Input.hot value tick: => |
