nobu	2009-08-15 10:40:10 +0900 (Sat, 15 Aug 2009)

  New Revision: 24542

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

  Log:
    * parse.y (fname, string_dvar, sym, dsym, f_arglist): removed
      duplications.

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24541)
+++ ChangeLog	(revision 24542)
@@ -1,3 +1,8 @@
+Sat Aug 15 10:39:53 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (fname, string_dvar, sym, dsym, f_arglist): removed
+	  duplications.
+
 Fri Aug 14 20:03:10 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/ruby.h (rb_check_safe_str): deprecated.
Index: parse.y
===================================================================
--- parse.y	(revision 24541)
+++ parse.y	(revision 24542)
@@ -1705,21 +1705,19 @@
 		| tFID
 		| op
 		    {
-		    /*%%%*/
 			lex_state = EXPR_END;
+		    /*%%%*/
 			$$ = $1;
 		    /*%
-			lex_state = EXPR_END;
 			$$ = $1;
 		    %*/
 		    }
 		| reswords
 		    {
-		    /*%%%*/
 			lex_state = EXPR_END;
+		    /*%%%*/
 			$$ = $<id>1;
 		    /*%
-			lex_state = EXPR_END;
 			$$ = $1;
 		    %*/
 		    }
@@ -4041,11 +4039,10 @@
 
 symbol		: tSYMBEG sym
 		    {
-		    /*%%%*/
 			lex_state = EXPR_END;
+		    /*%%%*/
 			$$ = $2;
 		    /*%
-			lex_state = EXPR_END;
 			$$ = dispatch1(symbol, $2);
 		    %*/
 		    }
@@ -4059,8 +4056,8 @@
 
 dsym		: tSYMBEG xstring_contents tSTRING_END
 		    {
-		    /*%%%*/
 			lex_state = EXPR_END;
+		    /*%%%*/
 			if (!($$ = $2)) {
 			    $$ = NEW_LIT(ID2SYM(rb_intern("")));
 			}
@@ -4082,7 +4079,6 @@
 			    }
 			}
 		    /*%
-			lex_state = EXPR_END;
 			$$ = dispatch1(dyna_symbol, $2);
 		    %*/
 		    }
@@ -4178,13 +4174,11 @@
 		    {
 		    /*%%%*/
 			$$ = $2;
-			lex_state = EXPR_BEG;
-			command_start = Qtrue;
 		    /*%
 			$$ = dispatch1(paren, $2);
+		    %*/
 			lex_state = EXPR_BEG;
 			command_start = Qtrue;
-		    %*/
 		    }
 		| f_args term
 		    {
@@ -8916,7 +8910,7 @@
 reg_fragment_check_gen(struct parser_params* parser, VALUE str, int options)
 {
     VALUE err;
-    reg_fragment_setenc_gen(parser, str, options);
+    reg_fragment_setenc(str, options);
     err = rb_reg_check_preprocess(str);
     if (err != Qnil) {
         err = rb_obj_as_string(err);
@@ -10084,7 +10078,7 @@
         if (!name) {
             rb_bug("cannot convert ID to string: %ld", (unsigned long)id);
         }
-        break;
+        return ID2SYM(id);
     }
     return ID2SYM(rb_intern(name));
 }

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