From f132f2705ded61b6b76ed829351c7f24ed0640e5 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 4 Mar 2005 10:39:46 +0000
Subject: * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace  
 also locally defined modules.

* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.

* ext/strscan/strscan.c: moved misplaced rdoc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/strscan/strscan.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'ext/strscan')

diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 81d3d84b9b..17ec3a8f81 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -269,7 +269,8 @@ strscan_terminate(self)
 }
 
 /*
- * Returns the string being scanned.
+ * Equivalent to #terminate.
+ * This method is obsolete; use #terminate instead.
  */
 static VALUE
 strscan_clear(self)
@@ -279,6 +280,9 @@ strscan_clear(self)
     return strscan_terminate(self);
 }
 
+/*
+ * Returns the string being scanned.
+ */
 static VALUE
 strscan_get_string(self)
     VALUE self;
@@ -719,6 +723,10 @@ strscan_get_byte(self)
                             p->prev + p->regs.end[0]);
 }
 
+/*
+ * Equivalent to #get_byte.
+ * This method is obsolete; use #get_byte instead.
+ */
 static VALUE
 strscan_getbyte(self)
     VALUE self;
@@ -756,6 +764,18 @@ strscan_peek(self, vlen)
     return extract_beg_len(p, p->curr, len);
 }
 
+/*
+ * Equivalent to #peek.
+ * This method is obsolete; use #peek instead.
+ */
+static VALUE
+strscan_peep(self, vlen)
+    VALUE self, vlen;
+{
+    rb_warning("StringScanner#peep is obsolete; use #peek instead");
+    return strscan_peek(self, vlen);
+}
+
 /*
  * Set the scan pointer to the previous position.  Only one previous position is
  * remembered, and it changes with each scanning operation.
@@ -767,14 +787,6 @@ strscan_peek(self, vlen)
  *   s.scan(/\d/)         # => nil
  *   s.unscan             # ScanError: can't unscan: prev match had failed
  */
-static VALUE
-strscan_peep(self, vlen)
-    VALUE self, vlen;
-{
-    rb_warning("StringScanner#peep is obsolete; use #peek instead");
-    return strscan_peek(self, vlen);
-}
-
 static VALUE
 strscan_unscan(self)
     VALUE self;
-- 
cgit v1.2.3