flor 0.11.0 → 0.12.0

data/lib/flor/pcore/cursor.rb

@@ -57,7 +57,7 @@ class Flor::Pro::Cursor < Flor::Procedure
         @node['subs'] << counter_next('subs')
         execute_child(first_non_att_child_id, @node['subs'].last)
       else
-        reply
+        wrap_reply
       end
     else
       execute_child(@ncid, @node['subs'].last)
@@ -105,7 +105,7 @@ class Flor::Pro::Cursor < Flor::Procedure
     if fla == 'continue'
 
       @node['on_receive_last'] =
-        reply(
+        wrap(
           'nid' => nid, 'from' => "#{nid}_#{children.size + 1}",
           'orl' => fla,
           'payload' => Flor.dup(message['payload']))

data/lib/flor/pcore/define.rb

@@ -66,7 +66,7 @@ class Flor::Pro::Define < Flor::Procedure
 
     payload['ret'] = val
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/fail.rb

@@ -20,12 +20,7 @@ class Flor::Pro::Fail < Flor::Procedure
         (payload['ret'] || 'error').to_s,
         Flor::Node.new(@executor, @node, @message))
 
-    #fail err
-      #
-      # let's reply with the failed message directly,
-      # no need for a Ruby backtrace, it's an error at the Flor level.
-      #
-    reply('point' => 'failed', 'error' => Flor.to_error(err))
+    wrap_error(err)
   end
 end
 

data/lib/flor/pcore/if.rb

@@ -52,7 +52,7 @@ class Flor::Pro::If < Flor::Procedure
 
   def receive_non_att
 
-    return reply if @fcid > first_unkeyed_child_id
+    return wrap_reply if @fcid > first_unkeyed_child_id
       # "else" or "then" answered, replying to parent...
 
     off =
@@ -65,7 +65,7 @@ class Flor::Pro::If < Flor::Procedure
     nxt = @fcid + off
 
     if nxt >= children.size
-      reply('ret' => node_payload_ret)
+      wrap_reply('ret' => node_payload_ret)
     else
       execute_child(nxt)
     end

data/lib/flor/pcore/map.rb

@@ -40,7 +40,7 @@ class Flor::Pro::Map < Flor::Procedure
     @node['idx'] += 1
     @node['mtime'] = Flor.tstamp
 
-    return reply('ret' => @node['res']) \
+    return wrap_reply('ret' => @node['res']) \
       if @node['idx'] == @node['col'].size
 
     @node['vars']['idx'] = @node['idx']

data/lib/flor/pcore/matchr.rb

@@ -0,0 +1,92 @@
+
+class Flor::Pro::Matchr < Flor::Procedure
+  #
+  # Matches a string against a regular expression.
+  #
+  # `matchr s r` will return an array of matching strings in `s` from regular
+  # expression `r`.
+  #
+  # `match? s r` will return true if string `s` matches regular expression `r`.
+  # It returns false else.
+  #
+  # ```
+  # matchr "alpha", /bravo/
+  #   # yields an empty array []
+  #
+  # match? "alpha", /bravo/  # => false
+  # match? "alpha", /alp/    # => true
+  # ```
+  #
+  # The second argument to `match?` and `matchr` is turned into a
+  # regular expression.
+  # ```
+  # match? "alpha", 'alp'    # => true
+  # ```
+  #
+  # When there is a single argument, `matchr` and `match?` will try
+  # to take the string out of `$(f.ret)`.
+  # ```
+  # "blue moon"
+  # match? (/blue/)
+  #   # => true
+  #
+  # "blue moon"
+  # match? 'blue'
+  #   # => true
+  #
+  # /blue/
+  # match? 'blue moon'
+  #   # => true
+  #
+  # 'blue'
+  # match? (/black/)
+  #   # => false
+  # ```
+
+  names %w[ matchr match? ]
+
+  def pre_execute
+
+    @node['rets'] = []
+  end
+
+  def receive_last
+
+    rex, str = arguments
+
+    m = rex.match(str)
+
+    payload['ret'] =
+      if @node['heap'] == 'match?'
+        !! m
+      else
+        m ? m.to_a : []
+      end
+
+    wrap_reply
+  end
+
+  protected
+
+  def arguments
+
+    rets = @node['rets'].dup
+    rets.unshift(node_payload_ret) if rets.size < 2
+
+    fail ArgumentError.new(
+      "'#{tree[0]}' needs 1 or 2 arguments"
+    ) if rets.size < 2
+
+    rex =
+      rets.find { |r| r.is_a?(Array) && r[0] == '_rxs' } ||
+      rets.last
+
+    str = (rets - [ rex ]).first
+
+    rex = rex.is_a?(String) ? rex : rex[1].to_s
+    rex = rex.match(/\A\/[^\/]*\/[a-z]*\z/) ? Kernel.eval(rex) : Regexp.new(rex)
+
+    [ rex, str ]
+  end
+end
+

data/lib/flor/pcore/move.rb

@@ -27,10 +27,9 @@ class Flor::Pro::Move < Flor::Procedure
 
     to = att('to')
 
-    rep = is_ancestor_node?(nid) ? [] : reply
+    rep = is_ancestor_node?(nid) ? [] : wrap_reply
 
-    reply(
-      'point' => 'cancel',
+    wrap_cancel(
       'nid' => nid,
       'flavour' => @node['heap'], # "move"
       'payload' => rep.any? ? payload.copy_current : payload.current,

data/lib/flor/pcore/noeval.rb

@@ -16,7 +16,7 @@ class Flor::Pro::NoEval < Flor::Procedure
 
   def execute
 
-    reply
+    wrap
   end
 end
 

data/lib/flor/pcore/noret.rb

@@ -17,7 +17,7 @@ class Flor::Pro::NoRet < Flor::Procedure
 
     payload['ret'] = node_payload_ret
 
-    reply
+    wrap
   end
 end
 

data/lib/flor/pcore/push.rb

@@ -39,7 +39,7 @@ class Flor::Pro::Push < Flor::Procedure
     payload['ret'] = node_payload_ret \
       unless tree[0] == 'pushr'
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/rand.rb

@@ -36,7 +36,7 @@ class Flor::Pro::Rand < Flor::Procedure
 
     payload['ret'] = Random.rand(a...b)
 
-    reply
+    wrap
   end
 
   protected

data/lib/flor/pcore/set.rb

@@ -27,7 +27,7 @@ class Flor::Pro::Set < Flor::Procedure
         node_payload_ret
       end
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/twig.rb

@@ -14,7 +14,7 @@ class Flor::Pro::Twig < Flor::Procedure
     nac = non_att_children
 
     if nac.size == 1
-      reply('ret' => nac.first)
+      wrap_reply('ret' => nac.first)
     else
       super
     end
@@ -26,7 +26,7 @@ class Flor::Pro::Twig < Flor::Procedure
 
     set_value(payload['ret'], t)
 
-    reply
+    wrap
   end
 end
 

data/lib/flor/pcore/until.rb

@@ -36,13 +36,15 @@ class Flor::Pro::Until < Flor::Procedure
         # over
 
         ret = @node.has_key?('cret') ? @node['cret'] : node_payload_ret
-        reply('ret' => ret)
+
+        wrap_reply('ret' => ret)
 
       else
         #
         # condition yield false, enter "block"
 
         payload['ret'] = node_payload_ret
+
         execute_child(@ncid, @node['subs'].last)
       end
 
@@ -54,6 +56,7 @@ class Flor::Pro::Until < Flor::Procedure
 
       @node['cret'] = payload['ret']
       payload['ret'] = node_payload_ret
+
       execute_child(first_unkeyed_child_id, @node['subs'].last)
 
     else

data/lib/flor/pcore/val.rb

@@ -10,7 +10,7 @@ class Flor::Pro::Val < Flor::Procedure
 
     payload['ret'] = heat
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/punit/cancel.rb

@@ -37,9 +37,8 @@ class Flor::Pro::Cancel < Flor::Procedure
 
     fla = @node['heap']
 
-    nids.uniq.collect { |nid|
-      reply('point' => 'cancel', 'nid' => nid, 'flavour' => fla).first
-    } + reply
+    nids.uniq.map { |nid| wrap_cancel('nid' => nid, 'flavour' => fla)[0] } +
+    wrap_reply
   end
 end
 

data/lib/flor/punit/cmap.rb

@@ -30,23 +30,22 @@ class Flor::Pro::Cmap < Flor::Procedure
       "cmap expects a function"
     ) unless Flor.is_func_tree?(fun)
 
-    col = att(nil)
     @node['fun'] = fun
 
-    col.collect.with_index do |e, i|
-      apply(@node['fun'], [ e, i ], tree[2])
-    end.flatten(1)
+    att(nil)
+      .collect.with_index { |e, i| apply(fun, [ e, i ], tree[2]) }
+      .flatten(1)
   end
 
   def receive_elt
 
     @node['col'] << payload['ret']
 
-    return [] if @node['cnodes'].any?
+    return [] if cnodes_any?
 
     payload['ret'] = @node['col']
 
-    reply
+    wrap
   end
 end
 

data/lib/flor/punit/concurrence.rb

@@ -64,7 +64,7 @@ class Flor::Pro::Concurrence < Flor::Procedure
 
   def receive_last_att
 
-    return reply unless children[@ncid]
+    return wrap_reply unless children[@ncid]
 
     (@ncid..children.size - 1)
       .map { |i| execute_child(i, 0, 'payload' => payload.copy_current) }
@@ -78,8 +78,6 @@ class Flor::Pro::Concurrence < Flor::Procedure
     @node['receiver'] ||= determine_receiver
     @node['merger'] ||= determine_merger
 
-    (@node['cnodes'] || []).delete(from)
-
     return [] if @node['over']
 
     over = invoke_receiver
@@ -93,7 +91,7 @@ class Flor::Pro::Concurrence < Flor::Procedure
       # determine post-concurrence payload
 
     cancel_remaining +
-    reply('payload' => pld)
+    wrap_reply('payload' => pld)
   end
 
   def receive_from_child_when_closed
@@ -132,7 +130,7 @@ class Flor::Pro::Concurrence < Flor::Procedure
 
     return [] if rem == 'forget'
 
-    cancel_nodes(@node['cnodes'])
+    wrap_cancel_children
   end
 
   def invoke_receiver

data/lib/flor/punit/schedule.rb

@@ -26,19 +26,34 @@ class Flor::Pro::Schedule < Flor::Procedure
       "missing a function to call when the scheduler triggers"
     ) unless fun
 
-    msg = apply(fun, [], tree[2], false).first.merge('noreply' => true)
+    m = apply(fun, [], tree[2], false).first
 
-    type, string =
+    t, s =
       @node['atts'].find { |k, v| %w[ cron at in every ].include?(k) } ||
       @node['atts'].find { |k, v| k == nil }
 
     fail ArgumentError.new(
       "missing a schedule"
-    ) unless string
+    ) unless s
 
-    #m = reply('point' => 'receive').first
+    @node['scheduled'] = true
 
-    schedule('type' => type, 'string' => string, 'message' => msg)
+    wrap_schedule('type' => t, 'string' => s, 'message' => m) +
+    flank
+  end
+
+  def receive
+
+    return [] if @node['scheduled']
+    super
+  end
+
+  # "schedule" keeps track of its children, but does not cascade 'cancel'
+  # to them, unless the cancel flavour is 'kill'.
+  #
+  def wrap_cancel_children(h={})
+
+    h['flavour'] == 'kill' ? super : []
   end
 end
 

data/lib/flor/punit/signal.rb

@@ -14,7 +14,7 @@ class Flor::Pro::Signal < Flor::Procedure
 
     return super unless name
 
-    reply(
+    wrap(
       'point' => 'signal', 'nid' => nid, 'name' => name,
       'payload' => payload.copy_current
     ) + super

data/lib/flor/punit/sleep.rb

@@ -21,9 +21,9 @@ class Flor::Pro::Sleep < Flor::Procedure
     t = att('for', nil)
     fail ArgumentError.new("missing a sleep time duration") unless t
 
-    m = reply('point' => 'receive').first
+    m = wrap('point' => 'receive').first
 
-    schedule('type' => 'in', 'string' => t, 'message' => m)
+    wrap_schedule('type' => 'in', 'string' => t, 'message' => m)
   end
 end
 

data/lib/flor/punit/task.rb

@@ -10,7 +10,7 @@ class Flor::Pro::Task < Flor::Procedure
 
   def do_receive
 
-    return reply('payload' => determine_reply_payload) \
+    return wrap_reply('payload' => determine_reply_payload) \
       if point == 'receive' && from == nil
 
     super
@@ -38,7 +38,7 @@ class Flor::Pro::Task < Flor::Procedure
 
     attl, attd = determine_atts
 
-    queue(
+    wrap(
       'point' => 'task',
       'exid' => exid, 'nid' => nid,
       'tasker' => tasker,
@@ -52,7 +52,7 @@ class Flor::Pro::Task < Flor::Procedure
 
     attl, attd = determine_atts
 
-    queue(
+    wrap(
       'point' => 'detask',
       'exid' => exid, 'nid' => nid,
       'tasker' => att(nil),