From fe2900b515df376d1c1f7c7d6d935f7026430374 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 16 Apr 2007 07:44:56 +0000 Subject: * parse.y (parser_yylex): should set command_start after block starting "do"s and braces. [ruby-core:10916] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 2 ++ version.h | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a5d8cb71e..48b17c9644 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 16 16:34:08 2007 Yukihiro Matsumoto + + * parse.y (parser_yylex): should set command_start after block + starting "do"s and braces. [ruby-core:10916] + Sun Apr 15 09:19:57 2007 Tadayoshi Funaba * lib/date/format.rb: added some zone names. diff --git a/parse.y b/parse.y index c30e42315a..0f458f994f 100644 --- a/parse.y +++ b/parse.y @@ -4146,6 +4146,7 @@ yylex() COND_PUSH(0); CMDARG_PUSH(0); lex_state = EXPR_BEG; + if (c != tLBRACE) command_start = Qtrue; return c; case '\\': @@ -4449,6 +4450,7 @@ yylex() return kw->id[0]; } if (kw->id[0] == kDO) { + command_start = Qtrue; if (COND_P()) return kDO_COND; if (CMDARG_P() && state != EXPR_CMDARG) return kDO_BLOCK; diff --git a/version.h b/version.h index 45ca3d411a..67e0de60b7 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-04-10" +#define RUBY_RELEASE_DATE "2007-04-16" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070410 +#define RUBY_RELEASE_CODE 20070416 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 16 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; -- cgit v1.2.3