ruby-changes:7445
From: akr <ko1@a...>
Date: Sun, 31 Aug 2008 04:23:42 +0900 (JST)
Subject: [ruby-changes:7445] Ruby:r18964 (trunk): * transcode.c (econv_insert_output): renamed from
akr 2008-08-31 04:23:23 +0900 (Sun, 31 Aug 2008) New Revision: 18964 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18964 Log: * transcode.c (econv_insert_output): renamed from econv_primitive_insert_output. Modified files: trunk/ChangeLog trunk/test/ruby/test_econv.rb trunk/transcode.c Index: ChangeLog =================================================================== --- ChangeLog (revision 18963) +++ ChangeLog (revision 18964) @@ -1,3 +1,8 @@ +Sun Aug 31 04:22:51 2008 Tanaka Akira <akr@f...> + + * transcode.c (econv_insert_output): renamed from + econv_primitive_insert_output. + Sun Aug 31 04:20:46 2008 Tanaka Akira <akr@f...> * test/ruby/test_econv.rb: follow econv_primitive_errinfo change. Index: test/ruby/test_econv.rb =================================================================== --- test/ruby/test_econv.rb (revision 18963) +++ test/ruby/test_econv.rb (revision 18964) @@ -415,25 +415,25 @@ ec = Encoding::Converter.new("EUC-JP", "ISO-2022-JP") ec.primitive_convert(src="\xa1\xa1", dst="", nil, 10, Encoding::Converter::PARTIAL_INPUT) assert_equal("\e$B!!".force_encoding("ISO-2022-JP"), dst) - assert_equal(true, ec.primitive_insert_output("???")) + assert_equal(true, ec.insert_output("???")) ec.primitive_convert("", dst, nil, 10, Encoding::Converter::PARTIAL_INPUT) assert_equal("\e$B!!\e(B???".force_encoding("ISO-2022-JP"), dst) ec.primitive_convert(src="\xa1\xa2", dst, nil, 10, Encoding::Converter::PARTIAL_INPUT) assert_equal("\e$B!!\e(B???\e$B!\"".force_encoding("ISO-2022-JP"), dst) - assert_equal(true, ec.primitive_insert_output("\xA1\xA1".force_encoding("EUC-JP"))) + assert_equal(true, ec.insert_output("\xA1\xA1".force_encoding("EUC-JP"))) ec.primitive_convert("", dst, nil, 10, Encoding::Converter::PARTIAL_INPUT) assert_equal("\e$B!!\e(B???\e$B!\"!!".force_encoding("ISO-2022-JP"), dst) ec.primitive_convert(src="\xa1\xa3", dst, nil, 10, Encoding::Converter::PARTIAL_INPUT) assert_equal("\e$B!!\e(B???\e$B!\"!!!\#".force_encoding("ISO-2022-JP"), dst) - assert_equal(true, ec.primitive_insert_output("\u3042")) + assert_equal(true, ec.insert_output("\u3042")) ec.primitive_convert("", dst, nil, 10, Encoding::Converter::PARTIAL_INPUT) assert_equal("\e$B!!\e(B???\e$B!\"!!!\#$\"".force_encoding("ISO-2022-JP"), dst) assert_raise(Encoding::ConversionUndefined) { - ec.primitive_insert_output("\uFFFD") + ec.insert_output("\uFFFD") } assert_equal("\e$B!!\e(B???\e$B!\"!!!\#$\"".force_encoding("ISO-2022-JP"), dst) @@ -553,7 +553,7 @@ def test_noconv_insert_output ec = Encoding::Converter.new("", "") - ec.primitive_insert_output("xyz") + ec.insert_output("xyz") ret = ec.primitive_convert(src="abc", dst="", nil, 20) assert_equal(:finished, ret) assert_equal(["xyzabc", ""], [dst, src]) Index: transcode.c =================================================================== --- transcode.c (revision 18963) +++ transcode.c (revision 18964) @@ -2707,7 +2707,7 @@ } static VALUE -econv_primitive_insert_output(VALUE self, VALUE string) +econv_insert_output(VALUE self, VALUE string) { const char *insert_enc; @@ -2833,7 +2833,7 @@ 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, "insert_output", econv_insert_output, 1); rb_define_method(rb_cEncodingConverter, "primitive_putback", econv_primitive_putback, 1); rb_define_const(rb_cEncodingConverter, "INVALID_MASK", INT2FIX(ECONV_INVALID_MASK)); rb_define_const(rb_cEncodingConverter, "INVALID_IGNORE", INT2FIX(ECONV_INVALID_IGNORE)); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/