carray 1.3.5 → 1.5.1

data/{ca_obj_field.c → ext/ca_obj_field.c}

@@ -15,7 +15,7 @@
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -44,7 +44,7 @@ int
 ca_field_setup (CAField *ca, CArray *parent,
                 ca_size_t offset, int8_t data_type, ca_size_t bytes)
 {
-  int8_t rank;
+  int8_t ndim;
   ca_size_t elements;
 
   /* check arguments */
@@ -64,25 +64,25 @@ ca_field_setup (CAField *ca, CArray *parent,
     rb_raise(rb_eRuntimeError, "offset or bytes out of range");
   }
 
-  rank     = parent->rank;
+  ndim     = parent->ndim;
   elements = parent->elements;
 
   ca->obj_type  = CA_OBJ_FIELD;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
   ca->nosync    = 0;
   ca->offset    = offset;
 
-  memcpy(ca->dim, parent->dim, rank * sizeof(ca_size_t));
+  memcpy(ca->dim, parent->dim, ndim * sizeof(ca_size_t));
 
   if ( ca_has_mask(parent) ) {
     ca_create_mask(ca);
@@ -149,9 +149,9 @@ ca_field_func_ptr_at_index (void *ap, ca_size_t *idx)
     ca_size_t *dim    = ca->dim;
     int8_t i;
     ca_size_t n;
-    n = idx[0];                  /* n = idx[0]*dim[1]*dim[2]*...*dim[rank-1] */
-    for (i=1; i<ca->rank; i++) { /*    + idx[1]*dim[1]*dim[2]*...*dim[rank-1] */
-      n = dim[i]*n+idx[i];       /*    ... + idx[rank-2]*dim[1] + idx[rank-1] */
+    n = idx[0];                  /* n = idx[0]*dim[1]*dim[2]*...*dim[ndim-1] */
+    for (i=1; i<ca->ndim; i++) { /*    + idx[1]*dim[1]*dim[2]*...*dim[ndim-1] */
+      n = dim[i]*n+idx[i];       /*    ... + idx[ndim-2]*dim[1] + idx[ndim-1] */
     }
 
     if ( ca->parent->ptr == NULL ) {
@@ -285,7 +285,7 @@ ca_field_func_create_mask (void *ap)
   }
   ca->mask =
     (CArray *) ca_refer_new(ca->parent->mask,
-                            CA_BOOLEAN, ca->rank, ca->dim, 0, 0);
+                            CA_BOOLEAN, ca->ndim, ca->dim, 0, 0);
 }
 
 ca_operation_function_t ca_field_func = {
@@ -583,21 +583,21 @@ rb_ca_field (int argc, VALUE *argv, VALUE self)
   if ( rb_obj_is_carray(rtype) ) {
     CArray *ct;
     ca_size_t dim[CA_RANK_MAX];
-    int8_t rank;
+    int8_t ndim;
     int8_t i, j;
     Data_Get_Struct(rtype, CArray, ct);
     data_type = CA_FIXLEN;
     bytes     = ct->bytes * ct->elements;
     obj = rb_ca_field_new(self, offset, data_type, bytes);
     rb_ca_data_type_inherit(obj, rtype);
-    rank = ca->rank + ct->rank;
-    for (i=0; i<ca->rank; i++) {
+    ndim = ca->ndim + ct->ndim;
+    for (i=0; i<ca->ndim; i++) {
       dim[i] = ca->dim[i];
     }
-    for (j=0; j<ct->rank; j++, i++) {
+    for (j=0; j<ct->ndim; j++, i++) {
       dim[i] = ct->dim[j];
     }
-    obj = rb_ca_refer_new(obj, ct->data_type, rank, dim, ct->bytes, 0);
+    obj = rb_ca_refer_new(obj, ct->data_type, ndim, dim, ct->bytes, 0);
   }
   else {
     rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);

data/{ca_obj_grid.c → ext/ca_obj_grid.c}

@@ -15,7 +15,7 @@
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -43,20 +43,20 @@ int
 ca_grid_setup (CAGrid *ca, CArray *parent, ca_size_t *dim,
                CArray **grid, int8_t *contig, int share)
 {
-  int8_t rank, data_type;
+  int8_t ndim, data_type;
   ca_size_t *dim0;
   ca_size_t elements, bytes;
   double  length;
   int i, j, k;
 
   data_type = parent->data_type;
-  rank      = parent->rank;
+  ndim      = parent->ndim;
   bytes     = parent->bytes;
   dim0      = parent->dim;
 
   elements = 1;
   length = bytes;
-  for (i=0; i<rank; i++) {
+  for (i=0; i<ndim; i++) {
     if ( dim[i] < 0 ) {
       rb_raise(rb_eRuntimeError, "negative size for %i-th dimension", i);
     }
@@ -71,12 +71,12 @@ ca_grid_setup (CAGrid *ca, CArray *parent, ca_size_t *dim,
   ca->obj_type  = CA_OBJ_GRID;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
@@ -88,14 +88,14 @@ ca_grid_setup (CAGrid *ca, CArray *parent, ca_size_t *dim,
     ca->contig = contig;
   }
   else {
-    ca->grid   = ALLOC_N(CArray *, rank);
-    ca->contig = ALLOC_N(int8_t, rank);
+    ca->grid   = ALLOC_N(CArray *, ndim);
+    ca->contig = ALLOC_N(int8_t, ndim);
   }
 
-  memcpy(ca->dim, dim, rank * sizeof(ca_size_t));
+  memcpy(ca->dim, dim, ndim * sizeof(ca_size_t));
 
   if ( ! share ) {
-    for (i=0; i<rank; i++) {
+    for (i=0; i<ndim; i++) {
       if ( grid[i] ) {
         if ( ca_is_any_masked(grid[i]) ) {
           ca_size_t gsize = grid[i]->elements - ca_count_masked(grid[i]);
@@ -137,7 +137,7 @@ ca_grid_setup (CAGrid *ca, CArray *parent, ca_size_t *dim,
     }
   }
 
-  if ( ca->rank == 1 && ca_is_scalar(grid[0]) ) {
+  if ( ca->ndim == 1 && ca_is_scalar(grid[0]) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
   }
 
@@ -169,7 +169,7 @@ free_ca_grid (void *ap)
     ca_free(ca->mask);
     if ( ! (ca->flags & CA_FLAG_SHARE_INDEX)) {
       xfree(ca->contig);
-      for (i=0; i<ca->rank; i++) {
+      for (i=0; i<ca->ndim; i++) {
         ca_free(ca->grid[i]);
       }
       xfree(ca->grid);
@@ -217,7 +217,7 @@ ca_grid_func_ptr_at_index (void *ap, ca_size_t *idx)
     ca_size_t  n;
 
     n = 0;
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       n = dim0[i]*n + *(ca_size_t*) ca_ptr_at_addr(grid[i], idx[i]);
     }
 
@@ -240,7 +240,7 @@ ca_grid_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
   CArray **grid = ca->grid;
   ca_size_t idx0[CA_RANK_MAX];
   int8_t i;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     ca_fetch_addr(grid[i], idx[i], &idx0[i]);
   }
   ca_fetch_index(ca->parent, idx0, ptr);
@@ -253,7 +253,7 @@ ca_grid_func_store_index (void *ap, ca_size_t *idx, void *ptr)
   CArray **grid = ca->grid;
   ca_size_t idx0[CA_RANK_MAX];
   int8_t i;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     ca_fetch_addr(grid[i], idx[i], &idx0[i]);
   }
   ca_store_index(ca->parent, idx0, ptr);
@@ -386,7 +386,7 @@ ca_grid_attach_loop (CAGrid *ca, int16_t level, ca_size_t *idx, ca_size_t *idx0)
   CArray **grid = ca->grid;
   ca_size_t i, k;
 
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = 0;
     idx0[level] = 0;
     if ( ca->contig[level] ) {
@@ -460,7 +460,7 @@ ca_grid_sync_loop (CAGrid *ca, int16_t level, ca_size_t *idx, ca_size_t *idx0)
   CArray **grid = ca->grid;
   ca_size_t i, k;
 
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = 0;
     idx0[level] = 0;
     if ( ca->contig[level] ) {
@@ -532,7 +532,7 @@ ca_grid_fill_loop (CAGrid *ca, char *ptr,
 {
   CArray **grid = ca->grid;
   ca_size_t i, k;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx0[level] = 0;
     if ( ca->contig[level] ) {
       char *p = ca_ptr_at_index(ca->parent, idx0);
@@ -624,21 +624,21 @@ rb_ca_grid (int argc, VALUE *argv, VALUE self)
 
   ridx = rb_ary_new4(argc, argv);
 
-  if ( RARRAY_LEN(ridx) > ca->rank ) {
-    rb_raise(rb_eArgError, "# of arguments doesn't equal to the rank");
+  if ( RARRAY_LEN(ridx) > ca->ndim ) {
+    rb_raise(rb_eArgError, "# of arguments doesn't equal to the ndim");
   }
-  else if ( RARRAY_LEN(ridx) < ca->rank ) {
+  else if ( RARRAY_LEN(ridx) < ca->ndim ) {
     volatile VALUE ref;
     CArray *cv;
     ca_size_t rdim[CA_RANK_MAX];
-    ca_size_t rrank = RARRAY_LEN(ridx);
+    ca_size_t rndim = RARRAY_LEN(ridx);
     ca_size_t j = 0, k;
-    for (i=0; i<rrank; i++) {
+    for (i=0; i<rndim; i++) {
       rval = rb_ary_entry(ridx, i);
       if ( rb_obj_is_carray(rval) ) {
         Data_Get_Struct(rval, CArray, cv);
         rdim[i] = 1;
-        for (k=0; k<cv->rank; k++) {
+        for (k=0; k<cv->ndim; k++) {
           rdim[i] *= ca->dim[j];
           j += 1;
         }
@@ -648,10 +648,10 @@ rb_ca_grid (int argc, VALUE *argv, VALUE self)
         j += 1;
       }
     }
-    if ( j != ca->rank ) {
-      rb_raise(rb_eArgError, "invalid total rank of args");
+    if ( j != ca->ndim ) {
+      rb_raise(rb_eArgError, "invalid total ndim of args");
     }
-    ref = rb_ca_refer_new(self, ca->data_type, rrank, rdim, ca->bytes, 0);
+    ref = rb_ca_refer_new(self, ca->data_type, rndim, rdim, ca->bytes, 0);
     return rb_ca_grid(argc, argv, ref);
   }
 

data/{ca_obj_mapping.c → ext/ca_obj_mapping.c}

@@ -21,7 +21,7 @@
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -49,7 +49,7 @@ static VALUE rb_cCAMapping;
 int
 ca_mapping_setup (CAMapping *ca, CArray *parent, CArray *mapper, int share)
 {
-  int8_t rank, data_type;
+  int8_t ndim, data_type;
   ca_size_t elements, bytes;
   ca_size_t *p;
   ca_size_t i;
@@ -66,19 +66,19 @@ ca_mapping_setup (CAMapping *ca, CArray *parent, CArray *mapper, int share)
   ca->bytes     = bytes;
   ca->ptr       = NULL;
 
-  rank          = mapper->rank;
+  ndim          = mapper->ndim;
   elements      = mapper->elements;
 
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->elements  = elements;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
   ca->nosync    = 0;
 
-  memcpy(ca->dim, mapper->dim, rank * sizeof(ca_size_t));
+  memcpy(ca->dim, mapper->dim, ndim * sizeof(ca_size_t));
 
   if ( share ) {
     ca_set_flag(ca, CA_FLAG_SHARE_INDEX);
@@ -176,7 +176,7 @@ ca_mapping_func_ptr_at_index (void *ap, ca_size_t *idx)
     int8_t   i;
     ca_size_t  n;
     n = idx[0];
-    for (i=1; i<ca->rank; i++) {
+    for (i=1; i<ca->ndim; i++) {
       n = dim[i]*n+idx[i];
     }
     n = *(ca_size_t*) ca_ptr_at_addr(ca->mapper, n);
@@ -200,7 +200,7 @@ ca_mapping_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
   int8_t   i;
   ca_size_t  n;
   n = idx[0];
-  for (i=1; i<ca->rank; i++) {
+  for (i=1; i<ca->ndim; i++) {
     n = dim[i]*n+idx[i];
   }
   n = *(ca_size_t*) ca_ptr_at_addr(ca->mapper, n);
@@ -215,7 +215,7 @@ ca_mapping_func_store_index (void *ap, ca_size_t *idx, void *ptr)
   int8_t   i;
   ca_size_t  n;
   n = idx[0];
-  for (i=1; i<ca->rank; i++) {
+  for (i=1; i<ca->ndim; i++) {
     n = dim[i]*n+idx[i];
   }
   n = *(ca_size_t*) ca_ptr_at_addr(ca->mapper, n);

data/{ca_obj_object.c → ext/ca_obj_object.c}

@@ -59,10 +59,10 @@ static VALUE rb_cCAObjectMask;
 
 
 static CAObjectMask *
-ca_objmask_new (VALUE array, int8_t rank, ca_size_t *dim)
+ca_objmask_new (VALUE array, int8_t ndim, ca_size_t *dim)
 {
   CAObjectMask *ca = ALLOC(CAObjectMask);
-  ca_wrap_setup_null((CArray *)ca, CA_BOOLEAN, rank, dim, 0, NULL);
+  ca_wrap_setup_null((CArray *)ca, CA_BOOLEAN, ndim, dim, 0, NULL);
   ca->obj_type = CA_OBJ_OBJECT_MASK;
   ca->array = array;
 
@@ -81,7 +81,7 @@ static void *
 ca_objmask_func_clone (void *ap)
 {
   CAObjectMask *ca = (CAObjectMask *) ap;
-  return ca_objmask_new(ca->array, ca->rank, ca->dim);
+  return ca_objmask_new(ca->array, ca->ndim, ca->dim);
 }
 
 void
@@ -100,8 +100,8 @@ ca_objmask_func_fetch_addr (void *ap, ca_size_t addr, void *ptr)
   else if ( rb_obj_respond_to(ca->array, rb_intern("mask_fetch_index"), Qtrue) ) {
     ca_size_t idx[CA_RANK_MAX];
     ca_addr2index(ca, addr, idx);
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rval = rb_funcall(ca->array, rb_intern("mask_fetch_index"), 1, ridx);
@@ -121,8 +121,8 @@ ca_objmask_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
   int i;
 
   if ( rb_obj_respond_to(ca->array, rb_intern("mask_fetch_index"), Qtrue) ) {
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rval = rb_funcall(ca->array, rb_intern("mask_fetch_index"), 1, ridx);
@@ -158,8 +158,8 @@ ca_objmask_func_store_addr (void *ap, ca_size_t addr, void *ptr)
   else if ( rb_obj_respond_to(ca->array, rb_intern("mask_store_index"), Qtrue) ) {
     ca_size_t idx[CA_RANK_MAX];
     ca_addr2index(ca, addr, idx);
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rb_funcall(ca->array, rb_intern("mask_store_index"), 2, ridx, rval);
@@ -177,8 +177,8 @@ ca_objmask_func_store_index (void *ap, ca_size_t *idx, void *ptr)
   rval = INT2NUM( *(uint8_t*)ptr );
 
   if ( rb_obj_respond_to(ca->array, rb_intern("mask_store_index"), Qtrue) ) {
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rb_funcall(ca->array, rb_intern("mask_store_index"), 2, ridx, rval);
@@ -290,7 +290,7 @@ rb_ca_objmask_initialize_copy (VALUE self, VALUE other)
   Data_Get_Struct(self,  CAObjectMask, ca);
   Data_Get_Struct(other, CAObjectMask, cs);
 
-  carray_setup((CArray *)ca, CA_BOOLEAN, cs->rank, cs->dim, 0, NULL);
+  carray_setup((CArray *)ca, CA_BOOLEAN, cs->ndim, cs->dim, 0, NULL);
   ca->obj_type = CA_OBJ_OBJECT_MASK;
   ca->array = cs->array;
 
@@ -301,7 +301,7 @@ rb_ca_objmask_initialize_copy (VALUE self, VALUE other)
 
 static int
 ca_object_setup (CAObject *ca,
-               int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes)
+               int8_t data_type, int8_t ndim, ca_size_t *dim, ca_size_t bytes)
 {
   ca_size_t elements;
   double  length;
@@ -310,15 +310,15 @@ ca_object_setup (CAObject *ca,
   /* check arguments */
 
   CA_CHECK_DATA_TYPE(data_type);
-  CA_CHECK_RANK(rank);
-  CA_CHECK_DIM(rank, dim);
+  CA_CHECK_RANK(ndim);
+  CA_CHECK_DIM(ndim, dim);
   CA_CHECK_BYTES(data_type, bytes);
 
   /* calculate total number of elements */
 
   elements = 1;
   length = bytes;
-  for (i=0; i<rank; i++) {
+  for (i=0; i<ndim; i++) {
     elements *= dim[i];
     length   *= dim[i];
   }
@@ -330,7 +330,7 @@ ca_object_setup (CAObject *ca,
   ca->obj_type  = CA_OBJ_OBJECT;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
@@ -339,20 +339,20 @@ ca_object_setup (CAObject *ca,
   ca->attach    = 0;
   ca->nosync    = 0;
 
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
-  ca->data      = ca_wrap_new_null(data_type, rank, dim, bytes, NULL);
+  ca->data      = ca_wrap_new_null(data_type, ndim, dim, bytes, NULL);
 
-  memcpy(ca->dim, dim, rank * sizeof(ca_size_t));
+  memcpy(ca->dim, dim, ndim * sizeof(ca_size_t));
 
   return 0;
 }
 
 static CAObject *
-ca_object_new (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes)
+ca_object_new (int8_t data_type, int8_t ndim, ca_size_t *dim, ca_size_t bytes)
 {
   CAObject *ca = ALLOC(CAObject);
-  ca_object_setup(ca, data_type, rank, dim, bytes);
+  ca_object_setup(ca, data_type, ndim, dim, bytes);
   return ca;
 }
 
@@ -373,7 +373,7 @@ static void *
 ca_object_func_clone (void *ap)
 {
   CAObject *ca = (CAObject *) ap;
-  return ca_object_new(ca->bytes, ca->rank, ca->dim, ca->bytes);
+  return ca_object_new(ca->bytes, ca->ndim, ca->dim, ca->bytes);
 }
 
 #define ca_object_func_ptr_at_addr ca_array_func_ptr_at_addr
@@ -408,8 +408,8 @@ ca_object_func_fetch_addr (void *ap, ca_size_t addr, void *ptr)
   else {
     ca_size_t idx[CA_RANK_MAX];
     ca_addr2index(ca, addr, idx);
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rval = rb_funcall(ca->self, rb_intern("fetch_index"), 1, ridx);
@@ -439,8 +439,8 @@ ca_object_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
   volatile VALUE ridx, raddr, rval;
   int i;
   if ( rb_obj_respond_to(ca->self, rb_intern("fetch_index"), Qtrue) ) {
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rval = rb_funcall(ca->self, rb_intern("fetch_index"), 1, ridx);
@@ -498,8 +498,8 @@ ca_object_func_store_addr (void *ap, ca_size_t addr, void *ptr)
   else {
     ca_size_t idx[CA_RANK_MAX];
     ca_addr2index(ca, addr, idx);
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rval = rb_ca_ptr2obj(ca->self, ptr);
@@ -514,8 +514,8 @@ ca_object_func_store_index (void *ap, ca_size_t *idx, void *ptr)
   volatile VALUE ridx, raddr, rval;
   int i;
   if ( rb_obj_respond_to(ca->self, rb_intern("store_index"), Qtrue) ) {
-    ridx = rb_ary_new2(ca->rank);
-    for (i=0; i<ca->rank; i++) {
+    ridx = rb_ary_new2(ca->ndim);
+    for (i=0; i<ca->ndim; i++) {
       rb_ary_store(ridx, i, SIZE2NUM(idx[i]));
     }
     rval = rb_ca_ptr2obj(ca->self, ptr);
@@ -634,7 +634,7 @@ ca_object_func_create_mask (void *ap)
   if ( ! ca->data->mask ) {
     ca_create_mask(ca->data);
   }
-  ca->mask = (CArray*) ca_objmask_new(ca->self, ca->rank, ca->dim);
+  ca->mask = (CArray*) ca_objmask_new(ca->self, ca->ndim, ca->dim);
   ca->mask->ptr = ca->data->mask->ptr;
   rmask = ca_wrap_struct(ca->mask);
   rb_ivar_set(ca->self, rb_intern("mask"), rmask);
@@ -679,7 +679,7 @@ rb_ca_object_initialize_copy (VALUE self, VALUE other)
   Data_Get_Struct(self,  CAObject, ca);
   Data_Get_Struct(other, CAObject, cs);
 
-  ca_object_setup(ca, cs->data_type, cs->rank, cs->dim, cs->bytes);
+  ca_object_setup(ca, cs->data_type, cs->ndim, cs->dim, cs->bytes);
   ca->self = self;
 
   rb_ca_data_type_inherit(self, other);
@@ -703,7 +703,7 @@ rb_ca_object_initialize (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE rtype, rdim, ropt, rbytes = Qnil, rrdonly = Qnil, rparent = Qnil, rdata;
   CAObject *ca;
-  int8_t data_type, rank;
+  int8_t data_type, ndim;
   ca_size_t dim[CA_RANK_MAX];
   ca_size_t bytes;
   int i;
@@ -721,13 +721,13 @@ rb_ca_object_initialize (int argc, VALUE *argv, VALUE self)
 
   Check_Type(rdim, T_ARRAY);
 
-  rank = RARRAY_LEN(rdim);
-  for (i=0; i<rank; i++) {
+  ndim = RARRAY_LEN(rdim);
+  for (i=0; i<ndim; i++) {
     dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
   }
 
   Data_Get_Struct(self, CAObject, ca);
-  ca_object_setup(ca, data_type, rank, dim, bytes);
+  ca_object_setup(ca, data_type, ndim, dim, bytes);
   ca->self = self;
 
   rdata = ca_wrap_struct(ca->data);