shyouhei	2009-03-09 08:54:13 +0900 (Mon, 09 Mar 2009)

  New Revision: 22828

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22828

  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_6/ChangeLog
    branches/ruby_1_8_6/parse.y
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/parse.y
===================================================================
--- ruby_1_8_6/parse.y	(revision 22827)
+++ ruby_1_8_6/parse.y	(revision 22828)
@@ -3368,6 +3368,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()
@@ -3453,7 +3454,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 {
@@ -3682,7 +3683,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 {
@@ -3736,7 +3737,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;
@@ -3766,7 +3767,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;
@@ -4027,8 +4028,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;
 	    }
@@ -4055,7 +4055,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;
 	}
@@ -4117,7 +4117,7 @@
 
       case '(':
 	command_start = Qtrue;
-	if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	if (IS_BEG()) {
 	    c = tLPAREN;
 	}
 	else if (space_seen) {
@@ -4147,7 +4147,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) {
@@ -4180,7 +4180,7 @@
 	return '\\';
 
       case '%':
-	if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	if (IS_BEG()) {
 	    int term;
 	    int paren;
 
@@ -4493,6 +4493,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_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22827)
+++ ruby_1_8_6/ChangeLog	(revision 22828)
@@ -1,3 +1,8 @@
+Mon Mar  9 08:52:37 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* parse.y (IS_BEG): EXPR_CLASS should be treated like EXPR_BEG.
+	  [ruby-core:21453]
+
 Wed Feb 25 15:14:32 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* node.h (rb_thread_raised_clear): should not clear flags other than
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22827)
+++ ruby_1_8_6/version.h	(revision 22828)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-25"
+#define RUBY_RELEASE_DATE "2009-03-09"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090225
-#define RUBY_PATCHLEVEL 355
+#define RUBY_RELEASE_CODE 20090309
+#define RUBY_PATCHLEVEL 356
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #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[];
@@ -21,3 +21,4 @@
 
 
 
+

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/