flor 0.9.5 → 0.10.0

data/lib/flor/core.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 module Flor
 

data/lib/flor/core/executor.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 module Flor
 
@@ -173,23 +149,7 @@ module Flor
 
       node['heat0'] = tree[0]
       node['heat'] = heat = n.deref(t0)
-
-      node['heap'] = heap =
-        if ! heat.is_a?(Array)
-          '_val'
-        elsif tree && tree[1] == []
-          '_val'
-        elsif heat[0] == '_proc'
-          heat[1]['proc']
-        elsif heat[0] == '_func'
-          'apply'
-        elsif heat[0] == '_task'
-          'task'
-        elsif Flor.is_tree_head_tree?(tree)
-          '_happly'
-        else
-          '_val'
-        end
+      node['heap'] = heap = n.reheap(tree, heat)
 
       if heap == 'task' && heat[0] == '_task'
         #
@@ -357,8 +317,16 @@ module Flor
 
     def task(message)
 
+      return error_reply(
+        node(message['nid']),
+        message,
+        "don't know how to apply #{message['tasker'].inspect}"
+      ) if message['routed'] == false
+
       @execution['tasks'][message['nid']] =
         { 'tasker' => message['tasker'], 'name' => message['taskname'] }
+          #
+          # FIXME is it in use???
 
       @unit.ganger.task(self, message)
     end
@@ -367,6 +335,8 @@ module Flor
     def return(message)
 
       @execution['tasks'].delete(message['nid'])
+        #
+        # FIXME is it in use???
 
       [
         { 'point' => 'receive',
@@ -398,7 +368,7 @@ module Flor
         ms = []
         ms += @unit.notify(self, message) # pre
 
-        ms += self.send(message['point'].to_sym, message)
+        ms += self.send(message['point'], message)
 
         message['payload'] = message.delete('pld') if message.has_key?('pld')
         message['consumed'] = Flor.tstamp

data/lib/flor/core/node.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 class Flor::Node
 
@@ -233,6 +209,25 @@ class Flor::Node
     v
   end
 
+  def reheap(tree, heat)
+
+    if ! heat.is_a?(Array)
+      '_val'
+    elsif tree && tree[1] == []
+      '_val'
+    elsif heat[0] == '_proc'
+      heat[1]['proc']
+    elsif heat[0] == '_func'
+      'apply'
+    elsif heat[0] == '_task'
+      'task'
+    elsif Flor.is_tree_head_tree?(tree)
+      '_happly'
+    else
+      '_val'
+    end
+  end
+
   def tree
 
     lookup_tree(nid)

data/lib/flor/core/procedure.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 class Flor::Procedure < Flor::Node
 
@@ -284,6 +260,14 @@ class Flor::Procedure < Flor::Node
 
     @node['mtime'] = Flor.tstamp
 
+    orl.each do |m|
+
+      m['from'] = @node['parent'] if m['from'] == 'parent'
+
+      #m['payload'] ||= Flor.dup(@node['payload'])
+        # No, let re_applier supply payload
+    end
+
     orl
   end
 
@@ -485,6 +469,8 @@ class Flor::Procedure < Flor::Node
     cni = fun[1]['cnid'] # closure nid
 
     t = lookup_tree(fni)
+    fail ArgumentError.new("couldn't find function at #{fni}") unless t
+
     t = t[0] if fun[1]['head']
 
     sig = t[1].select { |c| c[0] == '_att' }
@@ -537,6 +523,9 @@ class Flor::Procedure < Flor::Node
 
     return kill if @message['flavour'] == 'kill'
 
+    orl = @message['on_receive_last']
+    @node['on_receive_last'] = orl if orl
+
     return cancel_when_ended if node_ended?
     return cancel_when_closed if node_closed?
 

data/lib/flor/core/texecutor.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 module Flor
 
@@ -182,10 +158,16 @@ module Flor
 
     def self.interpret(path)
 
-      s = path
-
-      s = File.read(s).strip unless s.match(/[\r\n]/)
-      s = "{\n#{s}\n}"
+      s =
+        if path.match(/[\r\n]/)
+          path.strip
+        else
+          ls = File.readlines(path)
+          ls.reject! { |l| l.strip[0, 1] == '#' }
+          s = ls.join("\n").strip
+        end
+      s =
+        "{\n#{s}\n}" unless s[0, 1] == '{' && s[-1, 1] == '}'
 
       vs = Hash.new { |h, k| k }
       class << vs

data/lib/flor/deep.rb

@@ -0,0 +1,152 @@
+
+module Flor
+
+  # deep.rb
+  #
+  # functions for deep getting/setting in structures
+
+  def self.to_array_index(o)
+
+    return 0 if o == 'first'
+    return -1 if o == 'last'
+    return o if o.is_a?(Integer)
+    nil
+  end
+
+  def self.split_deep_path(k)
+
+    return k if k.is_a?(Array)
+
+    k
+      .scan(/(?:\.?(-?\d+)|\.?([^\.\[]+)|\[(-?\d+)\]|\[([^\[\]]+)\])/)
+      .collect { |doti, dots, squi, squs|
+        if doti
+          doti.to_i
+        elsif dots
+          dots
+        elsif squi
+          squi.to_i
+        else
+          s0 = squs[0, 1]
+          (s0 == "'" || s0 == '"') ? squs[1..-2] : squs
+        end }
+  end
+
+  def self.deep_get(o, k) # --> success(boolean), value
+
+    return [ true, o ] unless k
+
+    val = o
+
+    split_deep_path(k).each do |kk|
+
+      case val
+      when Array
+        i = to_array_index(kk)
+        return [ false, nil ] unless i
+        val = val[i]
+      when Hash
+        val = val[kk]
+      else
+        return [ false, nil ]
+      end
+    end
+
+    [ true, val ]
+  end
+
+  def self.deep_set(o, k, v) # --> [ success(boolean), value ]
+
+    ks = split_deep_path(k)
+    key = ks.pop
+
+    b, col = deep_get(o, ks)
+
+    return [ false, v ] unless b
+
+    case col
+    when Array
+      i = to_array_index(key)
+      return [ false, v ] unless i
+      col[i] = v
+    when Hash
+      col[key] = v
+    else
+      return [ false, v ]
+    end
+
+    [ true, v ]
+  end
+
+  def self.deep_insert(o, k, v) # --> [ success(boolean), value ]
+
+    ks = split_deep_path(k)
+    key = ks.pop
+
+    b, col = deep_get(o, ks)
+
+    return [ false, nil ] unless b
+
+    case col
+    when Array
+      i = to_array_index(key)
+      return [ false, v ] unless i
+      col.insert(i, v)
+    when Hash
+      col[key] = v
+    else
+      return [ false, v ]
+    end
+
+    [ true, v ]
+  end
+
+  def self.deep_unset(o, k) # --> [ success(boolean), value ]
+
+    ks = split_deep_path(k)
+    key = ks.pop
+
+    b, col = deep_get(o, ks)
+
+    return [ false, nil ] unless b
+
+    v =
+      case col
+      when Array
+        i = to_array_index(key)
+        return [ false, nil ] unless i
+        col.delete_at(i)
+      when Hash
+        col.delete(key)
+      else
+        return [ false, nil ]
+      end
+
+    [ true, v ]
+  end
+
+  def self.deep_has_key?(o, k)
+
+    val = o
+    ks = split_deep_path(k)
+
+    loop do
+
+      kk = ks.shift
+
+      case val
+      when Array
+        i = to_array_index(kk)
+        return false unless i
+        return (i < 0 ? -i < val.length : i < val.length) if ks.empty?
+        val = val[i]
+      when Hash
+        return val.has_key?(kk) if ks.empty?
+        val = val[kk]
+      else
+        return false
+      end
+    end
+  end
+end
+

data/lib/flor/djan.rb

@@ -0,0 +1,200 @@
+
+require 'io/console'
+
+
+module Flor
+
+  def self.to_djan(x, opts={}); to_d(x, opts); end
+
+  def self.to_d(x, opts={})
+
+    opts[:s] = StringIO.new
+    opts[:c] = Flor.colours(opts)
+
+    if opts[:width] == true
+      opts[:width] = IO.console.winsize[1]
+    elsif mw = (opts[:mw] || opts[:maxwidth] || opts[:max_width])
+      opts[:width] = [ IO.console.winsize[1], mw ].min
+    end
+
+    Djan.to_d(x, opts)
+
+    opts[:s].string
+  end
+
+  module Djan
+    extend self
+
+    def to_d(x, opts)
+
+      case x
+      when nil then nil_to_d(x, opts)
+      when String then string_to_d(x, opts)
+      when Hash then object_to_d(x, opts)
+      when Array then array_to_d(x, opts)
+      when TrueClass then boolean_to_d(x.to_s, opts)
+      when FalseClass then boolean_to_d(x.to_s, opts)
+      else num_to_d(x.to_s, opts)
+      end
+    end
+
+    def len(x, opts)
+
+      opts = opts.merge(
+        s: StringIO.new, c: Flor.no_colours, indent: nil, width: nil)
+
+      to_d(x, opts)
+
+      opts[:s].string.length
+    end
+
+    def newline(opts)
+
+      opts[:s] << "\n"
+    end
+
+    def space(opts, force=false)
+
+      opts[:s] << ' ' if force || ! opts[:compact]
+    end
+
+    def newline_or_space(opts)
+
+      if opts[:indent]
+        newline(opts)
+      elsif ! opts[:compact]
+        space(opts)
+      end
+    end
+
+    def indent_space(opts)
+
+      return if opts.delete(:first)
+      i = opts[:indent]
+      opts[:s] << '  ' * i if i
+    end
+
+    def indent(opts, os={})
+
+      if i = opts[:indent]
+        opts.merge(indent: i + (os[:inc] || 1), first: os[:first])
+      else
+        opts
+      end
+    end
+
+    def adjust(x, opts)
+
+      i = opts[:indent]
+      w = opts[:width]
+
+      return opts unless i && w && i + len(x, opts) < w
+      opts.merge(indent: nil)
+    end
+
+    def object_to_d(x, opts)
+
+      inner = opts.delete(:inner)
+
+      indent_space(opts)
+
+      return c_inf('{}', opts) if x.empty?
+
+      opts = adjust(x, opts)
+
+      unless inner
+        c_inf('{', opts); space(opts)
+      end
+
+      x.each_with_index do |(k, v), i|
+        string_to_d(k, indent(opts, first: i == 0))
+        c_inf(':', opts)
+        newline_or_space(opts)
+        to_d(v, indent(opts, inc: 2))
+        if i < x.size - 1
+          c_inf(',', opts)
+          newline_or_space(opts)
+        end
+      end
+
+      unless inner
+        space(opts); c_inf('}', opts)
+      end
+    end
+
+    def array_to_d(x, opts)
+
+      inner = opts.delete(:inner)
+
+      indent_space(opts)
+
+      return c_inf('[]', opts) if x.empty?
+
+      opts = adjust(x, opts)
+
+      unless inner
+        c_inf('[', opts); space(opts)
+      end
+
+      x.each_with_index do |e, i|
+        to_d(e, indent(opts, first: i == 0))
+        if i < x.size - 1
+          c_inf(',', opts)
+          newline_or_space(opts)
+        end
+      end
+
+      unless inner
+        space(opts); c_inf(']', opts)
+      end
+    end
+
+    def string_to_d(x, opts)
+
+      x = x.to_s
+
+      indent_space(opts)
+
+      if (
+        x.match(/\A[^: \b\f\n\r\t"',()\[\]{}#\\]+\z/) == nil ||
+        x.to_i.to_s == x ||
+        x.to_f.to_s == x
+      )
+        c_inf('"', opts)
+        c_str(x.inspect[1..-2], opts)
+        c_inf('"', opts)
+      else
+        c_str(x, opts)
+      end
+    end
+
+    def boolean_to_d(x, opts)
+
+      indent_space(opts)
+      if x
+        c_tru(x, opts)
+      else
+        c_fal(x, opts)
+      end
+    end
+
+    def num_to_d(x, opts)
+
+      indent_space(opts); c_num(x, opts)
+    end
+
+    def nil_to_d(x, opts)
+
+      indent_space(opts); c_nil('null', opts)
+    end
+
+    def c_inf(s, opts); opts[:s] << opts[:c].dark_gray(s); end
+
+    def c_nil(s, opts); opts[:s] << opts[:c].dark_gray(s); end
+    def c_tru(s, opts); opts[:s] << opts[:c].green(s); end
+    def c_fal(s, opts); opts[:s] << opts[:c].red(s); end
+    def c_str(s, opts); opts[:s] << opts[:c].brown(s); end
+    def c_num(s, opts); opts[:s] << opts[:c].light_blue(s); end
+  end
+end
+