diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/strscan/strscan.c | 12 | ||||
| -rw-r--r-- | test/strscan/test_stringscanner.rb | 3 |
3 files changed, 6 insertions, 14 deletions
@@ -1,3 +1,8 @@ +Wed Jun 17 13:54:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/strscan/strscan.c (Init_strscan): remove obsolete + matchedsize method, use matched_size instead. [ruby-dev:38591] + Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index 6b0d8e7c52..e843e547fb 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -931,17 +931,6 @@ strscan_matched_size(VALUE self) } /* - * Equivalent to #matched_size. - * This method is obsolete; use #matched_size instead. - */ -static VALUE -strscan_matchedsize(VALUE self) -{ - rb_warning("StringScanner#matchedsize is obsolete; use #matched_size instead"); - return strscan_matched_size(self); -} - -/* * call-seq: [](n) * * Return the n-th subgroup in the most recent match. @@ -1317,7 +1306,6 @@ Init_strscan() rb_define_method(StringScanner, "matched?", strscan_matched_p, 0); rb_define_method(StringScanner, "matched", strscan_matched, 0); rb_define_method(StringScanner, "matched_size", strscan_matched_size, 0); - rb_define_method(StringScanner, "matchedsize", strscan_matchedsize, 0); rb_define_method(StringScanner, "[]", strscan_aref, 1); rb_define_method(StringScanner, "pre_match", strscan_pre_match, 0); rb_define_method(StringScanner, "post_match", strscan_post_match, 0); diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb index 151e8928a4..f2feb6d9ae 100644 --- a/test/strscan/test_stringscanner.rb +++ b/test/strscan/test_stringscanner.rb @@ -528,9 +528,8 @@ class TestStringScanner < Test::Unit::TestCase s.terminate assert_nil s.matched_size - # obsolete s = StringScanner.new('test string') - assert_nil s.matchedsize + assert_nil s.matched_size s.scan(/test/) assert_equal 4, s.matched_size s.terminate |