3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8492394873..2093d96478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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 d1466e77ca..c08cfe5b24 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 e1222098c3..3a4d453a74 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 61
+#define RUBY_PATCHLEVEL 62
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8