diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-10 12:47:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-10 12:47:55 +0000 |
commit | b296c0d8b0d4a5dfdabe80896a55aae6c2363331 (patch) | |
tree | 5aa9e2e5c0da2ef9e8fb32bc174d53a5fe67ecb1 | |
parent | fc9493aaea3ca029b2c6fffe887a41a121993146 (diff) | |
download | ruby-b296c0d8b0d4a5dfdabe80896a55aae6c2363331.tar.gz ruby-b296c0d8b0d4a5dfdabe80896a55aae6c2363331.tar.xz ruby-b296c0d8b0d4a5dfdabe80896a55aae6c2363331.zip |
* transcode.c (str_transcode): allow non-registered encodings.
[ruby-dev:32520]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/encoding.h | 1 | ||||
-rw-r--r-- | transcode.c | 35 |
3 files changed, 34 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Dec 10 21:47:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * transcode.c (str_transcode): allow non-registered encodings. + [ruby-dev:32520] + Mon Dec 10 21:00:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_slice_bang): should return nil if position out diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 6924e955a..38ba031e6 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -38,6 +38,7 @@ typedef OnigEncodingType rb_encoding; +int rb_enc_replicate(const char *, rb_encoding *); int rb_enc_to_index(rb_encoding*); int rb_enc_get_index(VALUE obj); int rb_enc_find_index(const char *name); diff --git a/transcode.c b/transcode.c index 716fe4fd7..ee2730bbf 100644 --- a/transcode.c +++ b/transcode.c @@ -257,29 +257,46 @@ str_transcode(int argc, VALUE *argv, VALUE str) char *buf, *bp, *sp, *fromp; rb_encoding *from_enc, *to_enc; const char *from_e, *to_e; + int from_encidx, to_encidx; + VALUE from_encval, to_encval; transcoder *my_transcoder; transcoding my_transcoding; if (argc<1 || argc>2) { rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); } - to_enc = rb_to_encoding(argv[0]); - to_e = rb_enc_name(to_enc); + if ((to_encidx = rb_to_encoding_index(to_encval = argv[0])) < 0) { + to_enc = 0; + to_e = StringValueCStr(to_encval); + } + else { + to_enc = rb_enc_from_index(to_encidx); + to_e = rb_enc_name(to_enc); + } if (argc==1) { - from_enc = rb_enc_get(str); + from_encidx = rb_enc_get_index(str); + from_enc = rb_enc_from_index(from_encidx); + from_e = rb_enc_name(from_enc); + } + else if ((from_encidx = rb_to_encoding_index(from_encval = argv[1])) < 0) { + from_enc = 0; + from_e = StringValueCStr(from_encval); } else { - from_enc = rb_to_encoding(argv[1]); + from_enc = rb_enc_from_index(from_encidx); + from_e = rb_enc_name(from_enc); } - from_e = rb_enc_name(from_enc); - if (from_enc == to_enc) { + if (from_enc && from_enc == to_enc) { return Qnil; } - if (rb_enc_asciicompat(from_enc) && rb_enc_asciicompat(to_enc)) { + if (from_enc && to_enc && rb_enc_asciicompat(from_enc) && rb_enc_asciicompat(to_enc)) { if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) return Qnil; } + if (strcasecmp(from_e, to_e) == 0) { + return Qnil; + } if (!(my_transcoder = transcode_dispatch(from_e, to_e))) { rb_raise(rb_eArgError, "transcoding not supported (from %s to %s)", from_e, to_e); } @@ -302,6 +319,10 @@ str_transcode(int argc, VALUE *argv, VALUE str) rb_str_set_len(dest, bp - buf); /* set encoding */ + if (!to_enc) { + to_encidx = rb_enc_replicate(to_e, rb_default_encoding()); + to_enc = rb_enc_from_index(to_encidx); + } rb_enc_associate(dest, to_enc); return dest; |