ruby-changes:7750
From: akr <ko1@a...>
Date: Tue, 9 Sep 2008 21:23:02 +0900 (JST)
Subject: [ruby-changes:7750] Ruby:r19271 (trunk): * include/ruby/encoding.h (ECONV_DECORATOR_MASK): merge
akr 2008-09-09 21:22:43 +0900 (Tue, 09 Sep 2008) New Revision: 19271 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19271 Log: * include/ruby/encoding.h (ECONV_DECORATOR_MASK): merge ECONV_ENCODER_MASK and ECONV_DECORATOR_MASK. (ECONV_UNIVERSAL_NEWLINE_DECORATOR): renamed from ECONV_UNIVERSAL_NEWLINE_DECODER. (ECONV_CRLF_NEWLINE_DECORATOR): renamed from ECONV_CRLF_NEWLINE_ENCODER. (ECONV_CR_NEWLINE_DECORATOR): renamed from ECONV_CR_NEWLINE_ENCODER. (ECONV_XML_TEXT_DECORATOR): renamed from ECONV_XML_TEXT_ENCODER. (ECONV_XML_ATTR_CONTENT_DECORATOR): renamed from ECONV_XML_ATTR_CONTENT_ENCODER. (ECONV_STATEFUL_DECORATOR_MASK): renamed from ECONV_STATEFUL_ENCODER_MASK. (ECONV_XML_ATTR_QUOTE_DECORATOR): renamed from ECONV_XML_ATTR_CONTENT_DECORATOR. * io.c: follow the renaming. * transcode.c: ditto. Modified files: trunk/ChangeLog trunk/include/ruby/encoding.h trunk/io.c trunk/test/ruby/test_econv.rb trunk/transcode.c Index: include/ruby/encoding.h =================================================================== --- include/ruby/encoding.h (revision 19270) +++ include/ruby/encoding.h (revision 19271) @@ -265,19 +265,16 @@ #define ECONV_UNDEF_REPLACE 0x00000020 #define ECONV_UNDEF_HEX_CHARREF 0x00000030 -/* usable only if destination encoding is ascii compatible */ -#define ECONV_DECODER_MASK 0x00000f00 -#define ECONV_UNIVERSAL_NEWLINE_DECODER 0x00000100 +#define ECONV_DECORATOR_MASK 0x0000ff00 -/* usable only if source encoding is ascii compatible */ -#define ECONV_ENCODER_MASK 0x0000f000 -#define ECONV_CRLF_NEWLINE_ENCODER 0x00001000 -#define ECONV_CR_NEWLINE_ENCODER 0x00002000 -#define ECONV_XML_TEXT_ENCODER 0x00004000 -#define ECONV_XML_ATTR_CONTENT_ENCODER 0x00008000 +#define ECONV_UNIVERSAL_NEWLINE_DECORATOR 0x00000100 +#define ECONV_CRLF_NEWLINE_DECORATOR 0x00001000 +#define ECONV_CR_NEWLINE_DECORATOR 0x00002000 +#define ECONV_XML_TEXT_DECORATOR 0x00004000 +#define ECONV_XML_ATTR_CONTENT_DECORATOR 0x00008000 -#define ECONV_STATEFUL_ENCODER_MASK 0x00f00000 -#define ECONV_XML_ATTR_QUOTE_ENCODER 0x00100000 +#define ECONV_STATEFUL_DECORATOR_MASK 0x00f00000 +#define ECONV_XML_ATTR_QUOTE_DECORATOR 0x00100000 /* end of flags for rb_econv_open */ Index: ChangeLog =================================================================== --- ChangeLog (revision 19270) +++ ChangeLog (revision 19271) @@ -1,3 +1,24 @@ +Tue Sep 9 21:17:00 2008 Tanaka Akira <akr@f...> + + * include/ruby/encoding.h (ECONV_DECORATOR_MASK): merge + ECONV_ENCODER_MASK and ECONV_DECORATOR_MASK. + (ECONV_UNIVERSAL_NEWLINE_DECORATOR): renamed from + ECONV_UNIVERSAL_NEWLINE_DECODER. + (ECONV_CRLF_NEWLINE_DECORATOR): renamed from + ECONV_CRLF_NEWLINE_ENCODER. + (ECONV_CR_NEWLINE_DECORATOR): renamed from ECONV_CR_NEWLINE_ENCODER. + (ECONV_XML_TEXT_DECORATOR): renamed from ECONV_XML_TEXT_ENCODER. + (ECONV_XML_ATTR_CONTENT_DECORATOR): renamed from + ECONV_XML_ATTR_CONTENT_ENCODER. + (ECONV_STATEFUL_DECORATOR_MASK): renamed from + ECONV_STATEFUL_ENCODER_MASK. + (ECONV_XML_ATTR_QUOTE_DECORATOR): renamed from + ECONV_XML_ATTR_CONTENT_DECORATOR. + + * io.c: follow the renaming. + + * transcode.c: ditto. + Tue Sep 9 20:55:55 2008 Tanaka Akira <akr@f...> * transcode.c (rb_econv_open0): make it static. Index: io.c =================================================================== --- io.c (revision 19270) +++ io.c (revision 19271) @@ -673,16 +673,16 @@ #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32) /* Windows */ -# define NEED_NEWLINE_DECODER(fptr) (!(fptr->mode & FMODE_BINMODE)) -# define NEED_NEWLINE_ENCODER(fptr) (!(fptr->mode & FMODE_BINMODE)) -# define TEXTMODE_NEWLINE_ENCODER ECONV_CRLF_NEWLINE_ENCODER +# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (!(fptr->mode & FMODE_BINMODE)) +# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) (!(fptr->mode & FMODE_BINMODE)) +# define TEXTMODE_NEWLINE_DECORATOR_ON_WRITE ECONV_CRLF_NEWLINE_DECORATOR #else /* Unix */ -# define NEED_NEWLINE_DECODER(fptr) (fptr->mode & FMODE_TEXTMODE) -# define NEED_NEWLINE_ENCODER(fptr) 0 +# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (fptr->mode & FMODE_TEXTMODE) +# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) 0 #endif -#define NEED_READCONV(fptr) (fptr->encs.enc2 != NULL || NEED_NEWLINE_DECODER(fptr)) -#define NEED_WRITECONV(fptr) (fptr->encs.enc != NULL || NEED_NEWLINE_ENCODER(fptr) || (fptr->encs.ecflags & (ECONV_DECODER_MASK|ECONV_ENCODER_MASK|ECONV_STATEFUL_ENCODER_MASK))) +#define NEED_READCONV(fptr) (fptr->encs.enc2 != NULL || NEED_NEWLINE_DECORATOR_ON_READ(fptr)) +#define NEED_WRITECONV(fptr) (fptr->encs.enc != NULL || NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) || (fptr->encs.ecflags & (ECONV_DECORATOR_MASK|ECONV_STATEFUL_DECORATOR_MASK))) static void make_writeconv(rb_io_t *fptr) @@ -697,9 +697,9 @@ ecflags = fptr->encs.ecflags; ecopts = fptr->encs.ecopts; -#ifdef TEXTMODE_NEWLINE_ENCODER - if (NEED_NEWLINE_ENCODER(fptr)) - ecflags |= TEXTMODE_NEWLINE_ENCODER; +#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE + if (NEED_NEWLINE_DECORATOR_ON_WRITE(fptr)) + ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE; #endif if (!fptr->encs.enc) { @@ -714,7 +714,7 @@ else { enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc; senc = rb_econv_asciicompat_encoding(enc->name); - if (!senc && !(fptr->encs.ecflags & ECONV_STATEFUL_ENCODER_MASK)) { + if (!senc && !(fptr->encs.ecflags & ECONV_STATEFUL_DECORATOR_MASK)) { /* single conversion */ fptr->writeconv_pre_ecflags = ecflags; fptr->writeconv_pre_ecopts = ecopts; @@ -723,7 +723,7 @@ } else { /* double conversion */ - fptr->writeconv_pre_ecflags = ecflags & ~ECONV_STATEFUL_ENCODER_MASK; + fptr->writeconv_pre_ecflags = ecflags & ~ECONV_STATEFUL_DECORATOR_MASK; fptr->writeconv_pre_ecopts = ecopts; if (senc) { denc = enc->name; @@ -733,7 +733,7 @@ senc = denc = ""; fptr->writeconv_stateless = rb_str_new2(enc->name); } - ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_ENCODER_MASK); + ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_DECORATOR_MASK); ecopts = fptr->encs.ecopts; fptr->writeconv = rb_econv_open_opts(senc, denc, ecflags, ecopts); if (!fptr->writeconv) @@ -1455,8 +1455,8 @@ const char *sname, *dname; ecflags = fptr->encs.ecflags; ecopts = fptr->encs.ecopts; - if (NEED_NEWLINE_DECODER(fptr)) - ecflags |= ECONV_UNIVERSAL_NEWLINE_DECODER; + if (NEED_NEWLINE_DECORATOR_ON_READ(fptr)) + ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR; if (fptr->encs.enc2) { sname = fptr->encs.enc2->name; dname = fptr->encs.enc->name; @@ -3509,7 +3509,7 @@ rb_econv_binmode(fptr->writeconv); fptr->mode |= FMODE_BINMODE; fptr->mode &= ~FMODE_TEXTMODE; - fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECODER|ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER); + fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECORATOR|ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR); return io; } Index: test/ruby/test_econv.rb =================================================================== --- test/ruby/test_econv.rb (revision 19270) +++ test/ruby/test_econv.rb (revision 19271) @@ -69,23 +69,23 @@ def test_newline_converter_with_ascii_incompatible assert_nothing_raised { - Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::UNIVERSAL_NEWLINE_DECODER) + Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::UNIVERSAL_NEWLINE_DECORATOR) } assert_nothing_raised { - Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::CRLF_NEWLINE_ENCODER) + Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::CRLF_NEWLINE_DECORATOR) } assert_nothing_raised { - Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::CR_NEWLINE_ENCODER) + Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::CR_NEWLINE_DECORATOR) } assert_nothing_raised { - Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::UNIVERSAL_NEWLINE_DECODER) + Encoding::Converter.new("UTF-16BE", "UTF-8", Encoding::Converter::UNIVERSAL_NEWLINE_DECORATOR) } assert_nothing_raised { - Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::CRLF_NEWLINE_ENCODER) + Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::CRLF_NEWLINE_DECORATOR) } assert_nothing_raised { - Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::CR_NEWLINE_ENCODER) + Encoding::Converter.new("UTF-8", "UTF-16BE", Encoding::Converter::CR_NEWLINE_DECORATOR) } end @@ -372,7 +372,7 @@ end def test_universal_newline - ec = Encoding::Converter.new("UTF-8", "EUC-JP", universal_newline_decoder: true) + ec = Encoding::Converter.new("UTF-8", "EUC-JP", universal_newline: true) a = ["", src="", ec, nil, 50, :partial_input=>true] src << "abc\r\ndef"; check_ec("abc\ndef", "", :source_buffer_empty, *a) src << "ghi\njkl"; check_ec("abc\ndefghi\njkl", "", :source_buffer_empty, *a) @@ -383,7 +383,7 @@ end def test_universal_newline2 - ec = Encoding::Converter.new("", "", universal_newline_decoder: true) + ec = Encoding::Converter.new("", "", universal_newline: true) a = ["", src="", ec, nil, 50, :partial_input=>true] src << "abc\r\ndef"; check_ec("abc\ndef", "", :source_buffer_empty, *a) src << "ghi\njkl"; check_ec("abc\ndefghi\njkl", "", :source_buffer_empty, *a) @@ -394,22 +394,22 @@ end def test_crlf_newline - ec = Encoding::Converter.new("UTF-8", "EUC-JP", crlf_newline_encoder: true) + ec = Encoding::Converter.new("UTF-8", "EUC-JP", crlf_newline: true) assert_econv("abc\r\ndef", :finished, 50, ec, "abc\ndef", "") end def test_crlf_newline2 - ec = Encoding::Converter.new("", "", crlf_newline_encoder: true) + ec = Encoding::Converter.new("", "", crlf_newline: true) assert_econv("abc\r\ndef", :finished, 50, ec, "abc\ndef", "") end def test_cr_newline - ec = Encoding::Converter.new("UTF-8", "EUC-JP", cr_newline_encoder: true) + ec = Encoding::Converter.new("UTF-8", "EUC-JP", cr_newline: true) assert_econv("abc\rdef", :finished, 50, ec, "abc\ndef", "") end def test_cr_newline2 - ec = Encoding::Converter.new("", "", cr_newline_encoder: true) + ec = Encoding::Converter.new("", "", cr_newline: true) assert_econv("abc\rdef", :finished, 50, ec, "abc\ndef", "") end @@ -777,18 +777,18 @@ end def test_xml_escape_with_charref - ec = Encoding::Converter.new("utf-8", "euc-jp", Encoding::Converter::XML_TEXT_ENCODER|Encoding::Converter::UNDEF_HEX_CHARREF) + ec = Encoding::Converter.new("utf-8", "euc-jp", Encoding::Converter::XML_TEXT_DECORATOR|Encoding::Converter::UNDEF_HEX_CHARREF) assert_equal('<♥>&"♡"', ec.convert("<\u2665>&\"\u2661\"")) assert_equal('', ec.finish) ec = Encoding::Converter.new("utf-8", "euc-jp", - Encoding::Converter::XML_ATTR_CONTENT_ENCODER| - Encoding::Converter::XML_ATTR_QUOTE_ENCODER| + Encoding::Converter::XML_ATTR_CONTENT_DECORATOR| + Encoding::Converter::XML_ATTR_QUOTE_DECORATOR| Encoding::Converter::UNDEF_HEX_CHARREF) assert_equal('"<♥>&"♡"', ec.convert("<\u2665>&\"\u2661\"")) assert_equal('"', ec.finish) - ec = Encoding::Converter.new("utf-8", "iso-2022-jp", Encoding::Converter::XML_TEXT_ENCODER) + ec = Encoding::Converter.new("utf-8", "iso-2022-jp", Encoding::Converter::XML_TEXT_DECORATOR) assert_equal("&\e$B$&\e(B&".force_encoding("iso-2022-jp"), ec.convert("&\u3046&")) assert_equal('', ec.finish) end Index: transcode.c =================================================================== --- transcode.c (revision 19270) +++ transcode.c (revision 19271) @@ -22,9 +22,9 @@ static VALUE sym_invalid, sym_undef, sym_ignore, sym_replace; static VALUE sym_xml, sym_text, sym_attr; -static VALUE sym_universal_newline_decoder; -static VALUE sym_crlf_newline_encoder; -static VALUE sym_cr_newline_encoder; +static VALUE sym_universal_newline; +static VALUE sym_crlf_newline; +static VALUE sym_cr_newline; static VALUE sym_partial_input; static VALUE sym_invalid_byte_sequence; @@ -947,37 +947,37 @@ const char *decorators[6]; int i; - if ((ecflags & ECONV_CRLF_NEWLINE_ENCODER) && - (ecflags & ECONV_CR_NEWLINE_ENCODER)) + if ((ecflags & ECONV_CRLF_NEWLINE_DECORATOR) && + (ecflags & ECONV_CR_NEWLINE_DECORATOR)) return NULL; - if ((ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER)) && - (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER)) + if ((ecflags & (ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR)) && + (ecflags & ECONV_UNIVERSAL_NEWLINE_DECORATOR)) return NULL; - if ((ecflags & ECONV_XML_TEXT_ENCODER) && - (ecflags & ECONV_XML_ATTR_CONTENT_ENCODER)) + if ((ecflags & ECONV_XML_TEXT_DECORATOR) && + (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR)) return NULL; num_decorators = 0; - if (ecflags & ECONV_XML_TEXT_ENCODER) + if (ecflags & ECONV_XML_TEXT_DECORATOR) if (!(decorators[num_decorators++] = "xml-text-escaped")) return NULL; - if (ecflags & ECONV_XML_ATTR_CONTENT_ENCODER) + if (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR) if (!(decorators[num_decorators++] = "xml-attr-content-escaped")) return NULL; - if (ecflags & ECONV_XML_ATTR_QUOTE_ENCODER) + if (ecflags & ECONV_XML_ATTR_QUOTE_DECORATOR) if (!(decorators[num_decorators++] = "xml-attr-quoted")) return NULL; - if (ecflags & ECONV_CRLF_NEWLINE_ENCODER) + if (ecflags & ECONV_CRLF_NEWLINE_DECORATOR) if (!(decorators[num_decorators++] = "crlf_newline")) return NULL; - if (ecflags & ECONV_CR_NEWLINE_ENCODER) + if (ecflags & ECONV_CR_NEWLINE_DECORATOR) if (!(decorators[num_decorators++] = "cr_newline")) return NULL; - if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) + if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECORATOR) if (!(decorators[num_decorators++] = "universal_newline")) return NULL; @@ -1832,17 +1832,17 @@ int num_trans; n = 0; - if (ec->flags & ECONV_UNIVERSAL_NEWLINE_DECODER) { + if (ec->flags & ECONV_UNIVERSAL_NEWLINE_DECORATOR) { entry = get_transcoder_entry("universal_newline", ""); if (entry->transcoder) trs[n++] = entry->transcoder; } - if (ec->flags & ECONV_CRLF_NEWLINE_ENCODER) { + if (ec->flags & ECONV_CRLF_NEWLINE_DECORATOR) { entry = get_transcoder_entry("", "crlf_newline"); if (entry->transcoder) trs[n++] = entry->transcoder; } - if (ec->flags & ECONV_CR_NEWLINE_ENCODER) { + if (ec->flags & ECONV_CR_NEWLINE_DECORATOR) { entry = get_transcoder_entry("", "cr_newline"); if (entry->transcoder) trs[n++] = entry->transcoder; @@ -1866,7 +1866,7 @@ } } - ec->flags &= ~(ECONV_UNIVERSAL_NEWLINE_DECODER|ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER); + ec->flags &= ~(ECONV_UNIVERSAL_NEWLINE_DECORATOR|ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR); } @@ -1888,36 +1888,36 @@ has_description = 1; } - if (ecflags & (ECONV_UNIVERSAL_NEWLINE_DECODER| - ECONV_CRLF_NEWLINE_ENCODER| - ECONV_CR_NEWLINE_ENCODER| - ECONV_XML_TEXT_ENCODER| - ECONV_XML_ATTR_CONTENT_ENCODER| - ECONV_XML_ATTR_QUOTE_ENCODER)) { + if (ecflags & (ECONV_UNIVERSAL_NEWLINE_DECORATOR| + ECONV_CRLF_NEWLINE_DECORATOR| + ECONV_CR_NEWLINE_DECORATOR| + ECONV_XML_TEXT_DECORATOR| + ECONV_XML_ATTR_CONTENT_DECORATOR| + ECONV_XML_ATTR_QUOTE_DECORATOR)) { const char *pre = ""; if (has_description) rb_str_cat2(mesg, " with "); - if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) { + if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "universal-newline"); } - if (ecflags & ECONV_CRLF_NEWLINE_ENCODER) { + if (ecflags & ECONV_CRLF_NEWLINE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "CRLF-newline"); } - if (ecflags & ECONV_CR_NEWLINE_ENCODER) { + if (ecflags & ECONV_CR_NEWLINE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "CR-newline"); } - if (ecflags & ECONV_XML_TEXT_ENCODER) { + if (ecflags & ECONV_XML_TEXT_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "XML-text"); } - if (ecflags & ECONV_XML_ATTR_CONTENT_ENCODER) { + if (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "XML-attr-content"); } - if (ecflags & ECONV_XML_ATTR_QUOTE_ENCODER) { + if (ecflags & ECONV_XML_ATTR_QUOTE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "XML-attr-quote"); } @@ -2275,27 +2275,27 @@ if (!NIL_P(v)) { v = rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym"); if (v==sym_text) { - ecflags |= ECONV_XML_TEXT_ENCODER|ECONV_UNDEF_HEX_CHARREF; + ecflags |= ECONV_XML_TEXT_DECORATOR|ECONV_UNDEF_HEX_CHARREF; } else if (v==sym_attr) { - ecflags |= ECONV_XML_ATTR_CONTENT_ENCODER|ECONV_XML_ATTR_QUOTE_ENCODER|ECONV_UNDEF_HEX_CHARREF; + ecflags |= ECONV_XML_ATTR_CONTENT_DECORATOR|ECONV_XML_ATTR_QUOTE_DECORATOR|ECONV_UNDEF_HEX_CHARREF; } else { rb_raise(rb_eArgError, "unexpected value for xml option: %s", rb_id2name(SYM2ID(v))); } } - v = rb_hash_aref(opt, sym_universal_newline_decoder); + v = rb_hash_aref(opt, sym_universal_newline); if (RTEST(v)) - ecflags |= ECONV_UNIVERSAL_NEWLINE_DECODER; + ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR; - v = rb_hash_aref(opt, sym_crlf_newline_encoder); + v = rb_hash_aref(opt, sym_crlf_newline); if (RTEST(v)) - ecflags |= ECONV_CRLF_NEWLINE_ENCODER; + ecflags |= ECONV_CRLF_NEWLINE_DECORATOR; - v = rb_hash_aref(opt, sym_cr_newline_encoder); + v = rb_hash_aref(opt, sym_cr_newline); if (RTEST(v)) - ecflags |= ECONV_CR_NEWLINE_ENCODER; + ecflags |= ECONV_CR_NEWLINE_DECORATOR; return ecflags; } @@ -2430,12 +2430,12 @@ dencidx = str_transcode_enc_args(str, argv[0], argc==1 ? Qnil : argv[1], &sname, &senc, &dname, &denc); - if ((ecflags & (ECONV_UNIVERSAL_NEWLINE_DECODER| - ECONV_CRLF_NEWLINE_ENCODER| - ECONV_CR_NEWLINE_ENCODER| - ECONV_XML_TEXT_ENCODER| - ECONV_XML_ATTR_CONTENT_ENCODER| - ECONV_XML_ATTR_QUOTE_ENCODER)) == 0) { + if ((ecflags & (ECONV_UNIVERSAL_NEWLINE_DECORATOR| + ECONV_CRLF_NEWLINE_DECORATOR| + ECONV_CR_NEWLINE_DECORATOR| + ECONV_XML_TEXT_DECORATOR| + ECONV_XML_ATTR_CONTENT_DECORATOR| + ECONV_XML_ATTR_QUOTE_DECORATOR)) == 0) { if (senc && senc == denc) { return -1; } @@ -2644,18 +2644,18 @@ * * possible options elements: * hash form: - * :universal_newline_decoder => true # convert CRLF and CR to LF at last - * :crlf_newline_encoder => true # convert LF to CRLF at first - * :cr_newline_encoder => true # convert LF to CR at first + * :universal_newline => true # convert CRLF and CR to LF + * :crlf_newline => true # convert LF to CRLF + * :cr_newline => true # convert LF to CR * :invalid => nil # error on invalid byte sequence (default) * :invalid => :replace # replace invalid byte sequence * :undef => nil # error on undefined conversion (default) * :undef => :replace # replace undefined conversion * :replace => string # replacement string ("?" or "\uFFFD" if not specified) * integer form: - * Encoding::Converter::UNIVERSAL_NEWLINE_DECODER - * Encoding::Converter::CRLF_NEWLINE_ENCODER - * Encoding::Converter::CR_NEWLINE_ENCODER + * Encoding::Converter::UNIVERSAL_NEWLINE_DECORATOR + * Encoding::Converter::CRLF_NEWLINE_DECORATOR + * Encoding::Converter::CR_NEWLINE_DECORATOR * * Encoding::Converter.new creates an instance of Encoding::Converter. * @@ -2670,11 +2670,11 @@ * * # (1) convert UTF-16BE to UTF-8 * # (2) convert CRLF and CR to LF - * ec = Encoding::Converter.new("UTF-16BE", "UTF-8", :universal_newline_decoder => true) + * ec = Encoding::Converter.new("UTF-16BE", "UTF-8", :universal_newline => true) * * # (1) convert LF to CRLF * # (2) convert UTF-8 to UTF-16BE - * ec = Encoding::Converter.new("UTF-8", "UTF-16BE", :crlf_newline_encoder => true) + * ec = Encoding::Converter.new("UTF-8", "UTF-16BE", :crlf_newline => true) * */ static VALUE @@ -3633,9 +3633,9 @@ sym_finished = ID2SYM(rb_intern("finished")); sym_output_followed_by_input = ID2SYM(rb_intern("output_followed_by_input")); sym_incomplete_input = ID2SYM(rb_intern("incomplete_input")); - sym_universal_newline_decoder = ID2SYM(rb_intern("universal_newline_decoder")); - sym_crlf_newline_encoder = ID2SYM(rb_intern("crlf_newline_encoder")); - sym_cr_newline_encoder = ID2SYM(rb_intern("cr_newline_encoder")); + sym_universal_newline = ID2SYM(rb_intern("universal_newline")); + sym_crlf_newline = ID2SYM(rb_intern("crlf_newline")); + sym_cr_newline = ID2SYM(rb_intern("cr_newline")); sym_partial_input = ID2SYM(rb_intern("partial_input")); rb_define_method(rb_cString, "encode", str_encode, -1); @@ -3665,12 +3665,12 @@ rb_define_const(rb_cEncodingConverter, "UNDEF_HEX_CHARREF", INT2FIX(ECONV_UNDEF_HEX_CHARREF)); rb_define_const(rb_cEncodingConverter, "PARTIAL_INPUT", INT2FIX(ECONV_PARTIAL_INPUT)); rb_define_const(rb_cEncodingConverter, "OUTPUT_FOLLOWED_BY_INPUT", INT2FIX(ECONV_OUTPUT_FOLLOWED_BY_INPUT)); - rb_define_const(rb_cEncodingConverter, "UNIVERSAL_NEWLINE_DECODER", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECODER)); - rb_define_const(rb_cEncodingConverter, "CRLF_NEWLINE_ENCODER", INT2FIX(ECONV_CRLF_NEWLINE_ENCODER)); - rb_define_const(rb_cEncodingConverter, "CR_NEWLINE_ENCODER", INT2FIX(ECONV_CR_NEWLINE_ENCODER)); - rb_define_const(rb_cEncodingConverter, "XML_TEXT_ENCODER", INT2FIX(ECONV_XML_TEXT_ENCODER)); - rb_define_const(rb_cEncodingConverter, "XML_ATTR_CONTENT_ENCODER", INT2FIX(ECONV_XML_ATTR_CONTENT_ENCODER)); - rb_define_const(rb_cEncodingConverter, "XML_ATTR_QUOTE_ENCODER", INT2FIX(ECONV_XML_ATTR_QUOTE_ENCODER)); + rb_define_const(rb_cEncodingConverter, "UNIVERSAL_NEWLINE_DECORATOR", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECORATOR)); + rb_define_const(rb_cEncodingConverter, "CRLF_NEWLINE_DECORATOR", INT2FIX(ECONV_CRLF_NEWLINE_DECORATOR)); + rb_define_const(rb_cEncodingConverter, "CR_NEWLINE_DECORATOR", INT2FIX(ECONV_CR_NEWLINE_DECORATOR)); + rb_define_const(rb_cEncodingConverter, "XML_TEXT_DECORATOR", INT2FIX(ECONV_XML_TEXT_DECORATOR)); + rb_define_const(rb_cEncodingConverter, "XML_ATTR_CONTENT_DECORATOR", INT2FIX(ECONV_XML_ATTR_CONTENT_DECORATOR)); + rb_define_const(rb_cEncodingConverter, "XML_ATTR_QUOTE_DECORATOR", INT2FIX(ECONV_XML_ATTR_QUOTE_DECORATOR)); rb_define_method(rb_eConversionUndefined, "source_encoding_name", ecerr_source_encoding_name, 0); rb_define_method(rb_eConversionUndefined, "destination_encoding_name", ecerr_destination_encoding_name, 0); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/