* enc/trans/newline.trans: new file.

* transcode_data.h (rb_trans_t): add last_tc field.

* transcode.c (UNIVERSAL_NEWLINE): defined.
  (CRLF_NEWLINE): defined.
  (CR_NEWLINE): defined.
  (rb_trans_open_by_transcoder_entries): initialize last_tc.
  (trans_open_i): allocate one more room for newline converter.
  (rb_trans_open): universal newline implemented.
  (more_output_buffer): take max_output argument instead ts.
  (output_replacement_character): take tc argument instead of ts.
  (transcode_loop): use last_tc field.
  (econv_init): add flags argument for rb_trans_open.
  (Init_transcode): Encoding::Converter::UNIVERSAL_NEWLINE defined.



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

1 files changed, 56 insertions, 0 deletions

diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
new file mode 100644
index 0000000000..3d33a1e323
--- /dev/null
+++ b/enc/trans/newline.trans
@@ -0,0 +1,56 @@
+#include "transcode_data.h"
+
+<%
+  map_normalize = {}
+  map_normalize["{00-ff}"] = :func_so
+%>
+
+<%= transcode_generate_node(ActionMap.parse(map_normalize), "universal_newline") %>
+
+static int
+fun_so_universal_newline(rb_transcoding* t, const unsigned char* s, size_t l, unsigned char* o)
+{
+    int len;
+    /*
+      t->stateful[0] == 0       : normal
+      t->stateful[0] == 1       : just after '\r'
+    */
+    if (s[0] == '\n') {
+        if (t->stateful[0] == 0) {
+            o[0] = '\n';
+            len = 1;
+        }
+        else {
+            len = 0;
+        }
+        t->stateful[0] = 0;
+    }
+    else if (s[0] == '\r') {
+        o[0] = '\n';
+        len = 1;
+        t->stateful[0] = 1;
+    }
+    else {
+        o[0] = s[0];
+        len = 1;
+        t->stateful[0] = 0;
+    }
+    return len;
+}
+
+static const rb_transcoder
+rb_universal_newline = {
+    "universal_newline", "", &universal_newline,
+    1, /* input_unit_length */
+    1, /* max_input */
+    1, /* max_output */
+    NULL, NULL, NULL, fun_so_universal_newline
+};
+
+
+void
+Init_newline(void)
+{
+    rb_register_transcoder(&rb_universal_newline);
+}
+