naruse	2010-05-26 00:14:29 +0900 (Wed, 26 May 2010)

  New Revision: 28015

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

  Log:
    merge revision(s) 28013:
    * regparse.c (add_code_range_to_buf0): fix false negative
      warning when given range is just before previous range.
      [ruby-dev:41406]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/regparse.c
    branches/ruby_1_9_2/test/ruby/test_regexp.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/regparse.c
===================================================================
--- ruby_1_9_2/regparse.c	(revision 28014)
+++ ruby_1_9_2/regparse.c	(revision 28015)
@@ -1750,12 +1750,11 @@
     return ONIGERR_TOO_MANY_MULTI_BYTE_RANGES;
 
   if (inc_n != 1) {
+    if (checkdup && to >= data[low*2]) CC_DUP_WARN(env);
     if (from > data[low*2])
       from = data[low*2];
-    else if (checkdup) CC_DUP_WARN(env);
     if (to < data[(high - 1)*2 + 1])
       to = data[(high - 1)*2 + 1];
-    else if (checkdup) CC_DUP_WARN(env);
   }
 
   if (inc_n != 0 && (OnigCodePoint )high < n) {
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28014)
+++ ruby_1_9_2/ChangeLog	(revision 28015)
@@ -1,3 +1,9 @@
+Wed May 26 00:13:58 2010  NARUSE, Yui  <naruse@r...>
+
+	* regparse.c (add_code_range_to_buf0): fix false negative
+	  warning when given range is just before previous range.
+	  [ruby-dev:41406]
+
 Tue May 25 16:37:39 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* misc/ruby-style.el (ruby-style-version): take revision if
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 28014)
+++ ruby_1_9_2/version.h	(revision 28015)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-05-25"
+#define RUBY_RELEASE_DATE "2010-05-26"
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 
Index: ruby_1_9_2/test/ruby/test_regexp.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_regexp.rb	(revision 28014)
+++ ruby_1_9_2/test/ruby/test_regexp.rb	(revision 28015)
@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative 'envutil'
 
 class TestRegexp < Test::Unit::TestCase
   def setup
@@ -816,4 +817,10 @@
     bug2547 = '[ruby-core:27374]'
     assert_raise(SyntaxError, bug2547) {eval('/#{"\\\\"}y/')}
   end
+
+  def test_dup_warn
+    assert_in_out_err('-w', 'x=/[\u3042\u3041]/', [], /\A\z/)
+    assert_in_out_err('-w', 'x=/[\u3042\u3042]/', [], /duplicated/)
+    assert_in_out_err('-w', 'x=/[\u3042\u3041-\u3043]/', [], /duplicated/)
+  end
 end

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