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

* transcode.c (econv_init): accept Encoding object as source_encoding

Browse Source 
and destination_encoding.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-14 12:35:19 +00:00
parent d46728ec0e
commit a6daaf16b0
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 14 21:34:41 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_init): accept Encoding object as source_encoding
and destination_encoding.
Thu Aug 14 21:10:00 2008 Tanaka Akira <akr@fsij.org> Thu Aug 14 21:10:00 2008 Tanaka Akira <akr@fsij.org>
* encoding.c (rb_filesystem_encoding): use default external encoding * encoding.c (rb_filesystem_encoding): use default external encoding

5
test/ruby/test_econv.rb
View File

@ -20,6 +20,11 @@ class TestEncodingConverter < Test::Unit::TestCase
[o, ret, i]) [o, ret, i])
end end
def test_new
assert_kind_of(Encoding::Converter, Encoding::Converter.new("UTF-8", "EUC-JP"))
assert_kind_of(Encoding::Converter, Encoding::Converter.new(Encoding::UTF_8, Encoding::EUC_JP))
end
def test_output_region def test_output_region
ec = Encoding::Converter.new("UTF-8", "EUC-JP") ec = Encoding::Converter.new("UTF-8", "EUC-JP")
ec.primitive_convert(src="a", dst="b", nil, 1, Encoding::Converter::PARTIAL_INPUT) ec.primitive_convert(src="a", dst="b", nil, 1, Encoding::Converter::PARTIAL_INPUT)

40
transcode.c
View File

@ -1412,33 +1412,49 @@ econv_s_allocate(VALUE klass)
static VALUE static VALUE
econv_init(int argc, VALUE *argv, VALUE self) econv_init(int argc, VALUE *argv, VALUE self)
{ {
VALUE from_encoding, to_encoding, flags_v; VALUE source_encoding, destination_encoding, flags_v;
const char *from_e, *to_e; rb_encoding *senc, *denc;
rb_econv_t *ts; const char *sname, *dname;
rb_econv_t *ec;
int flags; int flags;
rb_scan_args(argc, argv, "21", &from_encoding, &to_encoding, &flags_v); rb_scan_args(argc, argv, "21", &source_encoding, &destination_encoding, &flags_v);
StringValue(from_encoding);
StringValue(to_encoding);
if (flags_v == Qnil) if (flags_v == Qnil)
flags = 0; flags = 0;
else else
flags = NUM2INT(flags_v); flags = NUM2INT(flags_v);
from_e = RSTRING_PTR(from_encoding); senc = NULL;
to_e = RSTRING_PTR(to_encoding); if (TYPE(source_encoding) != T_STRING) {
senc = rb_to_encoding(source_encoding);
}
denc = NULL;
if (TYPE(destination_encoding) != T_STRING) {
denc = rb_to_encoding(destination_encoding);
}
if (senc)
sname = senc->name;
else
sname = RSTRING_PTR(source_encoding);
if (denc)
dname = denc->name;
else
dname = RSTRING_PTR(destination_encoding);
if (DATA_PTR(self)) { if (DATA_PTR(self)) {
rb_raise(rb_eTypeError, "already initialized"); rb_raise(rb_eTypeError, "already initialized");
} }
ts = rb_econv_open(from_e, to_e, flags); ec = rb_econv_open(sname, dname, flags);
if (!ts) { if (!ec) {
rb_raise(rb_eArgError, "encoding convewrter not supported (from %s to %s)", from_e, to_e); rb_raise(rb_eArgError, "encoding convewrter not supported (from %s to %s)", sname, dname);
} }
DATA_PTR(self) = ts; DATA_PTR(self) = ec;
return self; return self;
} }