match_skeleton 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174be02fe7b1a1d7bc90813667fc844ee63cc5d7
-  data.tar.gz: 07bd14dc31db48d07301f4d4356db6bab79fa69a
+  metadata.gz: 52a61ea103053eb70d87995bab360db6e7557096
+  data.tar.gz: 28407978b5f043b2f180e7166da4b67d005ad64f
 SHA512:
-  metadata.gz: b6ba17d2747741c4ffd8aca55899320185e9db24e7eddb07a08dde73fd5fb955cd6517cdc2ac61c68df6f87fcbfb737aa883e33fabb9dbdaae25e221e34f5115
-  data.tar.gz: 4cceec801deab65b9c925fd93e16fdedc7e44933a95659332a86c58a012545ab9ebe3d87f816e01f8ee22d90ca44423c63be4e70a5c54e28881e80bb516337de
+  metadata.gz: aea87a97397f62d2f4facb609a264c7f5e57720c54fd2d2914d8354566556d4fa7ea88b98fd097d99f93235f518f757be22b06bd9e9762e6779cc21554a74ea7
+  data.tar.gz: bb95f8a27ea564603d1a5f4438253cd11df97c4c6b28000a420ddcba89c0697790e3b7f391aef2fa7d8bc8cf57cd69c305a378a3c4e621577c6053805230291d

data/ChangeLog

@@ -1,6 +1,12 @@
+-----
+(Version: 1.0.2)
+2016-05-19  Masa Sakano
+ * Fixed 2 bugs of (1) values_at (2) nil captures.
+
 -----
 (Version: 1.0.1)
 2016-05-19  Masa Sakano
+
  * Fixed a bug pre_match behaves incorrectly when the match starts at the beginning of the string.
 
 -----

data/lib/match_skeleton.rb

@@ -42,10 +42,6 @@ class MatchSkeleton
     names  = md.names
     ar_off = (0..(md.size-1)).map do |n|
       ar = md.offset(n)
-#if names[0]=='foo'
-#print "DEBUG: ar=#{ar.inspect}\n"
-#printf "DEBUG: n=(%d)range=%s\n", n, (ar.first...ar.last).inspect
-#end
       (ar.first...ar.last)
     end
     @offsets = {}
@@ -53,11 +49,7 @@ class MatchSkeleton
       @offsets[ei] = ev
       ej = ei - 1
       @offsets[names[ej]] = ev if (ej >= 0 && names[ej])
-#print "DEBUG: names=#{names[ei].inspect}\n"
-#p names[ei], ev
-#p md.offset(:foo)
     end
-#printf "DEBUG: offsets=%s\n", @offsets.inspect if !names.empty?
     
 
     @pos_begin = pos_begin
@@ -86,7 +78,9 @@ class MatchSkeleton
     if j
       to_a[i, j]
     elsif defined?(i.to_sym)
-      values_at(i)[0]
+      i = i.to_s
+      raise IndexError, sprintf("undefined group name reference: %s", i) if !names.include?(i)
+      offset2string(i)
     else
       to_a[i]
     end
@@ -190,10 +184,9 @@ class MatchSkeleton
   #
   # @return [Array]
   def to_a
-#print 'DEBUG: '; p @offsets
     indices = @offsets.keys.sort
     indices.delete_if { |i| !defined?(i.divmod) }
-    indices.map { |i| string[@offsets[i]] }
+    indices.map { |i| offset2string(i) }
   end
 
   # The same as {MatchData#to_s}
@@ -208,11 +201,18 @@ class MatchSkeleton
   # @param *rest [Integer, Symbol, String]
   # @return [Array]
   def values_at(*rest)
+    locary = to_a
     rest.map do |i|
-      key = @offsets[i.to_s]
-#    printf "DEBUG(%s): offsets=%s string=%s i=%s key=%s r=%s\n", __method__, @offsets.inspect,string.inspect,i.inspect,key.inspect,(string[key].inspect rescue 'nil') if !names.empty?
-      raise IndexError, sprintf("undefined group name reference: %s", i) if !key
-      string[key]
+      locary[i]
     end
   end
-end
+
+  ######################### private #########################
+
+  private 
+
+  def offset2string(i)
+    k = @offsets[i]
+    (k.first && k.last) ? string[k] : nil
+  end
+end	# class MatchSkeleton

data/test/test_match_skeleton.rb

@@ -9,38 +9,36 @@ arlibdir  = %w(match_skeleton)
 arlibbase = ['']	# match_skeleton.rb is read.
 
 arlibbase.each do |elibbase|
-arlibdir.each do |elibdir|
-
-  arAllPaths = []
-  er=nil
-  pathnow = nil
-  # (['../lib/', 'lib/', ''].map{|i| i+elibbase+'/'} + ['']).each do |dir|
-  ['../lib', 'lib', ''].each do |dirroot|
-    begin
-      s = [dirroot, elibdir, elibbase].join('/').sub(%r@^/@, '').sub(%r@/$@, '')
-      # eg., %w(../lib/rangeary lib/rangeary rangeary)
-      next if s.empty?
-      arAllPaths.push(s)
-      require s
-      pathnow = s
-      break
-    rescue LoadError => er
+  arlibdir.each do |elibdir|
+
+    arAllPaths = []
+    er=nil
+    pathnow = nil
+    ['../lib', 'lib', ''].each do |dirroot|
+      begin
+        # eg., %w(../lib/rangeary lib/rangeary rangeary)
+        s = [dirroot, elibdir, elibbase].join('/').sub(%r@^/@, '').sub(%r@/$@, '')
+        next if s.empty?
+        arAllPaths.push(s)
+        require s
+        pathnow = s
+        break
+      rescue LoadError => er
+      end
+    end	# ['../lib', 'lib', ''].each do |dirroot|
+
+    if pathnow.nil?
+      warn "Warning: All the attempts to load the following files have failed.  Abort..."
+      warn arAllPaths.inspect
+      warn " NOTE: It may be because a require statement in that file failed, rather than requiring the file itself. Check with
+  % ruby -r#{File.basename(elibbase)} -e p
+or maybe add  env RUBYLIB=$RUBYLIB:`pwd`"
+      # p $LOADED_FEATURES.grep(/#{Regexp.quote(File.basename(elibbase)+'.rb')}$/)
+      raise er
+    else
+      arlibrelpath.push pathnow
     end
-  end	# (['../lib/', 'lib/', ''].map{|i| i+elibbase+'/'} + '').each do |dir|
-
-  if pathnow.nil?
-    warn "Warning: All the attempts to load the following files have failed.  Abort..."
-    warn arAllPaths.inspect
-    warn " NOTE: It may be because a require statement in that file failed, 
-rather than requiring the file itself.
- Check with  % ruby -r#{File.basename(elibbase)} -e p
- or maybe add  env RUBYLIB=$RUBYLIB:`pwd`"
-    # p $LOADED_FEATURES.grep(/#{Regexp.quote(File.basename(elibbase)+'.rb')}$/)
-    raise er
-  else
-    arlibrelpath.push pathnow
-  end
-end	# arlibdir.each do |elibdir|
+  end	# arlibdir.each do |elibdir|
 end	# arlibbase.each do |elibbase|
 
 print "NOTE: Library relative paths: "; p arlibrelpath
@@ -206,6 +204,15 @@ class TestMatchSkeleton < Minitest::Test
     assert_equal ["H", "X", "113"], ms1[1..3]
   end
 
+  def test_squarebracket_range_nil
+    s = "efhi"
+    re = /(ef)(g)?(hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1[1..3],         ms1[1..3]
+    assert_equal ["ef", nil, "hi"], ms1[1..3]
+  end
+
   def test_squarebracket_name
     s = "ccaaab"
     md1 = /(?<foo>a+)b/.match(s)	#=> #<MatchData "aaab" foo:"aaa">
@@ -218,6 +225,16 @@ class TestMatchSkeleton < Minitest::Test
     assert_raises(IndexError) { ms1.begin(:naiyo) }
   end
 
+  def test_squarebracket_name_nil01
+    s = "efhi"
+    re = /(?<foo>ef)(?<baa>g)?(?<baz>hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1['foo'], ms1['foo']
+    assert_equal md1['baa'], ms1['baa']
+    assert_equal md1[:baa],  ms1[:baa]
+  end
+
   def test_begin_end_int01
     s ="THX1138."
     md1 = /(.)(.)(\d+)(\d)/.match(s)
@@ -248,6 +265,17 @@ class TestMatchSkeleton < Minitest::Test
     assert_raises(IndexError) { ms1.end(:naiyo) }
   end
 
+  def test_begin_end_nil01
+    s = "efhi"
+    re = /(ef)(g)?(hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1.begin(2), ms1.begin(2)
+    assert_equal nil,          ms1.begin(2)
+    assert_equal md1.end(2),   ms1.end(2)
+    assert_equal nil,          ms1.end(2)
+  end
+
   def test_captures01
     s ="THX1138."
     md1 = /(.)(.)(\d+)(\d)/.match(s)
@@ -262,6 +290,14 @@ class TestMatchSkeleton < Minitest::Test
     assert_equal '8', ms1.captures[3]
   end
 
+  def test_captures_nil01
+    s = "efhi"
+    re = /(ef)(g)?(hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1.captures, ms1.captures
+  end
+
   def test_inspect01
     s ="foo"
     md1 = /.$/.match(s)
@@ -293,6 +329,19 @@ class TestMatchSkeleton < Minitest::Test
     assert_equal [6, 7], ms1.offset(4)
   end
 
+  def test_offset_nil01
+    s = "efhi"
+    re = /(ef)(g)?(hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1.offset(0), ms1.offset(0)
+    assert_equal md1.offset(1), ms1.offset(1)
+    assert_equal [0, 2],        ms1.offset(1)
+    assert_equal md1.offset(2), ms1.offset(2)
+    assert_equal [nil, nil],    ms1.offset(2)	# (nil..nil)==@offsets[2]
+    assert_equal md1.offset(3), ms1.offset(3)
+  end
+
   def test_offset_name01
     s = "hoge"
     md1 = /(?<foo>.)(.)(?<bar>.)/.match(s)
@@ -354,6 +403,15 @@ class TestMatchSkeleton < Minitest::Test
     assert_equal ["HX1138", "H", "X", "113", "8"], ms1.to_a
   end
 
+  def test_to_a_nil01
+    s = "efhi"
+    re = /(ef)(g)?(hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1.to_a, ms1.to_a
+    assert_equal ["efhi", "ef", nil, "hi"], ms1.to_a
+  end
+
   def test_to_s01
     s = "THX1138."
     md1 = /(.)(.)(\d+)(\d)/.match(s)
@@ -364,6 +422,16 @@ class TestMatchSkeleton < Minitest::Test
     assert_equal ms1[0], ms1.to_s
   end
 
+  def test_values_at_nil
+    s = "efhi"
+    re = /(ef)(g)?(hi)/
+    md1 = re.match(s)
+    ms1 = MatchSkeleton.new(md1, s)
+    assert_equal md1.values_at(2,3), ms1.values_at(2,3)
+    assert_equal [nil, "hi"],        ms1.values_at(2,3)
+    assert_equal md1.values_at(2),   ms1.values_at(2)
+    assert_raises(TypeError) { ms1.values_at('foo') }
+  end
 end	# class TestMatchSkeleton < Minitest::Test
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: match_skeleton
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Masa Sakano