ruby-changes:7394
From: akr <ko1@a...>
Date: Fri, 29 Aug 2008 03:00:22 +0900 (JST)
Subject: [ruby-changes:7394] Ruby:r18913 (trunk): * transcode.c (econv_finish): new method.
akr 2008-08-29 03:00:02 +0900 (Fri, 29 Aug 2008) New Revision: 18913 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18913 Log: * transcode.c (econv_finish): new method. Modified files: trunk/ChangeLog trunk/test/ruby/test_econv.rb trunk/transcode.c Index: ChangeLog =================================================================== --- ChangeLog (revision 18912) +++ ChangeLog (revision 18913) @@ -1,3 +1,7 @@ +Fri Aug 29 02:59:35 2008 Tanaka Akira <akr@f...> + + * transcode.c (econv_finish): new method. + Fri Aug 29 02:45:29 2008 Tanaka Akira <akr@f...> * transcode.c (econv_convert): new method. Index: test/ruby/test_econv.rb =================================================================== --- test/ruby/test_econv.rb (revision 18912) +++ test/ruby/test_econv.rb (revision 18913) @@ -568,4 +568,17 @@ assert_equal(:finished, ret) assert_raise(ArgumentError) { ec.convert("a") } end + + def test_finish_iso2022jp + ec = Encoding::Converter.new("utf-8", "iso-2022-jp") + assert_equal("\e$B$\"".force_encoding("iso-2022-jp"), ec.convert("\u3042")) + assert_equal("\e(B".force_encoding("iso-2022-jp"), ec.finish) + + end + + def test_finish_incomplete_error + ec = Encoding::Converter.new("utf-8", "euc-jp") + ec.convert("\xEF") + assert_raise(Encoding::InvalidByteSequence) { ec.finish } + end end Index: transcode.c =================================================================== --- transcode.c (revision 18912) +++ transcode.c (revision 18913) @@ -2499,7 +2499,12 @@ * * source_string is assumed as a part of source. * i.e. Encoding::Converter::PARTIAL_INPUT is used internally. + * finish method should be used at last. * + * ec = Encoding::Converter.new("utf-8", "euc-jp") + * puts ec.convert("\u3042").dump #=> "\xA4\xA2" + * puts ec.finish.dump #=> "" + * * If a conversion error occur, * Encoding::ConversionUndefined or * Encoding::InvalidByteSequence is raised. @@ -2546,6 +2551,50 @@ /* * call-seq: + * finish -> string + * + * finishes the converter. + * It returns the last part of converted string. + * + * ec = Encoding::Converter.new("utf-8", "iso-2022-jp") + * p ec.convert("\u3042") #=> "\e$B$\"" + * p ec.finish #=> "\e(B" + */ +static VALUE +econv_finish(VALUE self) +{ + VALUE ret, dst; + VALUE av[5]; + int ac; + rb_econv_t *ec = check_econv(self); + + dst = rb_str_new(NULL, 0); + + av[0] = Qnil; + av[1] = dst; + av[2] = Qnil; + av[3] = Qnil; + av[4] = INT2NUM(0); + ac = 5; + + ret = econv_primitive_convert(ac, av, self); + + if (ret == sym_invalid_byte_sequence || + ret == sym_undefined_conversion || + ret == sym_incomplete_input) { + VALUE exc = make_econv_exception(ec); + rb_exc_raise(exc); + } + + if (ret != sym_finished) { + rb_bug("unexpected result of econv_primitive_convert"); + } + + return dst; +} + +/* + * call-seq: * primitive_errinfo -> array * * primitive_errinfo returns a precious information of last error result @@ -2775,6 +2824,7 @@ rb_define_method(rb_cEncodingConverter, "destination_encoding", econv_destination_encoding, 0); rb_define_method(rb_cEncodingConverter, "primitive_convert", econv_primitive_convert, -1); rb_define_method(rb_cEncodingConverter, "convert", econv_convert, 1); + rb_define_method(rb_cEncodingConverter, "finish", econv_finish, 0); rb_define_method(rb_cEncodingConverter, "primitive_errinfo", econv_primitive_errinfo, 0); rb_define_method(rb_cEncodingConverter, "primitive_insert_output", econv_primitive_insert_output, 1); rb_define_method(rb_cEncodingConverter, "primitive_putback", econv_primitive_putback, 1); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/