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

ruby-changes:7525

From: akr <ko1@a...>
Date: Tue, 2 Sep 2008 03:19:08 +0900 (JST)
Subject: [ruby-changes:7525] Ruby:r19046 (trunk): * tool/transcode-tblgen.rb: define TRANSCODE_TABLE_INFO in generated

akr	2008-09-02 03:18:50 +0900 (Tue, 02 Sep 2008)

  New Revision: 19046

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

  Log:
    * tool/transcode-tblgen.rb: define TRANSCODE_TABLE_INFO in generated
      code.  use it in rb_transcoder.
    
    * enc/trans/newline.trans: use TRANSCODE_TABLE_INFO.
    
    * enc/trans/iso2022.trans: ditto.
    
    * enc/trans/utf_16_32.trans: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/enc/trans/iso2022.trans
    trunk/enc/trans/newline.trans
    trunk/enc/trans/utf_16_32.trans
    trunk/tool/transcode-tblgen.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19045)
+++ ChangeLog	(revision 19046)
@@ -1,3 +1,14 @@
+Tue Sep  2 03:16:42 2008  Tanaka Akira  <akr@f...>
+
+	* tool/transcode-tblgen.rb: define TRANSCODE_TABLE_INFO in generated
+	  code.  use it in rb_transcoder.
+
+	* enc/trans/newline.trans: use TRANSCODE_TABLE_INFO.
+
+	* enc/trans/iso2022.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
 Tue Sep  2 03:04:33 2008  Tanaka Akira  <akr@f...>
 
 	* tool/transcode-tblgen.rb: record infos and BYTE_LOOKUPs as index of
Index: enc/trans/iso2022.trans
===================================================================
--- enc/trans/iso2022.trans	(revision 19045)
+++ enc/trans/iso2022.trans	(revision 19046)
@@ -70,7 +70,7 @@
 static const rb_transcoder
 rb_ISO_2022_JP_to_EUC_JP = {
     "ISO-2022-JP", "EUC-JP", iso2022jp_to_eucjp,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     3, /* max_input */
     3, /* max_output */
@@ -143,7 +143,7 @@
 static const rb_transcoder
 rb_EUC_JP_to_ISO_2022_JP = {
     "EUC-JP", "ISO-2022-JP", eucjp_to_iso2022jp,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     3, /* max_input */
     5, /* max_output */
Index: enc/trans/newline.trans
===================================================================
--- enc/trans/newline.trans	(revision 19045)
+++ enc/trans/newline.trans	(revision 19046)
@@ -55,7 +55,7 @@
 static const rb_transcoder
 rb_universal_newline = {
     "universal_newline", "", universal_newline,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     1, /* max_input */
     1, /* max_output */
@@ -66,7 +66,7 @@
 static const rb_transcoder
 rb_crlf_newline = {
     "", "crlf_newline", crlf_newline,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     1, /* max_input */
     2, /* max_output */
@@ -77,7 +77,7 @@
 static const rb_transcoder
 rb_cr_newline = {
     "", "cr_newline", cr_newline,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     1, /* max_input */
     1, /* max_output */
Index: enc/trans/utf_16_32.trans
===================================================================
--- enc/trans/utf_16_32.trans	(revision 19045)
+++ enc/trans/utf_16_32.trans	(revision 19046)
@@ -262,7 +262,7 @@
 static const rb_transcoder
 rb_from_UTF_16BE = {
     "UTF-16BE", "UTF-8", from_UTF_16BE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     2, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -273,7 +273,7 @@
 static const rb_transcoder
 rb_to_UTF_16BE = {
     "UTF-8", "UTF-16BE", to_UTF_16BE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -284,7 +284,7 @@
 static const rb_transcoder
 rb_from_UTF_16LE = {
     "UTF-16LE", "UTF-8", from_UTF_16LE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     2, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -295,7 +295,7 @@
 static const rb_transcoder
 rb_to_UTF_16LE = {
     "UTF-8", "UTF-16LE", to_UTF_16BE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -306,7 +306,7 @@
 static const rb_transcoder
 rb_from_UTF_32BE = {
     "UTF-32BE", "UTF-8", from_UTF_32BE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     4, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -317,7 +317,7 @@
 static const rb_transcoder
 rb_to_UTF_32BE = {
     "UTF-8", "UTF-32BE", to_UTF_16BE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -328,7 +328,7 @@
 static const rb_transcoder
 rb_from_UTF_32LE = {
     "UTF-32LE", "UTF-8", from_UTF_32LE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     4, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
@@ -339,7 +339,7 @@
 static const rb_transcoder
 rb_to_UTF_32LE = {
     "UTF-8", "UTF-32LE", to_UTF_16BE,
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     4, /* max_input */
     4, /* max_output */
Index: tool/transcode-tblgen.rb
===================================================================
--- tool/transcode-tblgen.rb	(revision 19045)
+++ tool/transcode-tblgen.rb	(revision 19046)
@@ -587,7 +587,7 @@
 static const rb_transcoder
 #{transcoder_name} = {
     #{c_esc from}, #{c_esc to}, #{real_tree_name},
-    byte_array, word_array, sizeof(uintptr_t),
+    TRANSCODE_TABLE_INFO,
     #{input_unit_length}, /* input_unit_length */
     #{max_input}, /* max_input */
     #{max_output}, /* max_output */
@@ -607,7 +607,10 @@
 end
 
 def transcode_generated_code
-  TRANSCODE_GENERATED_BYTES_CODE + TRANSCODE_GENERATED_WORDS_CODE + TRANSCODE_GENERATED_TRANSCODER_CODE
+  TRANSCODE_GENERATED_BYTES_CODE +
+    TRANSCODE_GENERATED_WORDS_CODE +
+    "\#define TRANSCODE_TABLE_INFO byte_array, word_array, sizeof(uintptr_t)\n" +
+    TRANSCODE_GENERATED_TRANSCODER_CODE
 end
 
 def transcode_register_code

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

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