flor 0.13.0 → 0.14.0

data/lib/flor/pcore/set.rb

@@ -1,28 +1,105 @@
 
 class Flor::Pro::Set < Flor::Procedure
+  #
+  # sets a field or a variable.
+  #
+  # ```
+  # sequence
+  #   set f.a 1        # sets the value `1` in the field 'a'
+  #   set a false      # sets the `false` in the variable 'a'
+  #   set v.b [ 1 2 ]  # sets `[ 1, 2 ]` in the variable 'b'
+  #   set v.c.0 -1     # sets `-1` in first slot of the array in var 'c'
+  # ```
+  #
+  # When set has a single child, it uses as value to copy the content of
+  # payload.ret.
+  #
+  # ```
+  # sequence
+  #   "hello world"
+  #   set a
+  # #
+  # # is equivalent to
+  # #
+  # sequence
+  #   set a "hello world"
+  # ```
+  #
+  # ## splat
+  #
+  # ```
+  # sequence
+  #   set a b___ c
+  #     [ 0 1 2 3 ]
+  #       # ==> a: 0, b: [ 1, 2 ], c: 3
+  #   set d e__2 f
+  #     [ 4 5 6 7 8 ]
+  #       # ==> d: 4, e: [ 5, 6 ], f: 7
+  #   set __2 g h
+  #     [ 9 10 11 12 13 ]
+  #       # ==> g: 11, h: 12
+  #       # `__` is not prefixed by a var name, so it justs discard
+  #       # what it captures
+  #   set i j___
+  #     [ 14 15 16 17 18 19 ]
+  #       # ==> i: 14, j: (15..19).to_a
+  #   set "k__$(c)" l
+  #     [ 20 21 22 23 24 ]
+  #       # ==> k: [ 20, 21, 22 ], l: 23
+  # ```
+  #
+  # ## "setr"
+  #
+  # "set", before terminating its execution carefully resets the payload.ret
+  # value to what it was right before it started executing.
+  # "setr" is a version of "set" that doesn't care and leave payload.ret to
+  # value set by its last child (usually the value set).
+  #
+  # ```
+  #   sequence
+  #     123         # payload.ret is set to `123`
+  #     set a 456   # var 'a' is set to 456, payload.ret is reset to `123`
+  #     setr b 789  # var 'b' is set to `789`, payload.ret as well
+  # ```
 
   names %w[ set setr ]
 
   def pre_execute
 
     unatt_unkeyed_children
-    stringify_first_child
+
+    nacn = non_att_children.dup
+    sc = @node['single_child'] = nacn.size == 1
+    nacn = non_att_children[0..-2] unless sc
+
+    nacn.each_with_index { |_, i| stringify_child(i) }
+
+    @node['refs'] = []
   end
 
   def receive_non_att
 
-    @node['ref'] ||= payload['ret']
+    ret = payload['ret']
+    last = ! @node['single_child'] && (@fcid + 1) == children.size
+
+    @node['refs'] << ret if ! last && ret.is_a?(String)
 
     super
   end
 
   def receive_last
 
-    set_value(@node['ref'], payload['ret'])
+    ret = @node['single_child'] ? node_payload_ret : payload['ret']
+
+    if @node['refs'].size == 1
+      set_value(@node['refs'].first, ret)
+    else
+      Flor.splat(@node['refs'], ret).each { |k, v| set_value(k, v) }
+    end
 
     payload['ret'] =
-      if tree[0] == 'setr' || @node['ref'] == 'f.ret'
-        payload['ret']
+      if tree[0] == 'setr' || @node['refs'].last == 'f.ret'
+        ret
       else
         node_payload_ret
       end
@@ -31,22 +108,3 @@ class Flor::Pro::Set < Flor::Procedure
   end
 end
 
-#  protected
-#
-#  def splat(ks, vs)
-#
-#    ks.inject(0) { |off, k|
-#      if k[0, 1] == '*'
-#        #p({ off: off, k: k, ks: ks[off + 1..-1], vs: vs[off..-1] })
-#        l = vs.length - ks.length + 1
-#        set_value(k[1..-1], vs[off, l])
-#        off + l
-#      else
-#        set_value(k, vs[off])
-#        off + 1
-#      end
-#    }
-#  end
-  #
-  # TODO need a splat a some point
-

data/lib/flor/unit/hook.rb

@@ -15,10 +15,17 @@ module Flor
       opts = {}
       opts[:consumed] = @h['consumed']
       opts[:point] = Flor.h_fetch_a(@h, 'points', 'point', nil)
+      opts[:nid] = Flor.h_fetch_a(@h, 'nids', 'nid', nil)
       opts[:heap] = Flor.h_fetch_a(@h, 'heaps', 'heap', nil)
       opts[:heat] = Flor.h_fetch_a(@h, 'heats', 'heat', nil)
       #opts[:name] = data['names']
 
+      #correct_points(opts)
+        #
+        # Necessary since "cancel" gets interpreted as
+        # [ '_proc', { 'proc' => 'cancel' }, @line ]
+        # ...
+
       [ "hook#{object_id}", opts, self, nil ]
     end
 
@@ -27,6 +34,27 @@ module Flor
 
       @unit.runner.run(executor, @h, message)
     end
+
+  # Avoid the proc/cancel problem upstreams in ConfExecutor, by ignoring
+  # non-core procedures, keeping this around for now
+  #
+#    protected
+#
+#    def correct_points(opts)
+#
+#      pts = opts[:point]; return unless pts
+#
+#      opts[:point] =
+#        Flor.is_tree?(pts) ?
+#        correct_point(pts) :
+#        pts.collect { |pt| correct_point(pt) }
+#    end
+#
+#    def correct_point(point)
+#
+#      return point[1]['proc'] if point.is_a?(Array) && point[0] == '_proc'
+#      point
+#    end
   end
 end
 

data/lib/flor/unit/hooker.rb

@@ -102,6 +102,11 @@ module Flor
       ps = o(opts, :point, :p, [])
       return false if ps && ! ps.include?(message['point'])
 
+      if nid = o(opts, :nid)
+        return false \
+          unless nid.include?(message['nid'])
+      end
+
       if exi = o(opts, :exid)
         return false \
           unless message['exid'] == exi

data/lib/flor/unit/loader.rb

@@ -94,6 +94,9 @@ module Flor
 
     def hooks(domain, name=nil)
 
+      # NB: do not relativize path, because Ruby load path != cwd,
+      # stay absolute for `require` and `load`
+
       Dir[File.join(@root, '**/*.json')]
         .select { |f| f.index('/lib/hooks/') }
         .collect { |pa| [ pa, expose_d(pa, {}) ] }
@@ -101,7 +104,7 @@ module Flor
         .sort_by { |pa, d| d.count('.') }
         .collect { |pa, d|
           interpret(pa).each_with_index { |h, i|
-            h['_path'] = Flor.relativize_path(pa) + ":#{i}" } }
+            h['_path'] = pa + ":#{i}" } }
         .flatten(1)
     end
 

data/lib/flor/unit/storage.rb

@@ -625,9 +625,11 @@ module Flor
         }.compact
 
       pointers +=
-        exe['tasks'].collect { |nid, v|
-          [ dom, exid, nid, 'tasker', v['tasker'], v['name'], now, u ]
-        }
+        exe['tasks']
+          .reject { |_, v|
+            v['tasker'] == nil }
+          .collect { |nid, v|
+            [ dom, exid, nid, 'tasker', v['tasker'], v['name'], now, u ] }
 
       cps = @db[:flor_pointers] # current pointers
         .where(exid: exid)

data/lib/flor/unit/waiter.rb

@@ -5,12 +5,14 @@ module Flor
 
     def initialize(exid, opts)
 
-      serie, timeout, repeat = expand_args(opts)
+      serie, timeout, on_timeout, repeat =
+        expand_args(opts)
 
       @exid = exid
       @original_serie = repeat ? Flor.dup(serie) : nil
       @serie = serie
       @timeout = timeout
+      @on_timeout = on_timeout
 
       @queue = []
       @mutex = Mutex.new
@@ -59,7 +61,11 @@ module Flor
           @var.wait(@mutex, @timeout)
             # will wait "in aeternum" if @timeout is nil
 
-          fail(RuntimeError, "timeout for #{self.to_s}") if @queue.empty?
+          if @queue.empty?
+            fail RuntimeError.new(
+              "timeout for #{self.to_s}") if @on_timeout == 'fail'
+            return { 'exid' => @exid, 'timed_out' => @on_timeout }
+          end
         end
 
         #executor, message = @queue.shift
@@ -89,19 +95,23 @@ module Flor
       owait = opts[:wait]
       orepeat = opts[:repeat] || false
       otimeout = opts[:timeout]
+      oontimeout = opts[:on_timeout] || opts[:ontimeout] || 'fail'
 
       case owait
       when true
         [ [ [ nil, %w[ failed terminated ] ] ], # serie
           otimeout,
+          oontimeout,
           orepeat ]
       when Numeric
         [ [ [ nil, %w[ failed terminated ] ] ], # serie
           owait, # timeout
+          oontimeout,
           orepeat ]
       when String, Array
         [ parse_serie(owait), # serie
           otimeout,
+          oontimeout,
           orepeat ]
       else
         fail ArgumentError.new(

data/lib/flor/unit/wlist.rb

@@ -19,8 +19,8 @@ module Flor
       @waiters = []
 
       @unit.instance_eval do
-        def wait(exid, opts=true)
-          @hooker['wlist'].wait(exid, opts)
+        def wait(exid, opts=true, more=nil)
+          @hooker['wlist'].wait(exid, opts, more)
         end
       end
     end
@@ -46,7 +46,7 @@ module Flor
       [] # no new messages
     end
 
-    def wait(exid, opts)
+    def wait(exid, opts, more)
 
       exid, opts =
         if opts == true && exid == 'idle'
@@ -56,6 +56,7 @@ module Flor
         else
           [ exid, opts ]
         end
+      opts.merge!(more) if more.is_a?(Hash)
 
       opts[:timeout] =
         nil if opts[:timeout] == true

data/match.md

@@ -0,0 +1,22 @@
+
+```
+  match f.data
+    { temperature: t }; register_temperature t
+    { humidity: h }; register_humidity h
+    { luminosity: l, period: 'am' }; register_morning_luminosity l
+    { luminosity: l }; register_pm_luminosity l
+```
+
+or
+
+```
+  cond
+    f.data.temperature; register_temperature f.data.temperature
+    f.data.humidity; register_humidity f.data.humidity
+    and \
+      luminosity
+      == period 'am'
+    register_morning_luminosity f.data.luminosity
+    f.data.luminosity; register_pm_luminosity f.data.luminosity
+```
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -140,9 +140,14 @@ files:
 - lib/flor/pcore/_att.rb
 - lib/flor/pcore/_dump.rb
 - lib/flor/pcore/_err.rb
-- lib/flor/pcore/_happly.rb
 - lib/flor/pcore/_obj.rb
+- lib/flor/pcore/_pat_.rb
+- lib/flor/pcore/_pat_arr.rb
+- lib/flor/pcore/_pat_guard.rb
+- lib/flor/pcore/_pat_obj.rb
+- lib/flor/pcore/_pat_or.rb
 - lib/flor/pcore/_skip.rb
+- lib/flor/pcore/_val.rb
 - lib/flor/pcore/apply.rb
 - lib/flor/pcore/arith.rb
 - lib/flor/pcore/break.rb
@@ -151,23 +156,28 @@ files:
 - lib/flor/pcore/cond.rb
 - lib/flor/pcore/cursor.rb
 - lib/flor/pcore/define.rb
+- lib/flor/pcore/do_return.rb
 - lib/flor/pcore/echo.rb
 - lib/flor/pcore/fail.rb
 - lib/flor/pcore/if.rb
+- lib/flor/pcore/length.rb
+- lib/flor/pcore/logo.rb
 - lib/flor/pcore/loop.rb
 - lib/flor/pcore/map.rb
+- lib/flor/pcore/match.rb
 - lib/flor/pcore/matchr.rb
 - lib/flor/pcore/move.rb
 - lib/flor/pcore/noeval.rb
 - lib/flor/pcore/noret.rb
+- lib/flor/pcore/not.rb
 - lib/flor/pcore/push.rb
 - lib/flor/pcore/rand.rb
+- lib/flor/pcore/range.rb
 - lib/flor/pcore/sequence.rb
 - lib/flor/pcore/set.rb
 - lib/flor/pcore/stall.rb
 - lib/flor/pcore/twig.rb
 - lib/flor/pcore/until.rb
-- lib/flor/pcore/val.rb
 - lib/flor/punit/cancel.rb
 - lib/flor/punit/cmap.rb
 - lib/flor/punit/concurrence.rb
@@ -208,8 +218,8 @@ files:
 - lib/flor.rb
 - flor.gemspec
 - LICENSE.txt
-- t.txt
 - CHANGELOG.md
+- match.md
 - README.md
 homepage: http://github.com/floraison
 licenses:

data/lib/flor/pcore/_happly.rb

@@ -1,49 +0,0 @@
-
-class Flor::Pro::Happly < Flor::Procedure
-
-  name '_happly'
-
-  def pre_execute
-
-    @node['atts'] = []
-  end
-
-  def execute
-
-    wrap(
-      'point' => 'execute',
-      'nid' => Flor.child_nid(nid, tree[1].size),
-      'tree' => tree[0])
-  end
-
-  def receive
-
-    fcid = Flor.child_id(message['from'])
-
-    return wrap_reply if @node['applied']
-    return super unless fcid == tree[1].size
-
-    ret = payload['ret']
-
-    @node['hret'] = payload['ret']
-    execute_child(0)
-  end
-
-  def receive_last
-
-    hret = @node['hret']
-
-    return wrap_reply('ret' => hret) unless Flor.is_func_tree?(hret)
-
-    args = @node['atts'].collect(&:last)
-
-    hret[1].merge!('head' => true, 'nid' => nid)
-
-    msgs = apply(hret, args, tree[2])
-
-    @node['applied'] = msgs.first['nid']
-
-    msgs
-  end
-end
-