summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 19:38:55 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 19:38:55 +0000
commit38cfb362f07cee77ba4ac9c61c42dbcdada77961 (patch)
treeffef092a174121f2d544daab444b95d5affbf462
parente8bf23e206835fb73bd88336cbfa00a65448ce2e (diff)
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--parse.y1
-rw-r--r--version.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2093d964782..c1973f73cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 16 04:38:39 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]
+
Thu Aug 16 04:36:41 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 c08cfe5b249..64afb9b74ff 100644
--- a/parse.y
+++ b/parse.y
@@ -4355,6 +4355,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 3a4d453a74a..3a06c0cd814 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 62
+#define RUBY_PATCHLEVEL 63
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8