From d1685ce96979defc6e775f1788f9afcc36ca3837 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 5 Dec 2006 22:16:53 +0000 Subject: 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 --- ChangeLog | 5 +++++ parse.y | 3 ++- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d6f95919b..07e5adcf1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ Sun Nov 26 16:36:46 2006 URABE Shyouhei * version.h: addition of RUBY_PATCHLEVEL. * version.c: ditto. +Thu Nov 2 15:43:39 2006 NAKAMURA Usaku + + * 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 * lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content diff --git a/parse.y b/parse.y index e2982f2c80..7b05c18f46 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 { diff --git a/version.h b/version.h index e76c7f4bf3..eb9ef531ae 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3