oj 3.7.5 → 3.7.6

data/ext/oj/oj.h

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_H__
-#define __OJ_H__
+#ifndef OJ_H
+#define OJ_H
 
-#if defined(__cplusplus)
+#if defined(cplusplus)
 extern "C" {
 #if 0
 } /* satisfy cc-mode */
@@ -108,7 +108,7 @@ typedef enum {
     // Add the fast versions if necessary. Maybe unparse as well if needed.
 } DumpCaller;
 
-typedef struct _DumpOpts {
+typedef struct _dumpOpts {
     bool	use;
     char	indent_str[16];
     char	before_sep[16];
@@ -125,7 +125,7 @@ typedef struct _DumpOpts {
     int		max_depth;
 } *DumpOpts;
 
-typedef struct _Options {
+typedef struct _options {
     int			indent;		// indention for dump, default 2
     char		circular;	// YesNo
     char		auto_define;	// YesNo
@@ -156,28 +156,28 @@ typedef struct _Options {
     char		float_fmt[7];	// float format for dumping, if empty use Ruby
     VALUE		hash_class;	// class to use in place of Hash on load
     VALUE		array_class;	// class to use in place of Array on load
-    struct _DumpOpts	dump_opts;
-    struct _RxClass	str_rx;
+    struct _dumpOpts	dump_opts;
+    struct _rxClass	str_rx;
     VALUE		*ignore;	// Qnil terminated array of classes or NULL
 } *Options;
 
-struct _Out;
-typedef void	(*DumpFunc)(VALUE obj, int depth, struct _Out *out, bool as_ok);
+struct _out;
+typedef void	(*DumpFunc)(VALUE obj, int depth, struct _out *out, bool as_ok);
 
 // rails optimize
-typedef struct _ROpt {
+typedef struct _rOpt {
     VALUE	clas;
     bool	on;
     DumpFunc	dump;
 } *ROpt;
 
-typedef struct _ROptTable {
+typedef struct _rOptTable {
     int			len;
     int			alen;
     ROpt		table;
 } *ROptTable;
 
-typedef struct _Out {
+typedef struct _out {
     char		*buf;
     char		*end;
     char		*cur;
@@ -195,9 +195,9 @@ typedef struct _Out {
     ROptTable		ropts;
 } *Out;
 
-typedef struct _StrWriter {
-    struct _Out		out;
-    struct _Options	opts;
+typedef struct _strWriter {
+    struct _out		out;
+    struct _options	opts;
     int			depth;
     char		*types;	// DumpType
     char		*types_end;
@@ -205,8 +205,8 @@ typedef struct _StrWriter {
     
 } *StrWriter;
 
-typedef struct _StreamWriter {
-    struct _StrWriter	sw;
+typedef struct _streamWriter {
+    struct _strWriter	sw;
     StreamWriterType	type;
     VALUE		stream;
     int			fd;
@@ -220,15 +220,15 @@ enum {
     RUBY_VAL = 0x03
 };
     
-typedef struct _Leaf {
-    struct _Leaf	*next;
+typedef struct _leaf {
+    struct _leaf	*next;
     union {
 	const char	*key;	   // hash key
 	size_t		index;	   // array index, 0 is not set
     };
     union {
 	char		*str;	   // pointer to location in json string or allocated
-	struct _Leaf	*elements; // array and hash elements
+	struct _leaf	*elements; // array and hash elements
 	VALUE		value;
     };
     uint8_t		rtype;
@@ -285,7 +285,7 @@ extern void	oj_parse_opt_match_string(RxClass rc, VALUE ropts);
 extern VALUE	oj_rails_encode(int argc, VALUE *argv, VALUE self);
 
 extern VALUE	Oj;
-extern struct _Options	oj_default_options;
+extern struct _options	oj_default_options;
 extern rb_encoding	*oj_utf8_encoding;
 
 extern VALUE	oj_bag_class;
@@ -372,10 +372,10 @@ extern pthread_mutex_t	oj_cache_mutex;
 extern VALUE	oj_cache_mutex;
 #endif
 
-#if defined(__cplusplus)
+#if defined(cplusplus)
 #if 0
 { /* satisfy cc-mode */
 #endif
 }  /* extern "C" { */
 #endif
-#endif /* __OJ_H__ */
+#endif /* OJ_H */

data/ext/oj/parse.c

@@ -188,7 +188,7 @@ unicode_to_chars(ParseInfo pi, Buf buf, uint32_t code) {
 // entered at /
 static void
 read_escaped_str(ParseInfo pi, const char *start) {
-    struct _Buf	buf;
+    struct _buf	buf;
     const char	*s;
     int		cnt = (int)(pi->cur - start);
     uint32_t	code;
@@ -378,7 +378,7 @@ read_str(ParseInfo pi) {
 
 static void
 read_num(ParseInfo pi) {
-    struct _NumInfo	ni;
+    struct _numInfo	ni;
     Val			parent = stack_peek(&pi->stack);
 
     ni.str = pi->cur;
@@ -1050,7 +1050,7 @@ CLEANUP:
 	case T_CLASS:
 	case T_STRING:
 	case T_SYMBOL: {
-	    struct _Err	err;
+	    struct _err	err;
 
 	    if (Qnil == pi->err_class) {
 		err.clas = oj_parse_error_class;

data/ext/oj/parse.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_PARSE_H__
-#define __OJ_PARSE_H__
+#ifndef OJ_PARSE_H
+#define OJ_PARSE_H
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -17,9 +17,9 @@
 #include "reader.h"
 #include "rxclass.h"
 
-struct _RxClass;
+struct _rxClass;
 
-typedef struct _NumInfo {
+typedef struct _numInfo {
     int64_t	i;
     int64_t	num;
     int64_t	div;
@@ -35,39 +35,39 @@ typedef struct _NumInfo {
     int		no_big;
 } *NumInfo;
 
-typedef struct _ParseInfo {
+typedef struct _parseInfo {
     // used for the string parser
     const char		*json;
     const char		*cur;
     const char		*end;
     // used for the stream parser
-    struct _Reader	rd;
+    struct _reader	rd;
 
-    struct _Err		err;
-    struct _Options	options;
+    struct _err		err;
+    struct _options	options;
     VALUE		handler;
-    struct _ValStack	stack;
+    struct _valStack	stack;
     CircArray		circ_array;
-    struct _RxClass	str_rx;
+    struct _rxClass	str_rx;
     int			expect_value;
     int			max_depth; // just for the json gem
     VALUE		proc;
-    VALUE		(*start_hash)(struct _ParseInfo *pi);
-    void		(*end_hash)(struct _ParseInfo *pi);
-    VALUE		(*hash_key)(struct _ParseInfo *pi, const char *key, size_t klen);
-    void		(*hash_set_cstr)(struct _ParseInfo *pi, Val kval, const char *str, size_t len, const char *orig);
-    void		(*hash_set_num)(struct _ParseInfo *pi, Val kval, NumInfo ni);
-    void		(*hash_set_value)(struct _ParseInfo *pi, Val kval, VALUE value);
+    VALUE		(*start_hash)(struct _parseInfo *pi);
+    void		(*end_hash)(struct _parseInfo *pi);
+    VALUE		(*hash_key)(struct _parseInfo *pi, const char *key, size_t klen);
+    void		(*hash_set_cstr)(struct _parseInfo *pi, Val kval, const char *str, size_t len, const char *orig);
+    void		(*hash_set_num)(struct _parseInfo *pi, Val kval, NumInfo ni);
+    void		(*hash_set_value)(struct _parseInfo *pi, Val kval, VALUE value);
 
-    VALUE		(*start_array)(struct _ParseInfo *pi);
-    void		(*end_array)(struct _ParseInfo *pi);
-    void		(*array_append_cstr)(struct _ParseInfo *pi, const char *str, size_t len, const char *orig);
-    void		(*array_append_num)(struct _ParseInfo *pi, NumInfo ni);
-    void		(*array_append_value)(struct _ParseInfo *pi, VALUE value);
+    VALUE		(*start_array)(struct _parseInfo *pi);
+    void		(*end_array)(struct _parseInfo *pi);
+    void		(*array_append_cstr)(struct _parseInfo *pi, const char *str, size_t len, const char *orig);
+    void		(*array_append_num)(struct _parseInfo *pi, NumInfo ni);
+    void		(*array_append_value)(struct _parseInfo *pi, VALUE value);
 
-    void		(*add_cstr)(struct _ParseInfo *pi, const char *str, size_t len, const char *orig);
-    void		(*add_num)(struct _ParseInfo *pi, NumInfo ni);
-    void		(*add_value)(struct _ParseInfo *pi, VALUE val);
+    void		(*add_cstr)(struct _parseInfo *pi, const char *str, size_t len, const char *orig);
+    void		(*add_num)(struct _parseInfo *pi, NumInfo ni);
+    void		(*add_value)(struct _parseInfo *pi, VALUE val);
     VALUE		err_class;
     bool		has_callbacks;
 } *ParseInfo;
@@ -87,7 +87,7 @@ extern VALUE	oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd);
 
 static inline void
 parse_info_init(ParseInfo pi) {
-    memset(pi, 0, sizeof(struct _ParseInfo));
+    memset(pi, 0, sizeof(struct _parseInfo));
 }
 
 static inline bool
@@ -108,4 +108,4 @@ empty_ok(Options options) {
     return Yes == options->empty_string;
 }
 
-#endif /* __OJ_PARSE_H__ */
+#endif /* OJ_PARSE_H */

data/ext/oj/rails.c

@@ -12,9 +12,9 @@
 #define OJ_INFINITY (1.0/0.0)
 
 // TBD keep static array of strings and functions to help with rails optimization
-typedef struct _Encoder {
-    struct _ROptTable	ropts;
-    struct _Options	opts;
+typedef struct _encoder {
+    struct _rOptTable	ropts;
+    struct _options	opts;
     VALUE		arg;
 } *Encoder;
 
@@ -28,7 +28,7 @@ static void	dump_rails_val(VALUE obj, int depth, Out out, bool as_ok);
 
 extern VALUE	Oj;
 
-static struct _ROptTable	ropts = { 0, 0, NULL };
+static struct _rOptTable	ropts = { 0, 0, NULL };
 
 static VALUE	encoder_class = Qnil;
 static bool	escape_html = true;
@@ -79,8 +79,8 @@ copy_opts(ROptTable src, ROptTable dest) {
     if (NULL == src->table) {
 	dest->table = NULL;
     } else {
-	dest->table = ALLOC_N(struct _ROpt, dest->alen);
-	memcpy(dest->table, src->table, sizeof(struct _ROpt) * dest->alen);
+	dest->table = ALLOC_N(struct _rOpt, dest->alen);
+	memcpy(dest->table, src->table, sizeof(struct _rOpt) * dest->alen);
     }
     return NULL;
 }
@@ -301,14 +301,18 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
 
 static void
 dump_time(VALUE obj, int depth, Out out, bool as_ok) {
-    time_t	sec;
+    long long	sec;
     long long	nsec;
 
 #ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
-	sec = ts.tv_sec;
+
+	sec = (long long)ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
@@ -339,7 +343,7 @@ dump_to_s(VALUE obj, int depth, Out out, bool as_ok) {
 
 static ID	parameters_id = 0;
 
-typedef struct _StrLen {
+typedef struct _strLen {
     const char	*str;
     int		len;
 } *StrLen;
@@ -362,7 +366,7 @@ columns_array(VALUE rcols, int *ccnt) {
     int			cnt = (int)RARRAY_LEN(rcols);
     
     *ccnt = cnt;
-    cols = ALLOC_N(struct _StrLen, cnt);
+    cols = ALLOC_N(struct _strLen, cnt);
     for (i = 0, cp = cols; i < cnt; i++, cp++) {
 	v = rb_ary_entry(rcols, i);
 	if (T_STRING != rb_type(v)) {
@@ -500,7 +504,7 @@ dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok) {
     *out->cur++ = ']';
 }
 
-typedef struct _NamedFunc {
+typedef struct _namedFunc {
     const char	*name;
     DumpFunc	func;
 } *NamedFunc;
@@ -557,7 +561,7 @@ dump_regexp(VALUE obj, int depth, Out out, bool as_ok) {
     dump_as_string(obj, depth, out, as_ok);
 }
 
-static struct _NamedFunc	dump_map[] = {
+static struct _namedFunc	dump_map[] = {
     { "ActionController::Parameters", dump_actioncontroller_parameters },
     { "ActiveRecord::Result", dump_activerecord_result },
     { "ActiveSupport::TimeWithZone", dump_timewithzone },
@@ -591,12 +595,12 @@ create_opt(ROptTable rot, VALUE clas) {
     rot->len++;
     if (NULL == rot->table) {
 	rot->alen = 256;
-	rot->table = ALLOC_N(struct _ROpt, rot->alen);
-	memset(rot->table, 0, sizeof(struct _ROpt) * rot->alen);
+	rot->table = ALLOC_N(struct _rOpt, rot->alen);
+	memset(rot->table, 0, sizeof(struct _rOpt) * rot->alen);
     } else if (rot->alen <= rot->len) {
 	rot->alen *= 2;
-	REALLOC_N(rot->table, struct _ROpt, rot->alen);
-	memset(rot->table + olen, 0, sizeof(struct _ROpt) * olen);
+	REALLOC_N(rot->table, struct _rOpt, rot->alen);
+	memset(rot->table + olen, 0, sizeof(struct _rOpt) * olen);
     }
     if (0 == olen) {
 	ro = rot->table;
@@ -607,7 +611,7 @@ create_opt(ROptTable rot, VALUE clas) {
 	
 	for (i = 0, ro = rot->table; i < olen; i++, ro++) {
 	    if (clas < ro->clas) {
-		memmove(ro + 1, ro, sizeof(struct _ROpt) * (olen - i));
+		memmove(ro + 1, ro, sizeof(struct _rOpt) * (olen - i));
 		break;
 	    }
 	}
@@ -674,7 +678,7 @@ encoder_mark(void *ptr) {
  */
 static VALUE
 encoder_new(int argc, VALUE *argv, VALUE self) {
-    Encoder	e = ALLOC(struct _Encoder);
+    Encoder	e = ALLOC(struct _encoder);
 
     e->opts = oj_default_options;
     e->arg = Qnil;
@@ -888,7 +892,7 @@ rails_optimized(VALUE self, VALUE clas) {
     return (ro->on) ? Qtrue : Qfalse;
 }
 
-typedef struct _OO {
+typedef struct _oo {
     Out		out;
     VALUE	obj;
 } *OO;
@@ -905,10 +909,10 @@ protect_dump(VALUE ov) {
 static VALUE
 encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *argv) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = *opts;
+    struct _out		out;
+    struct _options	copts = *opts;
     volatile VALUE	rstr = Qnil;
-    struct _OO		oo;
+    struct _oo		oo;
     int			line = 0;
 
     oo.out = &out;

data/ext/oj/rails.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_RAILS_H__
-#define __OJ_RAILS_H__
+#ifndef OJ_RAILS_H
+#define OJ_RAILS_H
 
 #include "dump.h"
 
@@ -18,4 +18,4 @@ extern bool	oj_rails_float_opt;
 extern VALUE	oj_optimize_rails(VALUE self);
 
 
-#endif /* __OJ_RAILS_H__ */
+#endif /* OJ_RAILS_H */

data/ext/oj/reader.h

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_READER_H__
-#define __OJ_READER_H__
+#ifndef OJ_READER_H
+#define OJ_READER_H
 
-typedef struct _Reader {
+typedef struct _reader {
     char	base[0x00001000];
     char	*head;
     char	*end;
@@ -18,7 +18,7 @@ typedef struct _Reader {
     int		line;
     int		col;
     int		free_head;
-    int		(*read_func)(struct _Reader *reader);
+    int		(*read_func)(struct _reader *reader);
     union {
 	int		fd;
 	VALUE		io;
@@ -148,4 +148,4 @@ is_white(char c) {
     return 0;
 }
 
-#endif /* __OJ_READER_H__ */
+#endif /* OJ_READER_H */

data/ext/oj/resolve.h

@@ -3,12 +3,12 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_RESOLVE_H__
-#define __OJ_RESOLVE_H__
+#ifndef OJ_RESOLVE_H
+#define OJ_RESOLVE_H
 
 #include "ruby.h"
 
 extern VALUE	oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class);
 extern VALUE	oj_name2struct(ParseInfo pi, VALUE nameVal, VALUE error_class);
 
-#endif /* __OJ_RESOLVE_H__ */
+#endif /* OJ_RESOLVE_H */