diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -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 @@ -1481,7 +1481,8 @@ primary : literal } | tLPAREN compstmt ')' { - $$ = $2; + if (!$2) $$ = NEW_NIL(); + else $$ = $2; } | primary_value tCOLON2 tCONSTANT { |