ruby-changes:2691
From: ko1@a...
Date: 10 Dec 2007 22:17:00 +0900
Subject: [ruby-changes:2691] nobu - Ruby:r14182 (trunk): * transcode.c (str_transcode): allow non-registered encodings.
nobu 2007-12-10 21:47:55 +0900 (Mon, 10 Dec 2007) New Revision: 14182 Modified files: trunk/ChangeLog trunk/include/ruby/encoding.h trunk/transcode.c Log: * transcode.c (str_transcode): allow non-registered encodings. [ruby-dev:32520] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14182&r2=14181 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode.c?r1=14182&r2=14181 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/encoding.h?r1=14182&r2=14181 Index: include/ruby/encoding.h =================================================================== --- include/ruby/encoding.h (revision 14181) +++ include/ruby/encoding.h (revision 14182) @@ -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); Index: ChangeLog =================================================================== --- ChangeLog (revision 14181) +++ ChangeLog (revision 14182) @@ -1,3 +1,8 @@ +Mon Dec 10 21:47:53 2007 Nobuyoshi Nakada <nobu@r...> + + * transcode.c (str_transcode): allow non-registered encodings. + [ruby-dev:32520] + Mon Dec 10 21:00:30 2007 Yukihiro Matsumoto <matz@r...> * array.c (rb_ary_slice_bang): should return nil if position out Index: transcode.c =================================================================== --- transcode.c (revision 14181) +++ transcode.c (revision 14182) @@ -257,29 +257,46 @@ 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 @@ 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; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml