1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* re.c (rb_reg_to_s): suppress duplicated charclass warning.

Browse Source 
Regexp#to_s suppress extra its whole regexp options by calling
  onig_new with its source, but it doesn't call rb_reg_preprocess.
  Therefore its Unicode escapes (\u{XXXX}) are given as is,
  and it may cause duplicated charclass warning for example
  "[\u{33}]" (3 is duplicated) or "[\u{a}\u{b}]" (u is duplicated).
  [ruby-core:53649] [Bug #8151]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-04-02 08:44:16 +00:00
parent a1a6fd90bb
commit 5fd798d1ed
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Tue Apr 2 17:38:20 2013 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_to_s): suppress duplicated charclass warning.
Regexp#to_s suppress extra its whole regexp options by calling
onig_new with its source, but it doesn't call rb_reg_preprocess.
Therefore its Unicode escapes (\u{XXXX}) are given as is,
and it may cause duplicated charclass warning for example
"[\u{33}]" (3 is duplicated) or "[\u{a}\u{b}]" (u is duplicated).
[ruby-core:53649] [Bug #8151]
Tue Apr 2 16:00:06 2013 NARUSE, Yui <naruse@ruby-lang.org> Tue Apr 2 16:00:06 2013 NARUSE, Yui <naruse@ruby-lang.org>
* vm_dump.c (rb_print_backtrace): separate to ease showing C backtrace. * vm_dump.c (rb_print_backtrace): separate to ease showing C backtrace.

3
re.c
View File

@ -571,12 +571,15 @@ rb_reg_to_s(VALUE re)
} }
if (*ptr == ':' && ptr[len-1] == ')') { if (*ptr == ':' && ptr[len-1] == ')') {
Regexp *rp; Regexp *rp;
VALUE verbose = ruby_verbose;
ruby_verbose = Qfalse;
++ptr; ++ptr;
len -= 2; len -= 2;
err = onig_new(&rp, ptr, ptr + len, ONIG_OPTION_DEFAULT, err = onig_new(&rp, ptr, ptr + len, ONIG_OPTION_DEFAULT,
enc, OnigDefaultSyntax, NULL); enc, OnigDefaultSyntax, NULL);
onig_free(rp); onig_free(rp);
ruby_verbose = verbose;
} }
if (err) { if (err) {
options = RREGEXP(re)->ptr->options; options = RREGEXP(re)->ptr->options;

3
test/ruby/test_regexp.rb
View File

@ -915,6 +915,9 @@ class TestRegexp < Test::Unit::TestCase
bug7471 = '[ruby-core:50344]' bug7471 = '[ruby-core:50344]'
assert_warning('', bug7471) { Regexp.new('[\D]') =~ "\u3042" } assert_warning('', bug7471) { Regexp.new('[\D]') =~ "\u3042" }
bug8151 = '[ruby-core:53649]'
assert_warning(/\A\z/, bug8151) { Regexp.new('(?:[\u{33}])').to_s }
end end
def test_property_warn def test_property_warn