diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-30 19:27:35 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-30 19:27:35 +0000 |
| commit | 998a4ec5af091792d06a4e266b63702d1651723b (patch) | |
| tree | 04d8a13cdf18fb1f5f6447b76a53493f73f2f517 | |
| parent | 5bbc51ed43e6fee737433964191b55d22497cdbd (diff) | |
| download | ruby-998a4ec5af091792d06a4e266b63702d1651723b.tar.gz | |
* transcode.c (econv_putback): renamed from econv_primitive_putback.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | test/ruby/test_econv.rb | 2 | ||||
| -rw-r--r-- | transcode.c | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -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> * transcode.c (econv_insert_output): renamed from diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index 302a3e3c48..48b22fc270 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -478,7 +478,7 @@ class TestEncodingConverter < Test::Unit::TestCase ret = ec.primitive_convert(src="abc\xa1def", dst="", nil, 10) assert_equal(:invalid_byte_sequence, ret) assert_equal(["abc", "ef"], [dst, src]) - src = ec.primitive_putback(nil) + src + src = ec.putback(nil) + src assert_equal(["abc", "def"], [dst, src]) ret = ec.primitive_convert(src, dst, nil, 10) assert_equal(:finished, ret) diff --git a/transcode.c b/transcode.c index d6fc3d4a39..88ccc9b042 100644 --- a/transcode.c +++ b/transcode.c @@ -2727,7 +2727,7 @@ econv_insert_output(VALUE self, VALUE string) } static VALUE -econv_primitive_putback(VALUE self, VALUE max) +econv_putback(VALUE self, VALUE max) { rb_econv_t *ec = check_econv(self); int n; @@ -2834,7 +2834,7 @@ Init_transcode(void) 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, "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_IGNORE", INT2FIX(ECONV_INVALID_IGNORE)); rb_define_const(rb_cEncodingConverter, "INVALID_REPLACE", INT2FIX(ECONV_INVALID_REPLACE)); |