diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-16 07:44:56 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-16 07:44:56 +0000 |
commit | fe2900b515df376d1c1f7c7d6d935f7026430374 (patch) | |
tree | 530fb07bcab1ec7dde256a8cf7af74a609d16db7 | |
parent | 3ff952f8c94d900bff866d3aa4b6ac56f628046f (diff) |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Apr 16 16:34:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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 <tadf@dotrb.org> * lib/date/format.rb: added some zone names. @@ -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; @@ -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[]; |