flor 0.12.0 → 0.13.0

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # flor CHANGELOG.md
 
 
+## flor 0.13.0  released 2017-04-24
+
+- Simplify "trace" implementation
+- Simplify "task" implementation
+
+
 ## flor 0.12.0  released 2017-04-14
 
 - Implementation of 'flank' and application to "trap" and "schedule"

data/lib/flor.rb

@@ -12,7 +12,7 @@ require 'raabro'
 
 module Flor
 
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end
 
 require 'flor/colours'

data/lib/flor/core/procedure.rb

@@ -605,6 +605,7 @@ class Flor::Procedure < Flor::Node
     close_node
 
     do_wrap_cancel_children ||
+    pop_on_receive_last ||
     wrap_cancelled
   end
 

data/lib/flor/log.rb

@@ -125,14 +125,12 @@ module Flor
     o.puts "#{_c.dg}| #{opts.inspect}#{_c.rs}" if opts.any?
 
     if src.is_a?(String)
-      src.split("\n").select { |l| l.strip.length > 0 }.each do |line|
-        o.puts "#{_c.dg}| #{_c.yl}#{line}#{_c.rs}"
-      end
+      src.split("\n")
+        .select { |l| l.strip.length > 0 && l.match(/\A\s*[^#]/) }
+        .each { |l| o.puts "#{_c.dg}| #{_c.yl}#{l}#{_c.rs}" }
     else
-      ss = Flor.to_pretty_s(src).split("\n")
-      ss.each do |line|
-        o.puts "#{_c.dg}| #{_c.yl}#{line}#{_c.rs}"
-      end
+      Flor.to_pretty_s(src).split("\n")
+        .each { |l| o.puts "#{_c.dg}| #{_c.yl}#{l}#{_c.rs}" }
     end
 
     o.puts "#{_c.dg}.#{_c.rs}"

data/lib/flor/parser.rb

@@ -309,7 +309,12 @@ module Flor
 
         t = [ atts[i][0][0] == 'if' ? 'if' : 'unless', [], @line ]
         t[1].concat(atts[i + 1..-1].collect(&:first))
-        t[1].push([ @head, cn[0, i], @line ])
+
+        cn0i = cn[0, i]; if Flor.is_tree?(@head) && cn0i == []
+          t[1].push(@head)
+        else
+          t[1].push([ @head, cn0i, @line ])
+        end
 
         t
       end

data/lib/flor/pcore/cursor.rb

@@ -21,6 +21,28 @@ class Flor::Pro::Cursor < Flor::Procedure
   #   task 'bravo'
   # task 'charly'
   # ```
+  #
+  # ## continue
+  #
+  # Cursor also understands `continue`. It's useful to rewind a cursor:
+  # ```
+  # cursor
+  #   sales_team "fill in customer details"
+  #   ops_team "attribute account number"
+  #   continue _ if f.ops_decision == 'reject'
+  #   create_account
+  # ```
+  #
+  # ## move
+  #
+  # Cursor accepts move orders, as in:
+  # ```
+  # cursor
+  #   do-this
+  #   move to: 'do-that-other-thing'
+  #   do-that _ # got skipped
+  #   do-that-other-thing _
+  # ```
 
   name 'cursor'
 
@@ -73,49 +95,18 @@ class Flor::Pro::Cursor < Flor::Procedure
 
   def cancel
 
-    fla = @message['flavour']
-
-#    busy = @node['on_receive_last']
-#
-#    close_node
-#
-#    @node['on_receive_last'] =
-#      if fla == 'continue'
-#        @node['subs'] << counter_next('subs')
-#        execute_child(first_non_att_child_id, @node['subs'].last, 'orl' => fla)
-#      elsif fla == 'move'
-#        @node['subs'] << counter_next('subs')
-#        execute_child(move_target_child_id, @node['subs'].last, 'orl' => fla)
-#      else # 'break'
-#        nil
-#      end
-#
-#    return [] if busy
-#      # <------- that implies that upon a sound reply,
-#      #          @node['on_receive_last'] is set to nil!
-#      #          @node['status'] is cleaned...
-#
-#    super.tap { |ms| pp ms }
-
-#if nid == '0_1_0'
-#  puts "\\" * 80
-#  puts caller[0, 7]
-#end
-
-    if fla == 'continue'
-
-      @node['on_receive_last'] =
-        wrap(
-          'nid' => nid, 'from' => "#{nid}_#{children.size + 1}",
-          'orl' => fla,
-          'payload' => Flor.dup(message['payload']))
+    if %w[ continue move ].include?(fla = @message['flavour'])
 
-    elsif fla == 'move'
+      cid =
+        fla == 'move' ?
+        move_target_child_id :
+        first_non_att_child_id
 
-      @node['subs'] << counter_next('subs')
+      @node['subs'] <<
+        counter_next('subs')
 
       @node['on_receive_last'] =
-        execute_child(move_target_child_id, @node['subs'].last, 'orl' => fla)
+        execute_child(cid, @node['subs'].last, 'orl' => fla)
 
     else
 

data/lib/flor/pcore/echo.rb

@@ -0,0 +1,23 @@
+
+class Flor::Pro::Echo < Flor::Procedure
+
+  name 'echo'
+
+  def receive_last_att
+
+    case ret = payload['ret']
+    when String then puts(ret)
+    else pp(ret)
+    end
+
+    super
+  end
+
+  def receive_last
+
+    payload['ret'] = node_payload_ret
+
+    wrap
+  end
+end
+

data/lib/flor/pcore/move.rb

@@ -7,8 +7,8 @@ class Flor::Pro::Move < Flor::Procedure
   # cursor
   #   do-this
   #   move to: 'do-that-other-thing'
-  #   do-that # got skipped
-  #   do-that-other-thing
+  #   do-that _ # got skipped
+  #   do-that-other-thing _
   # ```
 
   name 'move'

data/lib/flor/pcore/until.rb

@@ -77,9 +77,7 @@ class Flor::Pro::Until < Flor::Procedure
 
   def cancel
 
-    fla = @message['flavour']
-
-    if fla == 'continue'
+    if @message['flavour'] == 'continue'
 
       pl = node_payload.copy_current
       pl = pl.merge!(payload.copy_current)

data/lib/flor/punit/task.rb

@@ -8,7 +8,7 @@ class Flor::Pro::Task < Flor::Procedure
     @node['atts'] = []
   end
 
-  def do_receive
+  def receive
 
     return wrap_reply('payload' => determine_reply_payload) \
       if point == 'receive' && from == nil
@@ -17,6 +17,8 @@ class Flor::Pro::Task < Flor::Procedure
       # which goes to #receive or #receive_when_status
   end
 
+  alias receive_when_closed receive_from_child_when_closed
+
   def receive_last_att
 
     # task 'clean up' by: 'alan'
@@ -50,6 +52,8 @@ class Flor::Pro::Task < Flor::Procedure
 
   def cancel
 
+    close_node
+
     attl, attd = determine_atts
 
     wrap(

data/lib/flor/punit/trace.rb

@@ -5,14 +5,10 @@ class Flor::Pro::Trace < Flor::Procedure
 
   def receive
 
-    if @message['point'] == 'receive'
+    t = lookup_tree(@message['from'])
 
-      t = lookup_tree(@message['from'])
-
-      if t.first == '_att' && t[1].size == 1
-        @executor.unit.storage.trace(exid, nid, 'trace', payload['ret'])
-      end
-    end
+    @executor.unit.storage.trace(exid, nid, 'trace', payload['ret']) \
+      if point == 'receive' && (t[0] != '_att' || t[1].size == 1)
 
     super
   end
@@ -21,7 +17,7 @@ class Flor::Pro::Trace < Flor::Procedure
 
     payload['ret'] = node_payload_ret
 
-    wrap
+    super
   end
 end
 

data/lib/flor/unit/scheduler.rb

@@ -269,6 +269,7 @@ module Flor
 
       queue(*prepare_message('cancel', [ exid, *as, { re_apply: true } ]))
     end
+    alias reapply re_apply
 
     def schedule(message)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -151,6 +151,7 @@ files:
 - lib/flor/pcore/cond.rb
 - lib/flor/pcore/cursor.rb
 - lib/flor/pcore/define.rb
+- lib/flor/pcore/echo.rb
 - lib/flor/pcore/fail.rb
 - lib/flor/pcore/if.rb
 - lib/flor/pcore/loop.rb