aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortakano32 <takano32@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-16 07:14:48 +0000
committertakano32 <takano32@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-16 07:14:48 +0000
commitbc4c51eccea7d6d549bcf2874182022043974971 (patch)
tree68f46791f62688bf389169bcca35556c15411b5c
parent6f1edacc010c48c5762598fed74ff4f1e62d1b20 (diff)
downloadruby-bc4c51eccea7d6d549bcf2874182022043974971.tar.gz
Tue Jun 16 16:09:59 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
* parse.y (parser_read_escape, parser_tokadd_escape): replace scan_oct as ruby_scan_oct. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 16ac00296b..e4e78495b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 16 16:09:59 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
+
+ * parse.y (parser_read_escape, parser_tokadd_escape):
+ replace scan_oct as ruby_scan_oct.
+
Tue Jun 16 06:40:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (fptr_finalize): should close stdin/stdout/stderr when
diff --git a/parse.y b/parse.y
index 636f51f5e9..1b1636ea43 100644
--- a/parse.y
+++ b/parse.y
@@ -5437,7 +5437,7 @@ parser_read_escape(struct parser_params *parser, int flags,
case '4': case '5': case '6': case '7':
if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
pushback(c);
- c = scan_oct(lex_p, 3, &numlen);
+ c = ruby_scan_oct(lex_p, 3, &numlen);
lex_p += numlen;
return c;
@@ -5515,7 +5515,7 @@ parser_tokadd_escape(struct parser_params *parser, rb_encoding **encp)
case '4': case '5': case '6': case '7':
if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
{
- scan_oct(--lex_p, 3, &numlen);
+ ruby_scan_oct(--lex_p, 3, &numlen);
if (numlen == 0) goto eof;
lex_p += numlen;
tokcopy((int)numlen + 1);