From 73a8afe6743dcdb6fadbc03cbef5ff99131bcba2 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 6 Jan 2009 00:03:06 +0000 Subject: merge revision(s) 18318: * parse.y (yylex): 8 and 9 in octal integer should cause compile error. [ruby-dev:35729] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 4 +++- version.h | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9afe0b8d70..bdb047a506 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 6 09:02:14 2009 Nobuyoshi Nakada + + * parse.y (yylex): 8 and 9 in octal integer should cause compile + error. [ruby-dev:35729] + Mon Jan 5 11:12:39 2009 Nobuyoshi Nakada * eval.c (rb_thread_schedule): runs deferred finalizers. diff --git a/parse.y b/parse.y index 0dde920b2b..3377adb9a6 100644 --- a/parse.y +++ b/parse.y @@ -3903,7 +3903,8 @@ yylex() 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); @@ -3920,6 +3921,7 @@ yylex() } } if (c > '7' && c <= '9') { + invalid_octal: yyerror("Illegal octal digit"); } else if (c == '.' || c == 'e' || c == 'E') { diff --git a/version.h b/version.h index ca2d16593c..526e928382 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-05" +#define RUBY_RELEASE_DATE "2009-01-06" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090105 -#define RUBY_PATCHLEVEL 290 +#define RUBY_RELEASE_CODE 20090106 +#define RUBY_PATCHLEVEL 291 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3