diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-05 22:16:53 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-05 22:16:53 +0000 |
commit | d1685ce96979defc6e775f1788f9afcc36ca3837 (patch) | |
tree | 96334dec91f0ba00e4e55e707e04c1b8c097dc4e | |
parent | 253c38a903fb2c7fde30af7fb94ea14adfefe53d (diff) |
backport from ruby_1_8
* parse.y (primary): should set NODE even when compstmt is NULL.
merge from trunk. fixed: [ruby-dev:29732]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -12,6 +12,11 @@ Sun Nov 26 16:36:46 2006 URABE Shyouhei <shyouhei@ruby-lang.org> * version.h: addition of RUBY_PATCHLEVEL. * version.c: ditto. +Thu Nov 2 15:43:39 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * parse.y (primary): should set NODE even when compstmt is NULL. + merge from trunk. fixed: [ruby-dev:29732] + Sat Sep 23 21:34:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content @@ -1481,7 +1481,8 @@ primary : literal } | tLPAREN compstmt ')' { - $$ = $2; + if (!$2) $$ = NEW_NIL(); + else $$ = $2; } | primary_value tCOLON2 tCONSTANT { @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2006-12-06" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20061206 -#define RUBY_PATCHLEVEL 4 +#define RUBY_PATCHLEVEL 5 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |