matz	2009-06-17 13:57:11 +0900 (Wed, 17 Jun 2009)

  New Revision: 23721

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23721

  Log:
    * ext/strscan/strscan.c (Init_strscan): remove obsolete
      matchedsize method, use matched_size instead.  [ruby-dev:38591]

  Modified files:
    trunk/ChangeLog
    trunk/ext/strscan/strscan.c
    trunk/test/strscan/test_stringscanner.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23720)
+++ ChangeLog	(revision 23721)
@@ -1,3 +1,8 @@
+Wed Jun 17 13:54:18 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on
Index: ext/strscan/strscan.c
===================================================================
--- ext/strscan/strscan.c	(revision 23720)
+++ ext/strscan/strscan.c	(revision 23721)
@@ -931,17 +931,6 @@
 }
 
 /*
- * 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 @@
     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);
Index: test/strscan/test_stringscanner.rb
===================================================================
--- test/strscan/test_stringscanner.rb	(revision 23720)
+++ test/strscan/test_stringscanner.rb	(revision 23721)
@@ -528,9 +528,8 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/