summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:15 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:15 (GMT)
commit8e5359c36366f51d4570957f5fa06f2e30c5f55d (patch)
tree4934de5dcb2905a2784f549a1142d1c86ec27ac5
parent234ed34a8295fc8c1011e690bcac63667344df9c (diff)
parentf9c877d797660e8d3006f19cd08bf47d67100c0a (diff)
sorry. I made wrong tags.v1_8_5_62
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_62@13002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--parse.y1
-rw-r--r--version.h2
3 files changed, 1 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c1973f7..2093d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-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 64afb9b..c08cfe5 100644
--- a/parse.y
+++ b/parse.y
@@ -4355,7 +4355,6 @@ 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 3a06c0c..3a4d453 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 63
+#define RUBY_PATCHLEVEL 62
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8