ox 1.2.14 → 1.2.15

data/ext/ox/cache8.c

@@ -16,7 +16,7 @@
 struct _Cache8 {
     union {
         struct _Cache8  *slots[SLOT_CNT];
-        uint64_t        values[SLOT_CNT];
+        unsigned long   values[SLOT_CNT];
     };
 };
 
@@ -56,8 +56,8 @@ cache8_delete(Cache8 cache, int depth) {
     free(cache);
 }
 
-uint64_t
-ox_cache8_get(Cache8 cache, VALUE key, uint64_t **slot) {
+slot_t
+ox_cache8_get(Cache8 cache, VALUE key, slot_t **slot) {
     Cache8      *cp;
     int         i;
     VALUE       k;

data/ext/ox/cache8.h

@@ -33,12 +33,13 @@
 
 #include "ruby.h"
 
-typedef struct _Cache8   *Cache8;
+typedef struct _Cache8  *Cache8;
+typedef unsigned long   slot_t;
 
 extern void     ox_cache8_new(Cache8 *cache);
 extern void     ox_cache8_delete(Cache8 cache);
 
-extern uint64_t ox_cache8_get(Cache8 cache, VALUE key, uint64_t **slot);
+extern slot_t   ox_cache8_get(Cache8 cache, VALUE key, slot_t **slot);
 
 extern void     ox_cache8_print(Cache8 cache);
 

data/ext/ox/cache8_test.c

@@ -31,37 +31,37 @@
 #include <stdio.h>
 #include "cache8.h"
 
-static uint64_t data[] = {
-    0x000000A0A0A0A0A0ULL,
-    0x0000000000ABCDEFULL,
-    0x0123456789ABCDEFULL,
-    0x0000000000000001ULL,
-    0x0000000000000002ULL,
-    0x0000000000000003ULL,
-    0x0000000000000004ULL,
+static slot_t data[] = {
+    0x000000A0A0A0A0A0UL,
+    0x0000000000ABCDEFUL,
+    0x0123456789ABCDEFUL,
+    0x0000000000000001UL,
+    0x0000000000000002UL,
+    0x0000000000000003UL,
+    0x0000000000000004UL,
     0
 };
 
 void
 ox_cache8_test() {
     Cache8      c;
-    uint64_t    v;
-    uint64_t    *d;
-    uint64_t    cnt = 1;
-    uint64_t    *slot = 0;
+    slot_t      v;
+    slot_t      *d;
+    slot_t      cnt = 1;
+    slot_t      *slot = 0;
 
     ox_cache8_new(&c);
     for (d = data; 0 != *d; d++) {
         v = ox_cache8_get(c, *d, &slot);
         if (0 == v) {
             if (0 == slot) {
-                printf("*** failed to get a slot for 0x%016llx\n", *d);
+                printf("*** failed to get a slot for 0x%016lx\n", *d);
             } else {
-                printf("*** adding 0x%016llx to cache with value %llu\n", *d, cnt);
+                printf("*** adding 0x%016lx to cache with value %lu\n", *d, cnt);
                 *slot = cnt++;
             }
         } else {
-            printf("*** get on 0x%016llx returned %llu\n", *d, v);
+            printf("*** get on 0x%016lx returned %lu\n", *d, v);
         }
         //ox_cache8_print(c);
     }

data/ext/ox/dump.c

@@ -44,6 +44,8 @@
 #include "cache8.h"
 #include "ox.h"
 
+typedef unsigned long   ulong;
+
 typedef struct _Str {
     const char  *str;
     size_t      len;
@@ -192,7 +194,7 @@ fill_attr(Out out, char name, const char *value, size_t len) {
 }
 
 inline static const char*
-ulong2str(uint64_t num, char *end) {
+ulong2str(ulong num, char *end) {
     char        *b;
 
     *end-- = '\0';
@@ -206,8 +208,8 @@ ulong2str(uint64_t num, char *end) {
 
 static int
 check_circular(Out out, VALUE obj, Element e) {
-    uint64_t    *slot;
-    uint64_t    id;
+    ulong       *slot;
+    ulong       id;
     int         result;
     
     if (0 == (id = ox_cache8_get(out->circ_cache, obj, &slot))) {
@@ -541,7 +543,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         } else {
             char        buf64[4096];
             char        *b64 = buf64;
-            uint64_t    size = b64_size(cnt);
+            ulong       size = b64_size(cnt);
 
             e.type = String64Code;
             if (sizeof(buf64) < size) {
@@ -574,7 +576,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         } else {
             char        buf64[4096];
             char        *b64 = buf64;
-            uint64_t    size = b64_size(cnt);
+            ulong       size = b64_size(cnt);
 
             e.type = Symbol64Code;
             if (sizeof(buf64) < size) {
@@ -617,6 +619,11 @@ 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
         VALUE   clas;
 
         if (0 != out->circ_cache && check_circular(out, obj, &e)) {
@@ -651,6 +658,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             }
             out->w_end(out, &e);
         }
+#endif
         break;
     }
     case T_OBJECT:
@@ -688,9 +696,12 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
                 out->depth = od;
                 out->w_end(out, &e);
             }
+#else
+#ifdef JRUBY
+            VALUE       vars = rb_funcall2(obj, rb_intern("instance_variables"), 0, 0);
 #else
             VALUE       vars = rb_obj_instance_variables(obj);
-            
+#endif            
             e.type = ObjectCode;
             cnt = (int)RARRAY_LEN(vars);
             e.closed = (0 >= cnt);
@@ -734,7 +745,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         } else {
             char        buf64[4096];
             char        *b64 = buf64;
-            uint64_t    size = b64_size(cnt);
+            ulong       size = b64_size(cnt);
 
             if (sizeof(buf64) < size) {
                 if (0 == (b64 = (char*)malloc(size + 1))) {

data/ext/ox/obj_load.c

@@ -132,6 +132,7 @@ classname2obj(const char *name, PInfo pi) {
     }
 }
 
+#ifndef NO_RSTRUCT
 inline static VALUE
 structname2obj(const char *name) {
     VALUE       ost;
@@ -154,6 +155,7 @@ structname2obj(const char *name) {
     return rb_struct_new(ost);
 #endif
 }
+#endif
 
 // 2010-07-09T10:47:45.895826162+09:00
 inline static VALUE
@@ -222,6 +224,7 @@ get_obj_from_attrs(Attr a, PInfo pi) {
     return Qundef;
 }
 
+#ifndef NO_RSTRUCT
 static VALUE
 get_struct_from_attrs(Attr a) {
     for (; 0 != a->name; a++) {
@@ -231,6 +234,7 @@ get_struct_from_attrs(Attr a) {
     }
     return Qundef;
 }
+#endif
 
 static VALUE
 get_class_from_attrs(Attr a, PInfo pi) {
@@ -613,10 +617,14 @@ 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
         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));
         }
+#endif
         break;
     case ClassCode:
         h->obj = get_class_from_attrs(attrs, pi);
@@ -674,13 +682,20 @@ 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
                 rb_struct_aset(pi->h->obj, h->var, h->obj);
+#endif
                 break;
             case HashCode:
                 h->type = KeyCode;
                 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 (beg_id == h->var) {
                     RSTRUCT_PTR(pi->h->obj)[0] = h->obj;
                 } else if (end_id == h->var) {
@@ -690,6 +705,7 @@ end_element(PInfo pi, const char *ename) {
                 } else {
                     raise_error("Invalid range attribute", pi->str, pi->s);
                 }
+#endif
                 break;
             case KeyCode:
                 rb_hash_aset((pi->h - 1)->obj, pi->h->obj, h->obj);

data/ext/ox/ox.h

@@ -45,6 +45,13 @@ extern "C" {
 #endif
 #include "cache.h"
 
+#ifdef JRUBY
+#define NO_RSTRUCT 1
+#endif
+#ifdef RBX_Qnil
+#define NO_RSTRUCT 1
+#endif
+
 #define raise_error(msg, xml, current) _raise_error(msg, xml, current, __FILE__, __LINE__)
 
 #define MAX_TEXT_LEN    4096

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '1.2.14'
+  VERSION = '1.2.15'
 end

data/test/bug3.rb

@@ -3,21 +3,19 @@
 $: << '../lib'
 $: << '../ext'
 
-if __FILE__ == $0
-  if (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
-end
-
 require 'ox'
 
-def dump(cnt = 100000)
-  cnt.times do |i|
-    xml = Ox.dump([:inc, 1])
-    #puts xml
-    
+def name_it()
+  begin
+    "x".foo
+  rescue Exception => e
+    #puts e.message
+    xml = Ox.dump(e, effort: :tolerant)
+    puts xml
+    o = Ox.load(xml, mode: :object)
+    puts o.message
+    puts Ox.dump(e)
   end
 end
 
-dump()
+name_it()

metadata

@@ -1,24 +1,28 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ox
-version: !ruby/object:Gem::Version
-  version: 1.2.14
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.2.15
 platform: ruby
-authors:
+authors: 
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+
+date: 2011-09-06 00:00:00 +09:00
+default_executable: 
 dependencies: []
+
 description: A fast XML parser and object serializer that uses only standard C lib.
 email: peter@ohler.com
 executables: []
-extensions:
+
+extensions: 
 - ext/ox/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - lib/ox/bag.rb
 - lib/ox/cdata.rb
 - lib/ox/comment.rb
@@ -43,7 +47,6 @@ files:
 - ext/ox/obj_load.c
 - ext/ox/ox.c
 - ext/ox/parse.c
-- test/big.rb
 - test/bug1.rb
 - test/bug2.rb
 - test/bug3.rb
@@ -76,31 +79,35 @@ files:
 - test/Sample.graffle
 - LICENSE
 - README.rdoc
+has_rdoc: true
 homepage: https://github.com/ohler55/ox
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: ox
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A fast XML parser and object serializer.
 test_files: []
+

data/test/big.rb

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby -wW1
-
-$: << '../lib'
-$: << '../ext'
-
-if __FILE__ == $0
-  while (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
-end
-
-require 'ox'
-
-def dump(cnt = 10000)
-  h = { }
-  cnt.times do |i|
-    h[i] = [i * 2, "this is #{i}"]
-  end
-  xml = Ox.dump(h)
-  puts "size: #{xml.size}"
-end
-
-dump(200000)