flor 0.17.0 → 1.1.1

data/lib/flor/pcore/define.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Define < Flor::Procedure
   #

data/lib/flor/pcore/detect.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/do_return.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::DoReturn < Flor::Macro
   #

data/lib/flor/pcore/each.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/echo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Echo < Flor::Procedure
 

data/lib/flor/pcore/empty.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Empty < Flor::Procedure
   #

data/lib/flor/pcore/fail.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Fail < Flor::Procedure
   #

data/lib/flor/pcore/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/find.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/flatten.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Flatten < Flor::Procedure
   #

data/lib/flor/pcore/for_each.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/if.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::If < Flor::Procedure
   #

data/lib/flor/pcore/includes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Includes < Flor::Procedure
 

data/lib/flor/pcore/inject.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/iterator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Iterator < Flor::Procedure
 

data/lib/flor/pcore/keys.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Keys < Flor::Procedure
   #

data/lib/flor/pcore/length.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Length < Flor::Procedure
   #

data/lib/flor/pcore/loop.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Loop < Flor::Pro::Cursor
   #

data/lib/flor/pcore/map.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Map < Flor::Pro::Iterator
   #

data/lib/flor/pcore/match.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Match < Flor::Pro::Case
   #

data/lib/flor/pcore/matchr.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Matchr < Flor::Procedure
   #

data/lib/flor/pcore/max.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Max < Flor::Procedure
 

data/lib/flor/pcore/merge.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Merge < Flor::Procedure
   #

data/lib/flor/pcore/move.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Move < Flor::Procedure
   #

data/lib/flor/pcore/noeval.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::NoEval < Flor::Procedure
   #

data/lib/flor/pcore/noret.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::NoRet < Flor::Procedure
   #

data/lib/flor/pcore/not.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Not < Flor::Procedure
   #

data/lib/flor/pcore/on.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::On < Flor::Macro
   #
@@ -100,6 +101,20 @@ class Flor::Pro::On < Flor::Macro
   # If it were, it would trap the signal named "timeout".
   #
   #
+  # ## blocking mode
+  #
+  # When "on" is given no code block, it will block.
+  # ```
+  # sequence
+  #   # ...
+  #   on 'green'  # execution (branch) blocks here until signal 'green' comes
+  #   # ...
+  # ```
+  #
+  # Behind the scenes, it simply rewrites the "on" to a "trap" without a
+  # function, a blocking trap.
+  #
+  #
   # ## see also
   #
   # Trap and signal.
@@ -111,13 +126,13 @@ class Flor::Pro::On < Flor::Macro
     if att = find_catch # 22
       rewrite_as_catch_tree(att)
     else
-      rewrite_as_trap_tree
+      rewrite_as_signal_trap_tree
     end
   end
 
   protected
 
-  CATCHES = %w[ error cancel timeout ]
+  CATCHES = %w[ error cancel timeout ].freeze
 
   def find_catch
 
@@ -151,7 +166,7 @@ class Flor::Pro::On < Flor::Macro
     th
   end
 
-  def rewrite_as_trap_tree
+  def rewrite_as_signal_trap_tree
 
     atts = att_children
     signame_i = atts.index { |at| at[1].size == 1 }
@@ -166,16 +181,26 @@ class Flor::Pro::On < Flor::Macro
     l = tree[2]
 
     th = [ 'trap', [], l, *tree[3] ]
+
     th[1] << [ '_att', [ [ 'point', [], l ], [ '_sqs', 'signal', l ] ], l ]
     th[1] << [ '_att', [ [ 'name', [], l ], tname ], l ]
-    th[1] << [ '_att', [ [ 'payload', [], l ], [ '_sqs', 'event', l ] ], l ]
-    atts.each { |ac| th[1] << Flor.dup(ac) }
 
-    td = [ 'def', [], l ]
-    td[1] << [ '_att', [ [ 'msg', [], l ] ], l ]
-    non_att_children.each { |nac| td[1] << Flor.dup(nac) }
+    att_names = []
+    atts.each { |at|
+      att_names << at[1][0][0]
+      th[1] << Flor.dup(at) }
 
-    th[1] << td
+    th[1] << [ '_att', [ [ 'payload', [], l ], [ '_sqs', 'event', l ] ], l ] \
+      unless att_names.include?('payload')
+
+    if (nac = non_att_children).any?
+
+      td = [ 'def', [], l ]
+      td[1] << [ '_att', [ [ 'msg', [], l ] ], l ]
+      non_att_children.each { |nac| td[1] << Flor.dup(nac) }
+
+      th[1] << td
+    end
 
     th
   end

data/lib/flor/pcore/on_cancel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::OnCancel < Flor::Procedure
   #

data/lib/flor/pcore/on_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::OnError < Flor::Procedure
   #

data/lib/flor/pcore/push.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Push < Flor::Procedure
   #

data/lib/flor/pcore/rand.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Rand < Flor::Procedure
   #

data/lib/flor/pcore/range.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Range < Flor::Procedure
   #

data/lib/flor/pcore/reduce.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Reduce < Flor::Pro::Iterator
   #

data/lib/flor/pcore/return.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Return < Flor::Procedure
 

data/lib/flor/pcore/reverse.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Reverse < Flor::Procedure
   #

data/lib/flor/pcore/select.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 

data/lib/flor/pcore/sequence.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Sequence < Flor::Procedure
   #
@@ -9,14 +10,62 @@ class Flor::Pro::Sequence < Flor::Procedure
   #   task 'bravo' if f.amount > 2000
   #   task 'charly'
   # ```
+  #
+  # Giving a string as attribute result to "sequence" lets it interpret
+  # that string as a tag name, as in:
+  # ```
+  # sequence 'phase one'
+  #   alice 'gather customer requirements'
+  #   bob 'establish offer'
+  # sequence 'phase two'
+  #   alice 'present offer to customer'
+  #   bob 'sign contract'
+  # ```
+  # It is equivalent to:
+  # ```
+  # sequence tag: 'phase one'
+  #   alice 'gather customer requirements'
+  #   bob 'establish offer'
+  # sequence tag: 'phase two'
+  #   alice 'present offer to customer'
+  #   bob 'sign contract'
+  # ```
+  # Learn more about [tags](../tags.md).
+  #
+  # Please note that it sets only 1 tag, and if there are already tags
+  # sets (`sequence tags: [ 'a' 'b' ] "this won't become a tag"`), it won't set
+  # further tags.
+  #
+  # ## see also
+  #
+  # Concurrence, loop
 
   names %w[ sequence begin ]
 
+  def receive_att
+
+    ms = []
+
+    ms = enter_tag \
+      if @node['tags'].nil? && payload_ret.is_a?(String) && from_unkeyed_att?
+
+    ms + super
+  end
+
   def cancel_when_closed
 
     return cancel if node_status_flavour == 'on-error'
 
     []
   end
+
+  protected
+
+  def enter_tag
+
+    @node['tags'] = tags = [ payload_ret ]
+
+    wrap('point' => 'entered', 'nid' => nid, 'tags' => tags)
+  end
 end
 

data/lib/flor/pcore/set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Set < Flor::Procedure
   #

data/lib/flor/pcore/shuffle.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Shuffle < Flor::Procedure
   #

data/lib/flor/pcore/slice.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Slice < Flor::Procedure
   #

data/lib/flor/pcore/sort.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Sort < Flor::Procedure
   #

data/lib/flor/pcore/sort_by.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::SortBy < Flor::Pro::Iterator
   #

data/lib/flor/pcore/split.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Split < Flor::Procedure
 

data/lib/flor/pcore/stall.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Stall < Flor::Procedure
   #

data/lib/flor/pcore/strings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Strings < Flor::Procedure
   #

data/lib/flor/pcore/timestamp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::TimeStamp < Flor::Procedure
   #

data/lib/flor/pcore/to_array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::ToArray < Flor::Procedure
   #

data/lib/flor/pcore/twig.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Twig < Flor::Procedure