oj 3.10.6 → 3.12.1

data/ext/oj/dump.h

@@ -1,7 +1,5 @@
-/* dump.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #ifndef OJ_DUMP_H
 #define OJ_DUMP_H
@@ -15,80 +13,77 @@
 // Extra padding at end of buffer.
 #define BUFFER_EXTRA 64
 
-extern void	oj_dump_nil(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_true(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_false(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_float(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_str(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_sym(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_class(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_nil(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_true(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_false(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_float(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_str(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_sym(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_class(VALUE obj, int depth, Out out, bool as_ok);
 
-extern void	oj_dump_raw(const char *str, size_t cnt, Out out);
-extern void	oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out);
-extern void	oj_dump_ruby_time(VALUE obj, Out out);
-extern void	oj_dump_xml_time(VALUE obj, Out out);
-extern void	oj_dump_time(VALUE obj, Out out, int withZone);
-extern void	oj_dump_obj_to_s(VALUE obj, Out out);
+extern void oj_dump_raw(const char *str, size_t cnt, Out out);
+extern void oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out);
+extern void oj_dump_ruby_time(VALUE obj, Out out);
+extern void oj_dump_xml_time(VALUE obj, Out out);
+extern void oj_dump_time(VALUE obj, Out out, int withZone);
+extern void oj_dump_obj_to_s(VALUE obj, Out out);
 
-extern const char*	oj_nan_str(VALUE obj, int opt, int mode, bool plus, int *lenp);
+extern const char *oj_nan_str(VALUE obj, int opt, int mode, bool plus, int *lenp);
 
-extern void	oj_grow_out(Out out, size_t len);
-extern long	oj_check_circular(VALUE obj, Out out);
+extern void oj_grow_out(Out out, size_t len);
+extern long oj_check_circular(VALUE obj, Out out);
 
-extern void	oj_dump_strict_val(VALUE obj, int depth, Out out);
-extern void	oj_dump_null_val(VALUE obj, int depth, Out out);
-extern void	oj_dump_obj_val(VALUE obj, int depth, Out out);
-extern void	oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_rails_val(VALUE obj, int depth, Out out);
-extern void	oj_dump_custom_val(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_wab_val(VALUE obj, int depth, Out out);
+extern void oj_dump_strict_val(VALUE obj, int depth, Out out);
+extern void oj_dump_null_val(VALUE obj, int depth, Out out);
+extern void oj_dump_obj_val(VALUE obj, int depth, Out out);
+extern void oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_rails_val(VALUE obj, int depth, Out out);
+extern void oj_dump_custom_val(VALUE obj, int depth, Out out, bool as_ok);
+extern void oj_dump_wab_val(VALUE obj, int depth, Out out);
 
-extern void	oj_dump_raw_json(VALUE obj, int depth, Out out);
+extern void oj_dump_raw_json(VALUE obj, int depth, Out out);
 
-extern VALUE	oj_add_to_json(int argc, VALUE *argv, VALUE self);
-extern VALUE	oj_remove_to_json(int argc, VALUE *argv, VALUE self);
+extern VALUE oj_add_to_json(int argc, VALUE *argv, VALUE self);
+extern VALUE oj_remove_to_json(int argc, VALUE *argv, VALUE self);
 
-extern int	oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
+extern int oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
 
-extern bool	oj_dump_ignore(Options opts, VALUE obj);
-extern time_t	oj_sec_from_time_hard_way(VALUE obj);
+extern bool   oj_dump_ignore(Options opts, VALUE obj);
+extern time_t oj_sec_from_time_hard_way(VALUE obj);
 
-inline static void
-assure_size(Out out, size_t len) {
+inline static void assure_size(Out out, size_t len) {
     if (out->end - out->cur <= (long)len) {
-	oj_grow_out(out, len);
+        oj_grow_out(out, len);
     }
 }
 
-inline static void
-fill_indent(Out out, int cnt) {
+inline static void fill_indent(Out out, int cnt) {
     if (0 < out->indent) {
-	cnt *= out->indent;
-	*out->cur++ = '\n';
-	for (; 0 < cnt; cnt--) {
-	    *out->cur++ = ' ';
-	}
+        cnt *= out->indent;
+        *out->cur++ = '\n';
+        for (; 0 < cnt; cnt--) {
+            *out->cur++ = ' ';
+        }
     }
 }
 
-inline static void
-dump_ulong(unsigned long num, Out out) {
-    char	buf[32];
-    char	*b = buf + sizeof(buf) - 1;
+inline static void dump_ulong(unsigned long num, Out out) {
+    char  buf[32];
+    char *b = buf + sizeof(buf) - 1;
 
     *b-- = '\0';
     if (0 < num) {
-	for (; 0 < num; num /= 10, b--) {
-	    *b = (num % 10) + '0';
-	}
-	b++;
+        for (; 0 < num; num /= 10, b--) {
+            *b = (num % 10) + '0';
+        }
+        b++;
     } else {
-	*b = '0';
+        *b = '0';
     }
     for (; '\0' != *b; b++) {
-	*out->cur++ = *b;
+        *out->cur++ = *b;
     }
     *out->cur = '\0';
 }

data/ext/oj/dump_compat.c

@@ -1,7 +1,5 @@
-/* dump_object.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 "code.h"
 #include "dump.h"

data/ext/oj/dump_leaf.c

@@ -1,252 +1,208 @@
-/* dump_leaf.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 "oj.h"
 #include "dump.h"
+#include "oj.h"
+
+static void dump_leaf(Leaf leaf, int depth, Out out);
 
-static void	dump_leaf(Leaf leaf, int depth, Out out);
+static void grow(Out out, size_t len) {
+    size_t size = out->end - out->buf;
+    long   pos  = out->cur - out->buf;
+    char * buf;
 
-static void
-grow(Out out, size_t len) {
-    size_t  size = out->end - out->buf;
-    long    pos = out->cur - out->buf;
-    char    *buf;
-	
     size *= 2;
     if (size <= len * 2 + pos) {
-	size += len;
+        size += len;
     }
     if (out->allocated) {
-	buf = REALLOC_N(out->buf, char, (size + BUFFER_EXTRA));
+        buf = REALLOC_N(out->buf, char, (size + BUFFER_EXTRA));
     } else {
-	buf = ALLOC_N(char, (size + BUFFER_EXTRA));
-	out->allocated = true;
-	memcpy(buf, out->buf, out->end - out->buf + BUFFER_EXTRA);
+        buf            = ALLOC_N(char, (size + BUFFER_EXTRA));
+        out->allocated = true;
+        memcpy(buf, out->buf, out->end - out->buf + BUFFER_EXTRA);
     }
     if (0 == buf) {
-	rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
+        rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
     }
     out->buf = buf;
     out->end = buf + size;
     out->cur = out->buf + pos;
 }
 
-
-inline static void
-dump_chars(const char *s, size_t size, Out out) {
+inline static void dump_chars(const char *s, size_t size, Out out) {
     if (out->end - out->cur <= (long)size) {
-	grow(out, size);
+        grow(out, size);
     }
     memcpy(out->cur, s, size);
     out->cur += size;
     *out->cur = '\0';
 }
 
-static void
-dump_leaf_str(Leaf leaf, Out out) {
+static void dump_leaf_str(Leaf leaf, Out out) {
     switch (leaf->value_type) {
-    case STR_VAL:
-	oj_dump_cstr(leaf->str, strlen(leaf->str), 0, 0, out);
-	break;
+    case STR_VAL: oj_dump_cstr(leaf->str, strlen(leaf->str), 0, 0, out); break;
     case RUBY_VAL:
-	oj_dump_cstr(rb_string_value_cstr(&leaf->value), (int)RSTRING_LEN(leaf->value), 0, 0, out);
-	break;
+        oj_dump_cstr(rb_string_value_cstr(&leaf->value), (int)RSTRING_LEN(leaf->value), 0, 0, out);
+        break;
     case COL_VAL:
-    default:
-	rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type);
-	break;
+    default: rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type); break;
     }
 }
 
-static void
-dump_leaf_fixnum(Leaf leaf, Out out) {
+static void dump_leaf_fixnum(Leaf leaf, Out out) {
     switch (leaf->value_type) {
-    case STR_VAL:
-	dump_chars(leaf->str, strlen(leaf->str), out);
-	break;
+    case STR_VAL: dump_chars(leaf->str, strlen(leaf->str), out); break;
     case RUBY_VAL:
-	if (T_BIGNUM == rb_type(leaf->value)) {
-	    oj_dump_bignum(leaf->value, 0, out, false);
-	} else {
-	    oj_dump_fixnum(leaf->value, 0, out, false);
-	}
-	break;
+        if (T_BIGNUM == rb_type(leaf->value)) {
+            oj_dump_bignum(leaf->value, 0, out, false);
+        } else {
+            oj_dump_fixnum(leaf->value, 0, out, false);
+        }
+        break;
     case COL_VAL:
-    default:
-	rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type);
-	break;
+    default: rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type); break;
     }
 }
 
-static void
-dump_leaf_float(Leaf leaf, Out out) {
+static void dump_leaf_float(Leaf leaf, Out out) {
     switch (leaf->value_type) {
-    case STR_VAL:
-	dump_chars(leaf->str, strlen(leaf->str), out);
-	break;
-    case RUBY_VAL:
-	oj_dump_float(leaf->value, 0, out, false);
-	break;
+    case STR_VAL: dump_chars(leaf->str, strlen(leaf->str), out); break;
+    case RUBY_VAL: oj_dump_float(leaf->value, 0, out, false); break;
     case COL_VAL:
-    default:
-	rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type);
-	break;
+    default: rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type); break;
     }
 }
 
-static void
-dump_leaf_array(Leaf leaf, int depth, Out out) {
-    size_t	size;
-    int		d2 = depth + 1;
+static void dump_leaf_array(Leaf leaf, int depth, Out out) {
+    size_t size;
+    int    d2 = depth + 1;
 
     size = 2;
     if (out->end - out->cur <= (long)size) {
-	grow(out, size);
+        grow(out, size);
     }
     *out->cur++ = '[';
     if (0 == leaf->elements) {
-	*out->cur++ = ']';
+        *out->cur++ = ']';
     } else {
-	Leaf	first = leaf->elements->next;
-	Leaf	e = first;
-
-	size = d2 * out->indent + 2;
-	do {
-	    if (out->end - out->cur <= (long)size) {
-		grow(out, size);
-	    }
-	    fill_indent(out, d2);
-	    dump_leaf(e, d2, out);
-	    if (e->next != first) {
-		*out->cur++ = ',';
-	    }
-	    e = e->next;
-	} while (e != first);
-	size = depth * out->indent + 1;
-	if (out->end - out->cur <= (long)size) {
-	    grow(out, size);
-	}
-	fill_indent(out, depth);
-	*out->cur++ = ']';
+        Leaf first = leaf->elements->next;
+        Leaf e     = first;
+
+        size = d2 * out->indent + 2;
+        do {
+            if (out->end - out->cur <= (long)size) {
+                grow(out, size);
+            }
+            fill_indent(out, d2);
+            dump_leaf(e, d2, out);
+            if (e->next != first) {
+                *out->cur++ = ',';
+            }
+            e = e->next;
+        } while (e != first);
+        size = depth * out->indent + 1;
+        if (out->end - out->cur <= (long)size) {
+            grow(out, size);
+        }
+        fill_indent(out, depth);
+        *out->cur++ = ']';
     }
     *out->cur = '\0';
 }
 
-static void
-dump_leaf_hash(Leaf leaf, int depth, Out out) {
-    size_t	size;
-    int		d2 = depth + 1;
+static void dump_leaf_hash(Leaf leaf, int depth, Out out) {
+    size_t size;
+    int    d2 = depth + 1;
 
     size = 2;
     if (out->end - out->cur <= (long)size) {
-	grow(out, size);
+        grow(out, size);
     }
     *out->cur++ = '{';
     if (0 == leaf->elements) {
-	*out->cur++ = '}';
+        *out->cur++ = '}';
     } else {
-	Leaf	first = leaf->elements->next;
-	Leaf	e = first;
-
-	size = d2 * out->indent + 2;
-	do {
-	    if (out->end - out->cur <= (long)size) {
-		grow(out, size);
-	    }
-	    fill_indent(out, d2);
-	    oj_dump_cstr(e->key, strlen(e->key), 0, 0, out);
-	    *out->cur++ = ':';
-	    dump_leaf(e, d2, out);
-	    if (e->next != first) {
-		*out->cur++ = ',';
-	    }
-	    e = e->next;
-	} while (e != first);
-	size = depth * out->indent + 1;
-	if (out->end - out->cur <= (long)size) {
-	    grow(out, size);
-	}
-	fill_indent(out, depth);
-	*out->cur++ = '}';
+        Leaf first = leaf->elements->next;
+        Leaf e     = first;
+
+        size = d2 * out->indent + 2;
+        do {
+            if (out->end - out->cur <= (long)size) {
+                grow(out, size);
+            }
+            fill_indent(out, d2);
+            oj_dump_cstr(e->key, strlen(e->key), 0, 0, out);
+            *out->cur++ = ':';
+            dump_leaf(e, d2, out);
+            if (e->next != first) {
+                *out->cur++ = ',';
+            }
+            e = e->next;
+        } while (e != first);
+        size = depth * out->indent + 1;
+        if (out->end - out->cur <= (long)size) {
+            grow(out, size);
+        }
+        fill_indent(out, depth);
+        *out->cur++ = '}';
     }
     *out->cur = '\0';
 }
 
-static void
-dump_leaf(Leaf leaf, int depth, Out out) {
+static void dump_leaf(Leaf leaf, int depth, Out out) {
     switch (leaf->rtype) {
-    case T_NIL:
-	oj_dump_nil(Qnil, 0, out, false);
-	break;
-    case T_TRUE:
-	oj_dump_true(Qtrue, 0, out, false);
-	break;
-    case T_FALSE:
-	oj_dump_false(Qfalse, 0, out, false);
-	break;
-    case T_STRING:
-	dump_leaf_str(leaf, out);
-	break;
-    case T_FIXNUM:
-	dump_leaf_fixnum(leaf, out);
-	break;
-    case T_FLOAT:
-	dump_leaf_float(leaf, out);
-	break;
-    case T_ARRAY:
-	dump_leaf_array(leaf, depth, out);
-	break;
-    case T_HASH:
-	dump_leaf_hash(leaf, depth, out);
-	break;
-    default:
-	rb_raise(rb_eTypeError, "Unexpected type %02x.\n", leaf->rtype);
-	break;
+    case T_NIL: oj_dump_nil(Qnil, 0, out, false); break;
+    case T_TRUE: oj_dump_true(Qtrue, 0, out, false); break;
+    case T_FALSE: oj_dump_false(Qfalse, 0, out, false); break;
+    case T_STRING: dump_leaf_str(leaf, out); break;
+    case T_FIXNUM: dump_leaf_fixnum(leaf, out); break;
+    case T_FLOAT: dump_leaf_float(leaf, out); break;
+    case T_ARRAY: dump_leaf_array(leaf, depth, out); break;
+    case T_HASH: dump_leaf_hash(leaf, depth, out); break;
+    default: rb_raise(rb_eTypeError, "Unexpected type %02x.\n", leaf->rtype); break;
     }
 }
 
-void
-oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
+void oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
     if (0 == out->buf) {
-	out->buf = ALLOC_N(char, 4096);
-	out->end = out->buf + 4095 - BUFFER_EXTRA; // 1 less than end plus extra for possible errors
-	out->allocated = true;
+        out->buf = ALLOC_N(char, 4096);
+        out->end = out->buf + 4095 -
+                   BUFFER_EXTRA;  // 1 less than end plus extra for possible errors
+        out->allocated = true;
     }
-    out->cur = out->buf;
+    out->cur      = out->buf;
     out->circ_cnt = 0;
-    out->opts = copts;
+    out->opts     = copts;
     out->hash_cnt = 0;
-    out->indent = copts->indent;
+    out->indent   = copts->indent;
     dump_leaf(leaf, 0, out);
 }
 
-void
-oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
-    char	buf[4096];
+void oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
+    char        buf[4096];
     struct _out out;
-    size_t	size;
-    FILE	*f;
+    size_t      size;
+    FILE *      f;
 
-    out.buf = buf;
-    out.end = buf + sizeof(buf) - BUFFER_EXTRA;
+    out.buf       = buf;
+    out.end       = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = false;
-    out.omit_nil = copts->dump_opts.omit_nil;
+    out.omit_nil  = copts->dump_opts.omit_nil;
     oj_dump_leaf_to_json(leaf, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
-	rb_raise(rb_eIOError, "%s\n", strerror(errno));
+        rb_raise(rb_eIOError, "%s\n", strerror(errno));
     }
     if (size != fwrite(out.buf, 1, size, f)) {
-	int	err = ferror(f);
+        int err = ferror(f);
 
-	rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", err, strerror(err));
+        rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", err, strerror(err));
     }
     if (out.allocated) {
-	xfree(out.buf);
+        xfree(out.buf);
     }
     fclose(f);
 }