aboutsummaryrefslogtreecommitdiffstats
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
commitcf46a2fce6758d7ba2b9a5615249fde9af6015ea (patch)
tree340815f2fcf44bc770b805398b064bf5e03041fa
parentbaaa30ec03195e4d6fc6c2d144f8224f250d58f2 (diff)
downloadruby-cf46a2fce6758d7ba2b9a5615249fde9af6015ea.tar.gz
* 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/trunk@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 d111444349..2d6addca06 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]
+
Thu Jun 28 23:29:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (assoc_list): odd number check only for NODE_ARRAY.
diff --git a/parse.y b/parse.y
index b6a3fc3388..51c1b792c5 100644
--- a/parse.y
+++ b/parse.y
@@ -3829,6 +3829,7 @@ dsym : tSYMBEG xstring_contents tSTRING_END
/*%%%*/
lex_state = EXPR_ENDARG;
if (!($$ = $2)) {
+ $$ = NEW_NIL();
yyerror("empty symbol literal");
}
else {
diff --git a/version.h b/version.h
index 18caba8f07..ae13fd5fad 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-06-28"
+#define RUBY_RELEASE_DATE "2007-06-29"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070628
+#define RUBY_RELEASE_CODE 20070629
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];