diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/strscan/strscan.c | 3 | ||||
| -rw-r--r-- | test/strscan/test_stringscanner.rb | 20 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 29 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Thu Aug 27 08:16:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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]. + Wed Aug 26 12:36:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm.c (collect_local_variables_in_env): skips internal variables. diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index 6b0d8e7c52..a6b012ceb0 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 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 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 304 +#define RUBY_PATCHLEVEL 305 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |