* tool/transcode-tblgen.rb (transcode_generated_code): defined for

  generating table at once.
  (transcode_tblgen): returns an empty string.
  (transcode_generate_node): ditto.

* enc/trans/newline.trans: use transcode_generated_code.

* enc/trans/iso2022.trans: ditto.

* enc/trans/single_byte.trans: ditto.

* enc/trans/utf_16_32.trans: ditto.

* enc/trans/japanese.trans: ditto.

* enc/trans/korean.trans: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 37 insertions, 43 deletions

diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans
index 3b11654305..b71c289bae 100644
--- a/enc/trans/utf_16_32.trans
+++ b/enc/trans/utf_16_32.trans
@@ -1,5 +1,42 @@
 #include "transcode_data.h"
 
+<%
+  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")
+
+  map = {}
+  map["{00-d7,e0-ff}{00-ff}"] = :func_so
+  map["{d8-db}{00-ff}{dc-df}{00-ff}"] = :func_so
+  transcode_generate_node(ActionMap.parse(map), "from_UTF_16BE")
+
+  map = {}
+  map["{00-7f}"] = :func_so
+  map["{c2-df}{80-bf}"] = :func_so
+  map["e0{a0-bf}{80-bf}"] = :func_so
+  map["{e1-ec}{80-bf}{80-bf}"] = :func_so
+  map["ed{80-9f}{80-bf}"] = :func_so
+  map["{ee-ef}{80-bf}{80-bf}"] = :func_so
+  map["f0{90-bf}{80-bf}{80-bf}"] = :func_so
+  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_generated_code %>
+
 static int
 fun_so_from_utf_16be(rb_transcoding* t, const unsigned char* s, size_t l, unsigned char* o)
 {
@@ -222,13 +259,6 @@ fun_so_to_utf_32le(rb_transcoding* t, const unsigned char* s, size_t l, unsigned
     return 4;
 }
 
-<%=
-  map = {}
-  map["{00-d7,e0-ff}{00-ff}"] = :func_so
-  map["{d8-db}{00-ff}{dc-df}{00-ff}"] = :func_so
-  transcode_generate_node(ActionMap.parse(map), "from_UTF_16BE")
-%>
-
 static const rb_transcoder
 rb_from_UTF_16BE = {
     "UTF-16BE", "UTF-8", &from_UTF_16BE,
@@ -239,21 +269,6 @@ rb_from_UTF_16BE = {
     NULL, NULL, NULL, &fun_so_from_utf_16be
 };
 
-<%=
-  map = {}
-  map["{00-7f}"] = :func_so
-  map["{c2-df}{80-bf}"] = :func_so
-  map["e0{a0-bf}{80-bf}"] = :func_so
-  map["{e1-ec}{80-bf}{80-bf}"] = :func_so
-  map["ed{80-9f}{80-bf}"] = :func_so
-  map["{ee-ef}{80-bf}{80-bf}"] = :func_so
-  map["f0{90-bf}{80-bf}{80-bf}"] = :func_so
-  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")
-%>
-
 static const rb_transcoder
 rb_to_UTF_16BE = {
     "UTF-8", "UTF-16BE", &to_UTF_16BE,
@@ -264,13 +279,6 @@ rb_to_UTF_16BE = {
     NULL, NULL, NULL, &fun_so_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")
-%>
-
 static const rb_transcoder
 rb_from_UTF_16LE = {
     "UTF-16LE", "UTF-8", &from_UTF_16LE,
@@ -291,13 +299,6 @@ rb_to_UTF_16LE = {
     NULL, NULL, NULL, &fun_so_to_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")
-%>
-
 static const rb_transcoder
 rb_from_UTF_32BE = {
     "UTF-32BE", "UTF-8", &from_UTF_32BE,
@@ -318,13 +319,6 @@ rb_to_UTF_32BE = {
     NULL, NULL, NULL, &fun_so_to_utf_32be
 };
 
-<%=
-  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")
-%>
-
 static const rb_transcoder
 rb_from_UTF_32LE = {
     "UTF-32LE", "UTF-8", &from_UTF_32LE,