ruby_deep_clone 0.2.0 → 0.3.0

data/deep_clone.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name = 'ruby_deep_clone'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.date = '2013-04-03'
 
   s.summary = "Ruby native deep clone"

data/ext/deep_clone/deep_clone.c

@@ -1,4 +1,29 @@
 #include "deep_clone.h"
+int ident = 0;
+
+void
+inspect(VALUE val) {
+#ifdef DC_DEBUG
+  int i;
+  for(i = 0; i <= ident-1; i++) {
+    printf("\t");
+  }
+  printf("BEFORE %d ", BUILTIN_TYPE(val));
+  printf("INSPECT: %s\n", RSTRING_PTR(rb_any_to_s(val)));
+#endif
+}
+
+void
+inspect_kvp(ID key, VALUE val) {
+#ifdef DC_DEBUG
+  int i;
+  for(i = 0; i <= ident-1; i++) {
+    printf("\t");
+  }
+  printf("BEFORE %s %d %d", RSTRING_PTR(rb_inspect(ID2SYM(key))), val);
+  printf("VALUE: %s => %s\n", RSTRING_PTR(rb_inspect(ID2SYM(key))), RSTRING_PTR(rb_any_to_s(val)));
+#endif
+}
 
 void Init_deep_clone()
 {
@@ -8,8 +33,9 @@ void Init_deep_clone()
 
 static int clone_variable(st_data_t key, st_data_t index, struct dump_call_arg *arg)
 {
-  VALUE val = ROBJECT_IVPTR(arg->src)[(long)index];
-  rb_ivar_set(arg->obj, key, clone_object(val,arg->tracker));
+  VALUE val = rb_ivar_get(arg->obj, (ID)key);// ROBJECT_IVPTR(arg->src)[(long)index];
+  inspect_kvp((ID)key, val);
+  rb_ivar_set(arg->obj, (ID)key, clone_object(val,arg->tracker));
   return ST_CONTINUE;
 }
 
@@ -24,16 +50,20 @@ static VALUE clone_object(VALUE object, VALUE tracker)
   if(rb_special_const_p(object))
     return object;
 
+  inspect(object);
+
   VALUE new_obj;
   VALUE id = rb_obj_id(object);
 
   if(st_lookup(RHASH_TBL(tracker), id, 0)) {
     new_obj = rb_hash_aref(tracker,id);
   } else {
+    ident++;
     switch (BUILTIN_TYPE(object)) {
       case T_ARRAY:
         new_obj = rb_ary_new2(RARRAY_LEN(object));
         long len = RARRAY_LEN(object);
+        if(len == 0) break;
         rb_hash_aset(tracker,id,new_obj);
         VALUE *ptr = RARRAY_PTR(object);
         while (len--) {
@@ -54,20 +84,35 @@ static VALUE clone_object(VALUE object, VALUE tracker)
         break;
       case T_CLASS:
       case T_MODULE:
+      case T_FLOAT:
       case T_REGEXP:
+      case T_BIGNUM:
+      case T_NIL:
+      case T_TRUE:
+      case T_FALSE:
+      case T_FIXNUM:
+      case T_STRUCT:
+      case T_FILE:
         new_obj = object;
         rb_hash_aset(tracker,id,new_obj);
         break;
       default:
         new_obj = rb_obj_clone(object);
+
+        // Unfreeze the new object
+        OBJ_UNFREEZE(new_obj);
+
         rb_hash_aset(tracker,id,new_obj);
         st_table *tbl = ROBJECT_IV_INDEX_TBL(object);
         if(tbl) {
           struct dump_call_arg arg = {new_obj,tracker, object};
           TABLE_FOREACH(tbl, clone_variable, (st_data_t)&arg);
         }
+
+        if(OBJ_FROZEN(object)) OBJ_FREEZE(new_obj);
         break;
     }
+    ident--;
   }
   return new_obj;
 }

data/ext/deep_clone/deep_clone.h

@@ -10,6 +10,10 @@ struct dump_call_arg {
   VALUE src;
 };
 
+// #define DC_DEBUG 0
+
+#define OBJ_UNFREEZE(x) FL_UNSET((x), FL_FREEZE)
+
 #ifdef SA_EMPTY
 
 // Gotta do this because of 1.9.3's falcon patch
@@ -25,15 +29,9 @@ struct dump_call_arg {
 #define RCLASS_IV_INDEX_TBL(c) (&RCLASS_EXT(c)->iv_index_tbl)
 
 #else
-
 // Make it work with vanilla ruby (including 2.0)
-#ifndef TABLE_FOREACH
-#define TABLE_FOREACH st_foreach
-#endif
-
-#ifndef RCLASS_IV_INDEX_TBL
 #define RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
-#endif
+#define TABLE_FOREACH st_foreach
 
 #endif
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_deep_clone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18286920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,15 +22,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *18286920
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18285940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,15 +33,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
+  version_requirements: *18285940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18285120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,12 +44,7 @@ dependencies:
         version: 10.0.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.4
+  version_requirements: *18285120
 description: Native implementation to create deep clones of Ruby objects
 email:
 - balmma@sysinf.ch
@@ -95,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: Ruby native deep clone