From c3f55e6d486d4c5ccbc32c7c32c72fc586e99293 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Aug 2008 05:27:52 +0000
Subject: [PATCH] * transcode.c (econv_last_error): new method.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               |  4 ++++
 test/ruby/test_econv.rb | 15 +++++++++++++++
 transcode.c             | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ab5f85cf6..eb8acd588d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 31 14:27:27 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (econv_last_error): new method.
+
 Sun Aug 31 14:17:34 2008  Tanaka Akira  <akr@fsij.org>
 
 	* transcode.c (econv_primitive_convert): make two arguments,
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb
index b1052dfc21..917b46c629 100644
--- a/test/ruby/test_econv.rb
+++ b/test/ruby/test_econv.rb
@@ -598,4 +598,19 @@ class TestEncodingConverter < Test::Unit::TestCase
     ec.convert("\xEF")
     assert_raise(Encoding::InvalidByteSequence) { ec.finish }
   end
+
+  def test_last_error1
+    ec = Encoding::Converter.new("sjis", "euc-jp")
+    assert_equal(nil, ec.last_error)
+    assert_equal(:incomplete_input, ec.primitive_convert(src="fo\x81", dst="", nil, nil))
+    assert_kind_of(Encoding::InvalidByteSequence, ec.last_error)
+  end
+
+  def test_last_error2
+    ec = Encoding::Converter.new("sjis", "euc-jp")
+    assert_equal("fo", ec.convert(src="fo\x81"))
+    assert_raise(Encoding::InvalidByteSequence) { ec.finish }
+    assert_kind_of(Encoding::InvalidByteSequence, ec.last_error)
+  end
+
 end
diff --git a/transcode.c b/transcode.c
index d692b13d79..fb6bee7bba 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2756,6 +2756,39 @@ econv_putback(int argc, VALUE *argv, VALUE self)
     return str;
 }
 
+/*
+ * call-seq:
+ *   last_error -> exception or nil
+ *
+ * returns an exception object for the last conversion.
+ * it returns nil if the last conversion is not an error. 
+ *
+ * "error" means that
+ * Encoding::InvalidByteSequence and Encoding::ConversionUndefined for
+ * Encoding::Converter#convert and
+ * :invalid_byte_sequence, :incomplete_input and :undefined_conversion for
+ * Encoding::Converter#primitive_convert.
+ *
+ * ec = Encoding::Converter.new("utf-8", "iso-8859-1")
+ * p ec.primitive_convert(src="\xf1abcd", dst="")       #=> :invalid_byte_sequence
+ * p ec.last_error      #=> #<Encoding::InvalidByteSequence: "\xF1" followed by "a" on UTF-8>
+ * p ec.primitive_convert(src, dst, nil, 1)             #=> :destination_buffer_full
+ * p ec.last_error      #=> nil
+ *
+ */
+
+static VALUE
+econv_last_error(VALUE self)
+{
+    rb_econv_t *ec = check_econv(self);
+    VALUE exc;
+
+    exc = make_econv_exception(ec);
+    if (NIL_P(exc))
+        return Qnil;
+    return exc;
+}
+
 void
 rb_econv_check_error(rb_econv_t *ec)
 {
@@ -2842,6 +2875,7 @@ Init_transcode(void)
     rb_define_method(rb_cEncodingConverter, "primitive_errinfo", econv_primitive_errinfo, 0);
     rb_define_method(rb_cEncodingConverter, "insert_output", econv_insert_output, 1);
     rb_define_method(rb_cEncodingConverter, "putback", econv_putback, -1);
+    rb_define_method(rb_cEncodingConverter, "last_error", econv_last_error, 0);
     rb_define_const(rb_cEncodingConverter, "INVALID_MASK", INT2FIX(ECONV_INVALID_MASK));
     rb_define_const(rb_cEncodingConverter, "INVALID_IGNORE", INT2FIX(ECONV_INVALID_IGNORE));
     rb_define_const(rb_cEncodingConverter, "INVALID_REPLACE", INT2FIX(ECONV_INVALID_REPLACE));