flor 0.11.0 → 0.12.0

data/lib/flor/core/texecutor.rb

@@ -31,9 +31,9 @@ module Flor
         []
       end
 
-      def remove_node(exid, n)
+      def archive_node(exid, node)
 
-        (@archive[exid] ||= {})[n['nid']] = Flor.dup(n) if @archive
+        (@archive[exid] ||= {})[node['nid']] = Flor.dup(node) if @archive
       end
 
       def has_tasker?(exid, tname)
@@ -59,8 +59,7 @@ module Flor
 
     def initialize(conf={})
 
-      conf.merge!(Flor::Conf.read_env) unless conf['conf'] == true
-        # don't read FLOR_DEBUG if this executor is only meant to read the conf
+      conf = Flor::Conf.prepare(conf, {})
 
       super(
         TransientUnit.new(conf),
@@ -72,6 +71,8 @@ module Flor
           #'ashes' => {},
           'start' => Flor.tstamp
         })
+
+      @unit.archive = {} if conf['archive']
     end
 
     def journal; @unit.journal; end
@@ -80,7 +81,7 @@ module Flor
     def launch(tree, opts={})
 
       @unit.opts = opts
-      @unit.archive = {} if opts[:archive]
+      @unit.archive ||= {} if opts[:archive]
 
       Flor.print_src(tree, opts) if conf['log_src']
 

data/lib/flor/log.rb

@@ -142,6 +142,8 @@ module Flor
 
   def self.print_tree(tree, nid='0', opts={})
 
+    t0, t1, t2 = (tree || [])
+
     o = (opts[:out] ||= $stdout)
     _c = colours(opts)
 
@@ -150,14 +152,14 @@ module Flor
     headers = opts[:headers]; headers = true if headers.nil?
     headers = true if opts[:title]
 
-    h = "#{_c.yl}#{Flor.to_d(tree[0], compact: true)}"
-    c = tree[1].is_a?(Array) ? '' : " #{_c.yl}#{tree[1]}"
-    l = " #{_c.dg}L#{tree[2]}"
+    h = "#{_c.yl}#{Flor.to_d(t0, compact: true)}"
+    c = t1.is_a?(Array) ? '' : " #{_c.yl}#{t1}"
+    l = " #{_c.dg}L#{t2}"
 
     o.puts "#{ind}#{_c.dg}+--- #{opts[:title]}#{_c.rs}" if headers && nid == '0'
     o.puts "#{ind}#{_c.dg}| #{nid} #{h}#{c}#{l}#{_c.rs}"
-    if tree[1].is_a?(Array)
-      tree[1].each_with_index { |ct, i| print_tree(ct, "#{nid}_#{i}", opts) }
+    if t1.is_a?(Array)
+      t1.each_with_index { |ct, i| print_tree(ct, Flor.child_nid(nid, i), opts) }
     end
     o.puts "#{ind}#{_c.dg}.#{_c.rs}" if headers && nid == '0'
 
@@ -235,7 +237,7 @@ module Flor
     t = Flor.truncate_string(t, 42);
 
     h = {}
-    %w[ parent cnid noreply dbg removed ].each do |k|
+    %w[ parent cnid noreply dbg ].each do |k|
       h[k] = n[k] if n.has_key?(k)
     end
 
@@ -306,7 +308,7 @@ module Flor
     o.puts "#{_c.dg}payload:#{_c.yl}"
     o.puts(Flor.to_pretty_s(m['payload'], 0))
     o.puts "#{_c.dg}tree:"
-    print_tree(node.lookup_tree(nid), nid, out: o) if node # FIXME
+    print_tree(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:"

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

@@ -0,0 +1,35 @@
+
+Sequel.migration do
+
+  up do
+
+    alter_table :flor_timers do
+
+      add_column :onid, String
+      add_column :bnid, String
+    end
+
+    self[:flor_timers].update(onid: :nid)
+    self[:flor_timers].update(bnid: :nid)
+
+    alter_table :flor_timers do
+
+      set_column_not_null :onid
+      set_column_not_null :bnid
+    end
+      #
+      # Sqlite3, for example, does that by renaming "flor_timers",
+      # creating a new table with the "not null" set, then copying the
+      # values of the renamed, original, table into the new table...
+  end
+
+  down do
+
+    alter_table :flor_timers do
+
+      drop_column :onid
+      drop_column :bnid
+    end
+  end
+end
+

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

@@ -0,0 +1,16 @@
+
+Sequel.migration do
+
+  up do
+
+    alter_table(:flor_traps) { add_column :bnid, String }
+    self[:flor_traps].update(bnid: :nid)
+    alter_table(:flor_traps) { set_column_not_null :bnid }
+  end
+
+  down do
+
+    alter_table(:flor_traps) { drop_column :bnid }
+  end
+end
+

data/lib/flor/pcore/_arr.rb

@@ -10,7 +10,7 @@ class Flor::Pro::Arr < Flor::Procedure
 
   def receive
 
-    return reply('ret' => []) if children == 0
+    return wrap_reply('ret' => []) if children == 0
 
     super
   end
@@ -19,7 +19,7 @@ class Flor::Pro::Arr < Flor::Procedure
 
     payload['ret'] = @node['rets']
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/_atom.rb

@@ -13,7 +13,7 @@ class Flor::Pro::Atom < Flor::Procedure
         else tree[1]
       end
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/_att.rb

@@ -5,11 +5,14 @@ class Flor::Pro::Att < Flor::Procedure
 
   def execute
 
-    return reply if children == [ [ '_', [], tree[2] ] ]
+    return wrap_reply if children == [ [ '_', [], tree[2] ] ]
       # spares 1 message
 
     pt = parent_node['tree']
-    return reply if pt && pt[0] == '_apply'
+    return wrap_reply if pt && pt[0] == '_apply'
+
+    m = "pre_execute_#{children[0][0]}"
+    send(m) if respond_to?(m, true)
 
     execute_child(0, nil, 'accept_symbol' => children.size > 1)
   end
@@ -25,6 +28,36 @@ class Flor::Pro::Att < Flor::Procedure
 
   protected
 
+  #
+  # execute phase
+
+  def pre_execute_boolean_attribute
+
+    return unless children.size == 1
+
+    t = @node['tree'] = Flor.dup(tree)
+    t[1] << [ '_boo', true, @node['tree'][2] ]
+  end
+
+  alias pre_execute_flank pre_execute_boolean_attribute
+
+  def pre_execute_vars
+
+    return unless children.size == 2 && children[1][0] == '_obj'
+
+    t = tree
+
+    return if t[1][1][1] == 0 # [ '_obj', 0, 123 ]
+
+    t = @node['tree'] = Flor.dup(t)
+
+    t[1][1][1].unshift([
+      '_att', [ [ 'quote', [], -1 ], [ '_sqs', 'keys', -1 ] ], -1 ])
+  end
+
+  #
+  # receive phase
+
   def receive_unkeyed
 
     receive_att(nil)
@@ -71,17 +104,21 @@ class Flor::Pro::Att < Flor::Procedure
 
     payload['ret'] = @node['ret'] if key
 
-    reply
+    wrap_reply
   end
 
   # vars: { ... }, inits a scope for the parent node
   #
   def receive_vars
 
-    parent_node['vars'] = payload['ret']
+    vars = payload['ret']
+    vars = @executor.vars(nid) if vars == 'copy' || vars == '*'
+
+    (parent_node['vars'] ||= {}).merge!(vars)
+
     payload['ret'] = @node['ret']
 
-    reply
+    wrap_reply
   end
 
   def receive_tag
@@ -96,13 +133,13 @@ class Flor::Pro::Att < Flor::Procedure
 
     tags = Array(ret)
 
-    return reply if tags.empty?
+    return wrap_reply if tags.empty?
 
     (parent_node['tags'] ||= []).concat(tags)
     parent_node['tags'].uniq!
 
-    reply('point' => 'entered', 'tags' => tags) +
-    reply
+    wrap('point' => 'entered', 'tags' => tags) +
+    wrap_reply
   end
   alias receive_tags receive_tag
 
@@ -112,17 +149,17 @@ class Flor::Pro::Att < Flor::Procedure
       pn['aret'] = Flor.dup(payload['ret'])
     end
 
-    reply
+    wrap_reply
   end
 
   def receive_timeout
 
     n = parent
-    m = reply('point' => 'cancel', 'nid' => n, 'flavour' => 'timeout').first
+    m = wrap_cancel('nid' => n, 'flavour' => 'timeout').first
     t = payload['ret']
 
-    schedule('type' => 'in', 'string' => t, 'nid' => n, 'message' => m) +
-    reply
+    wrap_schedule('type' => 'in', 'string' => t, 'nid' => n, 'message' => m) +
+    wrap_reply
   end
 
   def receive_on_error
@@ -132,7 +169,16 @@ class Flor::Pro::Att < Flor::Procedure
 
     (parent_node['on_error'] ||= []) << oe
 
-    reply
+    wrap_reply
+  end
+
+  def receive_flank
+
+    return wrap_reply unless Flor.true?(payload['ret'])
+    return wrap_reply unless parent_node
+
+    Flor::Procedure.make(@executor, parent_node, @message).flank +
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/_happly.rb

@@ -10,7 +10,7 @@ class Flor::Pro::Happly < Flor::Procedure
 
   def execute
 
-    queue(
+    wrap(
       'point' => 'execute',
       'nid' => Flor.child_nid(nid, tree[1].size),
       'tree' => tree[0])
@@ -20,7 +20,7 @@ class Flor::Pro::Happly < Flor::Procedure
 
     fcid = Flor.child_id(message['from'])
 
-    return reply if @node['applied']
+    return wrap_reply if @node['applied']
     return super unless fcid == tree[1].size
 
     ret = payload['ret']
@@ -33,7 +33,7 @@ class Flor::Pro::Happly < Flor::Procedure
 
     hret = @node['hret']
 
-    return reply('ret' => hret) unless Flor.is_func_tree?(hret)
+    return wrap_reply('ret' => hret) unless Flor.is_func_tree?(hret)
 
     args = @node['atts'].collect(&:last)
 

data/lib/flor/pcore/_obj.rb

@@ -6,11 +6,31 @@ class Flor::Pro::Obj < Flor::Procedure
   def pre_execute
 
     @node['rets'] = []
+    @node['atts'] = []
+  end
+
+  def receive_last_att
+
+    return super unless att('quote') == 'keys'
+
+    t0 = tree
+    t1 = Flor.dup(t0)
+
+    (@ncid..t1[1].length - 1).step(2) do |i|
+
+      c = t1[1][i]
+
+      t1[1][i] = [ '_sqs', c[0], *c[2..-1] ] if c[0].is_a?(String) && c[1] == []
+    end
+
+    @node['tree'] = t1 if t1 != t0
+
+    super
   end
 
   def receive_first
 
-    return reply('ret' => {}) if children == 0
+    return wrap_reply('ret' => {}) if children == 0
 
     cn = children
       .inject([]) { |a, e| a << (a.size.even? ? stringify(e) : e); a }
@@ -27,7 +47,7 @@ class Flor::Pro::Obj < Flor::Procedure
         .each_slice(2)
         .inject({}) { |h, (k, v)| h[k.to_s] = v; h }
 
-    reply
+    wrap_reply
   end
 
   protected

data/lib/flor/pcore/_skip.rb

@@ -23,9 +23,9 @@ class Flor::Pro::Skip < Flor::Procedure
 
     @node['count'] -= 1
 
-    return reply if @node['count'] < 1
+    return wrap_reply if @node['count'] < 1
 
-    reply('nid' => nid, 'from' => Flor.child_nid(nid, children.size))
+    wrap_reply('nid' => nid, 'from' => Flor.child_nid(nid, children.size))
   end
 
   def receive_last

data/lib/flor/pcore/apply.rb

@@ -33,7 +33,7 @@ class Flor::Pro::Apply < Flor::Procedure
 
   def receive
 
-    return reply if from && from == @node['applied']
+    return wrap_reply if from && from == @node['applied']
 
     super
   end

data/lib/flor/pcore/arith.rb

@@ -16,7 +16,7 @@ class Flor::Pro::Arith < Flor::Procedure
 
     payload['ret'] = @node['rets'].reduce(&sign) || DEFAULTS[sign]
 
-    reply
+    wrap_reply
   end
 end
 

data/lib/flor/pcore/break.rb

@@ -30,7 +30,7 @@ class Flor::Pro::Break < Flor::Procedure
 
     if nid
 
-      ms += reply('point' => 'cancel', 'nid' => nid, 'flavour' => @node['heap'])
+      ms += wrap_cancel('nid' => nid, 'flavour' => @node['heap'])
     end
 
     unless is_ancestor_node?(nid)
@@ -38,7 +38,7 @@ class Flor::Pro::Break < Flor::Procedure
       pl = ms.any? ? payload.copy_current : payload.current
       pl['ret'] = node_payload_ret
 
-      ms += reply('payload' => pl)
+      ms += wrap_reply('payload' => pl)
     end
 
     ms

data/lib/flor/pcore/case.rb

@@ -42,7 +42,7 @@ class Flor::Pro::Case < Flor::Procedure
 
   def receive_non_att
 
-    return reply if @node['found']
+    return wrap_reply if @node['found']
 
     return receive_array if @node.has_key?('key')
 

data/lib/flor/pcore/cmp.rb

@@ -21,7 +21,7 @@ class Flor::Pro::Cmp < Flor::Procedure
         true
       end
 
-    reply
+    wrap_reply
   end
 
   protected

data/lib/flor/pcore/cond.rb

@@ -30,7 +30,7 @@ class Flor::Pro::Cond < Flor::Procedure
   def receive_non_att
 
     return execute_child(0) if @message['point'] == 'execute'
-    return reply if @node['found']
+    return wrap_reply if @node['found']
 
     tf2 = tree[1][@fcid + 2]