oj 2.0.14 → 2.1.0

data/ext/oj/buf.h

@@ -0,0 +1,103 @@
+/* buf.h
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __OJ_BUF_H__
+#define __OJ_BUF_H__
+
+#include "ruby.h"
+
+typedef struct _Buf {
+    char	base[1024];
+    char	*head;
+    char	*end;
+    char	*tail;
+} *Buf;
+
+inline static void
+buf_init(Buf buf) {
+    buf->head = buf->base;
+    buf->end = buf->base + sizeof(buf->base);
+    buf->tail = buf->head;
+}
+
+inline static void
+buf_cleanup(Buf buf) {
+    if (buf->base != buf->head) {
+        xfree(buf->head);
+    }
+}
+
+inline static size_t
+buf_len(Buf buf) {
+    return buf->tail - buf->head;
+}
+
+inline static void
+buf_append_string(Buf buf, const char *s, size_t slen) {
+    if (buf->end <= buf->tail + slen) {
+	size_t	len = buf->end - buf->head;
+	size_t	toff = buf->tail - buf->head;
+	size_t	new_len = len + slen + len / 2;
+
+	if (buf->base == buf->head) {
+	    buf->head = ALLOC_N(char, new_len);
+	    memcpy(buf->head, buf->base, len);
+	} else {
+	    REALLOC_N(buf->head, char, new_len);
+	}
+	buf->tail = buf->head + toff;
+	buf->end = buf->head + new_len;
+    }
+    memcpy(buf->tail, s, slen);
+    buf->tail += slen;
+}
+    
+inline static void
+buf_append(Buf buf, char c) {
+    if (buf->end <= buf->tail) {
+	size_t	len = buf->end - buf->head;
+	size_t	toff = buf->tail - buf->head;
+	size_t	new_len = len + len / 2;
+
+	if (buf->base == buf->head) {
+	    buf->head = ALLOC_N(char, new_len);
+	    memcpy(buf->head, buf->base, len);
+	} else {
+	    REALLOC_N(buf->head, char, new_len);
+	}
+	buf->tail = buf->head + toff;
+	buf->end = buf->head + new_len;
+    }
+    *buf->tail = c;
+    buf->tail++;
+    *buf->tail = '\0'; // TBD temp for debugging
+}
+
+#endif /* __OJ_BUF_H__ */

data/ext/oj/circarray.c

@@ -0,0 +1,93 @@
+/* circarray.c
+ * Copyright (c) 2012, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "circarray.h"
+
+CircArray
+oj_circ_array_new() {
+    CircArray	ca;
+    
+    if (0 == (ca = ALLOC(struct _CircArray))) {
+	rb_raise(rb_eNoMemError, "not enough memory\n");
+    }
+    ca->objs = ca->obj_array;
+    ca->size = sizeof(ca->obj_array) / sizeof(VALUE);
+    ca->cnt = 0;
+    
+    return ca;
+}
+
+void
+oj_circ_array_free(CircArray ca) {
+    if (ca->objs != ca->obj_array) {
+	xfree(ca->objs);
+    }
+    xfree(ca);
+}
+
+void
+oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
+    if (0 < id && 0 != ca) {
+	unsigned long	i;
+
+	if (ca->size < id) {
+	    unsigned long	cnt = id + 512;
+
+	    if (ca->objs == ca->obj_array) {
+		if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
+		    rb_raise(rb_eNoMemError, "not enough memory\n");
+		}
+		memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
+	    } else { 
+		REALLOC_N(ca->objs, VALUE, cnt);
+	    }
+	    ca->size = cnt;
+	}
+	id--;
+	for (i = ca->cnt; i < id; i++) {
+	    ca->objs[i] = Qnil;
+	}
+	ca->objs[id] = obj;
+	if (ca->cnt <= id) {
+	    ca->cnt = id + 1;
+	}
+    }
+}
+
+VALUE
+oj_circ_array_get(CircArray ca, unsigned long id) {
+    VALUE	obj = Qnil;
+
+    if (id <= ca->cnt && 0 != ca) {
+	obj = ca->objs[id - 1];
+    }
+    return obj;
+}
+

data/ext/oj/circarray.h

@@ -0,0 +1,48 @@
+/* circarray.h
+ * Copyright (c) 2012, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __OJ_CIRCARRAY_H__
+#define __OJ_CIRCARRAY_H__
+
+#include "ruby.h"
+
+typedef struct _CircArray {
+    VALUE		obj_array[1024];
+    VALUE		*objs;
+    unsigned long	size; // allocated size or initial array size
+    unsigned long	cnt;
+} *CircArray;
+
+extern CircArray	oj_circ_array_new(void);
+extern void		oj_circ_array_free(CircArray ca);
+extern void		oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id);
+extern VALUE		oj_circ_array_get(CircArray ca, unsigned long id);
+
+#endif /* __OJ_CIRCARRAY_H__ */

data/ext/oj/compat.c

@@ -0,0 +1,112 @@
+/* compat.c
+ * Copyright (c) 2012, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+
+#include "oj.h"
+#include "err.h"
+#include "parse.h"
+#include "resolve.h"
+
+static void
+hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_t len, const char *orig) {
+    Val	parent = stack_peek(&pi->stack);
+
+    if (0 != pi->options.create_id &&
+	*pi->options.create_id == *key &&
+	pi->options.create_id_len == klen &&
+	0 == strncmp(pi->options.create_id, key, klen)) {
+	if (str < pi->json || pi->cur < str) {
+	    parent->classname = strndup(str, len);
+	} else {
+	    parent->classname = str;
+	}
+	parent->clen = len;
+    } else {
+	VALUE	rstr = rb_str_new(str, len);
+	VALUE	rkey = rb_str_new(key, klen);
+
+#if HAS_ENCODING_SUPPORT
+	rb_enc_associate(rstr, oj_utf8_encoding);
+	rb_enc_associate(rkey, oj_utf8_encoding);
+#endif
+	if (Yes == pi->options.sym_key) {
+	    rkey = rb_str_intern(rkey);
+	}
+	rb_hash_aset(parent->val, rkey, rstr);
+    }
+}
+
+static void
+end_hash(struct _ParseInfo *pi) {
+    Val	parent = stack_peek(&pi->stack);
+
+    if (0 != parent->classname) {
+	VALUE	clas;
+
+	clas = oj_name2class(pi, parent->classname, parent->clen, 0);
+	if (Qundef != clas) { // else an error
+	    parent->val = rb_funcall(clas, oj_json_create_id, 1, parent->val);
+	}
+	if (parent->classname < pi->json || pi->cur < parent->classname) {
+	    xfree((char*)parent->classname);
+	    parent->classname = 0;
+	}
+    }
+}
+
+void
+oj_set_compat_callbacks(ParseInfo pi) {
+    oj_set_strict_callbacks(pi);
+    pi->end_hash = end_hash;
+    pi->hash_set_cstr = hash_set_cstr;
+}
+
+VALUE
+oj_compat_parse(int argc, VALUE *argv, VALUE self) {
+    struct _ParseInfo	pi;
+
+    pi.options = oj_default_options;
+    oj_set_compat_callbacks(&pi);
+
+    return oj_pi_parse(argc, argv, &pi, 0);
+}
+
+VALUE
+oj_compat_parse_cstr(int argc, VALUE *argv, char *json) {
+    struct _ParseInfo	pi;
+
+    pi.options = oj_default_options;
+    oj_set_strict_callbacks(&pi);
+    pi.end_hash = end_hash;
+    pi.hash_set_cstr = hash_set_cstr;
+
+    return oj_pi_parse(argc, argv, &pi, json);
+}

data/ext/oj/dump.c

@@ -40,6 +40,7 @@
 
 #include "oj.h"
 #include "cache8.h"
+#include "odd.h"
 
 #if !HAS_ENCODING_SUPPORT || defined(RUBINIUS_RUBY)
 #define rb_eEncodingError	rb_eException
@@ -1304,7 +1305,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
 
 static void
 dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
-    size_t	size;
+    size_t	size = 0;
     int		d2 = depth + 1;
 
     if (out->end - out->cur <= 2) {

data/ext/oj/err.c

@@ -0,0 +1,82 @@
+/* err.c
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdarg.h>
+
+#include "err.h"
+
+void
+oj_err_set(Err e, VALUE clas, const char *format, ...) {
+    va_list	ap;
+
+    va_start(ap, format);
+    e->clas = clas;
+    vsnprintf(e->msg, sizeof(e->msg) - 1, format, ap);
+    va_end(ap);
+}
+
+void
+oj_err_raise(Err e) {
+    rb_raise(e->clas, "%s", e->msg);
+}
+
+void
+_oj_err_set_with_location(Err err, VALUE eclas, const char *msg, const char *json, const char *current, const char* file, int line) {
+    int	n = 1;
+    int	col = 1;
+
+    for (; json < current && '\n' != *current; current--) {
+	col++;
+    }
+    for (; json < current; current--) {
+	if ('\n' == *current) {
+	    n++;
+	}
+    }
+    oj_err_set(err, eclas, "%s at line %d, column %d [%s:%d]", msg, n, col, file, line);
+}
+
+void
+_oj_raise_error(const char *msg, const char *json, const char *current, const char* file, int line) {
+    struct _Err	err;
+    int		n = 1;
+    int		col = 1;
+
+    for (; json < current && '\n' != *current; current--) {
+	col++;
+    }
+    for (; json < current; current--) {
+	if ('\n' == *current) {
+	    n++;
+	}
+    }
+    oj_err_set(&err, oj_parse_error_class, "%s at line %d, column %d [%s:%d]", msg, n, col, file, line);
+    rb_raise(err.clas, "%s", err.msg);
+}