flor 0.18.0 → 1.2.0

data/lib/flor/id.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
 
 module Flor
 
+  NID_REX = /\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/.freeze
+  START_NID_REX = /\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?/.freeze
+
   class << self
 
     #
@@ -98,7 +102,7 @@ module Flor
 
     def is_nid?(s)
 
-      !! (s.is_a?(String) && s.match(/\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/))
+      !! (s.is_a?(String) && s.match(NID_REX))
     end
 
     def split_exid(s)

data/lib/flor/log.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
   class << self
@@ -75,7 +76,7 @@ module Flor
       a << hp
 
       msr = " #{_c.dg}m#{m['m']}s#{m['sm'] || '_'}"
-      msr << "r#{m['er']}>#{m['pr']}" if m['er'] && m['er'] > -1
+      msr += "r#{m['er']}>#{m['pr']}" if m['er'] && m['er'] > -1
       a << msr
 
       a << (m['from'] ? " from #{m['from']}" : '')
@@ -323,6 +324,7 @@ module Flor
     def msg_to_detail_s(executor, m, opts={})
 
       return if m['_detail_msg_flag']
+        #
       m['_detail_msg_flag'] = true if opts[:flag]
 
       o = StringIO.new
@@ -332,18 +334,22 @@ module Flor
       n = executor.execution['nodes'][nid]
       node = n ? Flor::Node.new(executor, n, m) : nil
 
-      o.puts "#{_c.dg}<Flor.msg_to_detail_s>#{_c.rs}#{_c.yl}"
-      o.puts Flor.to_pretty_s(m)
-      o.puts "#{_c.dg}payload:#{_c.yl}"
-      o.puts Flor.to_pretty_s(m['payload'], 0)
-      o.puts "#{_c.dg}tree:"
+      o.puts "#{_c.rs}#{_c.dg}<Flor.msg_to_detail_s>"
+
+      o.puts "#{_c.dg}message:#{_c.yl}"
+      o.puts YAML.dump(m)
+
+      o.puts "#{_c.dg}tree:#{_c.yl}"
       o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node
+
       o.puts "#{_c.dg}node:#{_c.yl}"
-      o.puts(Flor.to_pretty_s(n)) if n
-      o.puts "#{_c.dg}nodes:"
+      o.puts YAML.dump(n.merge('tree' => '(above)'))
+
+      o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)
       z = executor.execution['nodes'].size
       o.puts "#{_c.yl}#{z} node#{z == 1 ? '' : 's'}."
+
       o.puts "#{_c.dg}</Flor.msg_to_detail_s>#{_c.rs}"
 
       o.string

data/lib/flor/migrations/0001_tables.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Sequel.migration do
 

data/lib/flor/migrations/0002_cunit_and_munit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Sequel.migration do
 

data/lib/flor/migrations/0003_timer_onid_bnid.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Sequel.migration do
 

data/lib/flor/migrations/0004_trap_bnid.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Sequel.migration do
 

data/lib/flor/migrations/0005_pointer_content.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Sequel.migration do
 

data/lib/flor/parser.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 module Flor
 
   def self.parse(input, fname=nil, opts={})
@@ -26,7 +26,10 @@ module Flor
       @line, @column, @offset, @msg, @visual = error_array
       @fname = fname
 
-      super("syntax error at line #{@line} column #{@column}")
+      m = "syntax error at line #{@line} column #{@column}"
+      m += " in #{fname}" if fname
+
+      super(m)
     end
   end
 
@@ -35,8 +38,11 @@ module Flor
     # parsing
 
     def wstar(i); rex(nil, i, /[ \t]*/); end
+    def wplus(i); rex(nil, i, /[ \t]+/); end
+
+    def rnstar(i); rex(nil, i, /[\r\n]*/); end
+    def rnplus(i); rex(nil, i, /[\r\n]+/); end
 
-    def retnew(i); rex(nil, i, /[\r\n]*/); end
     def dot(i); str(nil, i, '.'); end
     def colon(i); str(nil, i, ':'); end
     def semicolon(i); str(nil, i, ';'); end
@@ -160,8 +166,9 @@ module Flor
 
     def comment(i); rex(nil, i, /#[^\r\n]*/); end
 
-    def eol(i); seq(nil, i, :wstar, :comment, '?', :retnew); end
-    def eol_wstar(i); seq(nil, i, :wstar, :comment, '?', :retnew, :wstar); end
+    def eol(i); seq(nil, i, :wstar, :comment, '?', :rnstar); end
+    def eol_wstar(i); seq(nil, i, :wstar, :comment, '?', :rnstar, :wstar); end
+    def eol_plus(i); seq(nil, i, :wstar, :comment, '?', :rnplus); end
     def postval(i); rep(nil, i, :eol, 0); end
 
     def comma_eol(i); seq(nil, i, :comma, :eol, :wstar); end
@@ -170,6 +177,8 @@ module Flor
     def comma_qmark_eol(i); seq(nil, i, :comma, '?', :eol); end
     def coll_sep(i); alt(nil, i, :comma_qmark_eol, :wstar); end
 
+    def woreol(i); alt(:woreol, i, :wplus, :eol_plus); end
+
     def ent(i)
       seq(:ent, i, :key, :postval, :colon, :postval, :exp, :postval)
     end
@@ -212,8 +221,8 @@ module Flor
     def ssum(i); seq(nil, i, :sssum, :eol, '?'); end
     def slgt(i); seq(nil, i, :sslgt, :eol, '?'); end
     def sequ(i); seq(nil, i, :ssequ, :eol, '?'); end
-    def sand(i); seq(nil, i, :ssand, :eol, '?'); end
-    def sor(i); seq(nil, i, :ssor, :eol, '?'); end
+    def sand(i); seq(nil, i, :ssand, :woreol); end # space or eol
+    def sor(i); seq(nil, i, :ssor, :woreol); end # space or eol
 
     def emod(i); jseq(:exp, i, :val_ws, :smod); end
     def eprd(i); jseq(:exp, i, :emod, :sprd); end
@@ -230,7 +239,7 @@ module Flor
 
     def att(i); seq(:att, i, :sep, :keycol, '?', :exp); end
     def riou(i); rex(:iou, i, /(if|unless)/); end
-    def iou(i); seq(nil, i, :sep, :riou); end
+    def iou(i); seq(nil, i, :sep, :riou); end # If Or Unless
     def natt(i); alt(nil, i, :iou, :att); end
 
     def head(i); seq(:head, i, :exp); end
@@ -238,8 +247,8 @@ module Flor
     def node(i); seq(:node, i, :indent, :head, :natt, '*'); end
 
     def linjoin(i); rex(nil, i, /[ \t]*(\\|\|(?!\|)|;)[ \t]*/); end
-    def outjnl(i); seq(nil, i, :linjoin, :comment, '?', :retnew); end
-    def outnlj(i); seq(nil, i, :wstar, :comment, '?', :retnew, :linjoin); end
+    def outjnl(i); seq(nil, i, :linjoin, :comment, '?', :rnstar); end
+    def outnlj(i); seq(nil, i, :wstar, :comment, '?', :rnstar, :linjoin); end
     def outdent(i); alt(:outdent, i, :outjnl, :outnlj, :eol); end
 
     def line(i)
@@ -718,4 +727,3 @@ fail "don't know how to invert #{operation.inspect}" # FIXME
     sio.string
   end
 end
-

data/lib/flor/pcore/_apply.rb

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

data/lib/flor/pcore/_arr.rb

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

data/lib/flor/pcore/_atom.rb

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

data/lib/flor/pcore/_att.rb

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

data/lib/flor/pcore/_coll.rb

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

data/lib/flor/pcore/_dmute.rb

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

data/lib/flor/pcore/_dol.rb

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

data/lib/flor/pcore/_dqs.rb

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

data/lib/flor/pcore/_dump.rb

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

data/lib/flor/pcore/_err.rb

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

data/lib/flor/pcore/_head.rb

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

data/lib/flor/pcore/_obj.rb

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

data/lib/flor/pcore/_pat_.rb

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

data/lib/flor/pcore/_pat_arr.rb

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

data/lib/flor/pcore/_pat_guard.rb

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

data/lib/flor/pcore/_pat_obj.rb

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

data/lib/flor/pcore/_pat_or.rb

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

data/lib/flor/pcore/_pat_regex.rb

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

data/lib/flor/pcore/_ref.rb

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

data/lib/flor/pcore/_rxs.rb

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

data/lib/flor/pcore/_skip.rb

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

data/lib/flor/pcore/_val.rb

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

data/lib/flor/pcore/all.rb

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

data/lib/flor/pcore/andor.rb

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

data/lib/flor/pcore/any.rb

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

data/lib/flor/pcore/apply.rb

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

data/lib/flor/pcore/arith.rb

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

data/lib/flor/pcore/array_qmark.rb

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

data/lib/flor/pcore/break.rb

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

data/lib/flor/pcore/case.rb

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

data/lib/flor/pcore/cmp.rb

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

data/lib/flor/pcore/collect.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/pcore/iterator'
 
@@ -38,7 +39,7 @@ class Flor::Pro::Collect < Flor::Macro::Iterator
   #
   # ## see also
   #
-  # Map, c_map, c_collect.
+  # Map, c-map, c-collect.
 
   name 'collect'
 

data/lib/flor/pcore/cond.rb

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

data/lib/flor/pcore/cursor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Cursor < Flor::Procedure
   #
@@ -10,7 +11,9 @@ class Flor::Pro::Cursor < Flor::Procedure
   #   task 'charly'
   # ```
   #
-  # ## break
+  # ## "orders" understood by cursors
+  #
+  # ### break
   #
   # Cursor understands `break`. For example, this execution will go from
   # "alpha" to "charly", task "bravo" will not be visited.
@@ -22,7 +25,7 @@ class Flor::Pro::Cursor < Flor::Procedure
   # task 'charly'
   # ```
   #
-  # ## continue
+  # ### continue
   #
   # Cursor also understands `continue`. It's useful to rewind a cursor:
   # ```
@@ -33,7 +36,7 @@ class Flor::Pro::Cursor < Flor::Procedure
   #   create_account _
   # ```
   #
-  # ## move
+  # ### move
   #
   # Cursor accepts move orders, as in:
   # ```
@@ -44,6 +47,30 @@ class Flor::Pro::Cursor < Flor::Procedure
   #   do-that-other-thing _
   # ```
   #
+  #
+  # ## cursor and tags
+  #
+  # ```
+  # cursor 'main'
+  #   # is equivalent to
+  # cursor tag: 'main'
+  # ```
+  #
+  # Tags on cursors are useful for "break" and "continue" (as well as "cancel"),
+  # letting them act on other cursors.
+  #
+  #
+  # ## cursor and start: / initial: attribute
+  #
+  # ```
+  # task 'create mandate'
+  # cursor start: 'approve mandate'
+  #   task 'amend mandate'
+  #   task 'approve mandate'               # <-- first "cycle" will start here
+  #   continue _ if f.outcome == 'reject'  # <-- will go to "amend mandate"
+  # task 'activate mandate'
+  # ```
+  #
   # ## see also
   #
   # Break, continue, loop.
@@ -52,6 +79,7 @@ class Flor::Pro::Cursor < Flor::Procedure
 
   def pre_execute
 
+    @node['atts'] = []
     @node['subs'] = []
   end
 
@@ -90,6 +118,15 @@ class Flor::Pro::Cursor < Flor::Procedure
     end
   end
 
+  def receive_last_att
+
+    start = att('start', 'initial')
+    cid = start && find_child_id(start)
+    @ncid = cid if cid
+
+    super
+  end
+
   def cancel_when_closed
 
     return cancel if node_status_flavour == 'on-error'
@@ -131,6 +168,11 @@ class Flor::Pro::Cursor < Flor::Procedure
       "move target #{to.inspect} is not a string", self
     ) unless to.is_a?(String)
 
+    find_child_id(to)
+  end
+
+  def find_child_id(to)
+
     find_tag_target(to) ||
     find_string_arg_target(to) ||
     find_string_target(to) ||