usa	2012-10-16 09:48:04 +0900 (Tue, 16 Oct 2012)

  New Revision: 37203

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

  Log:
    merge revision(s) 37201,37202:
    
    * test/ruby/test_regexp.rb
      (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
      warnings are already set in setup method.
    
    * test/ruby/test_regexp.rb
      (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
      Regexp.new instead of literal to ignore a parser warning.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_regexp.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37202)
+++ ruby_1_9_3/ChangeLog	(revision 37203)
@@ -1,3 +1,15 @@
+Tue Oct 16 09:47:47 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
+	  Regexp.new instead of literal to ignore a parser warning.
+
+Tue Oct 16 09:47:47 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
+	  warnings are already set in setup method.
+
 Sun Oct 14 01:21:42 2012  NAKAMURA Usaku  <usa@r...>
 
 	* regparse.c (parse_char_class): should match with a hyphen after a
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37202)
+++ ruby_1_9_3/version.h	(revision 37203)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 289
+#define RUBY_PATCHLEVEL 290
 
-#define RUBY_RELEASE_DATE "2012-10-14"
+#define RUBY_RELEASE_DATE "2012-10-16"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/test_regexp.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_regexp.rb	(revision 37202)
+++ ruby_1_9_3/test/ruby/test_regexp.rb	(revision 37203)
@@ -870,11 +870,7 @@
 
   def test_raw_hyphen_and_tk_char_type_after_range
     bug6853 = '[ruby-core:47115]'
-    begin
-      verbose, $VERBOSE = $VERBOSE, nil
-      check(/[0-1-\s]/, [' ', '-'], [], bug6853)
-    ensure
-      $VERBOSE = verbose
-    end
+    # use Regexp.new instead of literal to ignore a parser warning.
+    check(Regexp.new('[0-1-\\s]'), [' ', '-'], ['2', 'a'], bug6853)
   end
 end

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