tb 0.1 → 0.2

data/lib/tb/reader.rb

@@ -24,106 +24,10 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 # OF SUCH DAMAGE.
 
-class Tb
-  def Tb.load_csv(filename, *header_fields, &block)
-    Tb.parse_csv(File.read(filename), *header_fields, &block)
-  end
-
-  def Tb.parse_csv(csv, *header_fields)
-    aa = []
-    csv_stream_input(csv) {|ary|
-      aa << ary
-    }
-    aa = yield aa if block_given?
-    if header_fields.empty?
-      reader = Tb::Reader.new(aa)
-      arys = []
-      reader.each {|ary|
-        arys << ary
-      }
-      header = reader.header
-    else
-      header = header_fields
-      arys = aa
-    end
-    t = Tb.new(header)
-    arys.each {|ary|
-      ary << nil while ary.length < header.length
-      t.insert_values header, ary
-    }
-    t
-  end
-
-  def Tb.load_tsv(filename, *header_fields, &block)
-    Tb.parse_tsv(File.read(filename), *header_fields, &block)
-  end
-
-  def Tb.parse_tsv(tsv, *header_fields)
-    aa = []
-    tsv_stream_input(tsv) {|ary|
-      aa << ary 
-    }
-    aa = yield aa if block_given?
-    if header_fields.empty?
-      reader = Tb::Reader.new(aa)
-      arys = []
-      reader.each {|ary|
-        arys << ary
-      }
-      header = reader.header
-    else
-      header = header_fields
-      arys = aa
-    end
-    t = Tb.new(header)
-    arys.each {|ary|
-      ary << nil while ary.length < header.length
-      t.insert_values header, ary
-    }
-    t
-  end
-end
-
 class Tb::Reader
-  def self.open(filename, opts={})
-    io = nil
-    case filename
-    when /\.csv\z/
-      io = File.open(filename)
-      rawreader = Tb::CSVReader.new(io)
-    when /\.tsv\z/
-      io = File.open(filename)
-      rawreader = Tb::TSVReader.new(io)
-    when /\Acsv:/
-      io = File.open($')
-      rawreader = Tb::CSVReader.new(io)
-    when /\Atsv:/
-      io = File.open($')
-      rawreader = Tb::TSVReader.new(io)
-    else
-      if filename == '-'
-        rawreader = Tb::CSVReader.new(STDIN)
-      else
-        # guess table format?
-        io = File.open(filename)
-        rawreader = Tb::CSVReader.new(io)
-      end
-    end
-    reader = self.new(rawreader, opts)
-    if block_given?
-      begin
-        yield reader
-      ensure
-        reader.close
-      end
-    else
-      reader
-    end
-
-  end
-
   def initialize(rawreader, opts={})
     @opt_n = opts[:numeric]
+    @opt_close = opts[:close]
     @reader = rawreader
     @fieldset = nil
   end
@@ -146,34 +50,25 @@ class Tb::Reader
     return @fieldset.header
   end
 
+  def index_from_field_ex(f)
+    self.header
+    @fieldset.index_from_field_ex(f)
+  end
+
   def index_from_field(f)
     self.header
-    if @opt_n
-      raise "numeric field start from 1: #{f.inspect}" if /\A0+\z/ =~ f
-      raise "numeric field name expected: #{f.inspect}" if /\A(\d+)\z/ !~ f
-      $1.to_i - 1
-    else
-      @fieldset.index_from_field(f)
-    end
+    @fieldset.index_from_field(f)
   end
 
   def field_from_index_ex(i)
     raise ArgumentError, "negative index: #{i}" if i < 0
     self.header
-    if @opt_n
-      if @fieldset.length <= i
-        @fieldset.add_fields(*(@fieldset.header.length..i).to_a.map {|j| "#{j+1}" })
-      end
-    end
     @fieldset.field_from_index_ex(i)
   end
 
   def field_from_index(i)
     raise ArgumentError, "negative index: #{i}" if i < 0
     self.header
-    if @opt_n
-      return "#{i+1}"
-    end
     @fieldset.field_from_index(i)
   end
 
@@ -191,23 +86,18 @@ class Tb::Reader
     nil
   end
 
-  def close
-    @reader.close
+  def read_all
+    result = []
+    while ary = self.shift
+      result << ary
+    end
+    result
   end
 
-  def fix_header(header)
-    h = {}
-    header.map {|s|
-      s ||= ''
-      if h[s]
-        s += "(2)" if /\(\d+\)\z/ !~ s
-        while h[s]
-          s = s.sub(/\((\d+)\)\z/) { n = $1.to_i; "(#{n+1})" }
-        end
-        s
-      end
-      h[s] = true
-      s
-    }
+  def close
+    @reader.close
+    if @opt_close
+      @opt_close.close
+    end
   end
 end

data/lib/tb/record.rb

@@ -90,7 +90,7 @@ class Tb::Record
   end
 
   def to_a
-    a = {}
+    a = []
     @table.each_field {|f|
       v = @table.get_cell(@recordid, f)
       a << [f, v] if !v.nil?
@@ -99,7 +99,7 @@ class Tb::Record
   end
 
   def to_a_with_reserved
-    a = {}
+    a = []
     @table.each_field_with_reserved {|f|
       v = @table.get_cell(@recordid, f)
       a << [f, v] if !v.nil?
@@ -116,7 +116,7 @@ class Tb::Record
   end
 
   def each_with_reserved
-    @table.each_field_reserved {|f|
+    @table.each_field_with_reserved {|f|
       v = @table.get_cell(@recordid, f)
       yield [f, v] if !v.nil?
     }

data/lib/tb/ropen.rb

@@ -0,0 +1,70 @@
+# lib/tb/ropen.rb - Tb::Reader.open
+#
+# Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#  1. Redistributions of source code must retain the above copyright notice, this
+#     list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#  3. The name of the author may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+
+class Tb::Reader
+  def self.open(filename, opts={})
+    opts = opts.dup
+    case filename
+    when /\Acsv:/
+      filename = $'
+      rawreader_maker = lambda {|io| Tb::CSVReader.new(io) }
+    when /\Atsv:/
+      filename = $'
+      rawreader_maker = lambda {|io| Tb::TSVReader.new(io) }
+    when /\Ap[pgbn]m:/
+      filename = $'
+      rawreader_maker = lambda {|io| Tb.pnm_stream_input(io) }
+    when /\.csv\z/
+      rawreader_maker = lambda {|io| Tb::CSVReader.new(io) }
+    when /\.tsv\z/
+      rawreader_maker = lambda {|io| Tb::TSVReader.new(io) }
+    when /\.p[pgbn]m\z/
+      rawreader_maker = lambda {|io| Tb.pnm_stream_input(io) }
+    else
+      rawreader_maker = lambda {|io| Tb::CSVReader.new(io) }
+    end
+    unless filename.respond_to? :to_str
+      raise ArgumentError, "unexpected filename: #{filename.inspect}"
+    end
+    if filename == '-'
+      rawreader = rawreader_maker.call(STDIN)
+    else
+      io = File.open(filename)
+      opts[:close] = io
+      rawreader = rawreader_maker.call(io)
+    end
+    reader = self.new(rawreader, opts)
+    if block_given?
+      begin
+        yield reader
+      ensure
+        reader.close
+      end
+    else
+      reader
+    end
+  end
+end

data/lib/tb/{pathfinder.rb → search.rb}

@@ -1,4 +1,4 @@
-# lib/tb/pathfinder.rb - pattern matcher for two-dimensional array.
+# lib/tb/search.rb - pattern matcher for two-dimensional array.
 #
 # Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
 # 
@@ -24,7 +24,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 # OF SUCH DAMAGE.
 
-module Tb::Pathfinder
+module Tb::Search
   module_function
 
   def strary_to_aa(strary)
@@ -47,7 +47,7 @@ module Tb::Pathfinder
   def each_match(pat, aa, spos=nil)
     if spos
       run {
-        try(pat, aa, Tb::Pathfinder::EmptyState.merge(:pos => spos)) {|st2|
+        try(pat, aa, Tb::Search::EmptyState.merge(:pos => spos)) {|st2|
           yield spos, st2.fetch(:pos), st2.reject {|k,v| k == :pos }
           nil
         }
@@ -57,7 +57,7 @@ module Tb::Pathfinder
         a.each_index {|x|
           spos = [x,y]
           run {
-            try(pat, aa, Tb::Pathfinder::EmptyState.merge(:pos => spos)) {|st2|
+            try(pat, aa, Tb::Search::EmptyState.merge(:pos => spos)) {|st2|
               yield spos, st2.fetch(:pos), st2.reject {|k,v| k == :pos }
               nil
             }
@@ -93,14 +93,18 @@ module Tb::Pathfinder
     when nil; lambda { yield st }
     when String; try_lit(pat, aa, st, &b)
     when Regexp; try_regexp(pat, aa, st, &b)
-    when :n, :north; try_rmove(:north, aa, st, &b)
-    when :s, :south; try_rmove(:south, aa, st, &b)
-    when :e, :east; try_rmove(:east, aa, st, &b)
-    when :w, :west; try_rmove(:west, aa, st, &b)
+    when :n, :north; try_rmove(0, -1, aa, st, &b)
+    when :s, :south; try_rmove(0, 1, aa, st, &b)
+    when :e, :east; try_rmove(1, 0, aa, st, &b)
+    when :w, :west; try_rmove(-1, 0, aa, st, &b)
+    when :ne, :north; try_rmove(1, -1, aa, st, &b)
+    when :nw, :south; try_rmove(-1, -1, aa, st, &b)
+    when :se, :east; try_rmove(1, 1, aa, st, &b)
+    when :sw, :west; try_rmove(-1, 1, aa, st, &b)
     when :debug_print_state; p st; yield st
     when Array
       case pat[0]
-      when :rmove; _, dir = pat; try_rmove(dir, aa, st, &b)
+      when :rmove; _, dx, dy = pat; try_rmove(dx, dy, aa, st, &b)
       when :lit; _, val = pat; try_lit(val, aa, st, &b)
       when :regexp; _, re = pat; try_regexp(re, aa, st, &b)
       when :cat; _, *ps = pat; try_cat(ps, aa, st, &b)
@@ -123,24 +127,31 @@ module Tb::Pathfinder
       when :pop_pos; _, n = pat; try_pop_pos(n, aa, st, &b)
       when :update; _, pr = pat; try_update(pr, aa, st, &b)
       when :assert; _, pr = pat; try_assert(pr, aa, st, &b)
-      else raise "unexpected: #{pat.inspect}"
+      else raise ArgumentError, "unexpected: #{pat.inspect}"
       end
     else
-      raise TypeError, "unexpected pattern: #{pat.inspect}"
+      raise ArgumentError, "unexpected pattern: #{pat.inspect}"
     end
   end
 
-  def try_rmove(dir, aa, st)
-    x, y = st.fetch(:pos)
-    case dir
-    when :east then x += 1
-    when :west then x -= 1
-    when :north then y -= 1
-    when :south then y += 1
-    end
-    if 0 <= y && y < aa.length &&
-       0 <= x && x < aa[y].length
-      lambda { yield st.merge(:pos => [x,y]) }
+  def try_rmove(dx, dy, aa, st)
+    # Basically, try_rmove restricts movement inside of _aa_ to avoid
+    # unintentional infinite loop such as [:rep, :e].
+    #
+    # However try_rmove permits movement to/from outside of _aa_.
+    # It don't permit between two position outside of _aa_, though.
+    # This make match [:rep, "a", :e] to %w[a a a] with three "a"s. 
+    # If try_rmove don't permit movement to outside of _aa_,
+    # the last movement is forbidden.
+    #
+    x1, y1 = st.fetch(:pos)
+    x2 = x1 + dx
+    y2 = y1 + dy
+    if (0 <= y1 && y1 < aa.length &&
+        0 <= x1 && x1 < aa[y1].length) ||
+       (0 <= y2 && y2 < aa.length &&
+        0 <= x2 && x2 < aa[y2].length)
+      lambda { yield st.merge(:pos => [x2,y2]) }
     else
       nil
     end
@@ -406,7 +417,7 @@ module Tb::Pathfinder
   end
 end
 
-module Tb::Pathfinder::EmptyState
+module Tb::Search::EmptyState
   module_function
 
   def empty?
@@ -416,13 +427,18 @@ module Tb::Pathfinder::EmptyState
   def each
   end
 
+  def to_h
+    {}
+  end
+
   def fetch(k, *rest)
     if block_given?
       yield k
     elsif !rest.empty?
       return rest[0]
     else
-      raise KeyError, "key not found: #{k}"
+      exc = defined?(KeyError) ? KeyError : IndexError # 1.9 v.s. 1.8
+      raise exc, "key not found: #{k}"
     end
   end
 
@@ -441,7 +457,7 @@ module Tb::Pathfinder::EmptyState
   def merge(h)
     pairs = self
     h.reverse_each {|k, v|
-      pairs = Tb::Pathfinder::State.new(k, v, pairs)
+      pairs = Tb::Search::State.new(k, v, pairs)
     }
     pairs
   end
@@ -451,11 +467,15 @@ module Tb::Pathfinder::EmptyState
   end
 
   def inspect
-    "\#<Tb::Pathfinder::EmptyState>"
+    "\#<Tb::Search::EmptyState>"
   end
 end
 
-class Tb::Pathfinder::State
+class Tb::Search::State
+  def self.make(hash)
+    Tb::Search::EmptyState.merge(hash)
+  end
+
   def initialize(key, val, tail=nil)
     @key = key
     @val = val
@@ -476,6 +496,21 @@ class Tb::Pathfinder::State
     nil
   end
 
+  def to_h
+    res = {}
+    each {|k, v|
+      if !res.include? k
+        res[k] = v
+      end
+    }
+    res
+  end
+
+  def ==(other)
+    other.kind_of?(Tb::Search::State) &&
+    self.to_h == other.to_h
+  end
+
   def fetch(k, *rest)
     pairs = self
     while !pairs.empty?
@@ -487,7 +522,8 @@ class Tb::Pathfinder::State
     elsif !rest.empty?
       return rest[0]
     else
-      raise KeyError, "key not found: #{k}"
+      exc = defined?(KeyError) ? KeyError : IndexError # 1.9 v.s. 1.8
+      raise exc, "key not found: #{k}"
     end
   end
 
@@ -529,10 +565,10 @@ class Tb::Pathfinder::State
     end
     (needs_copy-1).downto(0) {|i|
       pairs = ary[i]
-      result = Tb::Pathfinder::State.new(pairs.key, pairs.val, result)
+      result = Tb::Search::State.new(pairs.key, pairs.val, result)
     }
     h.reverse_each {|k, v|
-      result = Tb::Pathfinder::State.new(k, v, result)
+      result = Tb::Search::State.new(k, v, result)
     }
     result
   end
@@ -546,15 +582,14 @@ class Tb::Pathfinder::State
       end
       pairs = pairs.tail
     end
-    result = Tb::Pathfinder::EmptyState
-    ary.reverse_each {|pairs|
-      result = Tb::Pathfinder::State.new(pairs.key, pairs.val, result)
+    result = Tb::Search::EmptyState
+    ary.reverse_each {|pairs2|
+      result = Tb::Search::State.new(pairs2.key, pairs2.val, result)
     }
     result
   end
 
   def inspect
-    h = {}
     pairs = self
     str = ''
     while !pairs.empty?