oj 3.10.14 → 3.11.0

data/ext/oj/reader.h

@@ -1,7 +1,4 @@
-/* reader.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #ifndef OJ_READER_H
 #define OJ_READER_H
@@ -43,7 +40,7 @@ reader_get(Reader reader) {
     }
     reader->col++;
     reader->pos++;
-    
+
     return *reader->tail++;
 }
 

data/ext/oj/resolve.c

@@ -1,7 +1,4 @@
-/* resolve.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>

data/ext/oj/resolve.h

@@ -1,7 +1,4 @@
-/* resolve.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #ifndef OJ_RESOLVE_H
 #define OJ_RESOLVE_H

data/ext/oj/rxclass.c

@@ -1,7 +1,4 @@
-/* rxclass.c
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -101,12 +98,12 @@ 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;

data/ext/oj/rxclass.h

@@ -1,7 +1,4 @@
-/* rxclass.h
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
 #ifndef OJ_RXCLASS_H
 #define OJ_RXCLASS_H

data/ext/oj/saj.c

@@ -1,7 +1,4 @@
-/* saj.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #if !IS_WINDOWS
 #include <sys/resource.h>  /* for getrlimit() on linux */
@@ -213,7 +210,7 @@ read_next(ParseInfo pi, const char *key) {
 static void
 read_hash(ParseInfo pi, const char *key) {
     const char	*ks;
-    
+
     if (pi->has_hash_start) {
 	call_no_value(pi->handler, oj_hash_start_id, key);
     }
@@ -378,7 +375,7 @@ read_num(ParseInfo pi, const char *key) {
     if (0 == e && 0 == a && 1 == div) {
 	if (big) {
 	    char	c = *pi->s;
-	
+
 	    *pi->s = '\0';
 	    if (pi->has_add_value) {
 		call_add_value(pi->handler, rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(start)), key);
@@ -396,7 +393,7 @@ read_num(ParseInfo pi, const char *key) {
     } else { /* decimal */
 	if (big) {
 	    char	c = *pi->s;
-	
+
 	    *pi->s = '\0';
 	    if (pi->has_add_value) {
 		call_add_value(pi->handler, rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(start)), key);
@@ -541,7 +538,7 @@ read_quoted_value(ParseInfo pi) {
     char	*h = pi->s; /* head */
     char	*t = h;	    /* tail */
     uint32_t	code;
-    
+
     h++;	/* skip quote character */
     t++;
     value = h;
@@ -679,7 +676,7 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
-	
+
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    len = RSTRING_LEN(s) + 1;

data/ext/oj/scp.c

@@ -1,7 +1,4 @@
-/* scp.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>

data/ext/oj/sparse.c

@@ -1,7 +1,4 @@
-/* sparse.c
- * Copyright (c) 2013, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2013 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -228,17 +225,6 @@ read_escaped_str(ParseInfo pi) {
 	    case '"':	buf_append(&buf, '"');	break;
 	    case '/':	buf_append(&buf, '/');	break;
 	    case '\\':	buf_append(&buf, '\\');	break;
-	    case '\'':
-		// The json gem claims this is not an error despite the
-		// ECMA-404 indicating it is not valid.
-		if (CompatMode == pi->options.mode) {
-		    buf_append(&buf, '\'');
-		} else {
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
-		    buf_cleanup(&buf);
-		    return;
-		}
-		break;
 	    case 'u':
 		if (0 == (code = read_hex(pi)) && err_has(&pi->err)) {
 		    buf_cleanup(&buf);
@@ -276,6 +262,12 @@ read_escaped_str(ParseInfo pi) {
 		}
 		break;
 	    default:
+		// The json gem claims this is not an error despite the
+		// ECMA-404 indicating it is not valid.
+		if (CompatMode == pi->options.mode) {
+		    buf_append(&buf, c);
+		    break;
+		}
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
 		buf_cleanup(&buf);
 		return;
@@ -408,8 +400,13 @@ read_num(ParseInfo pi) {
     ni.nan = 0;
     ni.neg = 0;
     ni.has_exp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
-    ni.bigdec_load = pi->options.bigdec_load;
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
 
     c = reader_get(&pi->rd);
     if ('-' == c) {
@@ -526,7 +523,11 @@ read_num(ParseInfo pi) {
 	    ni.nan = 1;
 	}
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     add_num_value(pi, &ni);
@@ -549,15 +550,24 @@ read_nan(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 1;
     ni.neg = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
-    ni.bigdec_load = pi->options.bigdec_load;
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
 
     if ('a' != reader_get(&pi->rd) ||
 	('N' != (c = reader_get(&pi->rd)) && 'n' != c)) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
 	return;
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     add_num_value(pi, &ni);
@@ -747,8 +757,15 @@ oj_sparse2(ParseInfo pi) {
 		ni.infinity = 0;
 		ni.nan = 1;
 		ni.neg = 0;
-		ni.no_big = (FloatDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load);
-		ni.bigdec_load = pi->options.bigdec_load;
+		if (CompatMode == pi->options.mode) {
+		    ni.no_big = !pi->options.compat_bigdec;
+		    ni.bigdec_load = pi->options.compat_bigdec;
+		} else {
+		    ni.no_big = (FloatDec == pi->options.bigdec_load ||
+				 FastDec == pi->options.bigdec_load ||
+				 RubyDec == pi->options.bigdec_load);
+		    ni.bigdec_load = pi->options.bigdec_load;
+		}
 		add_num_value(pi, &ni);
 	    } else {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid token");

data/ext/oj/stream_writer.c

@@ -1,7 +1,4 @@
-/* stream_writer.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include <errno.h>
 
@@ -86,7 +83,7 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
 #if !IS_WINDOWS
     VALUE		s;
 #endif
-    
+
     if (oj_stringio_class == clas) {
 	type = STRING_IO;
 #if !IS_WINDOWS
@@ -107,7 +104,7 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
 
 	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
@@ -340,7 +337,7 @@ stream_writer_flush(VALUE self) {
 }
 
 /* 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
@@ -359,5 +356,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);
 }
-
-

data/ext/oj/strict.c

@@ -1,7 +1,4 @@
-/* strict.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -102,7 +99,7 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 static void
 hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     volatile VALUE	v;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
@@ -143,7 +140,7 @@ array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     volatile VALUE	v;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }

data/ext/oj/string_writer.c

@@ -1,7 +1,4 @@
-/* strwriter.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include "dump.h"
 #include "encode.h"

data/ext/oj/trace.c

@@ -1,7 +1,4 @@
-/* trace.h
- * Copyright (c) 2018, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2018 Peter Ohler. All rights reserved.
 
 #include "parse.h"
 #include "trace.h"
@@ -37,7 +34,7 @@ oj_trace_parse_call(const char *func, ParseInfo pi, const char *file, int line,
     char	fmt[64];
     char	indent[MAX_INDENT];
     int		depth = (int)(stack_size(&pi->stack) * 2);
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:-:%%%ds %%s %%s\n", depth);
     printf(fmt, file, line, indent, func, rb_obj_classname(obj));
@@ -48,7 +45,7 @@ oj_trace_parse_in(const char *func, ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
     int		depth = (int)(stack_size(&pi->stack) * 2);
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:}:%%%ds %%s\n", depth);
     printf(fmt, file, line, indent, func);
@@ -61,7 +58,7 @@ oj_trace_parse_hash_end(ParseInfo pi, const char *file, int line) {
     int		depth = (int)(stack_size(&pi->stack) * 2 - 2);
     Val		v = stack_peek(&pi->stack);
     VALUE	obj = v->val;
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds hash_end %%s\n", depth);
     printf(fmt, file, line, indent, rb_obj_classname(obj));
@@ -72,7 +69,7 @@ oj_trace_parse_array_end(ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
     int		depth = (int)(stack_size(&pi->stack) * 2);
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds array_ned\n", depth);
     printf(fmt, file, line, indent);

data/ext/oj/trace.h

@@ -1,7 +1,4 @@
-/* trace.h
- * Copyright (c) 2018, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2018 Peter Ohler. All rights reserved.
 
 #ifndef OJ_TRACE_H
 #define OJ_TRACE_H

data/ext/oj/util.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, Peter Ohler, All rights reserved.
+// Copyright (c) 2019 Peter Ohler. All rights reserved.
 
 #include "util.h"
 

data/ext/oj/util.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, Peter Ohler, All rights reserved.
+// Copyright (c) 2019 Peter Ohler. All rights reserved.
 
 #ifndef OJ_UTIL_H
 #define OJ_UTIL_H

data/ext/oj/val_stack.c

@@ -1,32 +1,4 @@
-/* val_stack.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.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include <string.h>
 

data/ext/oj/val_stack.h

@@ -1,32 +1,4 @@
-/* val_stack.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.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #ifndef OJ_VAL_STACK_H
 #define OJ_VAL_STACK_H