From 81c5ede3cab05e9138504c2cdc868ce976bff9ee Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 25 May 2010 15:12:19 +0000 Subject: * regparse.c (add_code_range_to_buf0): fix false negative warning when given range is just before previous range. [ruby-dev:41406] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ regparse.c | 3 +-- test/ruby/test_regexp.rb | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f9d1675f2..102bda624f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue May 25 14:00:51 2010 NARUSE, Yui + + * 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 * misc/ruby-style.el (ruby-style-version): take revision if diff --git a/regparse.c b/regparse.c index eb40cf67a4..e413f55816 100644 --- a/regparse.c +++ b/regparse.c @@ -1750,12 +1750,11 @@ add_code_range_to_buf0(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePo 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) { diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 888a0cb9e5..e853ee0369 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -1,4 +1,5 @@ require 'test/unit' +require_relative 'envutil' class TestRegexp < Test::Unit::TestCase def setup @@ -816,4 +817,10 @@ class TestRegexp < Test::Unit::TestCase 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 -- cgit v1.2.3