From a3cfd3233e6b3a98e6b47a40e3ff09c5de18f1a5 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 7 Sep 2008 11:03:24 +0000 Subject: [PATCH] * enc/trans/escape.trans (hexstr): renamed from str1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ enc/trans/escape.trans | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8748f86c1..9a399950cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Sep 7 20:03:01 2008 Tanaka Akira + + * enc/trans/escape.trans (hexstr): renamed from str1. + Sun Sep 7 19:45:31 2008 Tanaka Akira * enc/trans/escape.trans: use transcode_tblgen. diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans index 95977bde61..cc1513724b 100644 --- a/enc/trans/escape.trans +++ b/enc/trans/escape.trans @@ -1,28 +1,28 @@ #include "transcode_data.h" <% - def str1(str) + def hexstr(str) str.unpack("H*")[0] end transcode_tblgen("", "amp-escaped", [ ["{00-25,27-FF}", :nomap], - ["26", str1("&")] + ["26", hexstr("&")] ]) transcode_tblgen("", "xml-text-escaped", [ ["{00-25,27-3B,3D,3F-FF}", :nomap], - ["26", str1("&")], - ["3C", str1("<")], - ["3E", str1(">")] + ["26", hexstr("&")], + ["3C", hexstr("<")], + ["3E", hexstr(">")] ]) transcode_tblgen("", "xml-attr-content-escaped", [ ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap], - ["22", str1(""")], - ["26", str1("&")], - ["3C", str1("<")], - ["3E", str1(">")] + ["22", hexstr(""")], + ["26", hexstr("&")], + ["3C", hexstr("<")], + ["3E", hexstr(">")] ]) map_xml_attr_quote = {}