oj 2.18.3 → 3.13.14

data/ext/oj/err.h

@@ -1,64 +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"
 
-#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, __FILE__, __LINE__)
+// Needed to silence 2.4.0 warnings.
+#ifndef NORETURN
+#define NORETURN(x) x
+#endif
 
-typedef struct _Err {
-    VALUE	clas;
-    char	msg[128];
-} *Err;
+#define OJ_ERR_START		300
 
-extern VALUE	oj_parse_error_class;
+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 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_raise(Err e);
+#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];
+} * Err;
+
+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);
+
+NORETURN(extern void oj_err_raise(Err e));
 
 #define raise_error(msg, json, current) _oj_raise_error(msg, json, current, __FILE__, __LINE__)
-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);
 }
 
-#endif /* __OJ_ERR_H__ */
+#endif /* OJ_ERR_H */

data/ext/oj/extconf.rb

@@ -7,7 +7,6 @@ dir_config(extension_name)
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0]
 type = type[4..-1] if type.start_with?('tcs-')
-type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
 is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
 platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
@@ -20,36 +19,22 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => (!is_windows && 'ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
-  'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
-                             (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
-  'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1])) ? 0 : 1,
-  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
-  'NEEDS_RATIONAL' => ('1' == version[0] && '8' == version[1]) ? 1 : 0,
   'IS_WINDOWS' => is_windows ? 1 : 0,
-  'USE_PTHREAD_MUTEX' => is_windows ? 0 : 1,
-  'USE_RB_MUTEX' => (is_windows && !('1' == version[0] && '8' == version[1])) ? 1 : 0,
-  'DATETIME_1_8' => ('ruby' == type && ('1' == version[0] && '8' == version[1])) ? 1 : 0,
-  'NO_TIME_ROUND_PAD' => ('rubinius' == type) ? 1 : 0,
-  'HAS_DATA_OBJECT_WRAP' => ('ruby' == type && '2' == version[0] && '3' <= version[1]) ? 1 : 0,
-  'HAS_METHOD_ARITY' =>  ('rubinius' == type) ? 0 : 1,
-  'HAS_STRUCT_MEMBERS' =>  ('rubinius' == type) ? 0 : 1,
-  'UNIFY_FIXNUM_AND_BIGNUM' => ('ruby' == type && '2' == version[0] && '4' <= version[1]) ? 1 : 0,
+  'RSTRUCT_LEN_RETURNS_INTEGER_OBJECT' => ('ruby' == type && '2' == version[0] && '4' == version[1] && '1' >= version[2]) ? 1 : 0,
 }
-# This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
-# some reason math.h and string.h contents are not processed. Might be a
-# missing #define. This is the quick and easy way around it.
-if 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' == RUBY_RELEASE_DATE
-  begin
-    dflags['NEEDS_STPCPY'] = nil if File.read('/etc/redhat-release').include?('CentOS release 5.4')
-  rescue Exception
-  end
-else
-  dflags['NEEDS_STPCPY'] = nil if is_windows
-end
+
+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('pthread_mutex_init')
+have_func('rb_enc_associate')
+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?
 
@@ -63,6 +48,12 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
-create_makefile("#{extension_name}/#{extension_name}")
+# 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))
 
 %x{make clean}