summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-17 07:35:39 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-17 07:35:39 +0000
commitf9ea2d5ea2abbd64f77e474a2d2bb3d17710655e (patch)
treea9904a6d84ae737dbe772b6907de51fb0ab92a42
parent15d582a5f74e708b85783b94c44c780ceb58258e (diff)
downloadruby-f9ea2d5ea2abbd64f77e474a2d2bb3d17710655e.tar.gz
ruby-f9ea2d5ea2abbd64f77e474a2d2bb3d17710655e.tar.xz
ruby-f9ea2d5ea2abbd64f77e474a2d2bb3d17710655e.zip
* parse.y (parser_yylex): fix token even after trailing under score.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dd3c1f767..07b188317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 17 16:34:27 2009 Tanaka Akira <akr@fsij.org>
+
+ * parse.y (parser_yylex): fix token even after trailing under score.
+
Sat Oct 17 11:27:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* vm_method.c (basic_obj_respond_to): call #respond_to_missing?
diff --git a/parse.y b/parse.y
index ceaeed29a..507ff06a4 100644
--- a/parse.y
+++ b/parse.y
@@ -7062,13 +7062,13 @@ parser_yylex(struct parser_params *parser)
decode_num:
pushback(c);
- tokfix();
if (nondigit) {
char tmp[30];
trailing_uc:
snprintf(tmp, sizeof(tmp), "trailing `%c' in number", nondigit);
yyerror(tmp);
}
+ tokfix();
if (is_float) {
double d = strtod(tok(), 0);
if (errno == ERANGE) {