re_expand 0.0.3 → 0.0.4

data/README.rdoc

@@ -10,7 +10,7 @@ If a filter pattern is given, the output is filtered by the pattern.
 == SYNOPSIS:
 
   require 're_expand'
-  "test (a|b|c)".expand { |s|
+  "test (a|b|c)".expand { |s,a|
    puts s
   }
   # "test a",  "test b", ...

data/lib/Generator.rb

@@ -26,12 +26,7 @@ module ReExpand
       @accept = accept
       @state = state
     end
-    
-    attr :id, true
-    attr :s, true
-    attr :substrings, true
-    attr :accept, true
-    attr :state, true
+    attr_accessor :id,:s,:substrings,:accept,:state
   end
   
   class Generator
@@ -194,8 +189,14 @@ module ReExpand
       elsif t =~ /^[\+]$/ then
         endnode.addTrans('',startnode)
       elsif t =~ /^[\*]$/ then
+        n = Node.new
         startnode.addTrans('',endnode)
-        endnode.addTrans('',startnode)
+        endnode.addTrans('',n)
+        n.addTrans('',startnode)
+
+        # ループがあるとマズいのか? 上のように修正すると動くようなのだが
+        #startnode.addTrans('',endnode)
+        #endnode.addTrans('',startnode)
       else
         s.ungettoken
       end

data/lib/Node.rb

@@ -46,8 +46,7 @@ module ReExpand
     
     attr_reader :id
     attr_reader :trans
-    attr :accept, true
-    attr :pars, true
+    attr_accessor :accept,:pars
     
     def addTrans(pat,dest)
       t = Trans.new(pat,dest)

data/lib/Scanner.rb

@@ -2,8 +2,8 @@
 #
 # 文字列から1トークンずつ取得
 #
+$KCODE = 'utf8' if RUBY_VERSION < "1.9"
 
-$KCODE = 'utf8'
 
 module ReExpand
   class Scanner
@@ -26,7 +26,7 @@ module ReExpand
         return ''
       end
       @t = @a[@p]
-      if @t =~ /^[\(\|\)\*\?\[\]]$/ then
+      if @t =~ /^[\(\|\)\*\+\?\[\]]$/ then
         @p += 1
         return @t
       elsif @t == '\\' then

data/lib/re_expand.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module ReExpand
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
 require 'Generator'
@@ -39,7 +39,7 @@ class String
     end
 
     if block_given? then
-      matched.collect { |m|
+      matched.each { |m|
         yield m[0], m[1].split(/\t/)
       }
     else

data/test/test_scanner.rb

@@ -9,13 +9,27 @@ module ReExpand
     end
     
     def test_1
-      s = Scanner.new('abc*def')
-      assert_equal s.gettoken, 'abc'
+      s = Scanner.new('a*d')
+      assert_equal s.gettoken, 'a'
       assert_equal s.gettoken, '*'
-      assert_equal s.gettoken, 'def'
+      assert_equal s.gettoken, 'd'
     end
     
     def test_2
+      s = Scanner.new('a+d')
+      assert_equal s.gettoken, 'a'
+      assert_equal s.gettoken, '+'
+      assert_equal s.gettoken, 'd'
+    end
+    
+    def test_3
+      s = Scanner.new('ab*cd')
+      assert_equal s.gettoken, 'ab'
+      assert_equal s.gettoken, '*'
+      assert_equal s.gettoken, 'cd'
+    end
+    
+    def test_4
       s = Scanner.new("(a\tb|c\td)")
       assert_equal s.gettoken, "("
       assert_equal s.gettoken, "a\tb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: re_expand
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Toshiyuki Masui
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc