flor 0.9.5 → 0.10.0

data/lib/flor/log.rb

@@ -1,32 +1,10 @@
-#--
-# 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
 
   def self.log_message(executor, m, opts={})
 
+    return if m['point'] == 'end'
+
     _c = colours(opts)
 
     nid = m['nid']
@@ -47,7 +25,7 @@ module Flor
     a << _c.dg
 
     if ex = (m['exid'] || '').split('.').last
-      a << ex[-2..-1]
+      a << ex[-4..-1]
       a << ' '
     end
 
@@ -78,9 +56,9 @@ module Flor
       t || Node.new(executor, nd, m).lookup_tree(nid)
     t0 =
       if t
-        " [#{rw}#{_c.yl}#{Flor.s_to_d(t[0], compact: true)}#{_c.dg} L#{t[2]}]"
+        " [#{rw}#{_c.yl}#{Flor.to_d(t[0], compact: true)}#{_c.dg} L#{t[2]}]"
       elsif nt
-        " [#{_c.dg}#{Flor.s_to_d(nt[0], compact: true)}#{_c.dg} L#{nt[2]}]"
+        " [#{_c.dg}#{Flor.to_d(nt[0], compact: true)}#{_c.dg} L#{nt[2]}]"
       else
         ''
       end
@@ -98,7 +76,7 @@ module Flor
     a << tri
 
     cn = t ? " #{_c.dg}#{Flor.to_d(t[1], compact: true, inner: true)}" : ''
-    cn = cn.length > 49 ? "#{cn[0, 49]}..." : cn
+    cn = Flor.truncate_string(cn, 49, "#{_c.dg}...#{_c.rs}")
     a << cn
 
     hp = nd && nd['heap']
@@ -112,7 +90,7 @@ module Flor
     fr = m['from'] ? " from #{m['from']}" : ''
     a << fr
 
-    rt = ret_to_s(executor, m)
+    rt = ret_to_s(executor, m, _c)
     rt = rt.length > 0 ? " #{_c.lg}f.ret #{rt}" : ''
     a << rt
 
@@ -172,7 +150,7 @@ module Flor
     headers = opts[:headers]; headers = true if headers.nil?
     headers = true if opts[:title]
 
-    h = "#{_c.yl}#{Flor.s_to_d(tree[0], compact: true)}"
+    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]}"
 
@@ -222,7 +200,7 @@ module Flor
     end
 
     s << ind << _c.dg << '| ' << nid << ' '
-    s << _c.yl << Flor.s_to_d(tree[0], compact: true) << _c.dg << ' L' << tree[2]
+    s << _c.yl << Flor.to_d(tree[0], compact: true) << _c.dg << ' L' << tree[2]
 
     atts.each_with_index do |ct, i|
       print_flat_tree(ct, "_#{i}", opts)
@@ -241,12 +219,11 @@ module Flor
     opts[:out].puts(s.string) if is_root
   end
 
-  def self.ret_to_s(executor, m)
+  def self.ret_to_s(executor, m, c)
 
     ret = (m['payload'] || {})['ret']
     s = Flor.to_d(ret, compact: true)
-    l = s.length
-    l < 35 ? s : "#{s[0, 35]}(...L#{l})"
+    Flor.truncate_string(s, 35, Proc.new { |x| "#{c.dg}... (L#{x})#{c.rs}" })
   end
 
   def self.nod_to_s(executor, n, opts, here=false)
@@ -255,7 +232,7 @@ module Flor
 
     t = n['tree'] || Node.new(executor, n, nil).lookup_tree(n['nid'])
     t = Flor.to_d(t, compact: true) if t
-    t = t[0, 35] + '...' if t && t.length > 35
+    t = Flor.truncate_string(t, 42);
 
     h = {}
     %w[ parent cnid noreply dbg removed ].each do |k|

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

@@ -0,0 +1,86 @@
+
+Sequel.migration do
+
+  up do
+
+    alter_table :flor_messages do
+
+      add_column :cunit, String
+      add_column :munit, String
+    end
+
+    alter_table :flor_executions do
+
+      add_column :cunit, String
+      add_column :munit, String
+    end
+
+    alter_table :flor_timers do
+
+      add_column :cunit, String
+      add_column :munit, String
+    end
+
+    alter_table :flor_traps do
+
+      add_column :cunit, String
+      add_column :munit, String
+    end
+
+    alter_table :flor_pointers do
+
+      add_column :cunit, String
+
+      add_column :mtime, String
+      add_column :munit, String
+        #
+        # those 2 could prove useful later on
+    end
+
+    alter_table :flor_traces do
+
+      add_column :cunit, String
+    end
+  end
+
+  down do
+
+    alter_table :flor_messages do
+
+      drop_column :cunit
+      drop_column :munit
+    end
+
+    alter_table :flor_executions do
+
+      drop_column :cunit
+      drop_column :munit
+    end
+
+    alter_table :flor_timers do
+
+      drop_column :cunit
+      drop_column :munit
+    end
+
+    alter_table :flor_traps do
+
+      drop_column :cunit
+      drop_column :munit
+    end
+
+    alter_table :flor_pointers do
+
+      drop_column :cunit
+
+      drop_column :mtime
+      drop_column :munit
+    end
+
+    alter_table :flor_traces do
+
+      drop_column :cunit
+    end
+  end
+end
+

data/lib/flor/parser.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
 
@@ -29,6 +5,20 @@ module Flor
 
     # parsing
 
+    def ws_star(i); rex(nil, i, /[ \t]*/); 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 comma(i); str(nil, i, ','); end
+    def bslash(i); str(nil, i, '\\'); end
+
+    def pstart(i); str(nil, i, '('); end
+    def pend(i); str(nil, i, ')'); end
+    def sbstart(i); str(nil, i, '['); end
+    def sbend(i); str(nil, i, ']'); end
+    def pbstart(i); str(nil, i, '{'); end
+    def pbend(i); str(nil, i, '}'); end
+
     def null(i); str(:null, i, 'null'); end
     def number(i); rex(:number, i, /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/); end
 
@@ -36,11 +26,18 @@ module Flor
     def fls(i); str(nil, i, 'false'); end
     def boolean(i); alt(:boolean, i, :tru, :fls); end
 
+    def rf_symbol(i); rex(nil, i, /[^.:;| \b\f\n\r\t"',()\[\]{}#\\]+/); end
+    def rf_square_index(i); alt(nil, i, :rf_symbol, :dqstring, :sqstring); end
+    def rf_square(i); seq(nil, i, :sbstart, :rf_square_index, :sbend); end
+    def rf_dot(i); seq(nil, i, :dot, :rf_symbol); end
+    def rf_index(i); alt(nil, i, :rf_dot, :rf_square); end
+    def reference(i); seq(:ref, i, :rf_symbol, :rf_index, '*'); end
+
     def dqstring(i)
 
       rex(:dqstring, i, %r{
         "(
-          \\["bfnrt] |
+          \\["\\\/bfnrt] |
           \\u[0-9a-fA-F]{4} |
           [^"\\\b\f\n\r\t]
         )*"
@@ -51,7 +48,7 @@ module Flor
 
       rex(:sqstring, i, %r{
         '(
-          \\['bfnrt] |
+          \\['\\\/bfnrt] |
           \\u[0-9a-fA-F]{4} |
           [^'\\\b\f\n\r\t]
         )*'
@@ -69,23 +66,8 @@ module Flor
       }x)
     end
 
-    def symbol(i); rex(:symbol, i, /[^:;| \b\f\n\r\t"',()\[\]{}#\\]+/); end
-
     def comment(i); rex(nil, i, /#[^\r\n]*/); end
 
-    def ws_star(i); rex(nil, i, /[ \t]*/); end
-    def retnew(i); rex(nil, i, /[\r\n]*/); end
-    def colon(i); str(nil, i, ':'); end
-    def comma(i); str(nil, i, ','); end
-    def bslash(i); str(nil, i, '\\'); end
-
-    def pstart(i); str(nil, i, '('); end
-    def pend(i); str(nil, i, ')'); end
-    def sbstart(i); str(nil, i, '['); end
-    def sbend(i); str(nil, i, ']'); end
-    def pbstart(i); str(nil, i, '{'); end
-    def pbend(i); str(nil, i, '}'); end
-
     def eol(i); seq(nil, i, :ws_star, :comment, '?', :retnew); end
     def postval(i); rep(nil, i, :eol, 0); end
 
@@ -109,7 +91,7 @@ module Flor
     def val(i)
       altg(:val, i,
         :panode, :par,
-        :symbol, :sqstring, :dqstring, :rxstring,
+        :reference, :sqstring, :dqstring, :rxstring,
         :arr, :obj,
         :number, :boolean, :null)
     end
@@ -172,10 +154,22 @@ module Flor
       Nod.new(t.lookup(:node)).to_a
     end
 
-    def rewrite_symbol(t); [ t.string, [], ln(t) ]; end
+    def rewrite_ref(t); [ t.string, [], ln(t) ]; end
+
+    UNESCAPE = {
+      "'" => "'", '"' => '"', '\\' => '\\', '/' => '/',
+      'b' => "\b", 'f' => "\f", 'n' => "\n", 'r' => "\r", 't' => "\t"
+    }
+    def restring(s)
+      s.gsub(
+        /\\(?:(['"\\\/bfnrt])|u([\da-fA-F]{4}))/
+      ) {
+        $1 ? UNESCAPE[$1] : [ "#$2".hex ].pack('U*')
+      }
+    end
 
-    def rewrite_sqstring(t); [ '_sqs', t.string[1..-2], ln(t) ]; end
-    def rewrite_dqstring(t); [ '_dqs', t.string[1..-2], ln(t) ]; end
+    def rewrite_dqstring(t); [ '_dqs', restring(t.string[1..-2]), ln(t) ]; end
+    def rewrite_sqstring(t); [ '_sqs', restring(t.string[1..-2]), ln(t) ]; end
     def rewrite_rxstring(t); [ '_rxs', t.string, ln(t) ]; end
 
     def rewrite_boolean(t); [ '_boo', t.string == 'true', line_number(t) ]; end
@@ -290,7 +284,7 @@ module Flor
 
         # rewrite if/unless suffix
 
-        t = [ atts[i][0][0] == 'if' ? 'ife' : 'unlesse', [], @line ]
+        t = [ atts[i][0][0] == 'if' ? 'if' : 'unless', [], @line ]
         t[1].concat(atts[i + 1..-1].collect(&:first))
         t[1].push([ @head, cn[0, i], @line ])
 

data/lib/flor/pcore/_arr.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::Pro::Arr < Flor::Procedure
 

data/lib/flor/pcore/_atom.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::Pro::Atom < Flor::Procedure
 

data/lib/flor/pcore/_att.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::Pro::Att < Flor::Procedure
 
@@ -57,7 +33,9 @@ class Flor::Pro::Att < Flor::Procedure
   def receive_keyed
 
     if Flor.child_id(@message['from']) == 0
-      @node['key'] = k = payload['ret']
+      ret = payload['ret']
+      ret = ret[1]['task'] if Flor.is_task_tree?(ret)
+      @node['key'] = k = ret
       as = (parent_node || {})['atts_accepting_symbols'] || []
       execute_child(1, nil, 'accept_symbol' => as.include?(k))
     else

data/lib/flor/pcore/_dump.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::Pro::Dump < Flor::Procedure