From 0ba42821dd51693bf0968c3cc44489c3bed317b4 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Jun 2007 15:17:02 +0000 Subject: * parse.y (parser_yylex): return non-valid token for an invalid instance/class variable name. a patch from from Yusuke ENDOH . [ruby-dev:31095] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ parse.y | 1 + version.h | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed6f8869a2..545e765443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 30 00:17:00 2007 Nobuyoshi Nakada + + * parse.y (yylex): return non-valid token for an invalid + instance/class variable name. a patch from from Yusuke ENDOH + . [ruby-dev:31095] + Fri Jun 29 11:23:09 2007 Nobuyoshi Nakada * parse.y (dsym): return non-null NODE even if yyerror(). based on a diff --git a/parse.y b/parse.y index ef709425cb..157aefc939 100644 --- a/parse.y +++ b/parse.y @@ -4351,6 +4351,7 @@ yylex() else { rb_compile_error("`@@%c' is not allowed as a class variable name", c); } + return 0; } if (!is_identchar(c)) { pushback(c); diff --git a/version.h b/version.h index e8ae237b20..9ec9ef5d4d 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-06-29" +#define RUBY_RELEASE_DATE "2007-06-30" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070629 +#define RUBY_RELEASE_CODE 20070630 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3