* include/ruby/encoding.h (ECONV_INVALID_MASK): defined.

  (ECONV_INVALID_IGNORE): defined.
  (ECONV_INVALID_REPLACE): defined.
  (ECONV_UNDEF_MASK): defined.
  (ECONV_UNDEF_IGNORE): defined.
  (ECONV_UNDEF_REPLACE): defined.

* transcode.c (INVALID_IGNORE): removed.
  (INVALID_REPLACE): removed.
  (UNDEF_IGNORE): removed.
  (UNDEF_REPLACE): removed.
  (rb_econv_convert0): renamed from rb_econv_convert.
  (rb_econv_convert): defined to call rb_econv_convert0 with
  replace/ignore behavior moved from transcode_loop.
  (transcode_loop): replace/ignore behavior removed.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 33 insertions, 0 deletions

diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb
index b8d9df7639..025887f1c6 100644
--- a/test/ruby/test_econv.rb
+++ b/test/ruby/test_econv.rb
@@ -448,4 +448,37 @@ class TestEncodingConverter < Test::Unit::TestCase
     assert_equal(["abcdef", ""], [dst, src])
   end
 
+  def test_invalid_replace
+    ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::INVALID_REPLACE)
+    ret = ec.primitive_convert(src="abc\x80def", dst="", nil, 100)
+    assert_equal(:finished, ret)
+    assert_equal("", src)
+    assert_equal("abc?def", dst)
+  end
+
+  def test_invalid_ignore
+    ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::INVALID_IGNORE)
+    ret = ec.primitive_convert(src="abc\x80def", dst="", nil, 100)
+    assert_equal(:finished, ret)
+    assert_equal("", src)
+    assert_equal("abcdef", dst)
+  end
+
+  def test_undef_replace
+    ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::UNDEF_REPLACE)
+    ret = ec.primitive_convert(src="abc\u{fffd}def", dst="", nil, 100)
+    assert_equal(:finished, ret)
+    assert_equal("", src)
+    assert_equal("abc?def", dst)
+  end
+
+  def test_undef_ignore
+    ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::UNDEF_IGNORE)
+    ret = ec.primitive_convert(src="abc\u{fffd}def", dst="", nil, 100)
+    assert_equal(:finished, ret)
+    assert_equal("", src)
+    assert_equal("abcdef", dst)
+  end
+
+
 end