diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-02 06:45:50 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-02 06:45:50 +0000 |
commit | 9bc5dc7a9d9040ee2c01246e73e3dc061ea98625 (patch) | |
tree | 68a384a84599ef25d2e02c6a625c5cb6ec3e0dd3 | |
parent | 30065371d1fa1acb4278f35e984f4fc04eae562b (diff) |
* parse.y (primary): should set NODE when compstmt is NULL.
marge from trunk. fixed: [ruby-dev:29732]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 { |