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 | |
| 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | regparse.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 7 | ||||
| -rw-r--r-- | version.h | 4 |
4 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed May 26 00:13:58 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * 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 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-05-25" +#define RUBY_RELEASE_DATE "2010-05-26" #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -7,7 +7,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" |