1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* transcode.c (econv_putback): renamed from econv_primitive_putback.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-30 19:27:35 +00:00
parent 5bbc51ed43
commit 998a4ec5af
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Aug 31 04:27:04 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_putback): renamed from econv_primitive_putback.
Sun Aug 31 04:22:51 2008 Tanaka Akira <akr@fsij.org> Sun Aug 31 04:22:51 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_insert_output): renamed from * transcode.c (econv_insert_output): renamed from

2
test/ruby/test_econv.rb
View File

@ -478,7 +478,7 @@ class TestEncodingConverter < Test::Unit::TestCase
ret = ec.primitive_convert(src="abc\xa1def", dst="", nil, 10) ret = ec.primitive_convert(src="abc\xa1def", dst="", nil, 10)
assert_equal(:invalid_byte_sequence, ret) assert_equal(:invalid_byte_sequence, ret)
assert_equal(["abc", "ef"], [dst, src]) assert_equal(["abc", "ef"], [dst, src])
src = ec.primitive_putback(nil) + src src = ec.putback(nil) + src
assert_equal(["abc", "def"], [dst, src]) assert_equal(["abc", "def"], [dst, src])
ret = ec.primitive_convert(src, dst, nil, 10) ret = ec.primitive_convert(src, dst, nil, 10)
assert_equal(:finished, ret) assert_equal(:finished, ret)

4
transcode.c
View File

@ -2727,7 +2727,7 @@ econv_insert_output(VALUE self, VALUE string)
} }
static VALUE static VALUE
econv_primitive_putback(VALUE self, VALUE max) econv_putback(VALUE self, VALUE max)
{ {
rb_econv_t *ec = check_econv(self); rb_econv_t *ec = check_econv(self);
int n; int n;
@ -2834,7 +2834,7 @@ Init_transcode(void)
rb_define_method(rb_cEncodingConverter, "finish", econv_finish, 0); 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_errinfo", econv_primitive_errinfo, 0);
rb_define_method(rb_cEncodingConverter, "insert_output", econv_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_method(rb_cEncodingConverter, "putback", econv_putback, 1);
rb_define_const(rb_cEncodingConverter, "INVALID_MASK", INT2FIX(ECONV_INVALID_MASK)); 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_IGNORE", INT2FIX(ECONV_INVALID_IGNORE));
rb_define_const(rb_cEncodingConverter, "INVALID_REPLACE", INT2FIX(ECONV_INVALID_REPLACE)); rb_define_const(rb_cEncodingConverter, "INVALID_REPLACE", INT2FIX(ECONV_INVALID_REPLACE));