From fd3f9eee0e9a37218edf21e1726ff1b5d90792ba Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Jun 2007 15:17:02 +0000 Subject: [PATCH] * 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/trunk@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 09f4bf542f..9561883a14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 30 00:17:00 2007 Nobuyoshi Nakada + + * parse.y (parser_yylex): return non-valid token for an invalid + instance/class variable name. a patch from from Yusuke ENDOH + . [ruby-dev:31095] + Fri Jun 29 23:38:06 2007 Nobuyoshi Nakada * parse.y (stmts): fix for ripper. diff --git a/parse.y b/parse.y index b53166812e..88cb61bdec 100644 --- a/parse.y +++ b/parse.y @@ -6705,6 +6705,7 @@ parser_yylex(struct parser_params *parser) else { rb_compile_error(PARSER_ARG "`@@%c' is not allowed as a class variable name", c); } + return 0; } uc = (unsigned char)c; if (!is_identchar(uc)) { diff --git a/version.h b/version.h index ae13fd5fad..a36134b7e2 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-06-29" +#define RUBY_RELEASE_DATE "2007-06-30" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070629 +#define RUBY_RELEASE_CODE 20070630 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #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[];