carray 1.5.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172f193a4ae5241f1b91116374bb05bfa9c5ab184d8a72e7f3a1a564541eff1d
-  data.tar.gz: c6a650327904d42d22a56b148f6e381a1940a1d6d91099509e53080b857572c9
+  metadata.gz: 753475db4ed70adab65aa99cea8b1d735580e9c0b223b5e09333fe330cc4bff6
+  data.tar.gz: 45358fcc7b4e34cc3149eb2efbd2147fbbddce6ace834bd1c55a1b5773715d02
 SHA512:
-  metadata.gz: bf6e6cd9c71441d16f6342ff7cdef459a5fb9d229083650241035000ba2dfa0e313e0fab2fd47b0b401b7a4f82e92564d6aad97f975f6100063e17b8f7567dbb
-  data.tar.gz: 8fca46a6402dd6ad29841429551dafa128bf1146218eb527236aff2f5d8c29cb127b180c1b2c766b39dd8b26c69641d916d7570823a5e4fd590052c9f9bee411
+  metadata.gz: 6eee1c8bd046106b36fdd0f6f8efbfa6e6dd620934f117fc31ef8145355028092cbb576dd7e22e8432ccd1b2b0a8c89bb7737cf69da4c03c7502c765e7a8bc39
+  data.tar.gz: 7f1a2c12010b430777f08639983b22bfd7378c18703fb5cf042e164f5ec62d42963878469c90fb005d86d842362e48357c2fd7f5b5952e52b584892244b8b7c8

data/NEWS.md

@@ -1,6 +1,16 @@
 ChangeLog of Ruby/CArray
 ========================
 
+1.6.0 -> 2.0.0
+--------------
+
+*  Data -> TypedData
+
+1.5.9 -> 1.6.0
+--------------
+
+* Remove taint check in CArray#inspect
+
 1.5.8 -> 1.5.9
 --------------
 

data/TODO.md

@@ -3,6 +3,7 @@ ToDo List
 
 ToDo
 -------
+ * Data -> TypedData
  * Implement CArray.broadcast in C
  * Implement Integer#{|,&,^,<<,>>} with Refinement (remove monkey patch)
  * Remove RSTRUCT hack in carray_access.c for handling of Range object.

data/carray.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification::new do |s|
 
-  version = "1.5.9"
+  version = "2.0.0"
 
   files = Dir.glob("**/*") + [".yardopts"] -
                              [ 

data/ext/ca_iter_block.c

@@ -10,11 +10,26 @@
 
 #include "carray.h"
 
+extern const rb_data_type_t cablockiterator_data_type;
+
+const rb_data_type_t cablockiterator_data_type = {
+    .parent = &caiterator_data_type,
+    .wrap_struct_name = "CABlockIterator",
+    .function = {
+        .dmark = NULL,
+        .dfree = free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 /* yard:
   class CABlockIterator < CAIterator # :nodoc: 
   end
 */
 
+
 VALUE rb_cCABlockIterator;
 
 /*
@@ -152,9 +167,9 @@ ca_bi_setup (VALUE self, VALUE rref, VALUE rker)
 
   rker = rb_obj_clone(rker);
 
-  Data_Get_Struct(self, CABlockIterator, it);
-  Data_Get_Struct(rref, CArray, ref);
-  Data_Get_Struct(rker, CABlock, ker);
+  TypedData_Get_Struct(self, CABlockIterator, &cablockiterator_data_type, it);
+  TypedData_Get_Struct(rref, CArray, &carray_data_type, ref);
+  TypedData_Get_Struct(rker, CABlock, &cablock_data_type, ker);
 
   if ( ref->ndim != ker->ndim ) {
     rb_raise(rb_eRuntimeError, "ndim mismatch between reference and kernel");
@@ -189,7 +204,7 @@ static VALUE
 rb_bi_s_allocate (VALUE klass)
 {
   CABlockIterator *it;
-  return Data_Make_Struct(klass, CABlockIterator, 0, free, it);
+  return TypedData_Make_Struct(klass, CABlockIterator, &cablockiterator_data_type, it);
 }
 
 static VALUE
@@ -217,7 +232,7 @@ rb_ca_block_iterator (int argc, VALUE *argv, VALUE self)
   rker = rb_ca_fetch2(self, argc, argv);
 
   rb_check_carray_object(rker);
-  Data_Get_Struct(rker, CArray, ker);
+  TypedData_Get_Struct(rker, CArray, &carray_data_type, ker);
 
   if ( ker->obj_type != CA_OBJ_BLOCK ) {
     rb_raise(rb_eRuntimeError, "kernel must be CABlock object");

data/ext/ca_iter_dimension.c

@@ -32,6 +32,18 @@ typedef struct {
   int8_t   symindex[CA_RANK_MAX];
 } CADimIterator;
 
+const rb_data_type_t cadimiterator_data_type = {
+    .parent = &caiterator_data_type,
+    .wrap_struct_name = "CADimIterator",
+    .function = {
+        .dmark = NULL,
+        .dfree = free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 /* -------------------------------------------------------------------- */
 
 static CArray *
@@ -128,9 +140,9 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
   CADimIterator *it;
   CAIndexInfo blk_spec;
   int8_t ndim;
-  int i, j, k;
+  int i, j;
 
-  Data_Get_Struct(self, CADimIterator, it);
+  TypedData_Get_Struct(self, CADimIterator, &cadimiterator_data_type, it);
 
   if ( info->type != CA_REG_ITERATOR ) {
     rb_raise(rb_eRuntimeError, "given spec is not for dim iteratror");
@@ -153,7 +165,6 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
   ndim = 0;
 
   j = 0;
-  k = 0;
 
   for (i=0; i<info->ndim; i++) {
     if ( info->index_type[i] == CA_IDX_SCALAR ) {
@@ -183,8 +194,8 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
   rker = rb_apply(rref, rb_intern("[]"), rindex);
 
   it->ndim = ndim;
-  Data_Get_Struct(rref, CArray, it->reference);
-  Data_Get_Struct(rker, CArray, it->kernel);
+  TypedData_Get_Struct(rref, CArray, &carray_data_type, it->reference);
+  TypedData_Get_Struct(rker, CArray, &carray_data_type, it->kernel);
   it->kernel_at_addr  = ca_di_kernel_at_addr;
   it->kernel_at_index = ca_di_kernel_at_index;
   it->kernel_move_to_addr  = ca_di_kernel_move_to_addr;
@@ -203,7 +214,7 @@ static VALUE
 rb_di_s_allocate (VALUE klass)
 {
   CADimIterator *it;
-  return Data_Make_Struct(klass, CADimIterator, 0, free, it);
+  return TypedData_Make_Struct(klass, CADimIterator, &cadimiterator_data_type, it);
 }
 
 static VALUE
@@ -212,15 +223,15 @@ rb_di_initialize_copy (VALUE self, VALUE other)
   volatile VALUE rref, rker;
   CADimIterator *is, *io;
 
-  Data_Get_Struct(self, CADimIterator, is);
-  Data_Get_Struct(other, CADimIterator, io);
+  TypedData_Get_Struct(self, CADimIterator, &cadimiterator_data_type, is);
+  TypedData_Get_Struct(other, CADimIterator, &cadimiterator_data_type, io);
 
   rref = rb_ivar_get(self, rb_intern("@reference"));
   rker = rb_obj_clone(rb_ivar_get(self, rb_intern("@kernel")));
 
   *io = *is;
 
-  Data_Get_Struct(rker, CArray, io->kernel);
+  TypedData_Get_Struct(rker, CArray, &carray_data_type, io->kernel);
 
   rb_ivar_set(self, rb_intern("@reference"), rref); /* required ivar */
   rb_ivar_set(self, rb_intern("@kernel"), rker);
@@ -235,7 +246,7 @@ rb_ca_dim_iterator (int argc, VALUE *argv, VALUE self)
   CAIndexInfo info;
   CArray *ca;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);

data/ext/ca_iter_window.c

@@ -23,6 +23,18 @@ typedef struct {
   ca_size_t offset[CA_RANK_MAX];
 } CAWindowIterator;
 
+const rb_data_type_t cawindowiterator_data_type = {
+    .parent = &caiterator_data_type,
+    .wrap_struct_name = "CAWindowIterator",
+    .function = {
+        .dmark = NULL,
+        .dfree = free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rb_cCAWindowIterator;
 
 /* yard:
@@ -130,9 +142,9 @@ ca_vi_setup (VALUE self, VALUE rref, VALUE rker)
 
   rker = rb_obj_clone(rker);
 
-  Data_Get_Struct(self, CAWindowIterator, it);
-  Data_Get_Struct(rref, CArray, ref);
-  Data_Get_Struct(rker, CArray, ker);
+  TypedData_Get_Struct(self, CAWindowIterator, &cawindowiterator_data_type, it);
+  TypedData_Get_Struct(rref, CArray, &carray_data_type, ref);
+  TypedData_Get_Struct(rker, CArray, &carray_data_type, ker);
 
   if ( ref->ndim != ker->ndim ) {
     rb_raise(rb_eRuntimeError, "ndim mismatch between reference and kernel");
@@ -161,7 +173,7 @@ static VALUE
 rb_vi_s_allocate (VALUE klass)
 {
   CAWindowIterator *it;
-  return Data_Make_Struct(klass, CAWindowIterator, 0, free, it);
+  return TypedData_Make_Struct(klass, CAWindowIterator, &cawindowiterator_data_type, it);
 }
 
 static VALUE
@@ -170,7 +182,7 @@ rb_vi_initialize (VALUE self, VALUE rker)
   CArray *ker;
   
   rb_check_carray_object(rker);
-  Data_Get_Struct(rker, CArray, ker);
+  TypedData_Get_Struct(rker, CArray, &carray_data_type, ker);
   if ( ker->obj_type != CA_OBJ_WINDOW ) {
     rb_raise(rb_eRuntimeError, "kernel must be CAWindow object");
   }

data/ext/ca_obj_array.c

@@ -13,9 +13,72 @@
 #include "rubysig.h"
 #endif
 
+/* -------------------------------------------------------------------- */
+
+const rb_data_type_t carray_data_type = {
+    .parent = NULL,
+    .wrap_struct_name = "CArray",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+const rb_data_type_t cawrap_data_type = {
+    .parent = &carray_data_type,
+    .wrap_struct_name = "CAWrap",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cscalar_data_type = {
+    .parent = &carray_data_type,
+    .wrap_struct_name = "CScalar",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cavirtual_data_type = {
+    .parent = &carray_data_type,
+    .wrap_struct_name = "CAVirtual",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t carray_mask_data_type = {
+    .parent = &carray_data_type,
+    .wrap_struct_name = "CArrayMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /* ------------------------------------------------------------------- */
 
 VALUE rb_cCArray, rb_cCAWrap, rb_cCScalar, rb_cCAVirtual;
+VALUE rb_cCArrayMask;
 
 /* yard:
   class CArray
@@ -703,7 +766,7 @@ rb_ca_s_allocate (VALUE klass)
 {
   CArray *ca;
   ca_check_mem_count();  
-  return Data_Make_Struct(klass, CArray, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CArray, &carray_data_type, ca);
 }
 
 /* @overload  initialize(data_type, dim, bytes=0) { ... }
@@ -740,7 +803,7 @@ rb_ca_initialize (int argc, VALUE *argv, VALUE self)
     dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
   }
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   carray_safe_setup(ca, data_type, ndim, dim, bytes, NULL);
 
   if ( rb_block_given_p() ) {
@@ -953,8 +1016,8 @@ rb_ca_initialize_copy (VALUE self, VALUE other)
 
   rb_call_super(1, &other);
 
-  Data_Get_Struct(self,  CArray, ca);
-  Data_Get_Struct(other, CArray, cs);
+  TypedData_Get_Struct(self,  CArray, &carray_data_type, ca);
+  TypedData_Get_Struct(other, CArray, &carray_data_type, cs);
 
   ca_update_mask(cs);
   carray_setup(ca, cs->data_type, cs->ndim, cs->dim, cs->bytes, cs->mask);
@@ -993,7 +1056,7 @@ rb_ca_s_wrap (int argc, VALUE *argv, VALUE self)
 
   target = rb_yield_values(0);
 
-  obj = Data_Make_Struct(rb_cCAWrap, CAWrap, ca_mark, ca_free, ca);
+  obj = TypedData_Make_Struct(rb_cCAWrap, CAWrap, &cawrap_data_type, ca);
   ca_wrap_setup_null(ca, data_type, ndim, dim, bytes, NULL);
 
   rb_funcall(target, rb_intern("wrap_as_carray"), 1, obj);
@@ -1023,7 +1086,7 @@ static VALUE
 rb_cs_s_allocate (VALUE klass)
 {
   CScalar *ca;
-  return Data_Make_Struct(klass, CScalar, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CScalar, &cscalar_data_type, ca);
 }
 
 /* 
@@ -1054,7 +1117,7 @@ rb_cs_initialize (int argc, VALUE *argv, VALUE self)
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
   rb_ca_data_type_import(self, rtype);
 
-  Data_Get_Struct(self, CScalar, ca);
+  TypedData_Get_Struct(self, CScalar, &cscalar_data_type, ca);
   cscalar_setup(ca, data_type, bytes, NULL);
 
   if ( rb_block_given_p() ) {
@@ -1266,8 +1329,8 @@ rb_cs_initialize_copy (VALUE self, VALUE other)
 {
   CScalar *ca, *cs;
 
-  Data_Get_Struct(self,  CScalar, ca);
-  Data_Get_Struct(other, CScalar, cs);
+  TypedData_Get_Struct(self,  CScalar, &cscalar_data_type, ca);
+  TypedData_Get_Struct(other, CScalar, &cscalar_data_type, cs);
 
   cscalar_setup(ca, cs->data_type, cs->bytes, NULL);
   memcpy(ca->ptr, cs->ptr, ca->bytes);
@@ -1288,7 +1351,7 @@ static VALUE
 rb_cs_coerce (VALUE self, VALUE other)
 {
   CScalar *ca;
-  Data_Get_Struct(self, CScalar, ca);
+  TypedData_Get_Struct(self, CScalar, &cscalar_data_type, ca);
   return rb_assoc_new(rb_cscalar_new_with_value(ca->data_type, ca->bytes, other), 
                       self);
 }

data/ext/ca_obj_bitarray.c

@@ -28,6 +28,18 @@ typedef struct {
   ca_size_t   bitlen;
 } CABitarray;
 
+const rb_data_type_t cabitarray_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CABitarray",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_BITARRAY;
 
 static VALUE rb_cCABitarray;
@@ -455,7 +467,7 @@ rb_ca_bitarray_new (VALUE cary)
   CArray *parent;
   CABitarray *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_bitarray_new(parent);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -473,7 +485,7 @@ rb_ca_bitarray (VALUE self)
   volatile VALUE obj;
   CArray *ca;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   obj = rb_ca_bitarray_new(self);
 
@@ -484,7 +496,7 @@ static VALUE
 rb_ca_bitarray_s_allocate (VALUE klass)
 {
   CABitarray *ca;
-  return Data_Make_Struct(klass, CABitarray, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CABitarray, &cabitarray_data_type, ca);
 }
 
 static VALUE
@@ -492,8 +504,8 @@ rb_ca_bitarray_initialize_copy (VALUE self, VALUE other)
 {
   CABitarray *ca, *cs;
 
-  Data_Get_Struct(self,  CABitarray, ca);
-  Data_Get_Struct(other, CABitarray, cs);
+  TypedData_Get_Struct(self,  CABitarray, &cabitarray_data_type, ca);
+  TypedData_Get_Struct(other, CABitarray, &cabitarray_data_type, cs);
 
   ca_bitarray_setup(ca, cs->parent);
 
@@ -505,7 +517,10 @@ Init_ca_obj_bitarray ()
 {
   rb_cCABitarray = rb_define_class("CABitarray", rb_cCAVirtual);
 
-  CA_OBJ_BITARRAY = ca_install_obj_type(rb_cCABitarray, ca_bitarray_func);
+  CA_OBJ_BITARRAY = ca_install_obj_type(rb_cCABitarray, 
+                                        &cabitarray_data_type, 
+					rb_cCArrayMask,
+					&carray_data_type, ca_bitarray_func);
   rb_define_const(rb_cObject, "CA_OBJ_BITARRAY", INT2NUM(CA_OBJ_BITARRAY));
 
   rb_define_method(rb_cCArray, "bitarray", rb_ca_bitarray, 0);

data/ext/ca_obj_bitfield.c

@@ -29,6 +29,18 @@ typedef struct {
   uint64_t  bit_mask;
 } CABitfield;
 
+const rb_data_type_t cabitfield_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CABitfield",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_BITFIELD;
 
 static VALUE rb_cCABitfield;
@@ -550,7 +562,7 @@ rb_ca_bitfield_new (VALUE cary, ca_size_t offset, ca_size_t bitlen)
   CArray *parent;
   CABitfield *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_bitfield_new(parent, offset, bitlen);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -568,12 +580,11 @@ rb_ca_bitfield (int argc, VALUE *argv, VALUE self)
   volatile VALUE rrange, rtype;
   CArray *ca;
   ca_size_t offset, bitlen, step;
-  int data_type = CA_NONE;
   ca_size_t bitsize;
 
   rb_scan_args(argc, argv, "11", (VALUE *) &rrange, (VALUE *) &rtype);
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( TYPE(rrange) == T_FIXNUM ) {
     offset = NUM2INT(rrange);
@@ -587,10 +598,6 @@ rb_ca_bitfield (int argc, VALUE *argv, VALUE self)
     }
   }
 
-  if ( ! NIL_P(rtype) ) {
-    data_type = rb_ca_guess_type(rtype);
-  }
-
   return rb_ca_bitfield_new(self, offset, bitlen);
 }
 
@@ -598,7 +605,7 @@ static VALUE
 rb_ca_bitfield_s_allocate (VALUE klass)
 {
   CABitfield *ca;
-  return Data_Make_Struct(klass, CABitfield, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CABitfield, &cabitfield_data_type, ca);
 }
 
 static VALUE
@@ -606,8 +613,8 @@ rb_ca_bitfield_initialize_copy (VALUE self, VALUE other)
 {
   CABitfield *ca, *cs;
 
-  Data_Get_Struct(self,  CABitfield, ca);
-  Data_Get_Struct(other, CABitfield, cs);
+  TypedData_Get_Struct(self,  CABitfield, &cabitfield_data_type, ca);
+  TypedData_Get_Struct(other, CABitfield, &cabitfield_data_type, cs);
 
   ca_bitfield_setup(ca, cs->parent, 
                     8 * cs->byte_offset + cs->bit_offset, 
@@ -621,7 +628,10 @@ Init_ca_obj_bitfield ()
 {
   rb_cCABitfield = rb_define_class("CABitfield", rb_cCAVirtual);
 
-  CA_OBJ_BITFIELD = ca_install_obj_type(rb_cCABitfield, ca_bitfield_func);
+  CA_OBJ_BITFIELD = ca_install_obj_type(rb_cCABitfield, 
+  	                                &cabitfield_data_type, 
+					rb_cCArrayMask,
+					&carray_data_type, ca_bitfield_func);
   rb_define_const(rb_cObject, "CA_OBJ_BITFIELD", INT2NUM(CA_OBJ_BITFIELD));
 
   rb_define_method(rb_cCArray, "bitfield", rb_ca_bitfield, -1);

data/ext/ca_obj_block.c

@@ -10,7 +10,32 @@
 
 #include "carray.h"
 
+const rb_data_type_t cablock_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CABlock",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cablock_mask_data_type = {
+    .parent = &cablock_data_type,
+    .wrap_struct_name = "CABlockMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rb_cCABlock;
+VALUE rb_cCABlockMask;
 
 static int
 ca_block_setup (CABlock *ca, CArray *parent, int8_t ndim, ca_size_t *dim,
@@ -321,8 +346,7 @@ rb_ca_block_new (VALUE cary, int8_t ndim, ca_size_t *dim,
   CABlock *ca;
 
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
-
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_block_new(parent, ndim, dim, start, step, count, offset);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -687,7 +711,7 @@ static VALUE
 rb_cb_s_allocate (VALUE klass)
 {
   CABlock *ca;
-  return Data_Make_Struct(klass, CABlock, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CABlock, &cablock_data_type, ca);
 }
 
 static VALUE
@@ -697,8 +721,8 @@ rb_cb_initialize_copy (VALUE self, VALUE other)
   ca_size_t shrink[CA_RANK_MAX];
   int8_t i;
 
-  Data_Get_Struct(self,  CABlock, ca);
-  Data_Get_Struct(other, CABlock, cs);
+  TypedData_Get_Struct(self,  CABlock, &cablock_data_type, ca);
+  TypedData_Get_Struct(other, CABlock, &cablock_data_type, cs);
 
   for (i=0; i<cs->ndim; i++) {
     shrink[i] = 0;
@@ -720,7 +744,7 @@ rb_cb_initialize_copy (VALUE self, VALUE other)
     volatile VALUE ary;             \
     CABlock *cb;                    \
     int8_t i;                              \
-    Data_Get_Struct(self, CABlock, cb);     \
+    TypedData_Get_Struct(self, CABlock, &cablock_data_type, cb);     \
     ary = rb_ary_new2(cb->ndim);            \
     for (i=0; i<cb->ndim; i++) {                    \
       rb_ary_store(ary, i, LONG2NUM(cb->name[i]));  \
@@ -752,7 +776,7 @@ static VALUE
 rb_cb_offset (VALUE self)
 {
   CABlock *cb;
-  Data_Get_Struct(self, CABlock, cb);
+  TypedData_Get_Struct(self, CABlock, &cablock_data_type, cb);
   return SIZE2NUM(cb->offset);
 }
 
@@ -771,7 +795,7 @@ rb_cb_idx2addr0 (int argc, VALUE *argv, VALUE self)
   int8_t i;
   ca_size_t idxi;
 
-  Data_Get_Struct(self, CABlock, cb);
+  TypedData_Get_Struct(self, CABlock, &cablock_data_type, cb);
 
   if ( argc != cb->ndim ) {
     rb_raise(rb_eArgError,
@@ -803,7 +827,7 @@ rb_cb_addr2addr0 (VALUE self, VALUE raddr)
   ca_size_t idx[CA_RANK_MAX];
   int8_t i;
 
-  Data_Get_Struct(self, CABlock, cb);
+  TypedData_Get_Struct(self, CABlock, &cablock_data_type, cb);
 
   ca_addr2index((CArray*)cb, addr, idx);
 
@@ -831,7 +855,7 @@ rb_cb_move (int argc, VALUE *argv, VALUE self)
   ca_size_t start;
   int8_t i;
 
-  Data_Get_Struct(self, CABlock, cb);
+  TypedData_Get_Struct(self, CABlock, &cablock_data_type, cb);
 
   if ( argc != cb->ndim ) {
     rb_raise(rb_eArgError, "invalid # of arguments");