diff options
| author | s-ol <s+removethis@s-ol.nu> | 2021-01-30 22:36:09 +0000 |
|---|---|---|
| committer | s-ol <s+removethis@s-ol.nu> | 2021-01-30 23:09:23 +0000 |
| commit | faaff3eccf5c33067a3c47885cb97d5d2e7652fb (patch) | |
| tree | 85c98ee63c1f2dde90a9a7aaedacc7d6c102bc85 | |
| parent | alv.base.match: fix docs (diff) | |
| download | alive-faaff3eccf5c33067a3c47885cb97d5d2e7652fb.tar.gz alive-faaff3eccf5c33067a3c47885cb97d5d2e7652fb.zip | |
more overridable PureOp
| -rw-r--r-- | alv/base/pureop.moon | 32 | ||||
| -rw-r--r-- | alv/rtnode.moon | 2 |
2 files changed, 21 insertions, 13 deletions
diff --git a/alv/base/pureop.moon b/alv/base/pureop.moon index b497914..5188946 100644 --- a/alv/base/pureop.moon +++ b/alv/base/pureop.moon @@ -16,6 +16,11 @@ import ancestor, deep_iter, deep_map from require 'alv.util' unpack or= table.unpack +hot_if_trigger = (trigger) -> (a) -> + if a == trigger + return Input.hot a + Input.cold a + class PureOp extends Op --- members. -- @section members @@ -35,7 +40,11 @@ class PureOp extends Op -- @treturn type.Type --- set up inputs for a range of things. - setup: (inputs) => + -- + -- @tparam {RTNode,...} inputs a sequence of `RTNode`s + -- @tparam Scope scope (unused) + -- @tparam[opt] table extra_inputs table of `Input`s to merge into pureop result + setup: (inputs, scope, extra_inputs={}) => args = @@pattern\match inputs local trigger @@ -44,17 +53,16 @@ class PureOp extends Op assert not trigger, Error 'argument', "pure op can take at most one !-stream." trigger = arg - typ = if (type @type) == 'table' then @type else @type args - assert (ancestor typ.__class) == Type, "not a type: #{typ}" - - if trigger - super deep_map args, (a) -> - Inp = if a == trigger then Input.hot else Input.cold - Inp a - @out = typ\mk_evt! - else - super deep_map args, (a) -> Input.hot a - @out or= typ\mk_sig! + typ = if (type @type) == 'function' then @type args else @type + if typ + assert (ancestor typ.__class) == Type, "not a type: #{typ}" + @out = if trigger then typ\mk_evt! else typ\mk_sig! + + map_fn = if trigger then hot_if_trigger trigger else Input.hot + inputs = deep_map args, map_fn + for k,v in pairs extra_inputs + inputs[k] = v + super inputs { :PureOp diff --git a/alv/rtnode.moon b/alv/rtnode.moon index 1580020..5fa4898 100644 --- a/alv/rtnode.moon +++ b/alv/rtnode.moon @@ -80,7 +80,7 @@ class RTNode return unless self_dirty - Error.wrap "ticking #{op}", @op\tick + Error.wrap "ticking #{@op}", @op\tick __tostring: => buf = "<RT=#{@result}" |