oj 3.10.12 → 3.10.17

data/ext/oj/hash.c

@@ -1,32 +1,4 @@
-/* hash.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 "hash.h"
 #include <stdint.h>
@@ -85,7 +57,7 @@ hash_calc(const uint8_t *key, size_t len) {
     h ^= h >> 13;
     h *= M;
     h ^= h >> 15;
-    
+
     return h;
 }
 
@@ -115,7 +87,7 @@ hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value)
     if (0 != slotp) {
 	if (0 != bucket->key) {
 	    KeyVal	b = ALLOC(struct _keyVal);
-	
+
 	    b->next = 0;
 	    bucket->next = b;
 	    bucket = b;
@@ -155,7 +127,7 @@ oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
 char*
 oj_strndup(const char *s, size_t len) {
     char	*d = ALLOC_N(char, len + 1);
-    
+
     memcpy(d, s, len);
     d[len] = '\0';
 

data/ext/oj/hash.h

@@ -1,32 +1,4 @@
-/* hash.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_HASH_H
 #define OJ_HASH_H

data/ext/oj/hash_test.c

@@ -1,32 +1,4 @@
-/* hash_test.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.
 
 // if windows, comment out the whole file. It's only a performance test.
 #ifndef _WIN32

data/ext/oj/mimic_json.c

@@ -1,7 +1,4 @@
-/* mimic_json.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include "oj.h"
 #include "encode.h"
@@ -513,8 +510,6 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.options.create_ok = No;
     pi.options.allow_nan = (bang ? Yes : No);
     pi.options.nilnil = No;
-    //pi.options.bigdec_load = FloatDec;
-    pi.options.bigdec_load = RubyDec;
     pi.options.mode = CompatMode;
     pi.max_depth = 100;
 
@@ -564,6 +559,16 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
 		pi.options.array_class = v;
 	    }
 	}
+	if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+	    v = rb_hash_lookup(ropts, oj_decimal_class_sym);
+	    if (rb_cFloat == v) {
+		pi.options.bigdec_load = FloatDec;
+	    } else if (oj_bigdecimal_class == v) {
+		pi.options.bigdec_load = BigDec;
+	    } else if (Qnil == v) {
+		pi.options.bigdec_load = AutoDec;
+	    }
+	}
 	v = rb_hash_lookup(ropts, oj_max_nesting_sym);
 	if (Qtrue == v) {
 	    pi.max_depth = 100;

data/ext/oj/object.c

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

data/ext/oj/odd.c

@@ -1,7 +1,4 @@
-/* odd.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include <string.h>
 

data/ext/oj/odd.h

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

data/ext/oj/oj.c

@@ -1,7 +1,4 @@
-/* oj.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <errno.h>
@@ -91,6 +88,7 @@ VALUE	oj_slash_string;
 VALUE	oj_allow_nan_sym;
 VALUE	oj_array_class_sym;
 VALUE	oj_create_additions_sym;
+VALUE	oj_decimal_class_sym;
 VALUE	oj_hash_class_sym;
 VALUE	oj_indent_sym;
 VALUE	oj_object_class_sym;
@@ -584,6 +582,19 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    rb_raise(rb_eArgError, ":bigdecimal_load must be :bigdecimal, :float, or :auto.");
 	}
     }
+    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+	v = rb_hash_lookup(ropts, oj_decimal_class_sym);
+	if (rb_cFloat == v) {
+	    copts->bigdec_load = FloatDec;
+	} else if (oj_bigdecimal_class == v) {
+ 	    copts->bigdec_load = BigDec;
+	} else if (Qnil == v) {
+	    copts->bigdec_load = AutoDec;
+	} else {
+	    rb_raise(rb_eArgError, ":decimal_class must be BigDecimal, Float, or nil.");
+	}
+   }
+
     if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, create_id_sym)) {
 	v = rb_hash_lookup(ropts, create_id_sym);
 	if (Qnil == v) {
@@ -1677,6 +1688,7 @@ Init_oj() {
     oj_array_nl_sym = ID2SYM(rb_intern("array_nl"));		rb_gc_register_address(&oj_array_nl_sym);
     oj_ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_gc_register_address(&oj_ascii_only_sym);
     oj_create_additions_sym = ID2SYM(rb_intern("create_additions"));rb_gc_register_address(&oj_create_additions_sym);
+    oj_decimal_class_sym = ID2SYM(rb_intern("decimal_class"));	rb_gc_register_address(&oj_decimal_class_sym);
     oj_hash_class_sym = ID2SYM(rb_intern("hash_class"));	rb_gc_register_address(&oj_hash_class_sym);
     oj_indent_sym = ID2SYM(rb_intern("indent"));		rb_gc_register_address(&oj_indent_sym);
     oj_max_nesting_sym = ID2SYM(rb_intern("max_nesting"));	rb_gc_register_address(&oj_max_nesting_sym);

data/ext/oj/oj.h

@@ -1,7 +1,4 @@
-/* oj.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #ifndef OJ_H
 #define OJ_H
@@ -313,6 +310,7 @@ extern VALUE	oj_array_class_sym;
 extern VALUE	oj_array_nl_sym;
 extern VALUE	oj_ascii_only_sym;
 extern VALUE	oj_create_additions_sym;
+extern VALUE	oj_decimal_class_sym;
 extern VALUE	oj_hash_class_sym;
 extern VALUE	oj_indent_sym;
 extern VALUE	oj_max_nesting_sym;

data/ext/oj/parse.c

@@ -1,7 +1,4 @@
-/* parse.c
- * Copyright (c) 2013, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2013 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -215,18 +212,6 @@ read_escaped_str(ParseInfo pi, const char *start) {
 	    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 {
-		    pi->cur = s;
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
-		    buf_cleanup(&buf);
-		    return;
-		}
-		break;
 	    case 'u':
 		s++;
 		if (0 == (code = read_hex(pi, s)) && err_has(&pi->err)) {
@@ -266,6 +251,12 @@ read_escaped_str(ParseInfo pi, const char *start) {
 		}
 		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, *s);
+		    break;
+		}
 		pi->cur = s;
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
 		buf_cleanup(&buf);

data/ext/oj/parse.h

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

data/ext/oj/rails.c

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

data/ext/oj/rails.h

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

data/ext/oj/reader.c

@@ -1,7 +1,4 @@
-/* reader.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <errno.h>
@@ -9,7 +6,7 @@
 #include <strings.h>
 #include <sys/types.h>
 #if NEEDS_UIO
-#include <sys/uio.h>	
+#include <sys/uio.h>
 #endif
 #include <unistd.h>
 #include <time.h>
@@ -78,13 +75,13 @@ oj_reader_init(Reader reader, VALUE io, int fd, bool to_s) {
 	reader->io = io;
     } else if (to_s) {
 	volatile VALUE	rstr = rb_funcall(io, oj_to_s_id, 0);
-	
+
 	reader->read_func = 0;
 	reader->in_str = StringValuePtr(rstr);
 	reader->head = (char*)reader->in_str;
 	reader->tail = reader->head;
 	reader->read_end = reader->head + RSTRING_LEN(rstr);
-    } else {	
+    } else {
 	rb_raise(rb_eArgError, "parser io argument must be a String or respond to readpartial() or read().\n");
     }
 }
@@ -107,7 +104,7 @@ oj_reader_read(Reader reader) {
 	if (0 >= shift) { /* no space left so allocate more */
 	    const char	*old = reader->head;
 	    size_t	size = reader->end - reader->head + BUF_PAD;
-	
+
 	    if (reader->head == reader->base) {
 		reader->head = ALLOC_N(char, size * 2);
 		memcpy((char*)reader->head, old, size);

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;