diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-04 10:39:46 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-04 10:39:46 +0000 |
commit | f132f2705ded61b6b76ed829351c7f24ed0640e5 (patch) | |
tree | 8e2b713a9ee418650b4be0b4a33114ffaff7f2a8 /ext/strscan | |
parent | d43b7e03ef4295fd28f3080ff57f2b1ced60d5a1 (diff) |
* 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
Diffstat (limited to 'ext/strscan')
-rw-r--r-- | ext/strscan/strscan.c | 30 |
1 files changed, 21 insertions, 9 deletions
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; @@ -757,6 +765,18 @@ strscan_peek(self, vlen) } /* + * 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. * @@ -768,14 +788,6 @@ strscan_peek(self, vlen) * 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; { |