oj 3.11.0 → 3.16.5

data/ext/oj/encode.h

@@ -1,15 +1,14 @@
 // 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
 
+#include "oj.h"
 #include "ruby.h"
 #include "ruby/encoding.h"
 
-#include "oj.h"
-
-static inline VALUE
-oj_encode(VALUE rstr) {
+static inline VALUE oj_encode(VALUE rstr) {
     rb_enc_associate(rstr, oj_utf8_encoding);
     return rstr;
 }

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,12 +1,12 @@
 // Copyright (c) 2011 Peter Ohler. All rights reserved.
-
-#include <stdarg.h>
+// 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;
@@ -14,40 +14,43 @@ 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);
     rb_raise(err.clas, "%s", err.msg);

data/ext/oj/err.h

@@ -1,41 +1,66 @@
 // 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
 
+#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 OJ_ERR_START 300
+
+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;
+
 #define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, FILE, LINE)
 
 typedef struct _err {
-    VALUE	clas;
-    char	msg[128];
+    VALUE clas;
+    char  msg[128];
 } *Err;
 
-extern VALUE	oj_parse_error_class;
+extern VALUE oj_parse_error_class;
 
-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);
+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_err_raise(Err e));
+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));
-
+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);
 }
 

data/ext/oj/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 require 'rbconfig'
 
@@ -6,7 +8,7 @@ dir_config(extension_name)
 
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0]
-type = type[4..-1] if type.start_with?('tcs-')
+type = type[4..] if type.start_with?('tcs-')
 is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
 platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
@@ -23,16 +25,30 @@ 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('getrlimit', 'sys/resource.h')
+have_func('rb_enc_interned_str')
+have_func('rb_ext_ractor_safe', 'ruby.h')
 
 dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
 
-dflags.each do |k,v|
+if with_config('--with-sse42')
+  if try_cflags('-msse4.2')
+    $CPPFLAGS += ' -msse4.2'
+    dflags['OJ_USE_SSE4_2'] = 1
+  else
+    warn 'SSE 4.2 is not supported on this platform.'
+  end
+end
+
+if enable_config('trace-log', false)
+  dflags['OJ_ENABLE_TRACE_LOG'] = 1
+end
+
+dflags.each do |k, v|
   if v.nil?
     $CPPFLAGS += " -D#{k}"
   else
@@ -41,7 +57,7 @@ dflags.each do |k,v|
 end
 
 $CPPFLAGS += ' -Wall'
-#puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+# 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/)