зеркало из https://github.com/github/ruby.git
* transcode.c (str_transcode0): String#encode() with no encoding
specified transcode the string into Encoding.default_internal. inspired by [ruby-core:19298]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
e64453aa69
Коммит
284f4c8431
|
@ -1,3 +1,9 @@
|
|||
Mon Oct 13 07:42:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* transcode.c (str_transcode0): String#encode() with no encoding
|
||||
specified transcode the string into Encoding.default_internal.
|
||||
inspired by [ruby-core:19298].
|
||||
|
||||
Sun Oct 12 18:00:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
|
||||
|
||||
* ext/win32ole/win32ole.c (set_ole_codepage, ole_cp2encoding,
|
||||
|
|
19
transcode.c
19
transcode.c
|
@ -2448,12 +2448,20 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts)
|
|||
const char *sname, *dname;
|
||||
int dencidx;
|
||||
|
||||
if (argc < 1 || argc > 2) {
|
||||
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
|
||||
if (argc <0 || argc > 2) {
|
||||
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..2)", argc);
|
||||
}
|
||||
|
||||
arg1 = argv[0];
|
||||
arg2 = argc==1 ? Qnil : argv[1];
|
||||
if (argc == 0) {
|
||||
arg1 = rb_enc_default_internal();
|
||||
if (NIL_P(arg1)) {
|
||||
rb_raise(rb_eArgError, "Encoding.default_internal is not specified");
|
||||
}
|
||||
}
|
||||
else {
|
||||
arg1 = argv[0];
|
||||
}
|
||||
arg2 = argc<=1 ? Qnil : argv[1];
|
||||
dencidx = str_transcode_enc_args(str, &arg1, &arg2, &sname, &senc, &dname, &denc);
|
||||
|
||||
if ((ecflags & (ECONV_UNIVERSAL_NEWLINE_DECORATOR|
|
||||
|
@ -2568,6 +2576,7 @@ str_encode_bang(int argc, VALUE *argv, VALUE str)
|
|||
* call-seq:
|
||||
* str.encode(encoding [, options] ) => str
|
||||
* str.encode(dst_encoding, src_encoding [, options] ) => str
|
||||
* str.encode([options]) => str
|
||||
*
|
||||
* The first form returns a copy of <i>str</i> transcoded
|
||||
* to encoding +encoding+.
|
||||
|
@ -2575,6 +2584,8 @@ str_encode_bang(int argc, VALUE *argv, VALUE str)
|
|||
* from src_encoding to dst_encoding.
|
||||
* The options Hash gives details for conversion. Details
|
||||
* to be added.
|
||||
* The last form returns a copy of <i>str</i> transcoded to
|
||||
* <code>Encoding.default_internal</code>.
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
|
|
Загрузка…
Ссылка в новой задаче