naruse	2012-10-25 20:50:20 +0900 (Thu, 25 Oct 2012)

  New Revision: 37327

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

  Log:
    Revert r37316
    
    The commit introduces too many failures and disturbs release engineering.
    Re-commit it with fixed tests.
    
    
           * parse.y: show a warning for concatenating string literals because
             it will be deprecated in the future.
             patched by mame (Yusuke Endoh) at [ruby-core:44207].
             [ruby-core:44156] [Feature #6265]

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37326)
+++ ChangeLog	(revision 37327)
@@ -19,13 +19,6 @@
 
 	* tool/mkconfig.rb: remove string literal concatenation.
 
-Thu Oct 25 13:09:01 2012  NAKAMURA Usaku  <usa@r...>
-
-	* parse.y: show a warning for concatenating string literals because
-	  it will be deprecated in the future.
-	  patched by mame (Yusuke Endoh) at [ruby-core:44207].
-	  [ruby-core:44156] [Feature #6265]
-
 Wed Oct 24 18:49:16 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/objspace/objspace.c (type2sym, count_objects_size): use enum
Index: parse.y
===================================================================
--- parse.y	(revision 37326)
+++ parse.y	(revision 37327)
@@ -3810,7 +3810,6 @@
 		| string string1
 		    {
 		    /*%%%*/
-			rb_warning0("string concatenation syntax will be deprecated");
 			$$ = literal_concat($1, $2);
 		    /*%
 			$$ = dispatch2(string_concat, $1, $2);

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