summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-02 06:51:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-02 06:51:53 +0000
commit01ff66004f2edd6e792bb5c535e5567b71a8b5eb (patch)
tree051c5e82fd12337a37c3031cbfc3222dc8e07e84
parent0dc9fb7474fe95dd9993653849798c9533ac0c30 (diff)
downloadruby-01ff66004f2edd6e792bb5c535e5567b71a8b5eb.tar.gz
ruby-01ff66004f2edd6e792bb5c535e5567b71a8b5eb.tar.xz
ruby-01ff66004f2edd6e792bb5c535e5567b71a8b5eb.zip
* parse.y (yylex): 8 and 9 in octal integer should cause compile
error. [ruby-dev:35729] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bad90e7f..ade513c3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 2 15:51:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (yylex): 8 and 9 in octal integer should cause compile
+ error. [ruby-dev:35729]
+
Sat Aug 2 01:06:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
* enc/trans/japanese.c: add U+FF5E to EUC-JP.
diff --git a/parse.y b/parse.y
index 6abc2da09..546c08b48 100644
--- a/parse.y
+++ b/parse.y
@@ -6656,7 +6656,8 @@ parser_yylex(struct parser_params *parser)
nondigit = c;
continue;
}
- if (c < '0' || c > '7') break;
+ if (c < '0' || c > '9') break;
+ if (c > '7') goto invalid_octal;
nondigit = 0;
tokadd(c);
} while ((c = nextc()) != -1);
@@ -6673,6 +6674,7 @@ parser_yylex(struct parser_params *parser)
}
}
if (c > '7' && c <= '9') {
+ invalid_octal:
yyerror("Invalid octal digit");
}
else if (c == '.' || c == 'e' || c == 'E') {