re_expand 0.0.4 → 0.0.6

data/Manifest.txt

@@ -6,14 +6,12 @@ Rakefile
 lib/re_expand.rb
 lib/Generator.rb
 lib/Node.rb
-lib/Asearch.rb
 lib/Scanner.rb
 script/console
 script/destroy
 script/generate
 test/test_helper.rb
 test/test_re_expand.rb
-test/test_asearch.rb
 test/test_generator.rb
 test/test_re_expand.rb
 test/test_scanner.rb

data/Rakefile

@@ -14,6 +14,7 @@ $hoe = Hoe.spec 're_expand' do
   self.developer 'Toshiyuki Masui', 'masui@pitecan.com'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
+  self.extra_deps           = [['asearch','>= 0.0.1']]
   # self.extra_deps         = [['activesupport','>= 2.0.2']]
 
 end

data/lib/Generator.rb

@@ -15,7 +15,8 @@
 
 require 'Scanner'
 require 'Node'
-require 'Asearch'
+
+require 'asearch'
 
 module ReExpand
   class GenNode

data/lib/re_expand.rb

@@ -3,14 +3,15 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module ReExpand
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end
 
 require 'Generator'
 require 'Node'
-require 'Asearch'
 require 'Scanner'
 
+# require 'asearch'
+
 class String
   # ExpandHelp用のライブラリを利用
   def expand(filterpat=' ')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: re_expand
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Toshiyuki Masui
@@ -15,12 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 Z
+date: 2012-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: asearch
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,11 +47,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: newgem
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +63,11 @@ dependencies:
         - 3
         version: 1.5.3
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,7 +78,7 @@ dependencies:
         - 12
         version: "2.12"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: |-
   Generates all the text strings which match the given regexp.
   If a filter pattern is given, the output is filtered by the pattern.
@@ -85,14 +101,12 @@ files:
 - lib/re_expand.rb
 - lib/Generator.rb
 - lib/Node.rb
-- lib/Asearch.rb
 - lib/Scanner.rb
 - script/console
 - script/destroy
 - script/generate
 - test/test_helper.rb
 - test/test_re_expand.rb
-- test/test_asearch.rb
 - test/test_generator.rb
 - test/test_scanner.rb
 - .gemtest
@@ -131,7 +145,6 @@ signing_key:
 specification_version: 3
 summary: Generates all the text strings which match the given regexp
 test_files: 
-- test/test_asearch.rb
 - test/test_generator.rb
 - test/test_helper.rb
 - test/test_re_expand.rb

data/lib/Asearch.rb

@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-# Asearch.rb
-#
-# Created by Toshiyuki Masui on 11/04/16.
-# Copyright 2011 Pitecan Systems. All rights reserved.
-#
-#   a = Asearch.new('abcde')
-#   a.match('abcde') => true
-#   a.match('abXcde',1) => true
-#
-#   a = Asearch.new('abcde')
-#   initstate = a.initstate
-#   laststate = a.state(initstate,'abcde')
-#   laststate[0] & a.acceptpat => non-zero value
-#
-
-class Asearch
-  INITPAT = 0x80000000
-  MAXCHAR = 0x100
-
-  def isupper(c)
-    c >= 0x41 && c <= 0x5a
-  end
-
-  def islower(c)
-    c >= 0x61 && c <= 0x7a
-  end
-
-  def tolower(c)
-    c + 0x20
-  end
-
-  def toupper(c)
-    c - 0x20
-  end
-
-  def initialize(pat)
-    @shiftpat = []
-    @epsilon = 0
-    @acceptpat = 0
-    mask = INITPAT
-    (0...MAXCHAR).each { |c|
-      @shiftpat[c] = 0
-    }
-    chars = pat.unpack("C*")
-    chars.each { |c|
-      if c == 0x20 then
-        @epsilon |= mask
-      else
-        @shiftpat[c] |= mask
-        @shiftpat[toupper(c)] |= mask if islower(c) 
-        @shiftpat[tolower(c)] |= mask if isupper(c)
-        mask >>= 1
-      end
-    }
-    @acceptpat = mask
-  end
-
-  attr_reader :acceptpat
-
-def bin(val)
-  s = "00000000000000000000000000000000000000000" + sprintf("%b",val)
-  s[-32,100]
-end
-
-  #
-  # 状態stateからテキストstrを認識したときの状態変化
-  #
-  def state(state=nil,str='')
-    if state.nil? then
-      state = initstate
-    end
-    i0 = state[0]
-    i1 = state[1]
-    i2 = state[2]
-    i3 = state[3]
-    chars = str.unpack("C*")
-    chars.each { |c|
-      mask = @shiftpat[c]
-      i3 = (i3 & @epsilon) | ((i3 & mask) >> 1) | (i2 >> 1) | i2
-      i2 = (i2 & @epsilon) | ((i2 & mask) >> 1) | (i1 >> 1) | i1
-      i1 = (i1 & @epsilon) | ((i1 & mask) >> 1) | (i0 >> 1) | i0
-      i0 = (i0 & @epsilon) | ((i0 & mask) >> 1)
-      i1 |= (i0 >> 1)
-      i2 |= (i1 >> 1)
-      i3 |= (i2 >> 1)
-    }
-#puts bin(i3)
-#puts bin(i2)
-#puts bin(i1)
-#puts bin(i0)
-#puts bin(acceptpat | INITPAT)
-    [i0, i1, i2, i3]
-  end
-
-  def initstate
-    [INITPAT, 0, 0, 0]
-  end
-
-  def match(str, ambig=0)
-    s = state(initstate,str)
-    s[ambig] & acceptpat != 0
-  end
-end
-

data/test/test_asearch.rb

@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'Asearch'
-
-class AsearchTest < Test::Unit::TestCase
-  def setup
-  end
-  
-  def teardown
-  end
-
-  def test_init
-    a = Asearch.new('abc')
-    state = a.initstate
-    assert state[0] != 0
-    assert state[1] == 0
-    assert state[2] == 0
-  end
-
-  def test_match
-    #
-    # 状態を利用せず普通にマッチングを行なうメソッド
-    #
-    a = Asearch.new('abcde')
-    assert a.match('abcde')
-    assert a.match('abcde',1)
-    assert !a.match('abcd')
-    assert a.match('abcd',1)
-  end
-
-  def test_state
-    #
-    # "abcde"にマッチするかテスト
-    #
-    a = Asearch.new('abcde')
-    initstate = a.initstate
-    laststate = a.state(initstate,'abcde')
-    assert((laststate[0] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'abcdf')   # 1文字置換
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) != 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'abde')    # 1文字欠損
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) != 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'abcfg')   # 2文字置換
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) == 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'abe')     # 2文字欠損
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) == 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'axbcde')  # 1文字追加
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) != 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'axbcyde') # 2文字追加
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) == 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'ABCDF')   # 大文字
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) != 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-
-    #
-    # ワイルドカード
-    #
-    a = Asearch.new(' abc def')
-    initstate = a.initstate
-    laststate = a.state(initstate,'abcdef')
-    assert((laststate[0] & a.acceptpat) != 0)
-    initstate = a.initstate
-    laststate = a.state(initstate,'abcXXXXdef')
-    assert((laststate[0] & a.acceptpat) != 0)
-    initstate = a.initstate
-    laststate = a.state(initstate,'abcXXXXYYY')
-    assert((laststate[0] & a.acceptpat) == 0)
-    initstate = a.initstate
-    laststate = a.state(initstate,'abcXXXXde')
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) != 0)
-    assert((laststate[2] & a.acceptpat) != 0)
-    initstate = a.initstate
-    laststate = a.state(initstate,'ZZZZZabcdef')
-    assert((laststate[0] & a.acceptpat) != 0)
-
-    #
-    # 漢字
-    #
-    a = Asearch.new('漢字文字列')
-    initstate = a.initstate
-    laststate = a.state(initstate,'漢字文字列')
-    assert((laststate[0] & a.acceptpat) != 0)
-    laststate = a.state(initstate,'漢字文字')
-    assert((laststate[0] & a.acceptpat) == 0)
-    laststate = a.state(initstate,'漢字!文字列')
-    assert((laststate[0] & a.acceptpat) == 0)
-    assert((laststate[1] & a.acceptpat) != 0)
-  end
-  
-end
-