oj 3.7.4 → 3.13.21

data/ext/oj/encode.h

@@ -1,43 +1,16 @@
-/* encode.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.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
-#ifndef __OJ_ENCODE_H__
-#define __OJ_ENCODE_H__
+#ifndef OJ_ENCODE_H
+#define OJ_ENCODE_H
 
+#include "oj.h"
 #include "ruby.h"
 #include "ruby/encoding.h"
 
-static inline VALUE
-oj_encode(VALUE rstr) {
+static inline VALUE oj_encode(VALUE rstr) {
     rb_enc_associate(rstr, oj_utf8_encoding);
     return rstr;
 }
 
-#endif /* __OJ_ENCODE_H__ */
+#endif /* OJ_ENCODE_H */

data/ext/oj/encoder.c

@@ -0,0 +1,43 @@
+// Copyright (c) 2011, 2022 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
+
+#include "oj.h"
+
+typedef struct _encoder {
+    int              indent;         // indention for dump, default 2
+    char             circular;       // YesNo
+    char             escape_mode;    // Escape_Mode
+    char             mode;           // Mode
+    char             time_format;    // TimeFormat
+    char             bigdec_as_num;  // YesNo
+    char             to_hash;        // YesNo
+    char             to_json;        // YesNo
+    char             as_json;        // YesNo
+    char             raw_json;       // YesNo
+    char             trace;          // YesNo
+    char             sec_prec_set;   // boolean (0 or 1)
+    char             ignore_under;   // YesNo - ignore attrs starting with _ if true in object and custom modes
+    int64_t          int_range_min;  // dump numbers below as string
+    int64_t          int_range_max;  // dump numbers above as string
+    const char*      create_id;      // 0 or string
+    size_t           create_id_len;  // length of create_id
+    int              sec_prec;       // second precision when dumping time
+    char             float_prec;     // float precision, linked to float_fmt
+    char             float_fmt[7];   // float format for dumping, if empty use Ruby
+    struct _dumpOpts dump_opts;
+    struct _rxClass  str_rx;
+    VALUE*           ignore;  // Qnil terminated array of classes or NULL
+} * Encoder;
+
+/*
+    rb_define_module_function(Oj, "encode", encode, -1);
+    rb_define_module_function(Oj, "to_file", to_file, -1); // or maybe just write
+    rb_define_module_function(Oj, "to_stream", to_stream, -1);
+*/
+
+// write(to, obj)
+//  if to is a string then open file
+//  else if stream then write to stream
+//  handle non-blocking
+
+// should each mode have a different encoder or use delegates like the parser?

data/ext/oj/err.c

@@ -1,15 +1,12 @@
-/* err.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
-
-#include <stdarg.h>
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include "err.h"
 
-void
-oj_err_set(Err e, VALUE clas, const char *format, ...) {
-    va_list	ap;
+#include <stdarg.h>
+
+void oj_err_set(Err e, VALUE clas, const char *format, ...) {
+    va_list ap;
 
     va_start(ap, format);
     e->clas = clas;
@@ -17,41 +14,55 @@ oj_err_set(Err e, VALUE clas, const char *format, ...) {
     va_end(ap);
 }
 
-void
-oj_err_raise(Err e) {
+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;
+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++;
+        col++;
     }
     for (; json < current; current--) {
-	if ('\n' == *current) {
-	    n++;
-	}
+        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;
+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++;
+        col++;
     }
     for (; json < current; current--) {
-	if ('\n' == *current) {
-	    n++;
-	}
+        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);
+    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);
 }

data/ext/oj/err.h

@@ -1,70 +1,70 @@
-/* err.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.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
-#ifndef __OJ_ERR_H__
-#define __OJ_ERR_H__
+#ifndef OJ_ERR_H
+#define OJ_ERR_H
 
+#include <errno.h>
 #include "ruby.h"
+
 // Needed to silence 2.4.0 warnings.
 #ifndef NORETURN
-# define NORETURN(x) x
+#define NORETURN(x) x
 #endif
 
-#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, __FILE__, __LINE__)
+#define OJ_ERR_START		300
 
-typedef struct _Err {
-    VALUE	clas;
-    char	msg[128];
-} *Err;
+typedef enum {
+    OJ_OK		= 0,
+    OJ_ERR_MEMORY	= ENOMEM,
+    OJ_ERR_PARSE	= OJ_ERR_START,
+    OJ_ERR_READ,
+    OJ_ERR_WRITE,
+    OJ_ERR_OVERFLOW,
+    OJ_ERR_ARG,
+    OJ_ERR_TOO_MANY,
+    OJ_ERR_TYPE,
+    OJ_ERR_KEY,
+    OJ_ABORT,
+    OJ_ERR_LAST,
+} ojStatus;
 
-extern VALUE	oj_parse_error_class;
+#define set_error(err, eclas, msg, json, current) \
+    _oj_err_set_with_location(err, eclas, msg, json, current, FILE, LINE)
 
-extern void	oj_err_set(Err e, VALUE clas, const char *format, ...);
-extern void	_oj_err_set_with_location(Err err, VALUE eclas, const char *msg, const char *json, const char *current, const char* file, int line);
+typedef struct _err {
+    VALUE clas;
+    char  msg[128];
+} * Err;
 
-NORETURN(extern void	oj_err_raise(Err e));
+extern VALUE oj_parse_error_class;
 
-#define raise_error(msg, json, current) _oj_raise_error(msg, json, current, __FILE__, __LINE__)
+extern void oj_err_set(Err e, VALUE clas, const char *format, ...);
+extern void _oj_err_set_with_location(Err         err,
+                                      VALUE       eclas,
+                                      const char *msg,
+                                      const char *json,
+                                      const char *current,
+                                      const char *file,
+                                      int         line);
 
-NORETURN(extern void	_oj_raise_error(const char *msg, const char *json, const char *current, const char* file, int line));
+NORETURN(extern void oj_err_raise(Err e));
+
+#define raise_error(msg, json, current) _oj_raise_error(msg, json, current, __FILE__, __LINE__)
 
+NORETURN(extern void _oj_raise_error(const char *msg,
+                                     const char *json,
+                                     const char *current,
+                                     const char *file,
+                                     int         line));
 
-inline static void
-err_init(Err e) {
+inline static void err_init(Err e) {
     e->clas = Qnil;
     *e->msg = '\0';
 }
 
-inline static int
-err_has(Err e) {
+inline static int err_has(Err e) {
     return (Qnil != e->clas);
 }
 
-#endif /* __OJ_ERR_H__ */
+#endif /* OJ_ERR_H */

data/ext/oj/extconf.rb

@@ -23,14 +23,22 @@ dflags = {
   'RSTRUCT_LEN_RETURNS_INTEGER_OBJECT' => ('ruby' == type && '2' == version[0] && '4' == version[1] && '1' >= version[2]) ? 1 : 0,
 }
 
-have_func('rb_time_timespec')
-have_func('rb_ivar_count')
-have_func('rb_ivar_foreach')
+# Support for compaction.
+have_func('rb_gc_mark_movable')
 have_func('stpcpy')
-have_func('rb_data_object_wrap')
+have_func('pthread_mutex_init')
+have_func('rb_enc_interned_str')
+have_func('rb_ext_ractor_safe', 'ruby.h')
+# rb_hash_bulk_insert is deep down in a header not included in normal build and that seems to fool have_func.
+have_func('rb_hash_bulk_insert', 'ruby.h') unless '2' == version[0] && '6' == version[1]
 
 dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
 
+if with_config('--with-sse42')
+  $CPPFLAGS += ' -msse4.2'
+  dflags['OJ_USE_SSE4_2'] = 1
+end
+
 dflags.each do |k,v|
   if v.nil?
     $CPPFLAGS += " -D#{k}"
@@ -41,6 +49,11 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+# Adding the __attribute__ flag only works with gcc compilers and even then it
+# does not work to check args with varargs so just remove the check.
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
 
 create_makefile(File.join(extension_name, extension_name))