oj 2.18.5 → 3.0.0

data/ext/oj/parse.h

@@ -1,31 +1,6 @@
 /* parse.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_PARSE_H__
@@ -33,12 +8,16 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "ruby.h"
 #include "oj.h"
 #include "val_stack.h"
 #include "circarray.h"
 #include "reader.h"
+#include "rxclass.h"
+
+struct _RxClass;
 
 typedef struct _NumInfo {
     int64_t	i;
@@ -48,7 +27,6 @@ typedef struct _NumInfo {
     const char	*str;
     size_t	len;
     long	exp;
-    //int		dec_cnt;
     int		big;
     int		infinity;
     int		nan;
@@ -70,7 +48,9 @@ typedef struct _ParseInfo {
     VALUE		handler;
     struct _ValStack	stack;
     CircArray		circ_array;
+    struct _RxClass	str_rx;
     int			expect_value;
+    int			max_depth; // just for the json gem
     VALUE		proc;
     VALUE		(*start_hash)(struct _ParseInfo *pi);
     void		(*end_hash)(struct _ParseInfo *pi);
@@ -89,6 +69,7 @@ typedef struct _ParseInfo {
     void		(*add_num)(struct _ParseInfo *pi, NumInfo ni);
     void		(*add_value)(struct _ParseInfo *pi, VALUE val);
     VALUE		err_class;
+    bool		has_callbacks;
 } *ParseInfo;
 
 extern void	oj_parse2(ParseInfo pi);
@@ -103,4 +84,9 @@ extern void	oj_set_compat_callbacks(ParseInfo pi);
 extern void	oj_sparse2(ParseInfo pi);
 extern VALUE	oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd);
 
+static inline void
+parse_info_init(ParseInfo pi) {
+    memset(pi, 0, sizeof(struct _ParseInfo));
+}
+
 #endif /* __OJ_PARSE_H__ */

data/ext/oj/reader.c

@@ -1,31 +1,6 @@
 /* reader.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 <stdlib.h>
@@ -66,6 +41,7 @@ oj_reader_init(Reader reader, VALUE io, int fd) {
     reader->read_end = reader->head;
     reader->pro = 0;
     reader->str = 0;
+    reader->pos = 0;
     reader->line = 1;
     reader->col = 0;
     reader->free_head = 0;

data/ext/oj/reader.h

@@ -1,31 +1,6 @@
 /* reader.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_READER_H__
@@ -39,6 +14,7 @@ typedef struct _Reader {
     char	*read_end;	/* one past last character read */
     char	*pro;		/* protection start, buffer can not slide past this point */
     char	*str;		/* start of current string being read */
+    long	pos;
     int		line;
     int		col;
     int		free_head;
@@ -66,6 +42,7 @@ reader_get(Reader reader) {
 	reader->col = 0;
     }
     reader->col++;
+    reader->pos++;
     
     return *reader->tail++;
 }
@@ -74,6 +51,7 @@ static inline void
 reader_backup(Reader reader) {
     reader->tail--;
     reader->col--;
+    reader->pos--;
     if (0 >= reader->col) {
 	reader->line--;
 	// allow col to be negative since we never backup twice in a row

data/ext/oj/resolve.c

@@ -56,7 +56,7 @@ resolve_classname(VALUE mod, const char *classname, int auto_define) {
 }
 
 static VALUE
-resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define) {
+resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class) {
     char	class_name[1024];
     VALUE	clas;
     char	*end = class_name + sizeof(class_name) - 1;
@@ -84,23 +84,21 @@ resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define) {
     }
     *s = '\0';
     if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
-	if (sizeof(class_name) - 1 < len) {
-	    len = sizeof(class_name) - 1;
+	oj_set_error_at(pi, error_class, __FILE__, __LINE__, "class %s is not defined", name);
+	if (Qnil != error_class) {
+	    pi->err_class = error_class;
 	}
-	memcpy(class_name, name, len);
-	class_name[len] = '\0';
-	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "class %s is not defined", class_name);
     }
     return clas;
 }
 
 VALUE
-oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define) {
+oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class) {
     VALUE	clas;
     VALUE	*slot;
 
     if (No == pi->options.class_cache) {
-	return resolve_classpath(pi, name, len, auto_define);
+	return resolve_classpath(pi, name, len, auto_define, error_class);
     }
 #if USE_PTHREAD_MUTEX
     pthread_mutex_lock(&oj_cache_mutex);
@@ -108,7 +106,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define) {
     rb_mutex_lock(oj_cache_mutex);
 #endif
     if (Qnil == (clas = oj_class_hash_get(name, len, &slot))) {
-	if (Qundef != (clas = resolve_classpath(pi, name, len, auto_define))) {
+	if (Qundef != (clas = resolve_classpath(pi, name, len, auto_define, error_class))) {
 	    *slot = clas;
 	}
     }
@@ -121,9 +119,9 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define) {
 }
 
 VALUE
-oj_name2struct(ParseInfo pi, VALUE nameVal) {
+oj_name2struct(ParseInfo pi, VALUE nameVal, VALUE error_class) {
     size_t	len = RSTRING_LEN(nameVal);
     const char	*str = StringValuePtr(nameVal);
 
-    return resolve_classpath(pi, str, len, 0);
+    return resolve_classpath(pi, str, len, 0, error_class);
 }

data/ext/oj/resolve.h

@@ -33,7 +33,7 @@
 
 #include "ruby.h"
 
-extern VALUE	oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define);
-extern VALUE	oj_name2struct(ParseInfo pi, VALUE nameVal);
+extern VALUE	oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class);
+extern VALUE	oj_name2struct(ParseInfo pi, VALUE nameVal, VALUE error_class);
 
 #endif /* __OJ_RESOLVE_H__ */

data/ext/oj/rxclass.c

@@ -0,0 +1,133 @@
+/* rxclass.c
+ * Copyright (c) 2017, Peter Ohler
+ * All rights reserved.
+ */
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <regex.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "rxclass.h"
+
+typedef struct _RxC {
+    struct _RxC	*next;
+    VALUE	rrx;
+    regex_t	rx;
+    VALUE	clas;
+    char	src[256];
+} *RxC;
+
+void
+oj_rxclass_init(RxClass rc) {
+    *rc->err = '\0';
+    rc->head = NULL;
+    rc->tail = NULL;
+}
+
+void
+oj_rxclass_cleanup(RxClass rc) {
+    RxC	rxc;
+
+    while (NULL != (rxc = rc->head)) {
+	rc->head = rc->head->next;
+	if (Qnil == rxc->rrx) {
+	    regfree(&rxc->rx);
+	}
+	xfree(rxc);
+    }
+}
+
+void
+oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas) {
+    RxC	rxc = ALLOC_N(struct _RxC, 1);
+
+    memset(rxc, 0, sizeof(struct _RxC));
+    rxc->rrx = rx;
+    rxc->clas = clas;
+    if (NULL == rc->tail) {
+	rc->head = rxc;
+    } else {
+	rc->tail->next = rxc;
+    }
+    rc->tail = rxc;
+}
+
+// Attempt to compile the expression. If it fails populate the error code..
+int
+oj_rxclass_append(RxClass rc, const char *expr, VALUE clas) {
+    // Use mallow and not ALLOC_N to avoid pulliing ruby.h which conflicts
+    // with regex_t.
+    RxC	rxc;
+    int	err;
+    int	flags = 0;
+    
+    if (sizeof(rxc->src) <= strlen(expr)) {
+	snprintf(rc->err, sizeof(rc->err), "expressions must be less than %lu chracter", sizeof(rxc->src));
+	return EINVAL;
+    }
+    rxc = ALLOC_N(struct _RxC, 1);
+    rxc->next = 0;
+    rxc->rrx = Qnil;
+    rxc->clas = clas;
+    if (0 != (err = regcomp(&rxc->rx, expr, flags))) {
+	regerror(err, &rxc->rx, rc->err, sizeof(rc->err));
+	free(rxc);
+	return err;
+    }
+    if (NULL == rc->tail) {
+	rc->head = rxc;
+    } else {
+	rc->tail->next = rxc;
+    }
+    rc->tail = rxc;
+
+    return 0;
+}
+
+VALUE
+oj_rxclass_match(RxClass rc, const char *str, int len) {
+    RxC		rxc;
+    char	buf[4096];
+    
+    for (rxc = rc->head; NULL != rxc; rxc = rxc->next) {
+	if (Qnil != rxc->rrx) {
+	    // Must use a valiabel for this to work.
+	    volatile VALUE	rstr = rb_str_new(str, len);
+	    
+	    //if (Qtrue == rb_funcall(rxc->rrx, rb_intern("match?"), 1, rstr)) {
+	    if (Qnil != rb_funcall(rxc->rrx, rb_intern("match"), 1, rstr)) {
+		return rxc->clas;
+	    }
+	} else if (len < (int)sizeof(buf)) {
+	    // string is not \0 terminated so copy and atempt a match
+	    memcpy(buf, str, len);
+	    buf[len] = '\0';
+	    if (0 == regexec(&rxc->rx, buf, 0, NULL, 0)) { // match
+		return rxc->clas;
+	    }
+	} else {
+	    // TBD allocate a larger buffer and attempt
+	}
+    }
+    return Qnil;
+}
+
+void
+oj_rxclass_copy(RxClass src, RxClass dest) {
+    dest->head = NULL;
+    dest->tail = NULL;
+    if (NULL != src->head) {
+	RxC	rxc;
+
+	for (rxc = src->head; NULL != rxc; rxc = rxc->next) {
+	    if (Qnil != rxc->rrx) {
+		oj_rxclass_rappend(dest, rxc->rrx, rxc->clas);
+	    } else {
+		oj_rxclass_append(dest, rxc->src, rxc->clas);
+	    }
+	}
+    }
+}

data/ext/oj/rxclass.h

@@ -0,0 +1,27 @@
+/* rxclass.h
+ * Copyright (c) 2017, Peter Ohler
+ * All rights reserved.
+ */
+
+#ifndef __OJ_RXCLASS_H__
+#define __OJ_RXCLASS_H__
+
+#include <stdbool.h>
+#include "ruby.h"
+
+struct _RxC;
+
+typedef struct _RxClass {
+    struct _RxC	*head;
+    struct _RxC	*tail;
+    char	err[128];
+} *RxClass;
+
+extern void	oj_rxclass_init(RxClass rc);
+extern void	oj_rxclass_cleanup(RxClass rc);
+extern int	oj_rxclass_append(RxClass rc, const char *expr, VALUE clas);
+extern VALUE	oj_rxclass_match(RxClass rc, const char *str, int len);
+extern void	oj_rxclass_copy(RxClass src, RxClass dest);
+extern void	oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas);
+
+#endif /* __OJ_RXCLASS_H__ */

data/ext/oj/saj.c

@@ -1,31 +1,6 @@
 /* saj.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.
  */
 
 #if !IS_WINDOWS
@@ -682,6 +657,10 @@ saj_parse(VALUE handler, char *json) {
  * if the JSON is malformed.
  * @param [Oj::Saj] handler Saj (responds to Oj::Saj methods) like handler
  * @param [IO|String] io IO Object to read from
+ * @deprecated The sc_parse() method along with the ScHandler is the preferred
+ * callback parser. It is slightly faster and handles streams while the
+ * saj_parse() methos requires a complete read before parsing.
+ * @see sc_parse
  */
 VALUE
 oj_saj_parse(int argc, VALUE *argv, VALUE self) {