facets 1.3.3 → 1.4.0

data/lib/facets/more/stateparser.rb

@@ -1,40 +1,27 @@
-#--
-# StateParser
+# = stateparser.rb
 #
-# Copyright (c) 2005 Thomas Sawyer
+# == Copyright (c) 2005 Thomas Sawyer
 #
-# Ruby License
+#   Ruby License
 #
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
 #
-# ==========================================================================
-#  Revision History
-# ==========================================================================
-#
-#  5.6.05  v3.0  trans
-#    * Third major rewrite. This improves the system substantially.
-#
-#  5.2.06  v2.0  trans
-#    - Removed raw tokens. Raw text is now available to every regular
-#      token, so the end application can decided how to treat it.
-#
-#  5.1.27  v1.0  trans
-#    - Removed priority. Order of tokens when parser is initialized
-#      now determines precedence.
-#    - If first argument to Parser.new is not a kind of AbstractToken
-#      it is assumed to be the reentrant parser, otherwise the parser
-#      itself is considered the reentrant parser. Having this allows raw
-#      tokens to parse embedded content (among other things).
+# == Author(s)
 #
-# ==========================================================================
-#++
+# * Thomas Sawyer
+
+# Author::    Thomas Sawyer
+# Copyright:: Copyright (c) 2005 Thomas Sawyer
+# License::   Ruby License
 
-#:title: StateParser
+require 'ostruct'
+
+# = StateParser
 #
 # Gerenal purpose stack-based parser. Define custom tokens
 # and the parser will build a parse tree from them.
@@ -111,12 +98,16 @@
 # [Note: There are a few other subtilties to go over that I haven't yet
 # documented, primarily related to creating more elaborate custom tokens. TODO!]
 #
-# == Author(s)
+# Removed raw tokens. Raw text is now available to every regular
+# token, so the end application can decided how to treat it.
 #
-# * Thomas Sawyer
+# Removed priority. Order of tokens when parser is initialized
+# now determines precedence.
 #
-
-require 'ostruct'
+# If first argument to Parser.new is not a kind of AbstractToken
+# it is assumed to be the reentrant parser, otherwise the parser
+# itself is considered the reentrant parser. Having this allows raw
+# tokens to parse embedded content (among other things).
 
 class StateParser ; end
 
@@ -127,7 +118,6 @@ module StateParser::Constants
   ENDCALLBACK = "end_callback"
 end
 
-
 # StateMachine Class
 
 class StateMachine

data/lib/facets/more/statichash.rb

@@ -1,29 +1,41 @@
-#--
-# StaticHash
+# = statichash
 #
-# Copyright (c) 2005 Thomas Sawyer
+# == Copyright (c) 2005 Thomas Sawyer, Gavin Kistner
 #
-# Ported from Gavin Kistner's WriteOnceHash in basiclibrary.rb
-# Copyright (c) 2004 Gavin Kistner
+#   Ruby License
 #
-# Reuse License
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
+#
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
+#
+# == SPECIAL THANKS
+#
+# Special thanks go to Gavin Kistner.
+#
+# StaticHash is based on WriteOnceHash in basiclibrary.rb,
+# Copyright (c) 2004 by Gavin Kistner.
 #
 # It is covered under the license viewable at
+#
 #   http://phrogz.net/JS/_ReuseLicense.txt
+#
 # Reuse or modification is free provided you abide by the terms of that
-# license. (Including the first two lines above in your source code 
+# license. (Including the first two lines above in your source code
 # usually satisfies the conditions.)
 #
-# ==========================================================================
-#  Revision History
-# ==========================================================================
-#
-#  2004-06-01 Trans  * Ported to Calibre
+# == Author(s)
 #
-# ==========================================================================
-#++
+# * Thomas Sawyer
+# * Gavin Kistner
+
+# Author::    Thomas Sawyer, Gavin Kistner
+# Copyright:: Copyright (c) 2005 Thomas Sawyer, Gavin Kistner
+# License::   Ruby License
 
-#:title: StaticHash
+# = StaticHash
 #
 # A Hash object which raises an error if any
 # previously-defined key attempts to be set again.
@@ -40,10 +52,6 @@
 #   Error: StaticHash has value for key 'name' in object:
 #       {"name"=>"Tom", "age"=>30} (RuntimeError)  
 #
-# == Author(s)
-#
-# * Gavin Kistner
-#
 
 class StaticHash < Hash
 
@@ -69,19 +77,19 @@ end
 
 =begin testing
 
-require 'test/unit'
+  require 'test/unit'
 
-class TC_StaticHash < Test::Unit::TestCase 
+  class TC_StaticHash < Test::Unit::TestCase 
 
-  def setup
-    @sh1 = StaticHash.new
-  end
+    def setup
+      @sh1 = StaticHash.new
+    end
 
-  def test_assign
-    @sh1["x"] = 1
-    assert_raises( ArgumentError ){  @sh1["x"] = 2 }
-  end
+    def test_assign
+      @sh1["x"] = 1
+      assert_raises( ArgumentError ){  @sh1["x"] = 2 }
+    end
 
-end
+  end
 
 =end

data/lib/facets/more/syncarray.rb

@@ -1,39 +1,31 @@
-#--
-# SyncArray
+# = syncarray.rb
 #
-# Copyright (c) 2004-2005 Navel, all rights reserved.
+# == Copyright (c) 2004 Navel
 #
-# Ruby License
+#   Ruby License
 #
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
 #
-# ==========================================================================
-#  Revision History
-# ==========================================================================
-#  2005.08.07 trans  Ported to Mega Modules
-# ==========================================================================
-#++
+# == Author(s)
+#
+# * George Moschovitis
+
+# Author::    George Moschovitis <gm@navel.gr>
+# Copyright:: Copyright (c) 2005 Navel
+# License::   Ruby License
+
+require 'sync'
 
-#:title: SyncArray
+# = SyncArray
 #
 # A thread-safe array. We use a sync object instead of a 
 # mutex, because it is re-entrant. An exclusive lock is 
 # needed when writing, a shared lock IS NEEDED when reading.
-#
-# == Usage
-#
-#   TODO
-#
-# == Author(s)
-#
-# * George Moschovitis  <gm@navel.gr>
-
-require 'sync'
 
 class Array
 

data/lib/facets/more/synchash.rb

@@ -1,29 +1,25 @@
-#--
-# SyncHash
-#
-# Copyright (c) 2004-2005 Navel, all rights reserved.
-#
-# Ruby License
+# = synchash.rb
 #
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
+# == Copyright (c) 2004 Navel
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.
+#   Ruby License
 #
-# ==========================================================================
-#  Revision History
-# ==========================================================================
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
 #
-#  05.08.23 trans  United Inherited and Delegated forms in a single class.
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
 #
-#  05.08.07 trans  Ported to Mega from Glue.
+# == Author(s)
 #
-# ==========================================================================
-#++
+# * George Moschovitis
 
-#:title: SyncHash
+# Author::    George Moschovitis <gm@navel.gr>
+# Copyright:: Copyright (c) 2005 Navel
+# License::   Ruby License
+
+# = SyncHash
 #
 # A thread-safe hash. We use a sync object instead of a mutex,
 # because it is re-entrant. An exclusive lock is needed when
@@ -41,13 +37,8 @@
 #
 # == Usage
 #
-# hash = SyncHash.new
-# hash = SyncHash.new(Hash.new)   # Delegates
-#
-# ==Author(s)
-#
-# * George Moschovitis
-# * Thomas Sawyer
+#   hash = SyncHash.new
+#   hash = SyncHash.new(Hash.new)   # Delegates
 #
 
 require 'sync'

data/lib/facets/more/system.rb

@@ -1,30 +1,38 @@
-#--
-# System
+# = system.rb
 #
-# Copyright (c) 2005 Thomas Sawyer
+# == Copyright (c) 2005 Thomas Sawyer, Minero Aoki
+#
+#   Ruby License
+#
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
+#
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
+#
+# == Special Thanks
 #
 # Adapted from RubyParams module by Minero Aoki
 # Copyright (c) 1999-2002 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
-#  
-# =============================================================
-#  Revision History
-# =============================================================
-#  2005-11-29 trans  * Pieced together.
-# =============================================================
-#++
+# == Author(s)
+#
+# * Thomas Sawyer
+# * Minero Aoki
+
+# Author::    Thomas Sawyer, Minero Aoki
+# Copyright:: Copyright (c) 2005 Thomas Sawyer, Minero Aoki
+# License::   Ruby License
 
 require 'rbconfig'
 
-# :title: System
+# = System
 #
-# The System module provides Platform and Ruby system info.
+# The System module provides Platform and Ruby system information.
+# The module should also be able to stand in for rbconfig.
 # It is intended for use as a service module although it
-# can be mixed too.
-#
+# can be mixed-in too.
 
 module System
 

data/lib/facets/more/tagiterator.rb

@@ -1,45 +1,25 @@
-#--
-# TagIterator (aka Tagiter)
+# = tagiterator.rb
 #
-# Copyright (c) 2000 Ⴗnyasu <nyasu@osk.3web.ne.jp>
+# == Copyright (c) 2000 Ⴗnyasu <nyasu@osk.3web.ne.jp>
 #
-# Ruby License
+#   Ruby License
 #
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
 #
-# ==========================================================================
-#  Revision History
-# ==========================================================================
-#
-#  04.11.30 trans  Added to Calibre and renamed TagIterator.
-#
-#  03.09.18 nyasu  Made attribute name case-ignored.
-#
-#  03.06.06 nyasu  Added a new method : nth_trailer(tag,n).
-#                  Fixed regexp of tagnext method.
-#
-#  03.06.05 nyasu  Added new methods for information, #tagexist?(tag) and
-#                  tagnext. Fixed bugs on return values of each_block
-#
-#  03.06.01 nyasu  Fixed nth method which sometimes crashes at the
-#                  end-of-file. (reported by Matsui-san)
-#
-#  03.05.08 nyasu  Fixed enumtag which yields only half of texts in
-#                  some conditions.
-#
-#  02.04.27 nyasu  Regexp debugged in parse_attribute
-#
-#  02.03.12 nyasu  Started
+# == Author(s)
 #
-# ==========================================================================
-#++
+# * Ⴗnyasu
+
+# Author::    Ⴗnyasu <nyasu@osk.3web.ne.jp>
+# Copyright:: Copyright (c) 2000 Ⴗnyasu
+# License::   Ruby License
 
-#:title: TagIterator
+# = TagIterator (aka Tagiter)
 #
 # Simple but very useful HTML/XHTML cascading parser.
 #
@@ -124,10 +104,6 @@
 #   S1
 #   S2
 #
-# == Author(s)
-#
-# *ɂႷ nyasu <nyasu[at]osk.3web.ne.jp>
-#
 
 class TagIterator
 

data/lib/facets/more/taskable.rb

@@ -0,0 +1,417 @@
+# = taskable.rb
+#
+# == Copyright (c) 2006 Thomas Sawyer
+#
+#   Ruby License
+#
+#   This module is free software. You may use, modify, and/or redistribute this
+#   software under the same terms as Ruby.
+#
+#   This program is distributed in the hope that it will be useful, but WITHOUT
+#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.
+#
+# == Auhtor(s)
+#
+# * Thomas Sawyer
+
+# Author::    Thomas Sawyer
+# Copyright:: Copyright (c) 2006 Thomas Sawyer
+# License::   Ruby License
+
+require 'tsort'
+require 'facets/core/kernel/cache.rb'
+require 'facets/core/kernel/method.rb'
+require 'facets/more/inheritor.rb'
+
+# = TSort
+#
+# TSort is used to determine which prerequisites to run
+# for a task.
+#
+# Here we add a convenience method --if such a long method
+# name can be said to be convenient ;) Although we ended
+# not using it after all --it still may proved useful and
+# may eventually be added to Facets or submitted as a patch.
+
+module TSort
+  def strongly_connected_components_from(node)
+    result = []
+    each_strongly_connected_component_from(node) do |component|
+      result << component
+    end
+    result
+  end
+end
+
+# = Task
+#
+# A Task is a Method with prerequisite dependencies.
+#
+# NOTE Can't subclass Method b/c Method has no initiator.
+# Not sure that would be a good idea anyway.
+
+class Task
+  attr_accessor :description
+
+  def initialize( name, container, preq, desc=nil, &action )
+    @name = name
+    @container = container
+    @prerequisite = preq || []
+    @description = desc
+    @action = action
+  end
+
+  def prerequisite
+    @prerequisite ||= []
+  end
+
+#   #--
+#   # TODO Problem is 'a' can't take any parameters,
+#   #      and there's no way to sort the tasks
+#   #      from here. FIX if possible.
+#   #++
+#   def to_proc
+#     r = @prerequisite
+#     n = @name
+#     a = @action
+#     lambda {
+#       r.each{ |d| send(d) unless n == d }
+#       instance_eval &a if a
+#     }
+#   end
+
+  def complete
+    # ensure no cycles in the graph and extract call graph
+    #own = (class << self; self; end) # in case there are singletons?
+    t = Graph.new( container, name )
+    t.each_strongly_connected_component_from( name ) { |c|
+      #@container.instance_task(c).call
+      @container.send("->#{d}")
+    }
+  end
+
+  def call
+    @action.call
+  end
+
+  def each(&blk)
+    @prerequisite.each(&blk)
+  end
+
+  # Task::Graph is a Tarjan-sorted hash.
+  # It is used to generate the proper dependency chains.
+  # TODO Make Multiton off of base.
+
+  class Graph < Hash
+    include TSort
+
+    def initialize( base, name )
+      @base = base.class
+      @name = name
+      instance_map( name )
+    end
+
+    def instance_map( name )
+      t = @base.instance_task(name)
+      raise "prerequired task does not exist -- #{name} in #{@base}" unless t
+      self[name] = t.prerequisite || []
+      self[name].each { |r| instance_map( r ) }
+    end
+
+    alias_method :tsort_each_node, :each_key
+
+    def tsort_each_child(node, &block)
+      fetch(node).each(&block)
+    end
+  end
+
+end
+
+# = Taskable
+#
+# The Taskable module provides a generic task system
+# patterned after Rake, but useable in any
+# code context --not just with the Rake tool. In other
+# words one can create methods with dependencies.
+#
+# NOTE Unlike methods, tasks can't take parameters
+# if they are to be used as prerequisites.
+# This capability might be added in the future, but
+# presently syntax limitations make it awkward.
+
+module Taskable
+
+  # Provide a mapping of tasks, including task from ancestors.
+  # TODO Not sure this is properly reading from ancestors.
+
+  # Define description for subsequent task.
+
+  def desc(line=nil)
+    return @last_description unless line
+    @last_description = line.gsub("\n",'')
+  end
+
+  # Use a description for subsequent task.
+
+  def desc!
+    l = @last_description
+    @last_description = nil
+    l
+  end
+
+  # Access a task.
+
+  def instance_task( name )
+    instance_task_table[ name.to_sym ]
+  end
+
+  # List of task names.
+
+  def instance_tasks
+    instance_task_table.keys
+  #  t = instance_methods(true).select{ |m| m =~ /^->/ }
+  #  t.collect { |e| e[2..-1].to_sym }
+  end
+
+  # List of task names with descriptions.
+
+  def described_tasks
+    instance_tasks.select { |name| instance_task(name).description }
+  end
+
+  # List of task names without descriptions.
+
+  def undescribed_tasks
+    instance_tasks.select { |name| ! instance_task(name).description }
+  end
+
+  # Define a task.
+
+  def task(args, &action)
+    if Hash === args
+      raise ArgumentError, "#{args.size} for 1" if args.size != 1
+      name, *deps = *(args.to_a.flatten)
+      name = name.to_sym
+      deps = deps.compact.collect{ |e| e.to_sym }
+    else
+      name, deps = args.to_sym, []
+    end
+    # create task via create core and callable methods.
+    # We do it this way b/c otherwise we'd have to use
+    # instance_eval and then can't ever pass paramaters.
+    if action
+      define_method( "->#{name}", &action ) # core of the task
+      define_method( name ) do
+        # ensure no cycles in the graph and extract call graph
+        #own = (class << self; self; end) # in case there are singletons?
+        todolist = Task::Graph.new( self, name )
+        todolist.each_strongly_connected_component_from( name ) do |c|
+          send("->#{c}")
+        end
+      end
+      instance_task_table![name] = Task.new( name, self, deps, desc!, &action )
+    else
+      m = instance_task_table![name]
+      #m.description = desc!  # TODO should this apply only if there is an action?
+      m.prerequisite.concat deps unless deps.empty?
+      m
+    end
+  end
+
+  # Include the Task module into the Module class.
+
+  class ::Module
+    include Taskable
+    # This has to be down here and not in Taskable b/c of
+    # a glitch in inheritor's design.
+    inheritor :instance_task_table, {}, :merge
+  end
+
+end
+
+#
+
+class Object
+  def send_task( name )
+    (class << self; self; end).instance_task( name )
+  end
+end
+
+#--
+# TODO Allows tasks to defined at the toplevel (main).
+# This may need work b/c it might cause an infinite loop.
+# Plus there are a few method missing yet. Anyway,
+# I'm not needing this functionality at the moment, and
+# I leave it to somone else to finish when they do.
+#
+# class Object
+#
+#   def instance_tasks
+#     (class << self; self; end).instance_tasks
+#   end
+#
+#   def instance_task(*args, &blk)
+#     (class << self; self; end).task(*args, &blk)
+#   end
+#
+#   def desc(*args, &blk)
+#     (class << self; self; end).desc(*args, &blk)
+#   end
+#
+#   def desc!(*args, &blk)
+#     (class << self; self; end).desc!(*args, &blk)
+#   end
+#
+#   def task(*args, &blk)
+#     (class << self; self; end).desc(*args, &blk)
+#   end
+#
+# end
+#++
+
+
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |_
+#   |_|\___||___/\__|
+#
+=begin test
+
+  require 'test/unit'
+
+  class TCTask < Test::Unit::TestCase
+
+    module M
+      task :m1 => [ :c1 ] do @x << "m1" end
+      task :m2 => [ :c2 ] do @x << "m2" end
+      task :m3 => [ :c3 ] do @x << "m3" end
+      task :m4 => [ :c1, :c2, :c3 ] do @x << "m4" end
+      task :m5 do @x << 'm5' end
+    end
+
+    class C
+      include M
+      attr :x
+      def initialize ; @x = [] ; end
+
+      task :c1 do @x << "c1" end
+      task :c2 => [ :c1, :c1 ] do @x << "c2" end
+      task :c3 => [ :c1, :c2 ] do @x << "c3" end
+      task :c4 => [ :m1 ] do @x << "c4" end
+      task :c5 => [ :c5 ] do @x << "c5" end
+      task :c6 => [ :c7 ] do @x << "c6" end
+      task :c7 => [ :c6 ] do @x << "c7" end
+    end
+
+    class D < C
+      task :d1 => [ :c1 ] do @x << "d1" ; end
+      task :d2 => [ :m1 ] do @x << "d2" ; end
+    end
+
+    module N
+      include M
+    end
+
+    class E
+      include N
+      attr :x
+      def initialize ; @x = [] ; end
+
+      task :e1 => [ :c1 ] do @x << "e1" ; end
+      task :e2 => [ :m1 ] do @x << "e2" ; end
+      task :e3 => [ :m5 ] do @x << "e3" ; end
+    end
+
+    module O
+      attr :x
+      task :o1 do (@x||=[]) << "o1" end
+      task :o2 => [ :o1 ] do (@x||=[]) << "o2" end
+    end
+
+    # TODO Appearently extending does play well with inheritor?
+    # F = Module.new { extend O }
+
+    # tests
+
+    def test_C1
+      c = C.new ; c.c1
+      assert_equal( [ 'c1' ], c.x )
+    end
+
+    def test_C2
+      c = C.new ; c.c2
+      assert_equal( [ 'c1', 'c2' ], c.x )
+    end
+
+    def test_C3
+      c = C.new ; c.c3
+      assert_equal( [ 'c1', 'c2', 'c3' ], c.x )
+    end
+
+    def test_C4
+      c = C.new ; c.c4
+      assert_equal( [ 'c1', 'm1', 'c4' ], c.x )
+    end
+
+    def test_M1
+      c = C.new ; c.m1
+      assert_equal( [ 'c1', 'm1' ], c.x )
+    end
+
+    def test_M2
+      c = C.new ; c.m2
+      assert_equal( [ 'c1', 'c2', 'm2' ], c.x )
+    end
+
+    def test_M3
+      c = C.new ; c.m3
+      assert_equal( [ 'c1', 'c2', 'c3', 'm3' ], c.x )
+    end
+
+    def test_M4
+      c = C.new ; c.m4
+      assert_equal( [ 'c1', 'c2', 'c3', 'm4' ], c.x )
+    end
+
+    def test_D1
+      d = D.new ; d.d1
+      assert_equal( [ 'c1', 'd1' ], d.x )
+    end
+
+    def test_D2
+      d = D.new ; d.d2
+      assert_equal( [ 'c1', 'm1', 'd2' ], d.x )
+    end
+
+    def test_E1
+      e = E.new
+      assert_raises( RuntimeError ) { e.e1 }
+      #assert_equal( [ 'c1', 'e1' ], e.x )
+    end
+
+    def test_E2
+      e = E.new
+      assert_raises( RuntimeError ) { e.e2 }
+      #assert_equal( [ 'c1', 'm1', 'e2' ], e.x )
+    end
+
+    def test_E3
+      e = E.new ; e.e3
+      assert_equal( [ 'm5', 'e3' ], e.x )
+    end
+
+    # def test_F1
+    #   F.o1
+    #   assert_equal( [ 'o1' ], F.x )
+    # end
+    #
+    # def test_F2
+    #   F.o2
+    #   assert_equal( [ 'o1', 'o1', 'o2' ], F.x )
+    # end
+
+  end
+
+=end