ox 1.5.4 → 1.5.5

data/README.md

@@ -30,11 +30,29 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.5.4
+### Release 1.5.5
 
- - Worked around bug in rb_protect in ruby 1.9.x and OS X 10.6.8 that caused ignored exceptions to be raised on program exit.
+ - Fixed bug in special character encoding to remove the double ampersands.
 
- - Fixed a parse bug that did not accept &nn; sequences.
+ - Fixed bug that did not dump XSD times correctly.
+
+ - Fixed bug in the prolog parsing.
+
+ - Improved the speed of time parsing and dumping.
+
+ - Increased the time resolution for Rubies that support nanoseconds.
+
+ - Cleaned up compile flags.
+
+ - All tests pass with all supported Rubies.
+
+ - Added value() callback to the SAX parser which allows deferred value parsing and typing to improve performance.
+
+ - Added attr_value() callback to the SAX parser which allows deferred value parsing and typing to improve performance with attributes.
+
+ - Added an example that demonstrates using several parsing techniques with different parsers. The example is in the test/weather directory.
+
+ - The SAX parser was optimized slightly for StringIO input.
 
 ## <a name="description">Description</a>
 

data/ext/ox/dump.c

@@ -34,12 +34,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "ruby.h"
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/st.h"
-#else
-#include "st.h"
-#endif
 #include "base64.h"
 #include "cache8.h"
 #include "ox.h"
@@ -298,7 +292,7 @@ dump_start(Out out, Element e) {
     }
     if (0 < e->id) {
         char            buf[32];
-        char            *end = buf + sizeof(buf);
+        char            *end = buf + sizeof(buf) - 1;
         const char      *s = ulong2str(e->id, end);
         
         fill_attr(out, 'i', s, end - s);
@@ -380,7 +374,6 @@ dump_str_value(Out out, const char *value, size_t size) {
 		*out->cur++ = 't';
 		break;
 	    default:
-		*out->cur++ = '&';
 		*out->cur++ = '#';
 		*out->cur++ = 'x';
 		*out->cur++ = '0';
@@ -429,16 +422,26 @@ dump_num(Out out, VALUE obj) {
 
 static void
 dump_time_thin(Out out, VALUE obj) {
-    char        buf[64];
-    char        *b = buf + sizeof(buf) - 1;
-    time_t      sec = NUM2LONG(rb_funcall2(obj, ox_tv_sec_id, 0, 0));
-    long        usec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0));
-    char        *dot = b - 7;
-    long        size;
+    char		buf[64];
+    char		*b = buf + sizeof(buf) - 1;
+#if HAS_RB_TIME_TIMESPEC
+    struct timespec	ts = rb_time_timespec(obj);
+    time_t		sec = ts.tv_sec;
+    long		nsec = ts.tv_nsec;
+#else
+    time_t		sec = NUM2LONG(rb_funcall2(obj, ox_tv_sec_id, 0, 0));
+#if HAS_NANO_TIME
+    long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_nsec_id, 0, 0));
+#else
+    long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0)) * 1000;
+#endif
+#endif
+    char		*dot = b - 10;
+    long		size;
 
     *b-- = '\0';
-    for (; dot < b; b--, usec /= 10) {
-        *b = '0' + (usec % 10);
+    for (; dot < b; b--, nsec /= 10) {
+        *b = '0' + (nsec % 10);
     }
     *b-- = '.';
     for (; 0 < sec; b--, sec /= 10) {
@@ -479,11 +482,21 @@ dump_date(Out out, VALUE obj) {
 
 static void
 dump_time_xsd(Out out, VALUE obj) {
-    struct tm   *tm;
-    time_t      sec = NUM2LONG(rb_funcall2(obj, ox_tv_sec_id, 0, 0));
-    long        usec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0));
-    int         tzhour, tzmin;
-    char        tzsign = '+';
+    struct tm		*tm;
+#if HAS_RB_TIME_TIMESPEC
+    struct timespec	ts = rb_time_timespec(obj);
+    time_t		sec = ts.tv_sec;
+    long		nsec = ts.tv_nsec;
+#else
+    time_t		sec = NUM2LONG(rb_funcall2(obj, ox_tv_sec_id, 0, 0));
+#if HAS_NANO_TIME
+    long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_nsec_id, 0, 0));
+#else
+    long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0)) * 1000;
+#endif
+#endif
+    int			tzhour, tzmin;
+    char		tzsign = '+';
 
     if (out->end - out->cur <= 33) {
         grow(out, 33);
@@ -498,10 +511,11 @@ dump_time_xsd(Out out, VALUE obj) {
         tzhour = (int)(tm->tm_gmtoff / 3600);
         tzmin = (int)(tm->tm_gmtoff / 60) - (tzhour * 60);
     }
-    sprintf(out->cur, "%04d-%02d-%02dT%02d:%02d:%02d.%06ld%c%02d:%02d",
-            tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-            tm->tm_hour, tm->tm_min, tm->tm_sec, usec,
-            tzsign, tzhour, tzmin);
+    // TBD replace with more efficient printer
+    out->cur += sprintf(out->cur, "%04d-%02d-%02dT%02d:%02d:%02d.%06ld%c%02d:%02d",
+			tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+			tm->tm_hour, tm->tm_min, tm->tm_sec, nsec / 1000,
+			tzsign, tzhour, tzmin);
 }
 
 static void
@@ -621,7 +635,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         break;
     case T_FLOAT:
         e.type = FloatCode;
-        cnt = sprintf(value_buf, "%0.16g", RFLOAT_VALUE(obj)); // used sprintf due to bug in snprintf
+        cnt = sprintf(value_buf, "%0.16g", rb_num2dbl(obj)); // used sprintf due to bug in snprintf
         out->w_start(out, &e);
         dump_value(out, value_buf, cnt);
         e.indent = -1;
@@ -729,11 +743,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
     }
     case T_STRUCT:
     {
-#ifdef NO_RSTRUCT
-        e.type = NilClassCode;
-        e.closed = 1;
-        out->w_start(out, &e);
-#else
+#if HAS_RSTRUCT
         VALUE   clas;
 
         if (0 != out->circ_cache && check_circular(out, obj, &e)) {
@@ -768,6 +778,10 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             }
             out->w_end(out, &e);
         }
+#else
+        e.type = NilClassCode;
+        e.closed = 1;
+        out->w_start(out, &e);
 #endif
         break;
     }
@@ -792,8 +806,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             dump_gen_element(obj, depth + 1, out);
             out->w_end(out, &e);
         } else { // Object
-// use encoding as the indicator for Ruby 1.8.7 or 1.9.x
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_IVAR_HELPERS
             e.type = (Qtrue == rb_obj_is_kind_of(obj, rb_eException)) ? ExceptionCode : ObjectCode;
             cnt = (int)rb_ivar_count(obj);
             e.closed = (0 >= cnt);
@@ -807,11 +820,10 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
                 out->w_end(out, &e);
             }
 #else
-#if (defined JRUBY || defined RUBINIUS)
+            //VALUE       vars = rb_obj_instance_variables(obj);
+	    //#else
             VALUE       vars = rb_funcall2(obj, rb_intern("instance_variables"), 0, 0);
-#else
-            VALUE       vars = rb_obj_instance_variables(obj);
-#endif            
+	    //#endif            
             e.type = (Qtrue == rb_obj_is_kind_of(obj, rb_eException)) ? ExceptionCode : ObjectCode;
             cnt = (int)RARRAY_LEN(vars);
             e.closed = (0 >= cnt);
@@ -890,21 +902,31 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         out->w_end(out, &e);
         break;
     }
-#if (defined T_COMPLEX && defined RCOMPLEX)
+#ifdef T_COMPLEX
     case T_COMPLEX:
         e.type = ComplexCode;
         out->w_start(out, &e);
+#ifdef RCOMPLEX
         dump_obj(0, RCOMPLEX(obj)->real, depth + 1, out);
         dump_obj(0, RCOMPLEX(obj)->imag, depth + 1, out);
+#else
+        dump_obj(0, rb_funcall2(obj, rb_intern("real"), 0, 0), depth + 1, out);
+        dump_obj(0, rb_funcall2(obj, rb_intern("imag"), 0, 0), depth + 1, out);
+#endif
         out->w_end(out, &e);
         break;
 #endif
-#if (defined T_RATIONAL && defined RRATIONAL)
+#ifdef T_RATIONAL
     case T_RATIONAL:
         e.type = RationalCode;
         out->w_start(out, &e);
+#ifdef RRATIONAL
         dump_obj(0, RRATIONAL(obj)->num, depth + 1, out);
         dump_obj(0, RRATIONAL(obj)->den, depth + 1, out);
+#else
+        dump_obj(0, rb_funcall2(obj, rb_intern("numerator"), 0, 0), depth + 1, out);
+        dump_obj(0, rb_funcall2(obj, rb_intern("denominator"), 0, 0), depth + 1, out);
+#endif
         out->w_end(out, &e);
         break;
 #endif
@@ -920,7 +942,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
     default:
         if (StrictEffort == out->opts->effort) {
             rb_raise(rb_eNotImpError, "Failed to dump %s Object (%02x)\n",
-                     rb_class2name(rb_obj_class(obj)), rb_type(obj));
+                     rb_obj_classname(obj), rb_type(obj));
         } else {
             e.type = NilClassCode;
             e.closed = 1;
@@ -991,7 +1013,7 @@ dump_gen_doc(VALUE obj, unsigned int depth, Out out) {
 
 static void
 dump_gen_element(VALUE obj, unsigned int depth, Out out) {
-    VALUE       rname = rb_attr_get(obj, ox_value_id);
+    VALUE       rname = rb_attr_get(obj, ox_at_value_id);
     VALUE       attrs = rb_attr_get(obj, ox_attributes_id);
     VALUE       nodes = rb_attr_get(obj, ox_nodes_id);
     const char  *name = StringValuePtr(rname);
@@ -1091,7 +1113,7 @@ static void
 dump_gen_val_node(VALUE obj, unsigned int depth,
                   const char *pre, size_t plen,
                   const char *suf, size_t slen, Out out) {
-    VALUE       v = rb_attr_get(obj, ox_value_id);
+    VALUE       v = rb_attr_get(obj, ox_at_value_id);
     const char  *val;
     size_t      vlen;
     size_t      size;

data/ext/ox/extconf.rb

@@ -1,7 +1,39 @@
 require 'mkmf'
 
-$CPPFLAGS += ' -Wall'
-#puts "*** $CPPFLAGS: #{$CPPFLAGS}"
 extension_name = 'ox'
 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 || 'rubinius' == 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)
+
+%x{make clean}

data/ext/ox/gen_load.c

@@ -114,7 +114,7 @@ create_prolog_doc(PInfo pi, const char *target, Attr attrs) {
     doc = rb_obj_alloc(ox_document_clas);
     ah = rb_hash_new();
     for (; 0 != attrs->name; attrs++) {
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 	if (0 != pi->encoding) {
 	    VALUE	rstr = rb_str_new2(attrs->name);
 
@@ -127,7 +127,7 @@ create_prolog_doc(PInfo pi, const char *target, Attr attrs) {
 	sym = ID2SYM(rb_intern(attrs->name));
 #endif
         rb_hash_aset(ah, sym, rb_str_new2(attrs->value));
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
         if (0 == strcmp("encoding", attrs->name)) {
             pi->encoding = rb_enc_find(attrs->value);
         }
@@ -198,12 +198,12 @@ add_doctype(PInfo pi, const char *docType) {
     VALUE       n = rb_obj_alloc(ox_doctype_clas);
     VALUE       s = rb_str_new2(docType);
 
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     if (0 != pi->encoding) {
         rb_enc_associate(s, pi->encoding);
     }
 #endif
-    rb_ivar_set(n, ox_value_id, s);
+    rb_ivar_set(n, ox_at_value_id, s);
     if (0 == pi->h) { // top level object
 	create_doc(pi);
     }
@@ -215,12 +215,12 @@ add_comment(PInfo pi, const char *comment) {
     VALUE       n = rb_obj_alloc(ox_comment_clas);
     VALUE       s = rb_str_new2(comment);
 
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     if (0 != pi->encoding) {
         rb_enc_associate(s, pi->encoding);
     }
 #endif
-    rb_ivar_set(n, ox_value_id, s);
+    rb_ivar_set(n, ox_at_value_id, s);
     if (0 == pi->h) { // top level object
 	create_doc(pi);
     }
@@ -232,12 +232,12 @@ add_cdata(PInfo pi, const char *cdata, size_t len) {
     VALUE       n = rb_obj_alloc(ox_cdata_clas);
     VALUE       s = rb_str_new2(cdata);
 
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     if (0 != pi->encoding) {
         rb_enc_associate(s, pi->encoding);
     }
 #endif
-    rb_ivar_set(n, ox_value_id, s);
+    rb_ivar_set(n, ox_at_value_id, s);
     if (0 == pi->h) { // top level object
 	create_doc(pi);
     }
@@ -248,7 +248,7 @@ static void
 add_text(PInfo pi, char *text, int closed) {
     VALUE       s = rb_str_new2(text);
 
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     if (0 != pi->encoding) {
         rb_enc_associate(s, pi->encoding);
     }
@@ -264,13 +264,13 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     VALUE       e;
     VALUE       s = rb_str_new2(ename);
 
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     if (0 != pi->encoding) {
         rb_enc_associate(s, pi->encoding);
     }
 #endif
     e = rb_obj_alloc(ox_element_clas);
-    rb_ivar_set(e, ox_value_id, s);
+    rb_ivar_set(e, ox_at_value_id, s);
     if (0 != attrs->name) {
         VALUE   ah = rb_hash_new();
         
@@ -279,7 +279,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
             VALUE   *slot;
 
             if (Qundef == (sym = ox_cache_get(ox_symbol_cache, attrs->name, &slot))) {
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 		if (0 != pi->encoding) {
 		    VALUE	rstr = rb_str_new2(attrs->name);
 
@@ -294,7 +294,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
                 *slot = sym;
             }
             s = rb_str_new2(attrs->value);
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
             if (0 != pi->encoding) {
                 rb_enc_associate(s, pi->encoding);
             }

data/ext/ox/obj_load.c

@@ -164,7 +164,7 @@ classname2obj(const char *name, PInfo pi, VALUE base_class) {
     }
 }
 
-#ifndef NO_RSTRUCT
+#if HAS_RSTRUCT
 inline static VALUE
 structname2obj(const char *name) {
     VALUE       ost;
@@ -181,7 +181,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
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     return rb_struct_alloc_noinit(ost);
 #else
     return rb_struct_new(ost);
@@ -273,7 +273,7 @@ get_obj_from_attrs(Attr a, PInfo pi, VALUE base_class) {
     return Qundef;
 }
 
-#ifndef NO_RSTRUCT
+#if HAS_RSTRUCT
 static VALUE
 get_struct_from_attrs(Attr a) {
     for (; 0 != a->name; a++) {
@@ -380,7 +380,7 @@ parse_regexp(const char *text) {
     int         options = 0;
             
     te = text + strlen(text) - 1;
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
     for (; text < te && '/' != *te; te--) {
         switch (*te) {
         case 'i':       options |= ONIG_OPTION_IGNORECASE;      break;
@@ -396,7 +396,7 @@ parse_regexp(const char *text) {
 static void
 instruct(PInfo pi, const char *target, Attr attrs) {
     if (0 == strcmp("xml", target)) {
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
         for (; 0 != attrs->name; attrs++) {
             if (0 == strcmp("encoding", attrs->name)) {
                 pi->encoding = rb_enc_find(attrs->value);
@@ -421,7 +421,7 @@ add_text(PInfo pi, char *text, int closed) {
     case NoCode:
     case StringCode:
         pi->h->obj = rb_str_new2(text);
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
         if (0 != pi->encoding) {
             rb_enc_associate(pi->h->obj, pi->encoding);
         }
@@ -488,7 +488,7 @@ add_text(PInfo pi, char *text, int closed) {
         
         from_base64(text, (u_char*)str);
         v = rb_str_new(str, str_size);
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
         if (0 != pi->encoding) {
             rb_enc_associate(v, pi->encoding);
         }
@@ -648,13 +648,13 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
         }
         break;
     case StructCode:
-#ifdef NO_RSTRUCT
-        raise_error("Ruby structs not supported with this verion of Ruby", pi->str, pi->s);
-#else
+#if HAS_RSTRUCT
         h->obj = get_struct_from_attrs(attrs);
         if (0 != pi->circ_array) {
             circ_array_set(pi->circ_array, h->obj, get_id_from_attrs(pi, attrs));
         }
+#else
+        raise_error("Ruby structs not supported with this verion of Ruby", pi->str, pi->s);
 #endif
         break;
     case ClassCode:
@@ -714,10 +714,10 @@ end_element(PInfo pi, const char *ename) {
                 }
                 break;
             case StructCode:
-#ifdef NO_RSTRUCT
-                raise_error("Ruby structs not supported with this verion of Ruby", pi->str, pi->s);
-#else
+#if HAS_RSTRUCT
                 rb_struct_aset(pi->h->obj, h->var, h->obj);
+#else
+                raise_error("Ruby structs not supported with this verion of Ruby", pi->str, pi->s);
 #endif
                 break;
             case HashCode:
@@ -725,9 +725,7 @@ end_element(PInfo pi, const char *ename) {
                 pi->h++;
                 break;
             case RangeCode:
-#ifdef NO_RSTRUCT
-                raise_error("Ruby structs not supported with this verion of Ruby", pi->str, pi->s);
-#else
+#if HAS_RSTRUCT
                 if (ox_beg_id == h->var) {
                     RSTRUCT_PTR(pi->h->obj)[0] = h->obj;
                 } else if (ox_end_id == h->var) {
@@ -737,6 +735,8 @@ end_element(PInfo pi, const char *ename) {
                 } else {
                     raise_error("Invalid range attribute", pi->str, pi->s);
                 }
+#else
+                raise_error("Ruby structs not supported with this verion of Ruby", pi->str, pi->s);
 #endif
                 break;
             case KeyCode:
@@ -759,7 +759,11 @@ end_element(PInfo pi, const char *ename) {
                 if (Qundef == pi->h->obj) {
                     pi->h->obj = h->obj;
                 } else {
+#ifdef RUBINIUS_RUBY
+                    pi->h->obj = rb_Rational(pi->h->obj, h->obj);
+#else
                     pi->h->obj = rb_rational_new(pi->h->obj, h->obj);
+#endif
                 }
 #else
                 raise_error("Rational Objects not implemented in Ruby 1.8.7", pi->str, pi->s);
@@ -782,7 +786,6 @@ end_element(PInfo pi, const char *ename) {
 
 static VALUE
 parse_double_time(const char *text, VALUE clas) {
-    VALUE       args[2];
     long        v = 0;
     long        v2 = 0;
     const char  *dot = 0;
@@ -803,13 +806,14 @@ parse_double_time(const char *text, VALUE clas) {
         }
         v2 = 10 * v2 + (long)(c - '0');
     }
-    for (; text - dot <= 6; text++) {
+    for (; text - dot <= 9; text++) {
         v2 *= 10;
     }
-    args[0] = LONG2NUM(v);
-    args[1] = LONG2NUM(v2);
-
-    return rb_funcall2(clas, ox_at_id, 2, args);
+#if HAS_NANO_TIME
+    return rb_time_nano_new(v, v2);
+#else
+    return rb_time_new(v, v2 / 1000);
+#endif
 }
 
 typedef struct _Tp {
@@ -820,7 +824,6 @@ typedef struct _Tp {
 
 static VALUE
 parse_xsd_time(const char *text, VALUE clas) {
-    VALUE       args[2];
     long        cargs[10];
     long        *cp = cargs;
     long        v;
@@ -862,11 +865,11 @@ parse_xsd_time(const char *text, VALUE clas) {
     tm.tm_hour = (int)cargs[3];
     tm.tm_min = (int)cargs[4];
     tm.tm_sec = (int)cargs[5];
-
-    args[0] = LONG2NUM(mktime(&tm));
-    args[1] = LONG2NUM(cargs[6]);
-
-    return rb_funcall2(clas, ox_at_id, 2, args);
+#if HAS_NANO_TIME
+    return rb_time_nano_new(mktime(&tm), cargs[6]);
+#else
+    return rb_time_new(mktime(&tm), cargs[6] / 1000);
+#endif
 }
 
 // debug functions