summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-26 14:32:54 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-26 14:32:54 (GMT)
commita77ea177fe6609137c677d2c33453467eaea30df (patch)
tree9a0a8b47d5c5328a86eb6544868876969c9a6f64
parent6a8d0097095d975fbd19cf62c83645b51886025b (diff)
* regparse.c (add_code_range_to_buf0): wrong condition of duplicated
warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--regparse.c7
-rw-r--r--test/ruby/test_regexp.rb17
3 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f022be..be4a7a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 26 23:29:49 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regparse.c (add_code_range_to_buf0): wrong condition of duplicated
+ warnings.
+
Sun Feb 26 11:26:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): call on special object instead of
diff --git a/regparse.c b/regparse.c
index 183d1ff..08ffa80 100644
--- a/regparse.c
+++ b/regparse.c
@@ -1776,13 +1776,18 @@ add_code_range_to_buf0(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePo
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])
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 05ec477..b1490ed 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -848,11 +848,18 @@ class TestRegexp < Test::Unit::TestCase
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