diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | re.c | 1 | ||||
-rw-r--r-- | test/ruby/test_m17n_comb.rb | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Mar 3 17:15:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * re.c (rb_reg_regsub): remove too strict encoding check. + [ruby-dev:33966] + Mon Mar 3 16:14:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * hash.c (rb_any_hash): shrinks all results in Fixnum range. @@ -2960,7 +2960,6 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp) rb_encoding *str_enc = rb_enc_get(str); rb_encoding *src_enc = rb_enc_get(src); - rb_enc_check(str, src); p = s = RSTRING_PTR(str); e = s + RSTRING_LEN(str); diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb index e69d6fadc8..ca527cc807 100644 --- a/test/ruby/test_m17n_comb.rb +++ b/test/ruby/test_m17n_comb.rb @@ -1417,7 +1417,6 @@ class TestM17NComb < Test::Unit::TestCase assert_equal(s1, doit.call) next end - assert(false, "test broken") if !str_enc_compatible?(s1.gsub(r2, ''), s3) assert_raise(ArgumentError, desc) { doit.call } next @@ -1472,7 +1471,6 @@ class TestM17NComb < Test::Unit::TestCase assert_equal([s1, nil], doit.call) next end - assert(false, "test broken") if !str_enc_compatible?(s1.gsub(r2, ''), s3) assert_raise(ArgumentError, desc) { doit.call } next |