* ext/strscan/strscan.c: sync with HEAD (rev 1.25).

* ext/strscan/strscan.c (strscan_do_scan): StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 71 insertions, 0 deletions

diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
index 72961efd68..5b0fd53c75 100644
--- a/test/strscan/test_stringscanner.rb
+++ b/test/strscan/test_stringscanner.rb
@@ -45,6 +45,44 @@ class TestStringScanner < Test::Unit::TestCase
     }
   end
 
+  def test_dup
+    s = StringScanner.new('test string')
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+
+    s = StringScanner.new('test string')
+    s.scan(/test/)
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+
+    s = StringScanner.new('test string')
+    s.scan(/test/)
+    s.scan(/NOT MATCH/)
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+
+    s = StringScanner.new('test string')
+    s.terminate
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+  end
+
   def test_const_Version
     assert_instance_of String, StringScanner::Version
     assert_equal true, StringScanner::Version.frozen?
@@ -204,6 +242,11 @@ class TestStringScanner < Test::Unit::TestCase
     s.string.replace ''
     # unspecified: assert_equal 2, s.pos
     assert_equal nil, s.scan(/test/)
+
+    # [ruby-bugs:4361]
+    s = StringScanner.new("")
+    assert_equal "", s.scan(//)
+    assert_equal "", s.scan(//)
   end
 
   def test_skip
@@ -221,6 +264,11 @@ class TestStringScanner < Test::Unit::TestCase
     s.scan(/te/)
     s.string.replace ''
     assert_equal nil, s.skip(/./)
+
+    # [ruby-bugs:4361]
+    s = StringScanner.new("")
+    assert_equal 0, s.skip(//)
+    assert_equal 0, s.skip(//)
   end
 
   def test_getch
@@ -484,4 +532,27 @@ class TestStringScanner < Test::Unit::TestCase
     s.reset
     assert_equal 0, s.pos
   end
+
+  def test_matched_size
+    s = StringScanner.new('test string')
+    assert_nil s.matched_size
+    s.scan(/test/)
+    assert_equal 4, s.matched_size
+    assert_equal 4, s.matched_size
+    s.scan(//)
+    assert_equal 0, s.matched_size
+    s.scan(/x/)
+    assert_nil s.matched_size
+    assert_nil s.matched_size
+    s.terminate
+    assert_nil s.matched_size
+
+    # obsolete
+    s = StringScanner.new('test string')
+    assert_nil s.matchedsize
+    s.scan(/test/)
+    assert_equal 4, s.matched_size
+    s.terminate
+    assert_nil s.matched_size
+  end
 end