summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-29 02:23:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-29 02:23:13 +0000
commitfbf7e8ca5cdf48372bc513552da9f5c6eb441a46 (patch)
tree8148f6b466ec855894ceff548032b09145073242
parentb3e55118aaa90bfbc9c33c42e6d02e24dd7c2b1d (diff)
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y1
-rw-r--r--version.h6
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ad622dfd22..ed6f8869a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 29 11:23:09 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]
+
Tue Jun 26 16:35:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
diff --git a/parse.y b/parse.y
index 0f458f994f..ef709425cb 100644
--- a/parse.y
+++ b/parse.y
@@ -2143,6 +2143,7 @@ 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 823242d0bf..e8ae237b20 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-06-26"
+#define RUBY_RELEASE_DATE "2007-06-29"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070626
+#define RUBY_RELEASE_CODE 20070629
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 29
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];