* transcode_data.h (rb_transcoding): remove stateful field.

  add state field.
  (TRANSCODING_STATE): defined.
  (rb_transcoder): add fields: state_size, state_init_func,
  state_fini_func.
  change rb_transcoding* argument to void*.

* transcode.c (transcode_restartable0): use TRANSCODING_STATE for
  first arguments of transcoder functions.
  (rb_transcoding_open_by_transcoder): initialize state field.
  (rb_transcoding_close): finalize state field.

* tool/transcode-tblgen.rb: provide state size/init/fini.

* enc/trans/newline.trans (universal_newline_init): defined.
  (fun_so_universal_newline): take void* as a state pointer.
  (rb_universal_newline): provide state size/init/fini.
  (rb_crlf_newline): ditto.
  (rb_cr_newline): ditto.

* enc/trans/iso2022.trans (iso2022jp_init): defined.
  (fun_si_iso2022jp_to_eucjp): take void* as a state pointer.
  (fun_so_iso2022jp_to_eucjp): ditto.
  (fun_so_eucjp_to_iso2022jp): ditto.
  (iso2022jp_reset_sequence_size): ditto.
  (finish_eucjp_to_iso2022jp): ditto.
  (rb_ISO_2022_JP_to_EUC_JP): provide state size/init/fini.
  (rb_EUC_JP_to_ISO_2022_JP): ditto.

* enc/trans/utf_16_32.trans (fun_so_from_utf_16be): take void* as a
  state pointer.
  (fun_so_to_utf_16be): ditto.
  (fun_so_from_utf_16le): ditto.
  (fun_so_to_utf_16le): ditto.
  (fun_so_from_utf_32be): ditto.
  (fun_so_to_utf_32be): ditto.
  (fun_so_from_utf_32le): ditto.
  (fun_so_to_utf_32le): ditto.
  (rb_from_UTF_16BE): provide state size/init/fini.
  (rb_to_UTF_16BE): ditto.
  (rb_from_UTF_16LE): ditto.
  (rb_to_UTF_16LE): ditto.
  (rb_from_UTF_32BE): ditto.
  (rb_to_UTF_32BE): ditto.
  (rb_from_UTF_32LE): ditto.
  (rb_to_UTF_32LE): ditto.

* enc/trans/japanese.trans (fun_so_eucjp2sjis): take void* as a state
  pointer.
  (fun_so_sjis2eucjp): ditto.
  (rb_eucjp2sjis): provide state size/init/fini.
  (rb_sjis2eucjp): provide state size/init/fini.



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

1 files changed, 21 insertions, 10 deletions

diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
index da8202eea4..7b10d368b1 100644
--- a/enc/trans/newline.trans
+++ b/enc/trans/newline.trans
@@ -21,33 +21,41 @@
 
 <%= transcode_generated_code %>
 
+#define NORMAL 0
+#define JUST_AFTER_CR 1
+
+static int
+universal_newline_init(void *statep)
+{
+    unsigned char *sp = statep;
+    *sp = NORMAL;
+    return 0;
+}
+
 static int
-fun_so_universal_newline(rb_transcoding* t, const unsigned char* s, size_t l, unsigned char* o)
+fun_so_universal_newline(void *statep, const unsigned char* s, size_t l, unsigned char* o)
 {
+    unsigned char *sp = statep;
     int len;
-    /*
-      t->stateful[0] == 0       : normal
-      t->stateful[0] == 1       : just after '\r'
-    */
     if (s[0] == '\n') {
-        if (t->stateful[0] == 0) {
+        if (*sp == NORMAL) {
             o[0] = '\n';
             len = 1;
         }
-        else {
+        else { /* JUST_AFTER_CR */
             len = 0;
         }
-        t->stateful[0] = 0;
+        *sp = NORMAL;
     }
     else if (s[0] == '\r') {
         o[0] = '\n';
         len = 1;
-        t->stateful[0] = 1;
+        *sp = JUST_AFTER_CR;
     }
     else {
         o[0] = s[0];
         len = 1;
-        t->stateful[0] = 0;
+        *sp = NORMAL;
     }
     return len;
 }
@@ -60,6 +68,7 @@ rb_universal_newline = {
     1, /* max_input */
     1, /* max_output */
     stateful_decoder, /* stateful_type */
+    1, universal_newline_init, universal_newline_init, /* state_size, state_init, state_fini */
     NULL, NULL, NULL, fun_so_universal_newline
 };
 
@@ -71,6 +80,7 @@ rb_crlf_newline = {
     1, /* max_input */
     2, /* max_output */
     stateless_converter, /* stateful_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
     NULL, NULL, NULL, NULL
 };
 
@@ -82,6 +92,7 @@ rb_cr_newline = {
     1, /* max_input */
     1, /* max_output */
     stateless_converter, /* stateful_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
     NULL, NULL, NULL, NULL
 };