kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* transcode.c (str_transcode): allow non-registered encodings.

Browse source 
[ruby-dev:32520]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-10 12:47:55 +00:00
parent d04f108952
commit 6d7999c132
3 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 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 * array.c (rb_ary_slice_bang): should return nil if position out

1
include/ruby/encoding.h
View file

@ -38,6 +38,7 @@
typedef OnigEncodingType rb_encoding; typedef OnigEncodingType rb_encoding;
int rb_enc_replicate(const char *, rb_encoding *);
int rb_enc_to_index(rb_encoding*); int rb_enc_to_index(rb_encoding*);
int rb_enc_get_index(VALUE obj); int rb_enc_get_index(VALUE obj);
int rb_enc_find_index(const char *name); int rb_enc_find_index(const char *name);

37
transcode.c
View file

@ -257,29 +257,46 @@ str_transcode(int argc, VALUE *argv, VALUE str)
char *buf, *bp, *sp, *fromp; char *buf, *bp, *sp, *fromp;
rb_encoding *from_enc, *to_enc; rb_encoding *from_enc, *to_enc;
const char *from_e, *to_e; const char *from_e, *to_e;
int from_encidx, to_encidx;
VALUE from_encval, to_encval;
transcoder *my_transcoder; transcoder *my_transcoder;
transcoding my_transcoding; transcoding my_transcoding;
if (argc<1 || argc>2) { if (argc<1 || argc>2) {
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
} }
to_enc = rb_to_encoding(argv[0]); if ((to_encidx = rb_to_encoding_index(to_encval = argv[0])) < 0) {
to_e = rb_enc_name(to_enc); to_enc = 0;
if (argc==1) { to_e = StringValueCStr(to_encval);
from_enc = rb_enc_get(str);
} }
else { else {
from_enc = rb_to_encoding(argv[1]); to_enc = rb_enc_from_index(to_encidx);
to_e = rb_enc_name(to_enc);
}
if (argc==1) {
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_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; 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) if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT)
return Qnil; return Qnil;
} }
if (strcasecmp(from_e, to_e) == 0) {
return Qnil;
}
if (!(my_transcoder = transcode_dispatch(from_e, to_e))) { if (!(my_transcoder = transcode_dispatch(from_e, to_e))) {
rb_raise(rb_eArgError, "transcoding not supported (from %s to %s)", 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); rb_str_set_len(dest, bp - buf);
/* set encoding */ /* 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); rb_enc_associate(dest, to_enc);
return dest; return dest;