diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-25 15:14:29 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-25 15:14:29 +0000 |
| commit | f054a1bbe1243417f53df1312e2e3ba065b26df6 (patch) | |
| tree | 4fbc2620c5a24e28573b1c82275e447246b97365 /regparse.c | |
| parent | 2c2374224cd03319f082be10b9a153b5f74e78cf (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |