diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | re.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_m17n.rb | 14 |
3 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +Fri Aug 14 17:59:12 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * re.c (rb_reg_preprocess_dregexp): change Exception class to + RegexpError. + + * test/ruby/test_m17n.rb (test_regexp_usascii): follow above. + + * test/ruby/test_m17n.rb (test_regexp_embed): ditto. + Fri Aug 14 17:17:42 2009 NARUSE, Yui <naruse@ruby-lang.org> * enc/Makefile.in (MKDIRS): revert r24525. @@ -2301,7 +2301,7 @@ rb_reg_preprocess_dregexp(VALUE ary, int options) if (fixed_enc != 0) { if (regexp_enc != 0 && regexp_enc != fixed_enc) { - rb_raise(rb_eArgError, "encoding mismatch in dynamic regexp : %s and %s", + rb_raise(rb_eRegexpError, "encoding mismatch in dynamic regexp : %s and %s", rb_enc_name(regexp_enc), rb_enc_name(fixed_enc)); } regexp_enc = fixed_enc; diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 25bb0df3b0..78d98ac441 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -442,18 +442,18 @@ class TestM17N < Test::Unit::TestCase def test_regexp_embed r = eval(e("/\xc2\xa1/")) - assert_raise(ArgumentError) { eval(s("/\xc2\xa1\#{r}/s")) } - assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } + assert_raise(RegexpError) { eval(s("/\xc2\xa1\#{r}/s")) } + assert_raise(RegexpError) { eval(s("/\#{r}\xc2\xa1/s")) } r = /\xc2\xa1/e - assert_raise(ArgumentError) { eval(s("/\xc2\xa1\#{r}/s")) } - assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } + assert_raise(RegexpError) { eval(s("/\xc2\xa1\#{r}/s")) } + assert_raise(RegexpError) { eval(s("/\#{r}\xc2\xa1/s")) } r = eval(e("/\xc2\xa1/")) - assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } + assert_raise(RegexpError) { /\xc2\xa1#{r}/s } r = /\xc2\xa1/e - assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } + assert_raise(RegexpError) { /\xc2\xa1#{r}/s } r1 = Regexp.new('foo'.force_encoding("ascii-8bit")) r2 = eval('/bar#{r1}/'.force_encoding('ascii-8bit')) @@ -1255,7 +1255,7 @@ class TestM17N < Test::Unit::TestCase assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError) assert_regexp_usascii_literal('/\u1234#{"\x80"}/', nil, SyntaxError) assert_regexp_usascii_literal('/\u1234\x80/', nil, SyntaxError) - assert_regexp_usascii_literal('/\u1234#{}\x80/', nil, ArgumentError) + assert_regexp_usascii_literal('/\u1234#{}\x80/', nil, RegexpError) end def test_gbk |