carray 1.5.9 → 2.0.0

data/ext/ca_obj_fake.c

@@ -25,6 +25,18 @@ typedef struct {
   uint8_t   nosync;
 } CAFake;
 
+const rb_data_type_t cafake_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAFake",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_FAKE;
 
 static VALUE rb_cCAFake;
@@ -319,7 +331,7 @@ rb_ca_fake_new (VALUE cary, int8_t data_type, ca_size_t bytes)
   CArray *parent;
   CAFake *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca  = ca_fake_new(parent, data_type, bytes);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -341,7 +353,7 @@ rb_ca_fake (int argc, VALUE *argv, VALUE self)
   int8_t  data_type;
   ca_size_t bytes;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   rb_scan_args(argc, argv, "11", (VALUE *) &rtype, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
@@ -369,7 +381,7 @@ static VALUE
 rb_ca_fake_s_allocate (VALUE klass)
 {
   CAFake *ca;
-  return Data_Make_Struct(klass, CAFake, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAFake, &cafake_data_type, ca);
 }
 
 static VALUE
@@ -377,8 +389,8 @@ rb_ca_fake_initialize_copy (VALUE self, VALUE other)
 {
   CAFake *ca, *cs;
 
-  Data_Get_Struct(self,  CAFake, ca);
-  Data_Get_Struct(other, CAFake, cs);
+  TypedData_Get_Struct(self,  CAFake, &cafake_data_type, ca);
+  TypedData_Get_Struct(other, CAFake, &cafake_data_type, cs);
 
   ca_fake_setup(ca, cs->parent, cs->data_type, cs->bytes);
 
@@ -390,7 +402,10 @@ Init_ca_obj_fake ()
 {
   rb_cCAFake = rb_define_class("CAFake", rb_cCAVirtual);
 
-  CA_OBJ_FAKE = ca_install_obj_type(rb_cCAFake, ca_fake_func);
+  CA_OBJ_FAKE = ca_install_obj_type(rb_cCAFake, 
+                                    &cafake_data_type, 
+				    rb_cCArrayMask,
+				    &carray_data_type, ca_fake_func);
   rb_define_const(rb_cObject, "CA_OBJ_FAKE", INT2NUM(CA_OBJ_FAKE));
 
   rb_define_method(rb_cCArray, "fake", rb_ca_fake, -1);

data/ext/ca_obj_farray.c

@@ -27,9 +27,34 @@ typedef struct {
   ca_size_t   step;
 } CAFarray;
 
+const rb_data_type_t cafarray_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAFarray",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cafarray_mask_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAFarrayMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_FARRAY;
 
 static VALUE rb_cCAFarray;
+static VALUE rb_cCAFarrayMask;
 
 /* yard:
   class CAFArray < CAVirtual # :nodoc:
@@ -419,7 +444,7 @@ rb_ca_farray_new (VALUE cary)
   CArray *parent;
   CAFarray *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca  = ca_farray_new(parent);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -445,7 +470,7 @@ static VALUE
 rb_ca_farray_s_allocate (VALUE klass)
 {
   CAFarray *ca;
-  return Data_Make_Struct(klass, CAFarray, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAFarray, &cafarray_data_type, ca);
 }
 
 static VALUE
@@ -453,8 +478,8 @@ rb_ca_farray_initialize_copy (VALUE self, VALUE other)
 {
   CAFarray *ca, *cs;
 
-  Data_Get_Struct(self,  CAFarray, ca);
-  Data_Get_Struct(other, CAFarray, cs);
+  TypedData_Get_Struct(self,  CAFarray, &cafarray_data_type, ca);
+  TypedData_Get_Struct(other, CAFarray, &cafarray_data_type, cs);
 
   ca_farray_setup(ca, cs->parent);
 
@@ -465,8 +490,12 @@ void
 Init_ca_obj_farray ()
 {
   rb_cCAFarray = rb_define_class("CAFarray", rb_cCAVirtual);
+  rb_cCAFarrayMask = rb_define_class("CAFarrayMask", rb_cCAFarray);
 
-  CA_OBJ_FARRAY = ca_install_obj_type(rb_cCAFarray, ca_farray_func);
+  CA_OBJ_FARRAY = ca_install_obj_type(rb_cCAFarray, 
+                                      &cafarray_data_type, 
+				      rb_cCAFarrayMask,
+				      &cafarray_mask_data_type, ca_farray_func);
   rb_define_const(rb_cObject, "CA_OBJ_FARRAY", INT2NUM(CA_OBJ_FARRAY));
 
   rb_define_method(rb_cCArray, "farray", rb_ca_farray, 0);

data/ext/ca_obj_field.c

@@ -27,6 +27,19 @@ typedef struct {
   ca_size_t   offset;
 } CAField;
 
+
+const rb_data_type_t cafield_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAField",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_FIELD;
 
 static VALUE rb_cCAField;
@@ -514,7 +527,7 @@ rb_ca_field_new (VALUE cary, ca_size_t offset, int8_t data_type, ca_size_t bytes
   CArray *parent;
   CAField *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_field_new(parent, offset, data_type, bytes);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -525,7 +538,7 @@ static VALUE
 rb_ca_field_s_allocate (VALUE klass)
 {
   CAField *ca;
-  return Data_Make_Struct(klass, CAField, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAField, &cafield_data_type, ca);
 }
 
 static VALUE
@@ -533,8 +546,8 @@ rb_ca_field_initialize_copy (VALUE self, VALUE other)
 {
   CAField *ca, *cs;
 
-  Data_Get_Struct(self,  CAField, ca);
-  Data_Get_Struct(other, CAField, cs);
+  TypedData_Get_Struct(self,  CAField, &cafield_data_type, ca);
+  TypedData_Get_Struct(other, CAField, &cafield_data_type, cs);
 
   ca_field_setup(ca, cs->parent, cs->offset, cs->data_type, cs->bytes);
 
@@ -567,7 +580,7 @@ rb_ca_field (int argc, VALUE *argv, VALUE self)
     return rb_ca_field_as_member(self, argv[0]);
   }
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   /* CArray#field(offset, data_type[, :bytes=>bytes]) */
   /* CArray#field(offset, data_class) */
@@ -583,7 +596,7 @@ rb_ca_field (int argc, VALUE *argv, VALUE self)
     ca_size_t dim[CA_RANK_MAX];
     int8_t ndim;
     int8_t i, j;
-    Data_Get_Struct(rtype, CArray, ct);
+    TypedData_Get_Struct(rtype, CArray, &carray_data_type, ct);
     data_type = CA_FIXLEN;
     bytes     = ct->bytes * ct->elements;
     obj = rb_ca_field_new(self, offset, data_type, bytes);
@@ -612,7 +625,10 @@ Init_ca_obj_field ()
 {
   rb_cCAField = rb_define_class("CAField", rb_cCAVirtual);
 
-  CA_OBJ_FIELD = ca_install_obj_type(rb_cCAField, ca_field_func);
+  CA_OBJ_FIELD = ca_install_obj_type(rb_cCAField, 
+                                     &cafield_data_type, 
+				     rb_cCArrayMask,
+				     &carray_mask_data_type, ca_field_func);
   rb_define_const(rb_cObject, "CA_OBJ_FIELD", INT2NUM(CA_OBJ_FIELD));
 
   rb_define_method(rb_cCArray, "field", rb_ca_field, -1);

data/ext/ca_obj_grid.c

@@ -28,7 +28,32 @@ typedef struct {
   int8_t   *contig;
 } CAGrid;
 
+const rb_data_type_t cagrid_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAGrid",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cagrid_mask_data_type = {
+    .parent = &cagrid_data_type,
+    .wrap_struct_name = "CAGridMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE rb_cCAGrid;
+static VALUE rb_cCAGridMask;
 
 /* yard:
   class CAGrid < CAVirtual # :nodoc:
@@ -593,7 +618,7 @@ rb_ca_grid_new (VALUE cary, ca_size_t *dim, CArray **grid)
   CArray *parent;
   CAGrid *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_grid_new(parent, dim, grid);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -619,7 +644,7 @@ rb_ca_grid (int argc, VALUE *argv, VALUE self)
   CArray *grid[CA_RANK_MAX];
   ca_size_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type,ca);
 
   ridx = rb_ary_new4(argc, argv);
 
@@ -635,7 +660,7 @@ rb_ca_grid (int argc, VALUE *argv, VALUE self)
     for (i=0; i<rndim; i++) {
       rval = rb_ary_entry(ridx, i);
       if ( rb_obj_is_carray(rval) ) {
-        Data_Get_Struct(rval, CArray, cv);
+        TypedData_Get_Struct(rval, CArray, &carray_data_type, cv);
         rdim[i] = 1;
         for (k=0; k<cv->ndim; k++) {
           rdim[i] *= ca->dim[j];
@@ -702,7 +727,7 @@ static VALUE
 rb_ca_grid_s_allocate (VALUE klass)
 {
   CAGrid *ca;
-  return Data_Make_Struct(klass, CAGrid, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAGrid, &cagrid_data_type, ca);
 }
 
 static VALUE
@@ -710,8 +735,8 @@ rb_ca_grid_initialize_copy (VALUE self, VALUE other)
 {
   CAGrid *ca, *cs;
 
-  Data_Get_Struct(self,  CAGrid, ca);
-  Data_Get_Struct(other, CAGrid, cs);
+  TypedData_Get_Struct(self,  CAGrid, &cagrid_data_type, ca);
+  TypedData_Get_Struct(other, CAGrid, &cagrid_data_type, cs);
 
   /* share grid info */
   ca_grid_setup(ca, cs->parent, cs->dim, cs->grid, cs->contig, 1);
@@ -725,8 +750,12 @@ void
 Init_ca_obj_grid ()
 {
   rb_cCAGrid = rb_define_class("CAGrid", rb_cCAVirtual);
+  rb_cCAGridMask = rb_define_class("CAGridMask", rb_cCAGrid);
 
-  CA_OBJ_GRID = ca_install_obj_type(rb_cCAGrid, ca_grid_func);
+  CA_OBJ_GRID = ca_install_obj_type(rb_cCAGrid, 
+                                    &cagrid_data_type, 
+				    rb_cCAGridMask,
+				    &cagrid_mask_data_type, ca_grid_func);
   rb_define_const(rb_cObject, "CA_OBJ_GRID", INT2NUM(CA_OBJ_GRID));
 
   rb_define_method(rb_cCArray, "grid", rb_ca_grid, -1);

data/ext/ca_obj_mapping.c

@@ -33,9 +33,34 @@ typedef struct {
   CArray   *mapper;
 } CAMapping;
 
+const rb_data_type_t camapping_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAMapping",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t camapping_mask_data_type = {
+    .parent = &camapping_data_type,
+    .wrap_struct_name = "CAMappingMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_MAPPING;
 
-static VALUE rb_cCAMapping;
+VALUE rb_cCAMapping;
+VALUE rb_cCAMappingMask;
 
 /* yard:
   class CAMapping < CAVirtual # :nodoc: 
@@ -553,7 +578,7 @@ rb_ca_mapping_new (VALUE cary, CArray *mapper)
   CArray *parent;
   CAMapping *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_mapping_new(parent, mapper);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -568,7 +593,7 @@ rb_ca_mapping (int argc, VALUE *argv, VALUE self)
   volatile VALUE obj;
   CArray *ca;
   CArray *mapper;
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   rb_scan_args(argc, argv, "1", (VALUE *) &rmapper);
   rb_check_carray_object(rmapper);
@@ -584,7 +609,7 @@ static VALUE
 rb_ca_mapping_s_allocate (VALUE klass)
 {
   CAMapping *ca;
-  return Data_Make_Struct(klass, CAMapping, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAMapping, &camapping_data_type, ca);
 }
 
 static VALUE
@@ -592,8 +617,8 @@ rb_ca_mapping_initialize_copy (VALUE self, VALUE other)
 {
   CAMapping *ca, *cs;
 
-  Data_Get_Struct(self,  CAMapping, ca);
-  Data_Get_Struct(other, CAMapping, cs);
+  TypedData_Get_Struct(self,  CAMapping, &camapping_data_type, ca);
+  TypedData_Get_Struct(other, CAMapping, &camapping_data_type, cs);
 
   /* share mapper info */
   ca_mapping_setup(ca, cs->parent, cs->mapper, 1);
@@ -605,8 +630,12 @@ void
 Init_ca_obj_mapping ()
 {
   rb_cCAMapping = rb_define_class("CAMapping", rb_cCAVirtual);
+  rb_cCAMappingMask = rb_define_class("CAMappingMask", rb_cCAMapping);
 
-  CA_OBJ_MAPPING = ca_install_obj_type(rb_cCAMapping, ca_mapping_func);
+  CA_OBJ_MAPPING = ca_install_obj_type(rb_cCAMapping, 
+                                       &camapping_data_type, 
+				       rb_cCAMappingMask,
+				       &camapping_mask_data_type, ca_mapping_func);
   rb_define_const(rb_cObject, "CA_OBJ_MAPPING", INT2NUM(CA_OBJ_MAPPING));
 
   rb_define_alloc_func(rb_cCAMapping, rb_ca_mapping_s_allocate);

data/ext/ca_obj_object.c

@@ -36,6 +36,18 @@
 
 #include "carray.h"
 
+const rb_data_type_t caobject_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAObject",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rb_cCAObject;
 
 
@@ -47,8 +59,19 @@ VALUE rb_cCAObject;
 
 /* ---------------------------------------------------------------------- */
 
+const rb_data_type_t caobjectmask_data_type = {
+    .wrap_struct_name = "CAObjectMask",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_OBJECT_MASK;
-static VALUE rb_cCAObjectMask;
+VALUE rb_cCAObjectMask;
 
 /* yard:
   class CAObjectMask < CAVirtual # :nodoc:
@@ -277,7 +300,7 @@ static VALUE
 rb_ca_objmask_s_allocate (VALUE klass)
 {
   CAObjectMask *ca;
-  return Data_Make_Struct(klass, CAObjectMask, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAObjectMask, &caobject_data_type, ca);
 }
 
 static VALUE
@@ -285,8 +308,8 @@ rb_ca_objmask_initialize_copy (VALUE self, VALUE other)
 {
   CAObjectMask *ca, *cs;
 
-  Data_Get_Struct(self,  CAObjectMask, ca);
-  Data_Get_Struct(other, CAObjectMask, cs);
+  TypedData_Get_Struct(self,  CAObjectMask, &caobjectmask_data_type, ca);
+  TypedData_Get_Struct(other, CAObjectMask, &caobjectmask_data_type, cs);
 
   carray_setup((CArray *)ca, CA_BOOLEAN, cs->ndim, cs->dim, 0, NULL);
   ca->obj_type = CA_OBJ_OBJECT_MASK;
@@ -674,8 +697,8 @@ rb_ca_object_initialize_copy (VALUE self, VALUE other)
   volatile VALUE data;
   CAObject *ca, *cs;
 
-  Data_Get_Struct(self,  CAObject, ca);
-  Data_Get_Struct(other, CAObject, cs);
+  TypedData_Get_Struct(self,  CAObject, &caobject_data_type, ca);
+  TypedData_Get_Struct(other, CAObject, &caobject_data_type, cs);
 
   ca_object_setup(ca, cs->data_type, cs->ndim, cs->dim, cs->bytes);
   ca->self = self;
@@ -724,7 +747,7 @@ rb_ca_object_initialize (int argc, VALUE *argv, VALUE self)
     dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
   }
 
-  Data_Get_Struct(self, CAObject, ca);
+  TypedData_Get_Struct(self, CAObject, &caobject_data_type, ca);
   ca_object_setup(ca, data_type, ndim, dim, bytes);
   ca->self = self;
 
@@ -739,7 +762,7 @@ rb_ca_object_initialize (int argc, VALUE *argv, VALUE self)
 
   if ( ! NIL_P(rparent) ) {
     CArray *cp;
-    Data_Get_Struct(rparent, CArray, cp);
+    TypedData_Get_Struct(rparent, CArray, &carray_data_type, cp);
     ca->parent = cp;
     rb_ca_set_parent(self, rparent);
   }
@@ -754,7 +777,10 @@ Init_ca_obj_object ()
 {
   rb_cCAObjectMask = rb_define_class("CAObjectMask", rb_cCArray);
 
-  CA_OBJ_OBJECT_MASK = ca_install_obj_type(rb_cCAObjectMask, ca_objmask_func);
+  CA_OBJ_OBJECT_MASK = ca_install_obj_type(rb_cCAObjectMask, 
+  					   &caobjectmask_data_type, 
+					   rb_cCArrayMask,
+                                           &carray_data_type, ca_objmask_func);
   rb_define_const(rb_cObject, "CA_OBJ_OBJECT_MASK", INT2NUM(CA_OBJ_OBJECT_MASK));
 
   rb_define_alloc_func(rb_cCAObjectMask, rb_ca_objmask_s_allocate);

data/ext/ca_obj_reduce.c

@@ -10,9 +10,34 @@
 
 #include "carray.h"
 
+const rb_data_type_t careduce_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAReduce",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t careduce_mask_data_type = {
+    .parent = &careduce_data_type,
+    .wrap_struct_name = "CAReduceMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_REDUCE;
 
-static VALUE rb_cCAReduce;
+VALUE rb_cCAReduce;
+VALUE rb_cCAReduceMask;
 
 /* yard:
   class CAReduce < CAVirtual # :nodoc:
@@ -265,7 +290,7 @@ static VALUE
 rb_ca_reduce_s_allocate (VALUE klass)
 {
   CAReduce *ca;
-  return Data_Make_Struct(klass, CAReduce, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAReduce, &careduce_data_type, ca);
 }
 
 static VALUE
@@ -273,8 +298,8 @@ rb_ca_reduce_initialize_copy (VALUE self, VALUE other)
 {
   CAReduce *ca, *cs;
 
-  Data_Get_Struct(self,  CAReduce, ca);
-  Data_Get_Struct(other, CAReduce, cs);
+  TypedData_Get_Struct(self,  CAReduce, &careduce_data_type, ca);
+  TypedData_Get_Struct(other, CAReduce, &careduce_data_type, cs);
 
   ca_reduce_setup(ca, cs->parent, cs->count, cs->offset);
 
@@ -285,8 +310,12 @@ void
 Init_ca_obj_reduce ()
 {
   rb_cCAReduce = rb_define_class("CAReduce", rb_cCAVirtual);
+  rb_cCAReduceMask = rb_define_class("CAReduceMask", rb_cCAReduce);
 
-  CA_OBJ_REDUCE = ca_install_obj_type(rb_cCAReduce, ca_reduce_func);
+  CA_OBJ_REDUCE = ca_install_obj_type(rb_cCAReduce, 
+                                      &careduce_data_type, 
+				      rb_cCAReduceMask,
+				      &careduce_mask_data_type, ca_reduce_func);
   rb_define_const(rb_cObject, "CA_OBJ_REDUCE", INT2NUM(CA_OBJ_REDUCE));
 
   rb_define_alloc_func(rb_cCAReduce, rb_ca_reduce_s_allocate);

data/ext/ca_obj_refer.c

@@ -10,7 +10,32 @@
 
 #include "carray.h"
 
+const rb_data_type_t carefer_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CARefer",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t carefer_mask_data_type = {
+    .parent = &carefer_data_type,
+    .wrap_struct_name = "CAReferMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rb_cCARefer;
+VALUE rb_cCAReferMask;
 
 /* yard:
   class CARefer < CAVirtual # :nodoc:
@@ -140,13 +165,12 @@ static char *
 ca_refer_func_ptr_at_addr (void *ap, ca_size_t addr)
 {
   CARefer *ca = (CARefer *) ap;
-  ca_size_t major, minor;
+  ca_size_t minor;
   switch ( ca->is_deformed ) {
   case 0:
   case 1:
     return ca->ptr + ca->bytes * addr;
   case -2:
-    major = (addr * ca->bytes) / ca->parent->bytes;
     minor = (addr * ca->bytes) % ca->parent->bytes;
     return ca->ptr + ca->bytes * addr + minor;
   case 2:
@@ -470,7 +494,7 @@ static VALUE
 rb_ca_refer_s_allocate (VALUE klass)
 {
   CARefer *ca;
-  return Data_Make_Struct(klass, CARefer, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CARefer, &carefer_data_type, ca);
 }
 
 static VALUE
@@ -478,8 +502,8 @@ rb_ca_refer_initialize_copy (VALUE self, VALUE other)
 {
   CARefer *ca, *cs;
 
-  Data_Get_Struct(self,  CARefer, ca);
-  Data_Get_Struct(other, CARefer, cs);
+  TypedData_Get_Struct(self,  CARefer, &carefer_data_type, ca);
+  TypedData_Get_Struct(other, CARefer, &carefer_data_type, cs);
 
   ca_refer_setup(ca, cs->parent, cs->data_type, cs->ndim, cs->dim,
                              cs->bytes, cs->offset);
@@ -515,7 +539,7 @@ rb_ca_refer (int argc, VALUE *argv, VALUE self)
   ca_size_t bytes, offset = 0;
   int8_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( argc == 0 ) {                 /* CArray#refer() */
     data_type = ca->data_type;
@@ -531,7 +555,6 @@ rb_ca_refer (int argc, VALUE *argv, VALUE self)
   }
   else {
     volatile VALUE rtype, rdim, ropt, rbytes = Qnil, roffset = Qnil;
-    ca_size_t elements;
 
     ropt = rb_pop_options(&argc, &argv);
     rb_scan_args(argc, argv, "11", (VALUE *) &rtype, (VALUE *) &rdim);
@@ -556,10 +579,8 @@ rb_ca_refer (int argc, VALUE *argv, VALUE self)
     Check_Type(rdim, T_ARRAY);
     ndim = RARRAY_LEN(rdim);
 
-    elements = 1;
     for (i=0; i<ndim; i++) {
       dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
-      elements *= dim[i];
     }
 
     if ( ! NIL_P(roffset) ) {
@@ -587,7 +608,7 @@ rb_ca_refer_new (VALUE self,
   CArray *ca;
   int8_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   rdim = rb_ary_new2(ndim);
   for (i=0; i<ndim; i++) {