ruby-changes:7790
From: akr <ko1@a...>
Date: Sat, 13 Sep 2008 02:30:36 +0900 (JST)
Subject: [ruby-changes:7790] Ruby:r19311 (trunk): * enc/trans/escape.trans: transcoder name renamed to use underscore.
akr 2008-09-13 02:30:07 +0900 (Sat, 13 Sep 2008) New Revision: 19311 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19311 Log: * enc/trans/escape.trans: transcoder name renamed to use underscore. * transcode.c: follow the renaming. Modified files: trunk/ChangeLog trunk/enc/trans/escape.trans trunk/test/ruby/test_econv.rb trunk/transcode.c Index: ChangeLog =================================================================== --- ChangeLog (revision 19310) +++ ChangeLog (revision 19311) @@ -1,3 +1,9 @@ +Sat Sep 13 02:29:19 2008 Tanaka Akira <akr@f...> + + * enc/trans/escape.trans: transcoder name renamed to use underscore. + + * transcode.c: follow the renaming. + Sat Sep 13 02:12:17 2008 Tanaka Akira <akr@f...> * transcode.c (rb_econv_init_by_convpath_i): new function. Index: enc/trans/escape.trans =================================================================== --- enc/trans/escape.trans (revision 19310) +++ enc/trans/escape.trans (revision 19311) @@ -5,19 +5,19 @@ str.unpack("H*")[0] end - transcode_tblgen("", "amp-escaped", [ + transcode_tblgen("", "amp_escape", [ ["{00-25,27-FF}", :nomap], ["26", hexstr("&")] ]) - transcode_tblgen("", "xml-text-escaped", [ + transcode_tblgen("", "xml_text_escape", [ ["{00-25,27-3B,3D,3F-FF}", :nomap], ["26", hexstr("&")], ["3C", hexstr("<")], ["3E", hexstr(">")] ]) - transcode_tblgen("", "xml-attr-content-escaped", [ + transcode_tblgen("", "xml_attr_content_escape", [ ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap], ["22", hexstr(""")], ["26", hexstr("&")], @@ -74,7 +74,7 @@ static const rb_transcoder rb_escape_xml_attr_quote = { - "", "xml-attr-quoted", escape_xml_attr_quote, + "", "xml_attr_quote", escape_xml_attr_quote, TRANSCODE_TABLE_INFO, 1, /* input_unit_length */ 1, /* max_input */ Index: test/ruby/test_econv.rb =================================================================== --- test/ruby/test_econv.rb (revision 19310) +++ test/ruby/test_econv.rb (revision 19311) @@ -37,7 +37,7 @@ assert_nil(Encoding::Converter.asciicompat_encoding("EUC-JP")) assert_nil(Encoding::Converter.asciicompat_encoding("UTF-8")) assert_nil(Encoding::Converter.asciicompat_encoding(Encoding::UTF_8)) - assert_nil(Encoding::Converter.asciicompat_encoding("xml-attr-escaped")) + assert_nil(Encoding::Converter.asciicompat_encoding("xml_attr_escape")) assert_nil(Encoding::Converter.asciicompat_encoding("encoding-not-exist")) end @@ -755,45 +755,45 @@ end def test_xml_escape_text - ec = Encoding::Converter.new("", "amp-escaped") + ec = Encoding::Converter.new("", "amp_escape") assert_equal('&<>"', ec.convert("&<>\"")) assert_equal('', ec.finish) - ec = Encoding::Converter.new("", "xml-text-escaped") + ec = Encoding::Converter.new("", "xml_text_escape") assert_equal('&<>"', ec.convert("&<>\"")) assert_equal('', ec.finish) end def test_xml_escape_attr_content - ec = Encoding::Converter.new("", "xml-attr-content-escaped") + ec = Encoding::Converter.new("", "xml_attr_content_escape") assert_equal('', ec.finish) - ec = Encoding::Converter.new("", "xml-attr-content-escaped") + ec = Encoding::Converter.new("", "xml_attr_content_escape") assert_equal('', ec.convert("")) assert_equal('', ec.finish) - ec = Encoding::Converter.new("", "xml-attr-content-escaped") + ec = Encoding::Converter.new("", "xml_attr_content_escape") assert_equal('"', ec.convert('"')) assert_equal('', ec.finish) - ec = Encoding::Converter.new("", "xml-attr-content-escaped") + ec = Encoding::Converter.new("", "xml_attr_content_escape") assert_equal('&<>"', ec.convert("&<>\"")) assert_equal('', ec.finish) end def test_xml_escape_attr_quote - ec = Encoding::Converter.new("", "xml-attr-quoted") + ec = Encoding::Converter.new("", "xml_attr_quote") assert_equal('""', ec.finish) - ec = Encoding::Converter.new("", "xml-attr-quoted") + ec = Encoding::Converter.new("", "xml_attr_quote") assert_equal('', ec.convert("")) assert_equal('""', ec.finish) - ec = Encoding::Converter.new("", "xml-attr-quoted") + ec = Encoding::Converter.new("", "xml_attr_quote") assert_equal('""', ec.convert('"')) assert_equal('"', ec.finish) - ec = Encoding::Converter.new("", "xml-attr-quoted") + ec = Encoding::Converter.new("", "xml_attr_quote") assert_equal('"&<>"', ec.convert("&<>\"")) assert_equal('"', ec.finish) end Index: transcode.c =================================================================== --- transcode.c (revision 19310) +++ transcode.c (revision 19311) @@ -970,11 +970,11 @@ num_decorators = 0; if (ecflags & ECONV_XML_TEXT_DECORATOR) - decorators_ret[num_decorators++] = "xml-text-escaped"; + decorators_ret[num_decorators++] = "xml_text_escape"; if (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR) - decorators_ret[num_decorators++] = "xml-attr-content-escaped"; + decorators_ret[num_decorators++] = "xml_attr_content_escape"; if (ecflags & ECONV_XML_ATTR_QUOTE_DECORATOR) - decorators_ret[num_decorators++] = "xml-attr-quoted"; + decorators_ret[num_decorators++] = "xml_attr_quote"; if (ecflags & ECONV_CRLF_NEWLINE_DECORATOR) decorators_ret[num_decorators++] = "crlf_newline"; @@ -1905,27 +1905,27 @@ rb_str_cat2(mesg, " with "); if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "universal-newline"); + rb_str_cat2(mesg, "universal_newline"); } if (ecflags & ECONV_CRLF_NEWLINE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "CRLF-newline"); + rb_str_cat2(mesg, "crlf_newline"); } if (ecflags & ECONV_CR_NEWLINE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "CR-newline"); + rb_str_cat2(mesg, "cr_newline"); } if (ecflags & ECONV_XML_TEXT_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "XML-text"); + rb_str_cat2(mesg, "xml_text"); } if (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "XML-attr-content"); + rb_str_cat2(mesg, "xml_attr_content"); } if (ecflags & ECONV_XML_ATTR_QUOTE_DECORATOR) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "XML-attr-quote"); + rb_str_cat2(mesg, "xml_attr_quote"); } has_description = 1; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/