* merge -c 11960

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d0ce75c315..b6eadcba64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  3 15:41:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
+	  empty.  [ruby-dev:30452]
+
 Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* pack.c (pack_unpack): properly ignore non-base64 octets such as
diff --git a/parse.y b/parse.y
index e28ed946ae..9e65a76f32 100644
--- a/parse.y
+++ b/parse.y
@@ -542,6 +542,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
                         NODE *args;
 
 			value_expr($6);
+			if (!$3) $3 = NEW_ZARRAY();
 			args = arg_concat($6, $3);
 			if ($5 == tOROP) {
 			    $5 = 0;
@@ -1009,6 +1010,7 @@ arg		: lhs '=' arg
                         NODE *args;
 
 			value_expr($6);
+			if (!$3) $3 = NEW_ZARRAY();
 			args = arg_concat($6, $3);
 			if ($5 == tOROP) {
 			    $5 = 0;
diff --git a/version.h b/version.h
index 30847f430f..6b749d0bf1 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-02-28"
+#define RUBY_RELEASE_DATE "2007-03-08"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070228
-#define RUBY_PATCHLEVEL 24
+#define RUBY_RELEASE_CODE 20070308
+#define RUBY_PATCHLEVEL 25
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 8
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];