From 2ef382231fffd049fce83d742c26084ac8bb959c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 26 Aug 2009 23:16:40 +0000 Subject: * 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/trunk@24679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/strscan/strscan.c | 3 +-- test/strscan/test_stringscanner.rb | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a116e86d82..8e91bdb326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 27 08:16:34 2009 Nobuyoshi Nakada + + * 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]. + Thu Aug 27 02:06:11 2009 NARUSE, Yui * Makefile.in (enc/unicode/name2ctype.kwd): diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index e843e547fb..490689b3d2 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -321,8 +321,7 @@ strscan_set_string(VALUE self, VALUE str) Data_Get_Struct(self, struct strscanner, p); StringValue(str); - p->str = rb_str_dup(str); - rb_obj_freeze(p->str); + p->str = str; p->curr = 0; CLEAR_MATCH_STATUS(p); return str; diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb index f2feb6d9ae..ec6c6994ce 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 -- cgit v1.2.3