merges r24679 from trunk into ruby_1_9_1.

--
* ext/strscan/strscan.c (strscan_set_string): set string should not be
  dupped or frozen, because freezing it causes #concat method failure,
  and unnecessary to dup without freezing.  a patch from Aaron
  Patterson at [ruby-core:25145].

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

1 files changed, 20 insertions, 0 deletions

diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
index 151e8928a4..862b1f1bb6 100644
--- a/test/strscan/test_stringscanner.rb
+++ b/test/strscan/test_stringscanner.rb
@@ -168,6 +168,26 @@ class TestStringScanner < Test::Unit::TestCase
     assert_equal 0, s.pos
   end
 
+  def test_string_set_is_equal
+    name = 'tenderlove'
+
+    s = StringScanner.new(name)
+    assert_equal name.object_id, s.string.object_id
+
+    s.string = name
+    assert_equal name.object_id, s.string.object_id
+  end
+
+  def test_string_append
+    s = StringScanner.new('tender')
+    s << 'love'
+    assert_equal 'tenderlove', s.string
+
+    s.string = 'tender'
+    s << 'love'
+    assert_equal 'tenderlove', s.string
+  end
+
   def test_pos
     s = StringScanner.new('test string')
     assert_equal 0, s.pos