2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8202436bc8..b8ea7ca582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (primary): should set NODE when compstmt is NULL.
+	  marge from trunk. fixed: [ruby-dev:29732]
+
 Thu Nov  2 14:48:30 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (Set#^): Fix XOR operation against a container that
diff --git a/parse.y b/parse.y
index da79c20c1f..22f07ca1bb 100644
--- a/parse.y
+++ b/parse.y
@@ -1481,7 +1481,8 @@ primary		: literal
 		    }
 		| tLPAREN compstmt ')'
 		    {
-			$$ = $2;
+			if (!$2) $$ = NEW_NIL();
+			else $$ = $2;
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {