summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:17 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:17 (GMT)
commit358cf2adf81274bd61e4bbfaa8809e14b82ddd55 (patch)
tree6b316ae4076e230ae97d6cebc2fcf7a4a320761a
parentf9c877d797660e8d3006f19cd08bf47d67100c0a (diff)
parentcda9fb900bc7e26d1b0170c316bca310252e6586 (diff)
sorry. I made wrong tags.v1_8_5_61
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_61@13003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y1
-rw-r--r--version.h2
3 files changed, 1 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2093d96..8492394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-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
- patch from from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:31085]
-
Thu Aug 16 04:34:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (proc_exec_v, rb_proc_exec): preserve errno.
diff --git a/parse.y b/parse.y
index c08cfe5..d1466e7 100644
--- a/parse.y
+++ b/parse.y
@@ -2143,7 +2143,6 @@ dsym : tSYMBEG xstring_contents tSTRING_END
{
lex_state = EXPR_END;
if (!($$ = $2)) {
- $$ = NEW_NIL();
yyerror("empty symbol literal");
}
else {
diff --git a/version.h b/version.h
index 3a4d453..e122209 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 61
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8