From d121a3fb790192ca816d417c32829a36b7a04ae1 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 17 Jun 2009 04:57:11 +0000 Subject: * ext/strscan/strscan.c (Init_strscan): remove obsolete matchedsize method, use matched_size instead. [ruby-dev:38591] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/strscan/strscan.c | 12 ------------ test/strscan/test_stringscanner.rb | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 389c288a11..f2e4055214 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 17 13:54:18 2009 Yukihiro Matsumoto + + * 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 * 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 @@ -930,17 +930,6 @@ strscan_matched_size(VALUE self) return INT2NUM(p->regs.end[0] - p->regs.beg[0]); } -/* - * 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) * @@ -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 -- cgit v1.2.3