oj 3.9.1 → 3.16.11

data/ext/oj/stream_writer.c

@@ -1,71 +1,66 @@
-/* stream_writer.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include <errno.h>
-
 #include <ruby.h>
 
 #include "encode.h"
+#include "mem.h"
 
-extern VALUE	Oj;
+extern VALUE Oj;
 
-static void
-stream_writer_free(void *ptr) {
-    StreamWriter	sw;
+static void stream_writer_free(void *ptr) {
+    StreamWriter sw;
 
     if (0 == ptr) {
-	return;
+        return;
     }
     sw = (StreamWriter)ptr;
-    xfree(sw->sw.out.buf);
-    xfree(sw->sw.types);
-    xfree(ptr);
+    OJ_R_FREE(sw->sw.out.buf);
+    OJ_R_FREE(sw->sw.types);
+    OJ_R_FREE(ptr);
 }
 
-static void
-stream_writer_reset_buf(StreamWriter sw) {
-    sw->sw.out.cur = sw->sw.out.buf;
+static const rb_data_type_t oj_stream_writer_type = {
+    "Oj/stream_writer",
+    {
+        NULL,
+        stream_writer_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
+static void stream_writer_reset_buf(StreamWriter sw) {
+    sw->sw.out.cur  = sw->sw.out.buf;
     *sw->sw.out.cur = '\0';
 }
 
-static void
-stream_writer_write(StreamWriter sw) {
-    ssize_t	size = sw->sw.out.cur - sw->sw.out.buf;
+static void stream_writer_write(StreamWriter sw) {
+    ssize_t size = sw->sw.out.cur - sw->sw.out.buf;
 
     switch (sw->type) {
     case STRING_IO:
-    case STREAM_IO: {
-	volatile VALUE	rs = rb_str_new(sw->sw.out.buf, size);
-
-	// Oddly enough, when pushing ASCII characters with UTF-8 encoding or
-	// even ASCII-8BIT does not change the output encoding. Pushing any
-	// non-ASCII no matter what the encoding changes the output encoding
-	// to ASCII-8BIT if it the string is not forced to UTF-8 here.
-	rs = oj_encode(rs);
-	rb_funcall(sw->stream, oj_write_id, 1, rs);
-	break;
+    case STREAM_IO:
+    case FILE_IO: {
+        volatile VALUE rs = rb_utf8_str_new(sw->sw.out.buf, size);
+        rb_funcall(sw->stream, oj_write_id, 1, rs);
+        break;
     }
-    case FILE_IO:
-	if (size != write(sw->fd, sw->sw.out.buf, size)) {
-	    rb_raise(rb_eIOError, "Write failed. [_%d_:%s]\n", errno, strerror(errno));
-	}
-	break;
-    default:
-	rb_raise(rb_eArgError, "expected an IO Object.");
+    default: rb_raise(rb_eArgError, "expected an IO Object.");
     }
     stream_writer_reset_buf(sw);
 }
 
-static VALUE	buffer_size_sym = Qundef;
+static VALUE buffer_size_sym = Qundef;
 
 /* Document-method: new
  * call-seq: new(io, options)
  *
- * Creates a new StreamWriter. Options are supported according the the
- * specified mode or the mode in the default options. Note that if mimic_JSON
- * or Oj.optimize_rails has not been called then the behavior of the modes may
+ * Creates a new StreamWriter. Options are supported according the specified
+ * mode or the mode in the default options. Note that if mimic_JSON or
+ * Oj.optimize_rails has not been called then the behavior of the modes may
  * not be the same as if they were.
  *
  * In addition to the regular dump options for the various modes a
@@ -74,66 +69,59 @@ static VALUE	buffer_size_sym = Qundef;
  * should be and also a hint on when to flush.
  *
  * - *io* [_IO_] stream to write to
- * - *options* [_Hash_] formating options
+ * - *options* [_Hash_] formatting options
  */
-static VALUE
-stream_writer_new(int argc, VALUE *argv, VALUE self) {
-    StreamWriterType	type = STREAM_IO;
-    int			fd = 0;
-    VALUE		stream = argv[0];
-    VALUE		clas = rb_obj_class(stream);
-    StreamWriter	sw;
+static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
+    StreamWriterType type   = STREAM_IO;
+    int              fd     = 0;
+    VALUE            stream = argv[0];
+    VALUE            clas   = rb_obj_class(stream);
+    StreamWriter     sw;
 #if !IS_WINDOWS
-    VALUE		s;
+    VALUE s;
 #endif
-    
+
     if (oj_stringio_class == clas) {
-	type = STRING_IO;
+        type = STRING_IO;
 #if !IS_WINDOWS
-    } else if (rb_respond_to(stream, oj_fileno_id) &&
-	       Qnil != (s = rb_funcall(stream, oj_fileno_id, 0)) &&
-	       0 != (fd = FIX2INT(s))) {
-	type = FILE_IO;
+    } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0)) &&
+               0 != (fd = FIX2INT(s))) {
+        type = FILE_IO;
 #endif
     } else if (rb_respond_to(stream, oj_write_id)) {
-	type = STREAM_IO;
+        type = STREAM_IO;
     } else {
-	rb_raise(rb_eArgError, "expected an IO Object.");
+        rb_raise(rb_eArgError, "expected an IO Object.");
     }
-    sw = ALLOC(struct _streamWriter);
+    sw = OJ_R_ALLOC(struct _streamWriter);
     if (2 == argc && T_HASH == rb_type(argv[1])) {
-	volatile VALUE	v;
-	int		buf_size = 0;
-
-	if (Qundef == buffer_size_sym) {
-	    buffer_size_sym = ID2SYM(rb_intern("buffer_size"));	rb_gc_register_address(&buffer_size_sym);
-	    
-	}
-	if (Qnil != (v = rb_hash_lookup(argv[1], buffer_size_sym))) {
-#ifdef RUBY_INTEGER_UNIFICATION
-	    if (rb_cInteger != rb_obj_class(v)) {
-		rb_raise(rb_eArgError, ":buffer size must be a Integer.");
-	    }
-#else
-	    if (T_FIXNUM != rb_type(v)) {
-		rb_raise(rb_eArgError, ":buffer size must be a Integer.");
-	    }
-#endif
-	    buf_size = FIX2INT(v);
-	}
-	oj_str_writer_init(&sw->sw, buf_size);
-	oj_parse_options(argv[1], &sw->sw.opts);
-	sw->flush_limit = buf_size;
+        volatile VALUE v;
+        int            buf_size = 0;
+
+        if (Qundef == buffer_size_sym) {
+            buffer_size_sym = ID2SYM(rb_intern("buffer_size"));
+            rb_gc_register_address(&buffer_size_sym);
+        }
+        if (Qnil != (v = rb_hash_lookup(argv[1], buffer_size_sym))) {
+            if (rb_cInteger != rb_obj_class(v)) {
+                OJ_R_FREE(sw);
+                rb_raise(rb_eArgError, ":buffer size must be a Integer.");
+            }
+            buf_size = FIX2INT(v);
+        }
+        oj_str_writer_init(&sw->sw, buf_size);
+        oj_parse_options(argv[1], &sw->sw.opts);
+        sw->flush_limit = buf_size;
     } else {
-	oj_str_writer_init(&sw->sw, 4096);
-	sw->flush_limit = 0;
+        oj_str_writer_init(&sw->sw, 4096);
+        sw->flush_limit = 0;
     }
     sw->sw.out.indent = sw->sw.opts.indent;
-    sw->stream = stream;
-    sw->type = type;
-    sw->fd = fd;
+    sw->stream        = stream;
+    sw->type          = type;
+    sw->fd            = fd;
 
-    return Data_Wrap_Struct(oj_stream_writer_class, 0, stream_writer_free, sw);
+    return TypedData_Wrap_Struct(oj_stream_writer_class, &oj_stream_writer_type, sw);
 }
 
 /* Document-method: push_key
@@ -145,14 +133,13 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
  *
  * - *key* [_String_] the key pending for the next push
  */
-static VALUE
-stream_writer_push_key(VALUE self, VALUE key) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_push_key(VALUE self, VALUE key) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
-    rb_check_type(key, T_STRING);
     oj_str_writer_push_key(&sw->sw, StringValuePtr(key));
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
-	stream_writer_write(sw);
+        stream_writer_write(sw);
     }
     return Qnil;
 }
@@ -165,28 +152,23 @@ stream_writer_push_key(VALUE self, VALUE key) {
  *
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
-static VALUE
-stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     switch (argc) {
-    case 0:
-	oj_str_writer_push_object(&sw->sw, 0);
-	break;
+    case 0: oj_str_writer_push_object(&sw->sw, 0); break;
     case 1:
-	if (Qnil == argv[0]) {
-	    oj_str_writer_push_object(&sw->sw, 0);
-	} else {
-	    rb_check_type(argv[0], T_STRING);
-	    oj_str_writer_push_object(&sw->sw, StringValuePtr(argv[0]));
-	}
-	break;
-    default:
-	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
-	break;
+        if (Qnil == argv[0]) {
+            oj_str_writer_push_object(&sw->sw, 0);
+        } else {
+            oj_str_writer_push_object(&sw->sw, StringValuePtr(argv[0]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'."); break;
     }
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
-	stream_writer_write(sw);
+        stream_writer_write(sw);
     }
     return Qnil;
 }
@@ -199,28 +181,23 @@ stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
  *
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
-static VALUE
-stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     switch (argc) {
-    case 0:
-	oj_str_writer_push_array(&sw->sw, 0);
-	break;
+    case 0: oj_str_writer_push_array(&sw->sw, 0); break;
     case 1:
-	if (Qnil == argv[0]) {
-	    oj_str_writer_push_array(&sw->sw, 0);
-	} else {
-	    rb_check_type(argv[0], T_STRING);
-	    oj_str_writer_push_array(&sw->sw, StringValuePtr(argv[0]));
-	}
-	break;
-    default:
-	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
-	break;
+        if (Qnil == argv[0]) {
+            oj_str_writer_push_array(&sw->sw, 0);
+        } else {
+            oj_str_writer_push_array(&sw->sw, StringValuePtr(argv[0]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'."); break;
     }
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
-	stream_writer_write(sw);
+        stream_writer_write(sw);
     }
     return Qnil;
 }
@@ -232,28 +209,23 @@ stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
  * - *value* [_Object_] value to add to the JSON document
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
-static VALUE
-stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     switch (argc) {
-    case 1:
-	oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
-	break;
+    case 1: oj_str_writer_push_value((StrWriter)sw, *argv, 0); break;
     case 2:
-	if (Qnil == argv[1]) {
-	    oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
-	} else {
-	    rb_check_type(argv[1], T_STRING);
-	    oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
-	}
-	break;
-    default:
-	rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'.");
-	break;
+        if (Qnil == argv[1]) {
+            oj_str_writer_push_value((StrWriter)sw, *argv, 0);
+        } else {
+            oj_str_writer_push_value((StrWriter)sw, *argv, StringValuePtr(argv[1]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'."); break;
     }
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
-	stream_writer_write(sw);
+        stream_writer_write(sw);
     }
     return Qnil;
 }
@@ -267,29 +239,23 @@ stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
  * - *value* [_Object_] value to add to the JSON document
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
-static VALUE
-stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
-    rb_check_type(argv[0], T_STRING);
     switch (argc) {
-    case 1:
-	oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
-	break;
+    case 1: oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), 0); break;
     case 2:
-	if (Qnil == argv[1]) {
-	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
-	} else {
-	    rb_check_type(argv[1], T_STRING);
-	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), StringValuePtr(argv[1]));
-	}
-	break;
-    default:
-	rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'.");
-	break;
+        if (Qnil == argv[1]) {
+            oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), 0);
+        } else {
+            oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), StringValuePtr(argv[1]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;
     }
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
-	stream_writer_write(sw);
+        stream_writer_write(sw);
     }
     return Qnil;
 }
@@ -300,13 +266,13 @@ stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
  * Pops up a level in the JSON document closing the array or object that is
  * currently open.
  */
-static VALUE
-stream_writer_pop(VALUE self) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_pop(VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     oj_str_writer_pop(&sw->sw);
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
-	stream_writer_write(sw);
+        stream_writer_write(sw);
     }
     return Qnil;
 }
@@ -317,9 +283,9 @@ stream_writer_pop(VALUE self) {
  * Pops all level in the JSON document closing all the array or object that is
  * currently open.
  */
-static VALUE
-stream_writer_pop_all(VALUE self) {
-    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+static VALUE stream_writer_pop_all(VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     oj_str_writer_pop_all(&sw->sw);
     stream_writer_write(sw);
@@ -332,23 +298,25 @@ stream_writer_pop_all(VALUE self) {
  *
  * Flush any remaining characters in the buffer.
  */
-static VALUE
-stream_writer_flush(VALUE self) {
-    stream_writer_write((StreamWriter)DATA_PTR(self));
+static VALUE stream_writer_flush(VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+    stream_writer_write(sw);
 
     return Qnil;
 }
 
 /* Document-class: Oj::StreamWriter
- * 
+ *
  * Supports building a JSON document one element at a time. Build the IO stream
  * document by pushing values into the document. Pushing an array or an object
  * will create that element in the JSON document and subsequent pushes will add
  * the elements to that array or object until a pop() is called.
  */
-void
-oj_stream_writer_init() {
+void oj_stream_writer_init(void) {
     oj_stream_writer_class = rb_define_class_under(Oj, "StreamWriter", rb_cObject);
+    rb_gc_register_address(&oj_stream_writer_class);
+    rb_undef_alloc_func(oj_stream_writer_class);
     rb_define_module_function(oj_stream_writer_class, "new", stream_writer_new, -1);
     rb_define_method(oj_stream_writer_class, "push_key", stream_writer_push_key, 1);
     rb_define_method(oj_stream_writer_class, "push_object", stream_writer_push_object, -1);
@@ -359,5 +327,3 @@ oj_stream_writer_init() {
     rb_define_method(oj_stream_writer_class, "pop_all", stream_writer_pop_all, 0);
     rb_define_method(oj_stream_writer_class, "flush", stream_writer_flush, 0);
 }
-
-