summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regparse.c2
-rw-r--r--test/ruby/test_regexp.rb5
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f42d34..28699e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 14 06:46:53 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regparse.c (add_ctype_to_cc): don't check dup warn on adding
+ negative ctype to cclass. [Bug #7471] [ruby-core:50344]
+
Mon Jan 14 06:06:03 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/matrix/eigenvalue_decomposition: Backport bugfix of Jama 1.0.3
diff --git a/regparse.c b/regparse.c
index b8ef730..7486382 100644
--- a/regparse.c
+++ b/regparse.c
@@ -4127,7 +4127,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, int char_prop, ScanEnv* env)
r = add_ctype_to_cc_by_range(cc, ctype, not, env, sb_out, ranges);
if ((r == 0) && ascii_range) {
if (not != 0) {
- r = add_code_range_to_buf(&(cc->mbuf), env, 0x80, ONIG_LAST_CODE_POINT);
+ r = add_code_range_to_buf0(&(cc->mbuf), env, 0x80, ONIG_LAST_CODE_POINT, FALSE);
}
else {
CClassNode ccascii;
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index faafe33..e9c866a 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -906,6 +906,11 @@ class TestRegexp < Test::Unit::TestCase
assert_warning(/duplicated/) { Regexp.new('[\u1000-\u2000\u3042-\u3046\u3044]') }
assert_warning(/duplicated/) { Regexp.new('[\u3044\u3041-\u3047]') }
assert_warning(/duplicated/) { Regexp.new('[\u3042\u3044\u3046\u3041-\u3047]') }
+
+ bug7471 = '[ruby-core:50344]'
+ EnvUtil.verbose_warning do
+ assert_warning(/\A\z/, bug7471) { Regexp.new('[\D]') =~ "\u3042" }
+ end
end
def test_property_warn