oj 1.2.0 → 1.2.1

data/ext/oj/extconf.rb

@@ -1,7 +1,37 @@
 require 'mkmf'
 
-$CPPFLAGS += ' -Wall'
-#puts "*** $CPPFLAGS: #{$CPPFLAGS}"
 extension_name = 'oj'
 dir_config(extension_name)
+
+parts = RUBY_DESCRIPTION.split(' ')
+type = parts[0]
+type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+version = RUBY_VERSION.split('.')
+puts ">>>>> Creating Makefile for #{type} version #{RUBY_VERSION} <<<<<"
+
+dflags = {
+  'RUBY_TYPE' => type,
+  (type.upcase + '_RUBY') => nil,
+  'RUBY_VERSION' => RUBY_VERSION,
+  'RUBY_VERSION_MAJOR' => version[0],
+  'RUBY_VERSION_MINOR' => version[1],
+  'RUBY_VERSION_MICRO' => version[2],
+  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && '1.9.3' == RUBY_VERSION) ? 1 : 0,
+  'HAS_ENCODING_SUPPORT' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_NANO_TIME' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
+  'HAS_IVAR_HELPERS' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
+}
+
+dflags.each do |k,v|
+  if v.nil?
+    $CPPFLAGS += " -D#{k}"
+  else
+    $CPPFLAGS += " -D#{k}=#{v}"
+  end
+end
+$CPPFLAGS += ' -Wall'
+#puts "*** $CPPFLAGS: #{$CPPFLAGS}"
 create_makefile(extension_name)

data/ext/oj/fast.c

@@ -50,15 +50,10 @@ typedef struct _Batch {
 
 typedef struct _Doc {
     Leaf		data;
-    Leaf		*where;      // points to current location
+    Leaf		*where;	     // points to current location
     Leaf		where_path[MAX_STACK]; // points to head of path
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding		*encoding;
-#else
-    void		*encoding;
-#endif
     char		*json;
-    unsigned long	size;        // number of leaves/branches in the doc
+    unsigned long	size;	     // number of leaves/branches in the doc
     VALUE		self;
     Batch		batches;
     struct _Batch	batch0;
@@ -156,11 +151,11 @@ next_white(ParseInfo pi) {
 inline static char*
 ulong_fill(char *s, size_t num) {
     char	buf[32];
-    char        *b = buf + sizeof(buf) - 1;
+    char	*b = buf + sizeof(buf) - 1;
 
     *b-- = '\0';
     for (; 0 < num; num /= 10, b--) {
-        *b = (num % 10) + '0';
+	*b = (num % 10) + '0';
     }
     b++;
     if ('\0' == *b) {
@@ -256,10 +251,8 @@ leaf_value(Doc doc, Leaf leaf) {
 	    break;
 	case T_STRING:
 	    leaf->value = rb_str_new2(leaf->str);
-#ifdef HAVE_RUBY_ENCODING_H
-	    if (0 != doc->encoding) {
-		rb_enc_associate(leaf->value, doc->encoding);
-	    }
+#if HAS_ENCODING_SUPPORT
+	    rb_enc_associate(leaf->value, oj_utf8_encoding);
 #endif
 	    leaf->value_type = RUBY_VAL;
 	    break;
@@ -317,7 +310,7 @@ skip_comment(ParseInfo pi) {
     }
 }
 
-#ifdef RUBINIUS
+#ifdef RUBINIUS_RUBY
 #define NUM_MAX 0x07FFFFFF
 #else
 #define NUM_MAX (FIXNUM_MAX >> 8)
@@ -358,13 +351,7 @@ leaf_fixnum_value(Leaf leaf) {
     leaf->value_type = RUBY_VAL;
 }
 
-#if 1
-static void
-leaf_float_value(Leaf leaf) {
-    leaf->value = rb_float_new(rb_cstr_to_dbl(leaf->str, 1));
-    leaf->value_type = RUBY_VAL;
-}
-#else
+#ifdef JRUBY_RUBY
 static void
 leaf_float_value(Leaf leaf) {
     char	*s = leaf->str;
@@ -426,10 +413,16 @@ leaf_float_value(Leaf leaf) {
 	    }
 	    d *= pow(10.0, e);
 	}
-	leaf->value = DBL2NUM(d);
+	leaf->value = rb_float_new(d);
     }
     leaf->value_type = RUBY_VAL;
 }
+#else
+static void
+leaf_float_value(Leaf leaf) {
+    leaf->value = rb_float_new(rb_cstr_to_dbl(leaf->str, 1));
+    leaf->value_type = RUBY_VAL;
+}
 #endif
 
 static VALUE
@@ -459,10 +452,8 @@ leaf_hash_value(Doc doc, Leaf leaf) {
 
 	do {
 	    key = rb_str_new2(e->key);
-#ifdef HAVE_RUBY_ENCODING_H
-	    if (0 != doc->encoding) {
-		rb_enc_associate(key, doc->encoding);
-	    }
+#if HAS_ENCODING_SUPPORT
+	    rb_enc_associate(key, oj_utf8_encoding);
 #endif
 	    rb_hash_aset(h, key, leaf_value(doc, e));
 	    e = e->next;
@@ -722,7 +713,7 @@ static char*
 read_quoted_value(ParseInfo pi) {
     char	*value = 0;
     char	*h = pi->s; // head
-    char	*t = h;     // tail
+    char	*t = h;	    // tail
     
     h++;	// skip quote character
     t++;
@@ -1138,7 +1129,7 @@ doc_open_file(VALUE clas, VALUE filename) {
     Check_Type(filename, T_STRING);
     path = StringValuePtr(filename);
     if (0 == (f = fopen(path, "r"))) {
-        rb_raise(rb_eIOError, "%s\n", strerror(errno));
+	rb_raise(rb_eIOError, "%s\n", strerror(errno));
     }
     fseek(f, 0, SEEK_END);
     len = ftell(f);
@@ -1150,8 +1141,8 @@ doc_open_file(VALUE clas, VALUE filename) {
     }
     fseek(f, 0, SEEK_SET);
     if (len != fread(json, 1, len, f)) {
-        fclose(f);
-        rb_raise(rb_eLoadError, "Failed to read %lu bytes from %s.\n", (unsigned long)len, path);
+	fclose(f);
+	rb_raise(rb_eLoadError, "Failed to read %lu bytes from %s.\n", (unsigned long)len, path);
     }
     fclose(f);
     json[len] = '\0';
@@ -1212,9 +1203,9 @@ doc_where(VALUE self) {
  *
  * Returns the final key to the current location.
  * @example
- *   Oj::Doc.open('[1,2,3]') { |doc| doc.move('/2'); doc.local_key() }      #=> 2
+ *   Oj::Doc.open('[1,2,3]') { |doc| doc.move('/2'); doc.local_key() }	    #=> 2
  *   Oj::Doc.open('{"one":3}') { |doc| doc.move('/one'); doc.local_key() }  #=> "one"
- *   Oj::Doc.open('[1,2,3]') { |doc| doc.local_key() }                      #=> nil
+ *   Oj::Doc.open('[1,2,3]') { |doc| doc.local_key() }			    #=> nil
  */
 static VALUE
 doc_local_key(VALUE self) {
@@ -1224,10 +1215,8 @@ doc_local_key(VALUE self) {
 
     if (T_HASH == leaf->parent_type) {
 	key = rb_str_new2(leaf->key);
-#ifdef HAVE_RUBY_ENCODING_H
-	if (0 != doc->encoding) {
-	    rb_enc_associate(key, doc->encoding);
-	}
+#if HAS_ENCODING_SUPPORT
+	rb_enc_associate(key, oj_utf8_encoding);
 #endif
     } else if (T_ARRAY == leaf->parent_type) {
 	key = LONG2NUM(leaf->index);
@@ -1260,7 +1249,7 @@ doc_home(VALUE self) {
  * is low.
  * @param [String] path path to the location to get the type of if provided
  * @example
- *   Oj::Doc.open('[1,2]') { |doc| doc.type() }      #=> Array
+ *   Oj::Doc.open('[1,2]') { |doc| doc.type() }	     #=> Array
  *   Oj::Doc.open('[1,2]') { |doc| doc.type('/1') }  #=> Fixnum
  */
 static VALUE

data/ext/oj/load.c

@@ -40,10 +40,10 @@ enum {
 };
 
 typedef struct _CircArray {
-    VALUE               obj_array[1024];
-    VALUE               *objs;
-    unsigned long       size; // allocated size or initial array size
-    unsigned long       cnt;
+    VALUE		obj_array[1024];
+    VALUE		*objs;
+    unsigned long	size; // allocated size or initial array size
+    unsigned long	cnt;
 } *CircArray;
 
 typedef struct _ParseInfo {
@@ -124,8 +124,8 @@ next_white(ParseInfo pi) {
 
 inline static VALUE
 resolve_classname(VALUE mod, const char *class_name, int auto_define) {
-    VALUE       clas;
-    ID          ci = rb_intern(class_name);
+    VALUE	clas;
+    ID		ci = rb_intern(class_name);
 
     if (rb_const_defined_at(mod, ci) || !auto_define) {
 	clas = rb_const_get_at(mod, ci);
@@ -140,55 +140,55 @@ classname2obj(const char *name, ParseInfo pi) {
     VALUE   clas = classname2class(name, pi);
     
     if (Qundef == clas) {
-        return Qnil;
+	return Qnil;
     } else {
-        return rb_obj_alloc(clas);
+	return rb_obj_alloc(clas);
     }
 }
 
 static VALUE
 classname2class(const char *name, ParseInfo pi) {
-    VALUE       clas;
-    VALUE       *slot;
+    VALUE	clas;
+    VALUE	*slot;
     int		auto_define = (Yes == pi->options->auto_define);
 
     if (Qundef == (clas = oj_cache_get(oj_class_cache, name, &slot))) {
-        char            class_name[1024];
-        char            *s;
-        const char      *n = name;
-
-        clas = rb_cObject;
-        for (s = class_name; '\0' != *n; n++) {
-            if (':' == *n) {
-                *s = '\0';
-                n++;
+	char		class_name[1024];
+	char		*s;
+	const char	*n = name;
+
+	clas = rb_cObject;
+	for (s = class_name; '\0' != *n; n++) {
+	    if (':' == *n) {
+		*s = '\0';
+		n++;
 		if (':' != *n) {
-                    raise_error("Invalid classname, expected another ':'", pi->str, pi->s);
+		    raise_error("Invalid classname, expected another ':'", pi->str, pi->s);
 		}
-                if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
-                    return Qundef;
-                }
-                s = class_name;
-            } else {
-                *s++ = *n;
-            }
-        }
-        *s = '\0';
-        if (Qundef != (clas = resolve_classname(clas, class_name, auto_define))) {
-            *slot = clas;
-        }
+		if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
+		    return Qundef;
+		}
+		s = class_name;
+	    } else {
+		*s++ = *n;
+	    }
+	}
+	*s = '\0';
+	if (Qundef != (clas = resolve_classname(clas, class_name, auto_define))) {
+	    *slot = clas;
+	}
     }
     return clas;
 }
 
-#ifndef NO_RSTRUCT
+#if HAS_RSTRUCT
 inline static VALUE
 structname2obj(const char *name) {
-    VALUE       ost;
+    VALUE	ost;
 
     ost = rb_const_get(oj_struct_class, rb_intern(name));
 // use encoding as the indicator for Ruby 1.8.7 or 1.9.x
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     return rb_struct_alloc_noinit(ost);
 #else
     return rb_struct_new(ost);
@@ -212,10 +212,10 @@ read_ulong(const char *s, ParseInfo pi) {
 
 static CircArray
 circ_array_new() {
-    CircArray   ca;
+    CircArray	ca;
     
     if (0 == (ca = ALLOC(struct _CircArray))) {
-        rb_raise(rb_eNoMemError, "not enough memory\n");
+	rb_raise(rb_eNoMemError, "not enough memory\n");
     }
     ca->objs = ca->obj_array;
     ca->size = sizeof(ca->obj_array) / sizeof(VALUE);
@@ -227,7 +227,7 @@ circ_array_new() {
 static void
 circ_array_free(CircArray ca) {
     if (ca->objs != ca->obj_array) {
-        xfree(ca->objs);
+	xfree(ca->objs);
     }
     xfree(ca);
 }
@@ -235,41 +235,41 @@ circ_array_free(CircArray ca) {
 static void
 circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
     if (0 < id && 0 != ca) {
-        unsigned long   i;
-
-        if (ca->size < id) {
-            unsigned long       cnt = id + 512;
-
-            if (ca->objs == ca->obj_array) {
-                if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
-                    rb_raise(rb_eNoMemError, "not enough memory\n");
-                }
-                memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
-            } else { 
-                ca->objs = REALLOC_N(ca->objs, VALUE, cnt);
-                if (0 == ca->objs) {
-                    rb_raise(rb_eNoMemError, "not enough memory\n");
-                }
-            }
-            ca->size = cnt;
-        }
-        id--;
-        for (i = ca->cnt; i < id; i++) {
-            ca->objs[i] = Qnil;
-        }
-        ca->objs[id] = obj;
-        if (ca->cnt <= id) {
-            ca->cnt = id + 1;
-        }
+	unsigned long	i;
+
+	if (ca->size < id) {
+	    unsigned long	cnt = id + 512;
+
+	    if (ca->objs == ca->obj_array) {
+		if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
+		    rb_raise(rb_eNoMemError, "not enough memory\n");
+		}
+		memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
+	    } else { 
+		ca->objs = REALLOC_N(ca->objs, VALUE, cnt);
+		if (0 == ca->objs) {
+		    rb_raise(rb_eNoMemError, "not enough memory\n");
+		}
+	    }
+	    ca->size = cnt;
+	}
+	id--;
+	for (i = ca->cnt; i < id; i++) {
+	    ca->objs[i] = Qnil;
+	}
+	ca->objs[id] = obj;
+	if (ca->cnt <= id) {
+	    ca->cnt = id + 1;
+	}
     }
 }
 
 static VALUE
 circ_array_get(CircArray ca, unsigned long id) {
-    VALUE       obj = Qnil;
+    VALUE	obj = Qnil;
 
     if (id <= ca->cnt && 0 != ca) {
-        obj = ca->objs[id - 1];
+	obj = ca->objs[id - 1];
     }
     return obj;
 }
@@ -454,8 +454,8 @@ read_obj(ParseInfo pi) {
 	    }
 	    if (Qundef != key) {
 		if (T_OBJECT == obj_type) {
-		    VALUE       *slot;
-		    ID          var_id;
+		    VALUE	*slot;
+		    ID		var_id;
 
 		    if (Qundef == (var_id = oj_cache_get(oj_attr_cache, ks, &slot))) {
 			char	attr[1024];
@@ -516,7 +516,7 @@ read_array(ParseInfo pi, int hint) {
     int		type = T_NONE;
     int		cnt = 0;
     int		a_str;
-#ifndef NO_RSTRUCT
+#if HAS_RSTRUCT
     long	slen = 0;
 #endif
 
@@ -532,7 +532,7 @@ read_array(ParseInfo pi, int hint) {
 	if (Qundef == (e = read_next(pi, 0))) {
 	    raise_error("unexpected character", pi->str, pi->s);
 	}
-#ifndef NO_RSTRUCT
+#if HAS_RSTRUCT
 	if (Qundef == a && T_STRUCT == hint && T_STRING == rb_type(e)) {
 	    a = structname2obj(StringValuePtr(e));
 	    type = T_STRUCT;
@@ -550,13 +550,13 @@ read_array(ParseInfo pi, int hint) {
 	}
 	if (Qundef != e) {
 	    if (T_STRUCT == type) {
-#ifdef NO_RSTRUCT
-		raise_error("Ruby structs not supported with this version of Ruby", pi->str, pi->s);
-#else
+#if HAS_RSTRUCT
 		if (slen <= cnt) {
 		    raise_error("Too many elements for Struct", pi->str, pi->s);
 		}
 		RSTRUCT_PTR(a)[cnt] = e;
+#else
+		raise_error("Ruby structs not supported with this version of Ruby", pi->str, pi->s);
 #endif
 	    } else {
 		rb_ary_push(a, e);
@@ -596,12 +596,12 @@ read_str(ParseInfo pi, int hint) {
 	break;
     case T_STRING:
 	obj = rb_str_new2(text);
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 	rb_enc_associate(obj, oj_utf8_encoding);
 #endif
 	break;
     case T_SYMBOL:
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 	obj = rb_str_new2(text);
 	rb_enc_associate(obj, oj_utf8_encoding);
 	obj = rb_funcall(obj, oj_to_sym_id, 0);
@@ -613,7 +613,7 @@ read_str(ParseInfo pi, int hint) {
     default:
 	obj = Qundef;
 	if (':' == *text && !escaped) { // Symbol
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 	    obj = rb_str_new2(text + 1);
 	    rb_enc_associate(obj, oj_utf8_encoding);
 	    obj = rb_funcall(obj, oj_to_sym_id, 0);
@@ -631,7 +631,7 @@ read_str(ParseInfo pi, int hint) {
 	}
 	if (Qundef == obj) {
 	    obj = rb_str_new2(text);
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 	    rb_enc_associate(obj, oj_utf8_encoding);
 #endif
 	}
@@ -640,7 +640,7 @@ read_str(ParseInfo pi, int hint) {
     return obj;
 }
 
-#ifdef RUBINIUS
+#ifdef RUBINIUS_RUBY
 #define NUM_MAX 0x07FFFFFF
 #else
 #define NUM_MAX (FIXNUM_MAX >> 8)
@@ -749,7 +749,11 @@ read_time(ParseInfo pi) {
 	    v2 *= 10;
 	}
     }
+#if HAS_NANO_TIME
     return rb_time_nano_new(v, v2);
+#else
+    return rb_time_new(v, v2 / 1000);
+#endif
 }
 
 static VALUE
@@ -849,7 +853,7 @@ static char*
 read_quoted_value(ParseInfo pi) {
     char	*value = 0;
     char	*h = pi->s; // head
-    char	*t = h;     // tail
+    char	*t = h;	    // tail
     uint32_t	code;
     
     h++;	// skip quote character