ruby-changes:11221
From: shyouhei <ko1@a...>
Date: Mon, 9 Mar 2009 08:55:29 +0900 (JST)
Subject: [ruby-changes:11221] Ruby:r22830 (ruby_1_8_7): merge revision(s) 21688:
shyouhei 2009-03-09 08:55:21 +0900 (Mon, 09 Mar 2009) New Revision: 22830 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22830 Log: merge revision(s) 21688: * parse.y (IS_BEG): EXPR_CLASS should be treated like EXPR_BEG. [ruby-core:21453] Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/parse.y branches/ruby_1_8_7/version.h Index: ruby_1_8_7/parse.y =================================================================== --- ruby_1_8_7/parse.y (revision 22829) +++ ruby_1_8_7/parse.y (revision 22830) @@ -3434,6 +3434,7 @@ } #define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG) +#define IS_BEG() (lex_state == EXPR_BEG || lex_state == EXPR_MID || lex_state == EXPR_CLASS) static int yylex() @@ -3519,7 +3520,7 @@ rb_warning("`*' interpreted as argument prefix"); c = tSTAR; } - else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { + else if (IS_BEG()) { c = tSTAR; } else { @@ -3748,7 +3749,7 @@ rb_warning("`&' interpreted as argument prefix"); c = tAMPER; } - else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { + else if (IS_BEG()) { c = tAMPER; } else { @@ -3802,7 +3803,7 @@ lex_state = EXPR_BEG; return tOP_ASGN; } - if (lex_state == EXPR_BEG || lex_state == EXPR_MID || + if (IS_BEG() || (IS_ARG() && space_seen && !ISSPACE(c))) { if (IS_ARG()) arg_ambiguous(); lex_state = EXPR_BEG; @@ -3832,7 +3833,7 @@ lex_state = EXPR_BEG; return tOP_ASGN; } - if (lex_state == EXPR_BEG || lex_state == EXPR_MID || + if (IS_BEG() || (IS_ARG() && space_seen && !ISSPACE(c))) { if (IS_ARG()) arg_ambiguous(); lex_state = EXPR_BEG; @@ -4093,8 +4094,7 @@ case ':': c = nextc(); if (c == ':') { - if (lex_state == EXPR_BEG || lex_state == EXPR_MID || - lex_state == EXPR_CLASS || (IS_ARG() && space_seen)) { + if (IS_BEG() || (IS_ARG() && space_seen)) { lex_state = EXPR_BEG; return tCOLON3; } @@ -4121,7 +4121,7 @@ return tSYMBEG; case '/': - if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { + if (IS_BEG()) { lex_strterm = NEW_STRTERM(str_regexp, '/', 0); return tREGEXP_BEG; } @@ -4183,7 +4183,7 @@ case '(': command_start = Qtrue; - if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { + if (IS_BEG()) { c = tLPAREN; } else if (space_seen) { @@ -4213,7 +4213,7 @@ pushback(c); return '['; } - else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { + else if (IS_BEG()) { c = tLBRACK; } else if (IS_ARG() && space_seen) { @@ -4247,7 +4247,7 @@ return '\\'; case '%': - if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { + if (IS_BEG()) { int term; int paren; @@ -4561,6 +4561,7 @@ lex_state == EXPR_MID || lex_state == EXPR_DOT || lex_state == EXPR_ARG || + lex_state == EXPR_CLASS || lex_state == EXPR_CMDARG) { if (cmd_state) { lex_state = EXPR_CMDARG; Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 22829) +++ ruby_1_8_7/ChangeLog (revision 22830) @@ -1,3 +1,8 @@ +Mon Mar 9 08:54:47 2009 Yukihiro Matsumoto <matz@r...> + + * parse.y (IS_BEG): EXPR_CLASS should be treated like EXPR_BEG. + [ruby-core:21453] + Wed Feb 25 15:15:52 2009 Nobuyoshi Nakada <nobu@r...> * node.h (rb_thread_raised_clear): should not clear flags other than Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 22829) +++ ruby_1_8_7/version.h (revision 22830) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-02-25" +#define RUBY_RELEASE_DATE "2009-03-09" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090225 -#define RUBY_PATCHLEVEL 144 +#define RUBY_RELEASE_CODE 20090309 +#define RUBY_PATCHLEVEL 145 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 -#define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_MONTH 3 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; @@ -32,3 +32,4 @@ + -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/