From aff0d98a5bb4e8b6d808fa1a461991f3158690d4 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 7 Dec 2007 02:51:31 +0000
Subject: [PATCH] * parse.y (arg): tUPLUS no longer works as identity operation
 any   more.  inspired by [ruby-talk:265532].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 parse.y   | 7 +------
 version.h | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d84642702f..27b63e351b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 19:48:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): tUPLUS no longer works as identity operation any
+	  more.  inspired by [ruby-talk:265532].
+
 Thu Dec  6 18:22:11 2007  Tanaka Akira  <akr@fsij.org>
 
 	* encoding.c (rb_enc_precise_mbclen): new function for mbclen with
diff --git a/parse.y b/parse.y
index 03bbb3bd36..4698c35bfb 100644
--- a/parse.y
+++ b/parse.y
@@ -2035,12 +2035,7 @@ arg		: lhs '=' arg
 		| tUPLUS arg
 		    {
 		    /*%%%*/
-			if ($2 && nd_type($2) == NODE_LIT) {
-			    $$ = $2;
-			}
-			else {
-			    $$ = call_uni_op($2, tUPLUS);
-			}
+			$$ = call_uni_op($2, tUPLUS);
 		    /*%
 			$$ = dispatch2(unary, ripper_intern("+@"), $2);
 		    %*/
diff --git a/version.h b/version.h
index ba44dbcafe..009badf29f 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-06"
+#define RUBY_RELEASE_DATE "2007-12-07"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071206
+#define RUBY_RELEASE_CODE 20071207
 #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 12
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];