[前][次][番号順一覧][スレッド一覧]

ruby-changes:7542

From: usa <ko1@a...>
Date: Tue, 2 Sep 2008 14:06:28 +0900 (JST)
Subject: [ruby-changes:7542] Ruby:r19063 (trunk): * enc/trans/utf_16_32.trans (from_UTF_8): rename from to_UTF_16BE

usa	2008-09-02 14:06:05 +0900 (Tue, 02 Sep 2008)

  New Revision: 19063

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19063

  Log:
    * enc/trans/utf_16_32.trans (from_UTF_8): rename from to_UTF_16BE
      because it was not collect.

  Modified files:
    trunk/ChangeLog
    trunk/enc/trans/utf_16_32.trans

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19062)
+++ ChangeLog	(revision 19063)
@@ -1,3 +1,8 @@
+Tue Sep  2 14:05:50 2008  NAKAMURA Usaku  <usa@r...>
+
+	* enc/trans/utf_16_32.trans (from_UTF_8): rename from to_UTF_16BE
+	  because it was not collect.
+
 Tue Sep  2 14:00:54 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* enc/emacs_mule.c (svn:executable): dropped executable bit.
Index: enc/trans/utf_16_32.trans
===================================================================
--- enc/trans/utf_16_32.trans	(revision 19062)
+++ enc/trans/utf_16_32.trans	(revision 19063)
@@ -2,6 +2,11 @@
 
 <%
   map = {}
+  map["{00-ff}{00-d7,e0-ff}"] = :func_so
+  map["{00-ff}{d8-db}{00-ff}{dc-df}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_16LE")
+
+  map = {}
   map["{00-ff}{00-d7,e0-ff}0000"] = :func_so
   map["{00-ff}{00-ff}{01-10}00"] = :func_so
   transcode_generate_node(ActionMap.parse(map), "from_UTF_32LE")
@@ -12,6 +17,11 @@
   transcode_generate_node(ActionMap.parse(map), "from_UTF_16BE")
 
   map = {}
+  map["0000{00-d7,e0-ff}{00-ff}"] = :func_so
+  map["00{01-10}{00-ff}{00-ff}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_32BE")
+
+  map = {}
   map["{00-7f}"] = :func_so
   map["{c2-df}{80-bf}"] = :func_so
   map["e0{a0-bf}{80-bf}"] = :func_so
@@ -22,17 +32,7 @@
   map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so
   map["f4{80-8f}{80-bf}{80-bf}"] = :func_so
   am = ActionMap.parse(map)
-  transcode_generate_node(am, "to_UTF_16BE")
-
-  map = {}
-  map["{00-ff}{00-d7,e0-ff}"] = :func_so
-  map["{00-ff}{d8-db}{00-ff}{dc-df}"] = :func_so
-  transcode_generate_node(ActionMap.parse(map), "from_UTF_16LE")
-
-  map = {}
-  map["0000{00-d7,e0-ff}{00-ff}"] = :func_so
-  map["00{01-10}{00-ff}{00-ff}"] = :func_so
-  transcode_generate_node(ActionMap.parse(map), "from_UTF_32BE")
+  transcode_generate_node(am, "from_UTF_8")
 %>
 
 <%= transcode_generated_code %>
@@ -272,7 +272,7 @@
 
 static const rb_transcoder
 rb_to_UTF_16BE = {
-    "UTF-8", "UTF-16BE", to_UTF_16BE,
+    "UTF-8", "UTF-16BE", from_UTF_8,
     TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
@@ -294,7 +294,7 @@
 
 static const rb_transcoder
 rb_to_UTF_16LE = {
-    "UTF-8", "UTF-16LE", to_UTF_16BE,
+    "UTF-8", "UTF-16LE", from_UTF_8,
     TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
@@ -316,7 +316,7 @@
 
 static const rb_transcoder
 rb_to_UTF_32BE = {
-    "UTF-8", "UTF-32BE", to_UTF_16BE,
+    "UTF-8", "UTF-32BE", from_UTF_8,
     TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
@@ -338,7 +338,7 @@
 
 static const rb_transcoder
 rb_to_UTF_32LE = {
-    "UTF-8", "UTF-32LE", to_UTF_16BE,
+    "UTF-8", "UTF-32LE", from_UTF_8,
     TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]