diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-26 17:28:37 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-26 17:28:37 +0000 |
| commit | 660a3298f5f19c136b530789c63ac2f6d422d771 (patch) | |
| tree | 05247cc59a4f329acde9b1bfb4dc4b015580020d /regparse.c | |
| parent | 331d6b341817370d51bf21a4ea74d59fed828c4d (diff) | |
merge revision(s) 34821:
* regparse.c (add_code_range_to_buf0): wrong condition of duplicated
warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regparse.c b/regparse.c index b3f34b03f2..1489f0e58d 100644 --- a/regparse.c +++ b/regparse.c @@ -1744,13 +1744,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]) |