carray 1.5.9 → 2.0.0

data/ext/ca_obj_repeat.c

@@ -10,7 +10,32 @@
 
 #include "carray.h"
 
+const rb_data_type_t carepeat_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CARepeat",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t carepeat_mask_data_type = {
+    .parent = &carepeat_data_type,
+    .wrap_struct_name = "CARepeatMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rb_cCARepeat;
+VALUE rb_cCARepeatMask;
 
 /* yard:
   class CARepeat < CAVirtual # :nodoc:
@@ -193,10 +218,9 @@ ca_repeat_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
   CARepeat *ca = (CARepeat *) ap;
   ca_size_t *count = ca->count;
   ca_size_t idx0[CA_RANK_MAX];
-  int8_t   i;
-  ca_size_t  n, j;
+  int8_t    i;
+  ca_size_t j;
   j = 0;
-  n = 0;
   for (i=0; i<ca->ndim; i++) {
     if ( ! count[i] ) {
       idx0[j++] = idx[i];
@@ -212,9 +236,8 @@ ca_repeat_func_store_index (void *ap, ca_size_t *idx, void *ptr)
   ca_size_t *count = ca->count;
   ca_size_t idx0[CA_RANK_MAX];
   int8_t   i;
-  ca_size_t  n, j;
+  ca_size_t  j;
   j = 0;
-  n = 0;
   for (i=0; i<ca->ndim; i++) {
     if ( ! count[i] ) {
       idx0[j++] = idx[i];
@@ -479,7 +502,7 @@ rb_ca_repeat_new (VALUE cary, int8_t ndim, ca_size_t *count)
   CArray *parent;
   CARepeat *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_repeat_new(parent, ndim, count);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -496,7 +519,7 @@ rb_ca_repeat (int argc, VALUE *argv, VALUE self)
   ca_size_t repeat;
   ca_size_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( argc == 2 && 
        (
@@ -508,10 +531,10 @@ rb_ca_repeat (int argc, VALUE *argv, VALUE self)
     ca_size_t ndim, dim[CA_RANK_MAX];
     int k;
     if ( argv[0] == ID2SYM(rb_intern("%") ) ) {
-      Data_Get_Struct(argv[1], CArray, ct);
+      TypedData_Get_Struct(argv[1], CArray, &carray_data_type, ct);
     }
     else {
-      Data_Get_Struct(argv[0], CArray, ct);
+      TypedData_Get_Struct(argv[0], CArray, &carray_data_type, ct);
     }
     if ( ct->ndim < ca->ndim ) {
       rb_raise(rb_eRuntimeError, "invalid ndim to template");
@@ -612,7 +635,7 @@ static VALUE
 rb_ca_repeat_s_allocate (VALUE klass)
 {
   CARepeat *ca;
-  return Data_Make_Struct(klass, CARepeat, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CARepeat, &carepeat_data_type, ca);
 }
 
 static VALUE
@@ -620,8 +643,8 @@ rb_ca_repeat_initialize_copy (VALUE self, VALUE other)
 {
   CARepeat *ca, *cs;
 
-  Data_Get_Struct(self,  CARepeat, ca);
-  Data_Get_Struct(other, CARepeat, cs);
+  TypedData_Get_Struct(self,  CARepeat, &carepeat_data_type, ca);
+  TypedData_Get_Struct(other, CARepeat, &carepeat_data_type, cs);
 
   ca_repeat_setup(ca, cs->parent, cs->ndim, cs->count);
 

data/ext/ca_obj_select.c

@@ -10,8 +10,6 @@
 
 #include "carray.h"
 
-VALUE rb_cCASelect;
-
 /* yard:
   class CASelect < CAVirtual # :nodoc:
   end
@@ -35,6 +33,34 @@ typedef struct {
   ca_size_t  _dim;
 } CASelect;
 
+const rb_data_type_t caselect_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CASelect",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t caselect_mask_data_type = {
+    .parent = &caselect_data_type,
+    .wrap_struct_name = "CASelectMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+VALUE rb_cCASelect;
+VALUE rb_cCASelectMask;
+
+
 /* ------------------------------------------------------------------- */
 
 static int
@@ -365,8 +391,8 @@ rb_ca_select_new (VALUE cary, VALUE select)
   CASelect *ca;
   rb_check_carray_object(cary);
   rb_check_carray_object(select);
-  Data_Get_Struct(cary, CArray, parent);
-  Data_Get_Struct(select, CArray, cselect);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
+  TypedData_Get_Struct(select, CArray, &carray_data_type, cselect);
   ca = (CASelect *) ca_select_new(parent, cselect);
   if ( ! ca ) {
     return Qnil;
@@ -385,8 +411,8 @@ rb_ca_select_new_share (VALUE cary, VALUE select)
   CASelect *ca;
   rb_check_carray_object(cary);
   rb_check_carray_object(select);
-  Data_Get_Struct(cary, CArray, parent);
-  Data_Get_Struct(select, CArray, cselect);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
+  TypedData_Get_Struct(select, CArray, &carray_data_type, cselect);
   ca = (CASelect *) ca_select_new_share(parent, cselect);
   if ( ! ca ) {
     return Qnil;
@@ -527,7 +553,7 @@ static VALUE
 rb_cm_s_allocate (VALUE klass)
 {
   CASelect *ca;
-  return Data_Make_Struct(klass, CASelect, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CASelect, &caselect_data_type, ca);
 }
 
 static VALUE
@@ -535,8 +561,8 @@ rb_cm_initialize_copy (VALUE self, VALUE other)
 {
   CASelect *ca, *cs;
 
-  Data_Get_Struct(self,  CASelect, ca);
-  Data_Get_Struct(other, CASelect, cs);
+  TypedData_Get_Struct(self,  CASelect, &caselect_data_type, ca);
+  TypedData_Get_Struct(other, CASelect, &caselect_data_type, cs);
 
   /* share select info */
   ca_select_setup(ca, cs->parent, cs->select, 1);

data/ext/ca_obj_shift.c

@@ -15,8 +15,6 @@
   end
 */
 
-static VALUE rb_cCAShift;
-
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
@@ -37,8 +35,35 @@ typedef struct {
   int       fill_mask;
 } CAShift;
 
+const rb_data_type_t cashift_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAShift",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cashift_mask_data_type = {
+    .parent = &cashift_data_type,
+    .wrap_struct_name = "CAShift",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static int8_t CA_OBJ_SHIFT;
 
+VALUE rb_cCAShift;
+VALUE rb_cCAShiftMask;
+
 /* ------------------------------------------------------------------- */
 
 int
@@ -797,7 +822,7 @@ rb_ca_shift_set_fill_value (VALUE self, VALUE rfval)
   CAShift *ca;
   CArray *cs;
 
-  Data_Get_Struct(self, CAShift, ca);
+  TypedData_Get_Struct(self, CAShift, &cashift_data_type, ca);
 
   if ( NIL_P(rfval) ) {
     memset(ca->fill, 0, ca->bytes);
@@ -818,7 +843,7 @@ rb_ca_shift_new (VALUE cary, ca_size_t *shift, char *fill, int8_t *roll)
   CArray *parent;
   CAShift *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_shift_new(parent, shift, fill, roll);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -844,7 +869,7 @@ rb_ca_shift (int argc, VALUE *argv, VALUE self)
   char *fill = NULL;
   int8_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   ropt = rb_pop_options(&argc, &argv);
   rb_scan_options(ropt, "roll,fill_value", &rroll, &rfval);
@@ -868,7 +893,7 @@ rb_ca_shift (int argc, VALUE *argv, VALUE self)
 
   if ( rfval == CA_NIL ) {
     rcs = rb_cscalar_new(ca->data_type, ca->bytes, NULL);
-    Data_Get_Struct(rcs, CScalar, cs);
+    TypedData_Get_Struct(rcs, CScalar, &cscalar_data_type, cs);
     fill = cs->ptr;
     if ( ca_is_object_type(ca) ) {
       *(VALUE *)fill = INT2NUM(0);
@@ -882,7 +907,7 @@ rb_ca_shift (int argc, VALUE *argv, VALUE self)
   }
   else {
     rcs = rb_cscalar_new_with_value(ca->data_type, ca->bytes, rfval);
-    Data_Get_Struct(rcs, CScalar, cs);
+    TypedData_Get_Struct(rcs, CScalar, &cscalar_data_type, cs);
     fill = cs->ptr;
   }
 
@@ -907,7 +932,7 @@ rb_ca_shift (int argc, VALUE *argv, VALUE self)
 
   if ( rfval == CA_UNDEF ) {
     CArray *co;
-    Data_Get_Struct(obj, CArray, co);
+    TypedData_Get_Struct(obj, CArray, &carray_data_type, co);
     ca_create_mask(co);
   }
 
@@ -920,7 +945,7 @@ static VALUE
 rb_ca_shift_s_allocate (VALUE klass)
 {
   CAShift *ca;
-  return Data_Make_Struct(klass, CAShift, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAShift, &cashift_data_type, ca);
 }
 
 static VALUE
@@ -928,8 +953,8 @@ rb_ca_shift_initialize_copy (VALUE self, VALUE other)
 {
   CAShift *ca, *cs;
 
-  Data_Get_Struct(self,  CAShift, ca);
-  Data_Get_Struct(other, CAShift, cs);
+  TypedData_Get_Struct(self,  CAShift, &cashift_data_type, ca);
+  TypedData_Get_Struct(other, CAShift, &cashift_data_type, cs);
 
   ca_shift_setup(ca, cs->parent, cs->shift, cs->fill, cs->roll);
 
@@ -940,8 +965,12 @@ void
 Init_ca_obj_shift ()
 {
   rb_cCAShift = rb_define_class("CAShift", rb_cCAVirtual);
+  rb_cCAShiftMask = rb_define_class("CAShiftMask", rb_cCAShift);
 
-  CA_OBJ_SHIFT = ca_install_obj_type(rb_cCAShift, ca_shift_func);
+  CA_OBJ_SHIFT = ca_install_obj_type(rb_cCAShift, 
+  	                             &cashift_data_type, 
+				     rb_cCAShiftMask,
+				     &cashift_mask_data_type, ca_shift_func);
   rb_define_const(rb_cObject, "CA_OBJ_SHIFT", INT2NUM(CA_OBJ_SHIFT));
 
   rb_define_method(rb_cCArray, "shifted", rb_ca_shift, -1);

data/ext/ca_obj_transpose.c

@@ -30,7 +30,32 @@ typedef struct {
 
 static int8_t CA_OBJ_TRANSPOSE;
 
-static VALUE rb_cCATrans;
+const rb_data_type_t catrans_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CATrans",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t catrans_mask_data_type = {
+    .parent = &catrans_data_type,
+    .wrap_struct_name = "CATransMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+VALUE rb_cCATrans;
+VALUE rb_cCATransMask;
 
 /* yard:
   class CATranspose < CAVirtual # :nodoc:
@@ -501,7 +526,7 @@ rb_ca_trans_new (VALUE cary, ca_size_t *imap)
   CArray *parent;
   CATrans *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray,&carray_data_type, parent);
   ca = ca_trans_new(parent, imap);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -524,7 +549,7 @@ rb_ca_trans (int argc, VALUE *argv, VALUE self)
   ca_size_t imap[CA_RANK_MAX];
   int8_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( argc == 0 ) {
     for (i=0; i<ca->ndim; i++) {
@@ -549,7 +574,7 @@ static VALUE
 rb_ca_trans_s_allocate (VALUE klass)
 {
   CATrans *ca;
-  return Data_Make_Struct(klass, CATrans, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CATrans, &catrans_data_type, ca);
 }
 
 static VALUE
@@ -557,8 +582,8 @@ rb_ca_trans_initialize_copy (VALUE self, VALUE other)
 {
   CATrans *ca, *cs;
 
-  Data_Get_Struct(self,  CATrans, ca);
-  Data_Get_Struct(other, CATrans, cs);
+  TypedData_Get_Struct(self,  CATrans, &catrans_data_type, ca);
+  TypedData_Get_Struct(other, CATrans, &catrans_data_type, cs);
 
   ca_trans_setup(ca, cs->parent, cs->imap);
 
@@ -569,8 +594,12 @@ void
 Init_ca_obj_transpose ()
 {
   rb_cCATrans = rb_define_class("CATranspose", rb_cCAVirtual);
+  rb_cCATransMask = rb_define_class("CATransposeMask", rb_cCATrans);
 
-  CA_OBJ_TRANSPOSE = ca_install_obj_type(rb_cCATrans, ca_trans_func);
+  CA_OBJ_TRANSPOSE = ca_install_obj_type(rb_cCATrans, 
+                                         &catrans_data_type, 
+					 rb_cCATransMask,
+					 &catrans_mask_data_type, ca_trans_func);
   rb_define_const(rb_cObject, "CA_OBJ_TRANSPOSE", INT2NUM(CA_OBJ_TRANSPOSE));
 
   rb_define_method(rb_cCArray, "transposed", rb_ca_trans, -1);

data/ext/ca_obj_unbound_repeat.c

@@ -10,7 +10,32 @@
 
 #include "carray.h"
 
+const rb_data_type_t caunboundrepeat_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAUnboundRepeat",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t caunboundrepeat_mask_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAUnboundRepeatMask",
+    .function = {
+        .dmark = NULL,
+        .dfree = ca_free_nop,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rb_cCAUnboundRepeat;
+VALUE rb_cCAUnboundRepeatMask;
 
 /* yard:
   class CAUnboundRepeat < CArray 
@@ -228,8 +253,8 @@ rb_ca_ubrep_shave (VALUE self, VALUE other)
   rb_check_carray_object(self);
   rb_check_carray_object(other);
 
-  Data_Get_Struct(self, CAUnboundRepeat, ca);
-  Data_Get_Struct(other, CArray, co);
+  TypedData_Get_Struct(self, CAUnboundRepeat, &caunboundrepeat_data_type, ca);
+  TypedData_Get_Struct(other, CArray, &carray_data_type, co);
 
   if ( ca->elements != co->elements ) {
     rb_raise(rb_eRuntimeError, "mismatch in # of elements");
@@ -254,7 +279,7 @@ rb_ca_ubrep_new (VALUE cary, int32_t rep_ndim, ca_size_t *rep_dim)
   CArray *parent;
   CAUnboundRepeat *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_ubrep_new(parent, rep_ndim, rep_dim);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -272,7 +297,7 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
   ca_size_t rep_dim[CA_RANK_MAX];
   ca_size_t elements, count, i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   rep_ndim = argc;
 
@@ -314,7 +339,7 @@ static VALUE
 rb_ca_ubrep_s_allocate (VALUE klass)
 {
   CAUnboundRepeat *ca;
-  return Data_Make_Struct(klass, CAUnboundRepeat, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAUnboundRepeat, &caunboundrepeat_data_type, ca);
 }
 
 static VALUE
@@ -322,8 +347,8 @@ rb_ca_ubrep_initialize_copy (VALUE self, VALUE other)
 {
   CAUnboundRepeat *ca, *cs;
 
-  Data_Get_Struct(self,  CAUnboundRepeat, ca);
-  Data_Get_Struct(other, CAUnboundRepeat, cs);
+  TypedData_Get_Struct(self,  CAUnboundRepeat, &caunboundrepeat_data_type, ca);
+  TypedData_Get_Struct(other, CAUnboundRepeat, &caunboundrepeat_data_type, cs);
 
   ca_ubrep_setup(ca, cs->parent, cs->rep_ndim, cs->rep_dim);
 
@@ -362,7 +387,7 @@ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
   int ndim_real;
   int i;
 
-  Data_Get_Struct(self, CAUnboundRepeat, ca);
+  TypedData_Get_Struct(self, CAUnboundRepeat, &caunboundrepeat_data_type, ca);
 
   if ( ca->rep_ndim != new_ndim ) {
     rb_raise(rb_eArgError, "invalid new_ndim (%i <-> %i)",
@@ -417,11 +442,11 @@ ca_ubrep_bind_with (VALUE self, VALUE other)
 
   rb_check_carray_object(other);
 
-  Data_Get_Struct(self, CAUnboundRepeat, ca);
-  Data_Get_Struct(other, CArray, co);
+  TypedData_Get_Struct(self, CAUnboundRepeat, &caunboundrepeat_data_type, ca);
+  TypedData_Get_Struct(other, CArray, &carray_data_type, co);
 
   if ( co->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
-    Data_Get_Struct(other, CAUnboundRepeat, cup);
+    TypedData_Get_Struct(other, CAUnboundRepeat, &caunboundrepeat_data_type, cup);
     return ca_ubrep_bind2(self, cup->rep_ndim, cup->rep_dim);
   }
   else if ( ca_is_scalar(co) ) {
@@ -443,7 +468,7 @@ rb_ca_ubrep_bind (int argc, VALUE *argv, VALUE self)
   ca_size_t rep_spec[CA_RANK_MAX];
   int i;
 
-  Data_Get_Struct(self, CAUnboundRepeat, ca);
+  TypedData_Get_Struct(self, CAUnboundRepeat, &caunboundrepeat_data_type, ca);
 
   if ( ca->rep_ndim != argc ) {
     rb_raise(rb_eArgError, "invalid new_ndim");
@@ -468,7 +493,7 @@ rb_ca_ubrep_spec (VALUE self)
   CAUnboundRepeat *ca;
   int i;
 
-  Data_Get_Struct(self, CAUnboundRepeat, ca);
+  TypedData_Get_Struct(self, CAUnboundRepeat, &caunboundrepeat_data_type, ca);
 
   spec = rb_ary_new2(ca->rep_ndim);
   for (i=0; i<ca->rep_ndim; i++) {
@@ -486,7 +511,7 @@ rb_ca_ubrep_spec (VALUE self)
 void
 Init_ca_obj_unbound_repeat ()
 {
-  /* rb_cCAUnboudRepeat, CA_OBJ_UNBOUND_REPEAT are defined in rb_carray.c */
+  /* rb_cCAUnboundRepeat, CA_OBJ_UNBOUND_REPEAT are defined in rb_carray.c */
 
   rb_define_const(rb_cObject, "CA_OBJ_UNBOUND_REPEAT", INT2NUM(CA_OBJ_UNBOUND_REPEAT));
 

data/ext/ca_obj_window.c

@@ -12,9 +12,36 @@
 
 /* should not be static variable as used by CAIteratorWindow */
 
-VALUE rb_cCAWindow; 
+const rb_data_type_t cawindow_data_type = {
+    .parent = &cavirtual_data_type,
+    .wrap_struct_name = "CAWindow",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+const rb_data_type_t cawindow_mask_data_type = {
+    .parent = &cawindow_data_type,
+    .wrap_struct_name = "CAWindowMask",
+    .function = {
+        .dmark = ca_mark,
+        .dfree = ca_free,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 int8_t CA_OBJ_WINDOW;
 
+VALUE rb_cCAWindow; 
+VALUE rb_cCAWindowMask; 
+
+
 /* yard:
   class CAWindow < CAVirtual # :nodoc:
   end
@@ -693,7 +720,7 @@ rb_ca_window_new (VALUE cary,
   CArray *parent;
   CAWindow *ca;
   rb_check_carray_object(cary);
-  Data_Get_Struct(cary, CArray, parent);
+  TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
   ca = ca_window_new(parent, start, count, bounds, fill);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -721,7 +748,7 @@ rb_ca_window (int argc, VALUE *argv, VALUE self)
   char *cbounds;
   ca_size_t i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   ropt = rb_pop_options(&argc, &argv);
   rb_scan_options(ropt, "bounds,fill_value", &rbounds, &rfval);
@@ -760,7 +787,7 @@ rb_ca_window (int argc, VALUE *argv, VALUE self)
   }
   else {
     rcs = rb_cscalar_new_with_value(ca->data_type, ca->bytes, rfval);
-    Data_Get_Struct(rcs, CScalar, cs);
+    TypedData_Get_Struct(rcs, CScalar, &cscalar_data_type, cs);
     fill = cs->ptr;
   }
 
@@ -819,7 +846,7 @@ static VALUE
 rb_ca_window_s_allocate (VALUE klass)
 {
   CAWindow *ca;
-  return Data_Make_Struct(klass, CAWindow, ca_mark, ca_free, ca);
+  return TypedData_Make_Struct(klass, CAWindow, &cawindow_data_type, ca);
 }
 
 static VALUE
@@ -827,8 +854,8 @@ rb_ca_window_initialize_copy (VALUE self, VALUE other)
 {
   CAWindow *ca, *cs;
 
-  Data_Get_Struct(self,  CAWindow, ca);
-  Data_Get_Struct(other, CAWindow, cs);
+  TypedData_Get_Struct(self,  CAWindow, &cawindow_data_type, ca);
+  TypedData_Get_Struct(other, CAWindow, &cawindow_data_type, cs);
 
   ca_window_setup(ca, cs->parent, cs->start, cs->count, cs->bounds, cs->fill);
 
@@ -850,7 +877,7 @@ rb_ca_window_idx2addr0 (int argc, VALUE *argv, VALUE self)
   int8_t i;
   ca_size_t idxi;
 
-  Data_Get_Struct(self, CAWindow, cw);
+  TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);
 
   if ( argc != cw->ndim ) {
     rb_raise(rb_eArgError,
@@ -887,7 +914,7 @@ rb_ca_window_addr2addr0 (VALUE self, VALUE raddr)
   ca_size_t idx[CA_RANK_MAX];
   int8_t i;
 
-  Data_Get_Struct(self, CAWindow, cw);
+  TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);
 
   ca_addr2index((CArray*)cw, addr, idx);
 
@@ -908,7 +935,7 @@ rb_ca_window_move (int argc, VALUE *argv, VALUE self)
   ca_size_t start;
   int8_t i;
 
-  Data_Get_Struct(self, CAWindow, cw);
+  TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);
 
   if ( argc != cw->ndim ) {
     rb_raise(rb_eArgError, "invalid # of arguments");
@@ -939,7 +966,7 @@ static VALUE
 rb_ca_window_set_fill_value (VALUE self, VALUE rfval)
 {
   CAWindow *cw;
-  Data_Get_Struct(self, CAWindow, cw);
+  TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);
   rb_ca_obj2ptr(self, rfval, cw->fill);
   return Qnil;
 }
@@ -948,7 +975,7 @@ static VALUE
 rb_ca_window_get_fill_value (VALUE self)
 {
   CAWindow *cw;
-  Data_Get_Struct(self, CAWindow, cw);
+  TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);
   return rb_ca_ptr2obj(self, cw->fill);
 }
 
@@ -956,7 +983,7 @@ static VALUE
 rb_ca_window_get_bounds (VALUE self)
 {
   CAWindow *cw;
-  Data_Get_Struct(self, CAWindow, cw);
+  TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);
   return SIZE2NUM(cw->bounds);
 }
 
@@ -966,7 +993,7 @@ rb_ca_window_get_bounds (VALUE self)
     volatile VALUE ary;             \
     CAWindow *cw;                    \
     int8_t i;                              \
-    Data_Get_Struct(self, CAWindow, cw);     \
+    TypedData_Get_Struct(self, CAWindow, &cawindow_data_type, cw);     \
     ary = rb_ary_new2(cw->ndim);            \
     for (i=0; i<cw->ndim; i++) {                    \
       rb_ary_store(ary, i, SIZE2NUM(cw->name[i]));  \
@@ -998,8 +1025,12 @@ Init_ca_obj_window ()
 {    
 
   rb_cCAWindow = rb_define_class("CAWindow", rb_cCAVirtual);
+  rb_cCAWindowMask = rb_define_class("CAWindowMask", rb_cCAWindow);
 
-  CA_OBJ_WINDOW = ca_install_obj_type(rb_cCAWindow, ca_window_func);
+  CA_OBJ_WINDOW = ca_install_obj_type(rb_cCAWindow, 
+  		                      &cawindow_data_type, 
+				      rb_cCAWindowMask,
+				      &cawindow_mask_data_type, ca_window_func);
   rb_define_const(rb_cObject, "CA_OBJ_WINDOW", INT2NUM(CA_OBJ_WINDOW));
 
   rb_define_method(rb_cCArray, "window", rb_ca_window, -1);