naruse	2012-02-27 02:28:37 +0900 (Mon, 27 Feb 2012)

  New Revision: 34822

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

  Log:
    merge revision(s) 34821:
    
    * regparse.c (add_code_range_to_buf0): wrong condition of duplicated
      warnings.

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

Index: ruby_1_9_3/regparse.c
===================================================================
--- ruby_1_9_3/regparse.c	(revision 34821)
+++ ruby_1_9_3/regparse.c	(revision 34822)
@@ -1744,13 +1744,18 @@
     else
       bound = x;
   }
+  /* data[(low-1)*2+1] << from <= data[low*2]
+   * data[(high-1)*2+1] <= to << data[high*2]
+   */
 
   inc_n = low + 1 - high;
   if (n + inc_n > ONIG_MAX_MULTI_BYTE_RANGES_NUM)
     return ONIGERR_TOO_MANY_MULTI_BYTE_RANGES;
 
   if (inc_n != 1) {
-    if (checkdup && to >= data[low*2]) CC_DUP_WARN(env);
+    if (checkdup && from <= data[low*2+1]
+	&& (data[low*2] <= from  || data[low*2+1] <= to))
+	CC_DUP_WARN(env);
     if (from > data[low*2])
       from = data[low*2];
     if (to < data[(high - 1)*2 + 1])
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34821)
+++ ruby_1_9_3/ChangeLog	(revision 34822)
@@ -1,3 +1,8 @@
+Mon Feb 27 02:28:17 2012  NARUSE, Yui  <naruse@r...>
+
+	* regparse.c (add_code_range_to_buf0): wrong condition of duplicated
+	  warnings.
+
 Sun Feb 26 12:26:26 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_compile_each): call on special object instead of
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34821)
+++ ruby_1_9_3/version.h	(revision 34822)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 150
+#define RUBY_PATCHLEVEL 151
 
-#define RUBY_RELEASE_DATE "2012-02-26"
+#define RUBY_RELEASE_DATE "2012-02-27"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/test_regexp.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_regexp.rb	(revision 34821)
+++ ruby_1_9_3/test/ruby/test_regexp.rb	(revision 34822)
@@ -843,11 +843,18 @@
   end
 
   def test_dup_warn
-    assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3041]/\n!x", [], [])
-    assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3042]/\n!x", [], /duplicated/u, nil,
-                      encoding: Encoding::UTF_8)
-    assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3041-\u3043]/\n!x", [], /duplicated/u, nil,
-                      encoding: Encoding::UTF_8)
+    assert_warn(/duplicated/) { Regexp.new('[\u3042\u3043\u3042]') }
+    assert_warn(/duplicated/) { Regexp.new('[\u3042\u3043\u3043]') }
+    assert_warn(/\A\z/) { Regexp.new('[\u3042\u3044\u3043]') }
+    assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3043]') }
+    assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3044]') }
+    assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3043-\u3044]') }
+    assert_warn(/duplicated/) { Regexp.new('[\u3042\u3045\u3042-\u3043]') }
+    assert_warn(/duplicated/) { Regexp.new('[\u3042\u3045\u3044-\u3045]') }
+    assert_warn(/\A\z/) { Regexp.new('[\u3042\u3046\u3044]') }
+    assert_warn(/duplicated/) { Regexp.new('[\u1000-\u2000\u3042-\u3046\u3044]') }
+    assert_warn(/duplicated/) { Regexp.new('[\u3044\u3041-\u3047]') }
+    assert_warn(/duplicated/) { Regexp.new('[\u3042\u3044\u3046\u3041-\u3047]') }
   end
 
   def test_property_warn

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