ox 1.5.8 → 1.5.9

data/ext/ox/extconf.rb

@@ -16,7 +16,9 @@ dflags = {
   '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 || '2' <= version[0])) ? 1 : 0,
+  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION)) ? 1 : 0,
+  #'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
+  'HAS_TM_GMTOFF' => ('ruby' == type && '2' <= version[0]) ? 0 : 1,
   '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,
@@ -26,7 +28,7 @@ dflags = {
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
 }
 
-if 'i386-darwin10.0.0' == RUBY_PLATFORM
+if ['i386-darwin10.0.0', 'x86_64-darwin10.8.0'].include? RUBY_PLATFORM
   dflags['NEEDS_STPCPY'] = nil
   
   dflags['HAS_IVAR_HELPERS'] = 0 if ('ruby' == type && '1.9.1' == RUBY_VERSION)

data/ext/ox/gen_load.c

@@ -51,7 +51,7 @@ static void     end_element(PInfo pi, const char *ename);
 extern ParseCallbacks   ox_obj_callbacks;
 
 struct _ParseCallbacks   _ox_gen_callbacks = {
-    instruct, // instruct,
+    instruct, /* instruct, */
     add_doctype,
     add_comment,
     add_cdata,
@@ -107,7 +107,7 @@ create_prolog_doc(PInfo pi, const char *target, Attr attrs) {
     VALUE       nodes;
     VALUE	sym;
 
-    if (0 != pi->h) { // top level object
+    if (0 != pi->h) { /* top level object */
         rb_raise(rb_eSyntaxError, "Prolog must be the first element in an XML document.\n");
     }
     pi->h = pi->helpers;
@@ -162,7 +162,7 @@ instruct(PInfo pi, const char *target, Attr attrs) {
                     rb_raise(rb_eSyntaxError, "Only Ox XML Object version 1.0 supported, not %s.\n", attrs->value);
                 }
             }
-            // ignore other instructions
+            /* ignore other instructions */
         }
     } else {
         if (TRACE <= pi->options->trace) {
@@ -215,7 +215,7 @@ add_doctype(PInfo pi, const char *docType) {
     }
 #endif
     rb_ivar_set(n, ox_at_value_id, s);
-    if (0 == pi->h) { // top level object
+    if (0 == pi->h) { /* top level object */
 	create_doc(pi);
     }
     rb_ary_push(pi->h->obj, n);
@@ -232,7 +232,7 @@ add_comment(PInfo pi, const char *comment) {
     }
 #endif
     rb_ivar_set(n, ox_at_value_id, s);
-    if (0 == pi->h) { // top level object
+    if (0 == pi->h) { /* top level object */
 	create_doc(pi);
     }
     rb_ary_push(pi->h->obj, n);
@@ -249,7 +249,7 @@ add_cdata(PInfo pi, const char *cdata, size_t len) {
     }
 #endif
     rb_ivar_set(n, ox_at_value_id, s);
-    if (0 == pi->h) { // top level object
+    if (0 == pi->h) { /* top level object */
 	create_doc(pi);
     }
     rb_ary_push(pi->h->obj, n);
@@ -264,7 +264,7 @@ add_text(PInfo pi, char *text, int closed) {
         rb_enc_associate(s, pi->encoding);
     }
 #endif
-    if (0 == pi->h) { // top level object
+    if (0 == pi->h) { /* top level object */
 	create_doc(pi);
     }
     rb_ary_push(pi->h->obj, s);
@@ -323,7 +323,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
         }
         rb_ivar_set(e, ox_attributes_id, ah);
     }
-    if (0 == pi->h) { // top level object
+    if (0 == pi->h) { /* top level object */
         pi->h = pi->helpers;
         pi->obj = e;
     } else {

data/ext/ox/obj_load.c

@@ -64,10 +64,10 @@ static void             fill_indent(PInfo pi, char *buf, size_t size);
 
 
 struct _ParseCallbacks   _ox_obj_callbacks = {
-    instruct, // instruct,
-    0, // add_doctype,
-    0, // add_comment,
-    0, // add_cdata,
+    instruct, /* instruct, */
+    0, /* add_doctype, */
+    0, /* add_comment, */
+    0, /* add_cdata, */
     add_text,
     add_element,
     end_element,
@@ -146,7 +146,7 @@ resolve_classname(VALUE mod, const char *class_name, Effort effort, VALUE base_c
         break;
     case StrictEffort:
     default:
-        // raise an error if name is not defined
+        /* raise an error if name is not defined */
         clas = rb_const_get_at(mod, ci);
         break;
     }
@@ -180,7 +180,7 @@ structname2obj(const char *name) {
         }
     }
     ost = rb_const_get(ox_struct_class, rb_intern(s));
-// use encoding as the indicator for Ruby 1.8.7 or 1.9.x
+    /* use encoding as the indicator for Ruby 1.8.7 or 1.9.x */
 #if HAS_ENCODING_SUPPORT
     return rb_struct_alloc_noinit(ost);
 #else
@@ -203,7 +203,7 @@ parse_ulong(const char *s, PInfo pi) {
     return ULONG2NUM(n);
 }
 
-// 2010-07-09T10:47:45.895826162+09:00
+/* 2010-07-09T10:47:45.895826162+09:00 */
 inline static VALUE
 parse_time(const char *text, VALUE clas) {
     VALUE       t;
@@ -212,7 +212,7 @@ parse_time(const char *text, VALUE clas) {
         Qnil == (t = parse_xsd_time(text, clas))) {
         VALUE       args[1];
 
-        //printf("**** time parse\n");
+        /*printf("**** time parse\n"); */
         *args = rb_str_new2(text);
         t = rb_funcall2(ox_time_class, ox_parse_id, 1, args);
     }
@@ -486,7 +486,7 @@ add_text(PInfo pi, char *text, int closed) {
         VALUE           v;
         char            *str = ALLOCA_N(char, str_size + 1);
         
-        from_base64(text, (u_char*)str);
+        from_base64(text, (uchar*)str);
         v = rb_str_new(str, str_size);
 #if HAS_ENCODING_SUPPORT
         if (0 != pi->encoding) {
@@ -506,7 +506,7 @@ add_text(PInfo pi, char *text, int closed) {
         unsigned long   str_size = b64_orig_size(text);
         char            *str = ALLOCA_N(char, str_size + 1);
         
-        from_base64(text, (u_char*)str);
+        from_base64(text, (uchar*)str);
         if (Qundef == (sym = ox_cache_get(ox_symbol_cache, str, &slot))) {
 	    sym = str2sym(str, pi->encoding);
             *slot = sym;
@@ -521,7 +521,7 @@ add_text(PInfo pi, char *text, int closed) {
             unsigned long       str_size = b64_orig_size(text);
 	    char		*str = ALLOCA_N(char, str_size + 1);
         
-            from_base64(text, (u_char*)str);
+            from_base64(text, (uchar*)str);
             pi->h->obj = parse_regexp(str);
         }
         break;
@@ -559,7 +559,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
             printf("%s%s\n", indent, buf);
         }
     }
-    if (0 == pi->h) { // top level object
+    if (0 == pi->h) { /* top level object */
         pi->h = pi->helpers;
         if (0 != (id = get_id_from_attrs(pi, attrs))) {
             pi->circ_array = circ_array_new();
@@ -584,7 +584,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
         h->obj = Qfalse;
         break;
     case StringCode:
-        // h->obj will be replaced by add_text if it is called
+        /* h->obj will be replaced by add_text if it is called */
         h->obj = ox_empty_string;
         if (0 != pi->circ_array) {
             pi->id = get_id_from_attrs(pi, attrs);
@@ -600,8 +600,8 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     case ComplexCode:
     case DateCode:
     case TimeCode:
-    case RationalCode: // sub elements read next
-        // value will be read in the following add_text
+    case RationalCode: /* sub elements read next */
+        /* value will be read in the following add_text */
         h->obj = Qundef;
         break;
     case String64Code:
@@ -697,7 +697,7 @@ end_element(PInfo pi, const char *ename) {
         Helper  h = pi->h;
 
         if (ox_empty_string == h->obj) {
-            // special catch for empty strings
+            /* special catch for empty strings */
             h->obj = rb_str_new2("");
         }
         pi->obj = h->obj;
@@ -872,7 +872,7 @@ parse_xsd_time(const char *text, VALUE clas) {
 #endif
 }
 
-// debug functions
+/* debug functions */
 static void
 fill_indent(PInfo pi, char *buf, size_t size) {
     if (0 != pi->h) {

data/ext/ox/ox.c

@@ -36,7 +36,7 @@
 #include "ruby.h"
 #include "ox.h"
 
-// maximum to allocate on the stack, arbitrary limit
+/* maximum to allocate on the stack, arbitrary limit */
 #define SMALL_XML	65536
 
 typedef struct _YesNoOpt {
@@ -129,17 +129,17 @@ static VALUE	with_xml_sym;
 static VALUE	xsd_date_sym;
 
 struct _Options	 ox_default_options = {
-    { '\0' },		// encoding
-    2,			// indent
-    0,			// trace
-    No,			// with_dtd
-    No,			// with_xml
-    No,			// with_instruct
-    No,			// circular
-    No,			// xsd_date
-    NoMode,		// mode
-    StrictEffort,	// effort
-    Yes			// sym_keys
+    { '\0' },		/* encoding */
+    2,			/* indent */
+    0,			/* trace */
+    No,			/* with_dtd */
+    No,			/* with_xml */
+    No,			/* with_instruct */
+    No,			/* circular */
+    No,			/* xsd_date */
+    NoMode,		/* mode */
+    StrictEffort,	/* effort */
+    Yes			/* sym_keys */
 };
 
 extern ParseCallbacks	ox_obj_callbacks;
@@ -306,7 +306,7 @@ to_obj(VALUE self, VALUE ruby_xml) {
     VALUE	obj;
 
     Check_Type(ruby_xml, T_STRING);
-    // the xml string gets modified so make a copy of it
+    /* the xml string gets modified so make a copy of it */
     len = RSTRING_LEN(ruby_xml) + 1;
     if (SMALL_XML < len) {
 	xml = ALLOC_N(char, len);
@@ -335,7 +335,7 @@ to_gen(VALUE self, VALUE ruby_xml) {
     VALUE		obj;
 
     Check_Type(ruby_xml, T_STRING);
-    // the xml string gets modified so make a copy of it
+    /* the xml string gets modified so make a copy of it */
     len = RSTRING_LEN(ruby_xml) + 1;
     if (SMALL_XML < len) {
 	xml = ALLOC_N(char, len);
@@ -436,7 +436,7 @@ load_str(int argc, VALUE *argv, VALUE self) {
     VALUE	obj;
     
     Check_Type(*argv, T_STRING);
-    // the xml string gets modified so make a copy of it
+    /* the xml string gets modified so make a copy of it */
     len = RSTRING_LEN(*argv) + 1;
     if (SMALL_XML < len) {
 	xml = ALLOC_N(char, len);

data/ext/ox/ox.h

@@ -50,7 +50,7 @@ extern "C" {
 enum st_retval {ST_CONTINUE = 0, ST_STOP = 1, ST_DELETE = 2, ST_CHECK};
 #else
 #if HAS_TOP_LEVEL_ST_H
-// Only on travis, local is where it is for all others. Seems to vary depending on the travis machine picked up.
+/* Only on travis, local is where it is for all others. Seems to vary depending on the travis machine picked up. */
 #include "st.h"
 #else
 #include "ruby/st.h"
@@ -118,9 +118,9 @@ typedef enum {
 typedef enum {
     NoCode	   = 0,
     ArrayCode	   = 'a',
-    String64Code   = 'b', // base64 encoded String
+    String64Code   = 'b', /* base64 encoded String */
     ClassCode	   = 'c',
-    Symbol64Code   = 'd', // base64 encoded Symbol
+    Symbol64Code   = 'd', /* base64 encoded Symbol */
     DateCode	   = 'D',
     ExceptionCode  = 'e',
     FloatCode	   = 'f',
@@ -128,7 +128,7 @@ typedef enum {
     HashCode	   = 'h',
     FixnumCode	   = 'i',
     BignumCode	   = 'j',
-    KeyCode	   = 'k', // indicates the value is a hash key, kind of a hack
+    KeyCode	   = 'k', /* indicates the value is a hash key, kind of a hack */
     RationalCode   = 'l',
     SymbolCode	   = 'm',
     FalseClassCode = 'n',
@@ -170,22 +170,22 @@ typedef struct _ParseCallbacks {
 typedef struct _CircArray {
     VALUE		obj_array[1024];
     VALUE		*objs;
-    unsigned long	size; // allocated size or initial array size
+    unsigned long	size; /* allocated size or initial array size */
     unsigned long	cnt;
 } *CircArray;
 
 typedef struct _Options {
-    char	encoding[64];	// encoding, stored in the option to avoid GC invalidation in default values
-    int		indent;		// indention for dump, default 2
-    int		trace;		// trace level
-    char	with_dtd;	// YesNo
-    char	with_xml;	// YesNo
-    char	with_instruct;	// YesNo
-    char	circular;	// YesNo
-    char	xsd_date;	// YesNo
-    char	mode;		// LoadMode
-    char	effort;		// Effort
-    char	sym_keys;	// symbolize keys
+    char	encoding[64];	/* encoding, stored in the option to avoid GC invalidation in default values */
+    int		indent;		/* indention for dump, default 2 */
+    int		trace;		/* trace level */
+    char	with_dtd;	/* YesNo */
+    char	with_xml;	/* YesNo */
+    char	with_instruct;	/* YesNo */
+    char	circular;	/* YesNo */
+    char	xsd_date;	/* YesNo */
+    char	mode;		/* LoadMode */
+    char	effort;		/* Effort */
+    char	sym_keys;	/* symbolize keys */
 } *Options;
 
 /* parse information structure */

data/ext/ox/parse.c

@@ -41,7 +41,7 @@ static void	read_doctype(PInfo pi);
 static void	read_comment(PInfo pi);
 static void	read_element(PInfo pi);
 static void	read_text(PInfo pi);
-//static void	  read_reduced_text(PInfo pi);
+/*static void	  read_reduced_text(PInfo pi); */
 static void	read_cdata(PInfo pi);
 static char*	read_name_token(PInfo pi);
 static char*	read_quoted_value(PInfo pi);
@@ -116,7 +116,7 @@ ox_parse(char *xml, ParseCallbacks pcb, char **endp, Options options) {
     pi.encoding = 0;
     pi.options = options;
     while (1) {
-	next_non_white(&pi);	// skip white space
+	next_non_white(&pi);	/* skip white space */
 	if ('\0' == *pi.s) {
 	    break;
 	}
@@ -124,12 +124,12 @@ ox_parse(char *xml, ParseCallbacks pcb, char **endp, Options options) {
 	    *endp = pi.s;
 	    break;
 	}
-	if ('<' != *pi.s) {		// all top level entities start with <
+	if ('<' != *pi.s) {		/* all top level entities start with < */
 	    raise_error("invalid format, expected <", pi.str, pi.s);
 	}
-	pi.s++;		// past <
+	pi.s++;		/* past < */
 	switch (*pi.s) {
-	case '?':	// prolog
+	case '?':	/* prolog */
 	    pi.s++;
 	    read_instruction(&pi);
 	    break;
@@ -138,11 +138,11 @@ ox_parse(char *xml, ParseCallbacks pcb, char **endp, Options options) {
 	    if ('\0' == *pi.s) {
 		raise_error("invalid format, DOCTYPE or comment not terminated", pi.str, pi.s);
 	    } else if ('-' == *pi.s) {
-		pi.s++;	// skip -
+		pi.s++;	/* skip - */
 		if ('-' != *pi.s) {
 		    raise_error("invalid format, bad comment format", pi.str, pi.s);
 		} else {
-		    pi.s++;	// skip second -
+		    pi.s++;	/* skip second - */
 		    read_comment(&pi);
 		}
 	    } else if (0 == strncmp("DOCTYPE", pi.s, 7)) {
@@ -178,7 +178,7 @@ read_instruction(PInfo pi) {
     end = pi->s;
     next_non_white(pi);
     c = *pi->s;
-    *end = '\0'; // terminate name
+    *end = '\0'; /* terminate name */
     if ('?' != c) {
 	while ('?' != *pi->s) {
 	    if ('\0' == *pi->s) {
@@ -191,8 +191,8 @@ read_instruction(PInfo pi) {
 	    if ('=' != *pi->s++) {
 		raise_error("invalid format, no attribute value", pi->str, pi->s);
 	    }
-	    *end = '\0'; // terminate name
-	    // read value
+	    *end = '\0'; /* terminate name */
+	    /* read value */
 	    next_non_white(pi);
 	    a->value = read_quoted_value(pi);
 	    a++;
@@ -276,7 +276,7 @@ read_comment(PInfo pi) {
 	    break;
 	}
     }
-    *end = '\0'; // in case the comment was blank
+    *end = '\0'; /* in case the comment was blank */
     pi->s = end + 3;
     if (0 != pi->pcb->add_comment) {
 	pi->pcb->add_comment(pi, comment);
@@ -308,7 +308,7 @@ read_element(PInfo pi) {
 	/* empty element, no attributes and no children */
 	pi->s++;
 	if ('>' != *pi->s) {
-	    //printf("*** '%s' ***\n", pi->s);
+	    /*printf("*** '%s' ***\n", pi->s); */
 	    raise_error("invalid format, element not closed", pi->str, pi->s);
 	}
 	pi->s++;	/* past > */
@@ -328,7 +328,7 @@ read_element(PInfo pi) {
 	case '\0':
 	    raise_error("invalid format, document not terminated", pi->str, pi->s);
 	case '/':
-	    // Element with just attributes.
+	    /* Element with just attributes. */
 	    pi->s++;
 	    if ('>' != *pi->s) {
 		raise_error("invalid format, element not closed", pi->str, pi->s);
@@ -340,7 +340,7 @@ read_element(PInfo pi) {
 
 	    return;
 	case '>':
-	    // has either children or a value
+	    /* has either children or a value */
 	    pi->s++;
 	    hasChildren = 1;
 	    done = 1;
@@ -348,16 +348,16 @@ read_element(PInfo pi) {
 	    pi->pcb->add_element(pi, ename, attrs, hasChildren);
 	    break;
 	default:
-	    // Attribute name so it's an element and the attribute will be
-	    // added to it.
+	    /* Attribute name so it's an element and the attribute will be */
+	    /* added to it. */
 	    ap->name = read_name_token(pi);
 	    end = pi->s;
 	    next_non_white(pi);
 	    if ('=' != *pi->s++) {
 		raise_error("invalid format, no attribute value", pi->str, pi->s);
 	    }
-	    *end = '\0'; // terminate name
-	    // read value
+	    *end = '\0'; /* terminate name */
+	    /* read value */
 	    next_non_white(pi);
 	    ap->value = read_quoted_value(pi);
 	    if (0 != strchr(ap->value, '&')) {
@@ -377,7 +377,7 @@ read_element(PInfo pi) {
 	char	*start;
 	
 	done = 0;
-	// read children
+	/* read children */
 	while (!done) {
 	    start = pi->s;
 	    next_non_white(pi);
@@ -418,21 +418,21 @@ read_element(PInfo pi) {
 		case '\0':
 		    raise_error("invalid format, document not terminated", pi->str, pi->s);
 		default:
-		    // a child element
+		    /* a child element */
 		    read_element(pi);
 		    break;
 		}
-	    } else {	// read as TEXT
+	    } else {	/* read as TEXT */
 		pi->s = start;
-		//pi->s--;
+		/*pi->s--; */
 		read_text(pi);
-		//read_reduced_text(pi);
+		/*read_reduced_text(pi); */
 
-		// to exit read_text with no errors the next character must be <
+		/* to exit read_text with no errors the next character must be < */
 		if ('/' == *(pi->s + 1) &&
 		    0 == strncmp(ename, pi->s + 2, elen) &&
 		    '>' == *(pi->s + elen + 2)) {
-		    // close tag after text so treat as a value
+		    /* close tag after text so treat as a value */
 		    pi->s += elen + 3;
 		    pi->pcb->end_element(pi, ename);
 		    return;
@@ -579,9 +579,9 @@ read_name_token(PInfo pi) {
 	case '\r':
 	    return start;
 	case '\0':
-	    // documents never terminate after a name token
+	    /* documents never terminate after a name token */
 	    raise_error("invalid format, document not terminated", pi->str, pi->s);
-	    break; // to avoid warnings
+	    break; /* to avoid warnings */
 	default:
 	    break;
 	}
@@ -634,15 +634,15 @@ read_quoted_value(PInfo pi) {
     if ('"' == *pi->s || ('\'' == *pi->s && StrictEffort != pi->options->effort)) {
         char	term = *pi->s;
         
-        pi->s++;	// skip quote character
+        pi->s++;	/* skip quote character */
         value = pi->s;
         for (; *pi->s != term; pi->s++) {
             if ('\0' == *pi->s) {
                 raise_error("invalid format, document not terminated", pi->str, pi->s);
             }
         }
-        *pi->s = '\0'; // terminate value
-        pi->s++;	   // move past quote
+        *pi->s = '\0'; /* terminate value */
+        pi->s++;	   /* move past quote */
     } else if (StrictEffort == pi->options->effort) {
 	raise_error("invalid format, expected a quote character", pi->str, pi->s);
     } else {
@@ -651,7 +651,7 @@ read_quoted_value(PInfo pi) {
 	if ('\0' == *pi->s) {
 	    raise_error("invalid format, document not terminated", pi->str, pi->s);
         }
-        *pi->s++ = '\0'; // terminate value
+        *pi->s++ = '\0'; /* terminate value */
     }
     return value;
 }