3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8db08652a9..e3da1f9809 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 22 09:40:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yylex): return non-valid token for an invalid
+	  instance/class variable name.  a patch from from Yusuke ENDOH
+	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
+
 Wed Aug 22 09:39:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
diff --git a/parse.y b/parse.y
index fcb888f71e..7aa04c8837 100644
--- a/parse.y
+++ b/parse.y
@@ -4350,6 +4350,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 234dae2ac1..05510e84ec 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 51
+#define RUBY_PATCHLEVEL 52
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8