carray 1.4.0 → 1.5.5

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

@@ -3,10 +3,8 @@
   ca_obj_window.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -17,7 +15,7 @@
 VALUE rb_cCAWindow; 
 int8_t CA_OBJ_WINDOW;
 
-/* rdoc:
+/* yard:
   class CAWindow < CAVirtual # :nodoc:
   end
 */
@@ -29,18 +27,18 @@ int
 ca_window_setup (CAWindow *ca, CArray *parent,
                ca_size_t *start, ca_size_t *count, int8_t bounds, char *fill)
 {
-  int8_t  data_type, rank;
+  int8_t  data_type, ndim;
   ca_size_t *dim;
   ca_size_t bytes, elements;
   int i;
 
   data_type = parent->data_type;
-  rank      = parent->rank;
+  ndim      = parent->ndim;
   bytes     = parent->bytes;
   dim       = parent->dim;
 
   elements = 1;
-  for (i=0; i<rank; i++) {
+  for (i=0; i<ndim; i++) {
     if ( count[i] <= 0 ) {
       rb_raise(rb_eIndexError,
                "invalid size for %i-th dimension (negative or zero)", i);
@@ -51,7 +49,7 @@ ca_window_setup (CAWindow *ca, CArray *parent,
   ca->obj_type  = CA_OBJ_WINDOW;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
@@ -62,16 +60,16 @@ ca_window_setup (CAWindow *ca, CArray *parent,
   ca->attach    = 0;
   ca->nosync    = 0;
   ca->bounds    = bounds;
-  ca->start     = ALLOC_N(ca_size_t, rank);
-  ca->count     = ALLOC_N(ca_size_t, rank);
-  ca->size0     = ALLOC_N(ca_size_t, rank);
+  ca->start     = ALLOC_N(ca_size_t, ndim);
+  ca->count     = ALLOC_N(ca_size_t, ndim);
+  ca->size0     = ALLOC_N(ca_size_t, ndim);
   ca->fill      = ALLOC_N(char, ca->bytes);
 
   ca->dim = ca->count;
 
-  memcpy(ca->start, start, rank * sizeof(ca_size_t));
-  memcpy(ca->count, count, rank * sizeof(ca_size_t));
-  memcpy(ca->size0,  dim,  rank * sizeof(ca_size_t));
+  memcpy(ca->start, start, ndim * sizeof(ca_size_t));
+  memcpy(ca->count, count, ndim * sizeof(ca_size_t));
+  memcpy(ca->size0,  dim,  ndim * sizeof(ca_size_t));
 
   if ( fill ) {
     memcpy(ca->fill, fill, ca->bytes);
@@ -157,7 +155,7 @@ ca_window_func_ptr_at_index (void *ap, ca_size_t *idx)
     int8_t  i;
     ca_size_t n;
     n = 0;
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = start[i] + idx[i];
       k = ca_bounds_normalize_index(ca->bounds, size0[i], k);
       if ( k < 0 || k >= size0[i] ) {
@@ -187,7 +185,7 @@ ca_window_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
   ca_size_t idx0[CA_RANK_MAX];
   int8_t  i;
   ca_size_t k;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     k = start[i] + idx[i];
     k = ca_bounds_normalize_index(ca->bounds, size0[i], k);
     if ( k < 0 || k >= size0[i] ) {
@@ -208,7 +206,7 @@ ca_window_func_store_index (void *ap, ca_size_t *idx, void *ptr)
   ca_size_t idx0[CA_RANK_MAX];
   int8_t  i;
   ca_size_t k;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     k = start[i] + idx[i];
     k = ca_bounds_normalize_index(ca->bounds, size0[i], k);
     if ( k < 0 || k >= size0[i] ) {
@@ -397,7 +395,7 @@ ca_window_attach_loop (CAWindow *cb, int8_t level,
   ca_size_t count = cb->count[level];
   ca_size_t i, k;
 
-  if ( level == cb->rank - 1 ) {
+  if ( level == cb->ndim - 1 ) {
     switch ( cb->data_type ) {
     case CA_BOOLEAN:
     case CA_INT8:   proc_window_attach_get(int8_t); break;
@@ -525,7 +523,7 @@ ca_window_sync_loop (CAWindow *cb, int8_t level,
   ca_size_t size0 = cb->size0[level];
   ca_size_t i, k;
 
-  if ( level == cb->rank - 1 ) {
+  if ( level == cb->ndim - 1 ) {
     switch ( cb->data_type ) {
     case CA_BOOLEAN:
     case CA_INT8:   proc_window_sync_set(int8_t); break;
@@ -629,7 +627,7 @@ ca_window_fill_loop (CAWindow *cb, char *ptr,
   ca_size_t size0 = cb->size0[level];
   ca_size_t i, k;
 
-  if ( level == cb->rank - 1 ) {
+  if ( level == cb->ndim - 1 ) {
     switch ( cb->data_type ) {
     case CA_BOOLEAN:
     case CA_INT8:   proc_window_fill_set(int8_t); break;
@@ -703,7 +701,7 @@ rb_ca_window_new (VALUE cary,
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def window (*argv)
     end
@@ -728,8 +726,8 @@ rb_ca_window (int argc, VALUE *argv, VALUE self)
   ropt = rb_pop_options(&argc, &argv);
   rb_scan_options(ropt, "bounds,fill_value", &rbounds, &rfval);
 
-  if ( argc != ca->rank ) {
-    rb_raise(rb_eArgError, "rank mismatch");
+  if ( argc != ca->ndim ) {
+    rb_raise(rb_eArgError, "ndim mismatch");
   }
 
   for (i=0; i<argc; i++) {
@@ -837,7 +835,7 @@ rb_ca_window_initialize_copy (VALUE self, VALUE other)
   return self;
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def index2addr0 (idx)
     end
@@ -854,13 +852,13 @@ rb_ca_window_idx2addr0 (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CAWindow, cw);
 
-  if ( argc != cw->rank ) {
+  if ( argc != cw->ndim ) {
     rb_raise(rb_eArgError,
-             "invalid # of arguments (should be <%i>)", cw->rank);
+             "invalid # of arguments (should be <%i>)", cw->ndim);
   }
 
   addr = 0;
-  for (i=0; i<cw->rank; i++) {
+  for (i=0; i<cw->ndim; i++) {
     idxi = NUM2SIZE(argv[i]);
     CA_CHECK_INDEX(idxi, cw->dim[i]);
     addr = cw->size0[i] * addr + cw->start[i] + idxi;
@@ -874,7 +872,7 @@ rb_ca_window_idx2addr0 (int argc, VALUE *argv, VALUE self)
   }
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def addr2addr0 (addr)
     end
@@ -894,7 +892,7 @@ rb_ca_window_addr2addr0 (VALUE self, VALUE raddr)
   ca_addr2index((CArray*)cw, addr, idx);
 
   addr = 0;
-  for (i=0; i<cw->rank; i++) {
+  for (i=0; i<cw->ndim; i++) {
     addr *= cw->size0[i];
     addr += cw->start[i] + idx[i];
   }
@@ -912,12 +910,12 @@ rb_ca_window_move (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CAWindow, cw);
 
-  if ( argc != cw->rank ) {
+  if ( argc != cw->ndim ) {
     rb_raise(rb_eArgError, "invalid # of arguments");
   }
 
   ca_update_mask(cw);
-  for (i=0; i<cw->rank; i++) {
+  for (i=0; i<cw->ndim; i++) {
     start = NUM2SIZE(argv[i]);
     cw->start[i] = start;
     if ( cw->mask ) {
@@ -928,7 +926,7 @@ rb_ca_window_move (int argc, VALUE *argv, VALUE self)
   return self;
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def fill_value
     end
@@ -969,14 +967,14 @@ rb_ca_window_get_bounds (VALUE self)
     CAWindow *cw;                    \
     int8_t i;                              \
     Data_Get_Struct(self, CAWindow, cw);     \
-    ary = rb_ary_new2(cw->rank);            \
-    for (i=0; i<cw->rank; i++) {                    \
+    ary = rb_ary_new2(cw->ndim);            \
+    for (i=0; i<cw->ndim; i++) {                    \
       rb_ary_store(ary, i, SIZE2NUM(cw->name[i]));  \
     }                                               \
     return ary;                                     \
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def size0
     end

data/{carray.h → ext/carray.h}

@@ -3,10 +3,8 @@
   carray.h
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -198,7 +196,8 @@ typedef int8_t boolean8_t;
 /* -------------------------------------------------------------------- */
 
 #define CA_OBJ_TYPE_MAX  256
-#define CA_RANK_MAX      16
+#define CA_DIM_MAX       16
+#define CA_RANK_MAX      CA_DIM_MAX
 #define CA_ATTACH_MAX    0x80000000
 
 #define CA_FLAG_SCALAR           1
@@ -337,21 +336,21 @@ typedef struct _CArray CArray;
 struct _CArray {
   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;
   ca_size_t  *dim;
   char     *ptr;
   CArray   *mask;
-};                         /* 28 + 4*rank (bytes) */
+};                         /* 28 + 4*ndim (bytes) */
 
 typedef CArray CAWrap;
 
 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;
@@ -364,7 +363,7 @@ typedef struct {
 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;
@@ -374,12 +373,12 @@ typedef struct {
   CArray   *parent;
   uint32_t  attach;
   uint8_t   nosync;
-} CAVirtual;               /* 40 + 4*(rank) (bytes) */
+} CAVirtual;               /* 40 + 4*(ndim) (bytes) */
 
 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;
@@ -397,12 +396,12 @@ typedef struct {
   ca_size_t   ratio;
   ca_size_t   offset;
   CArray   *mask0;
-} CARefer;                 /* 52 + 4*(rank) (bytes) */
+} CARefer;                 /* 52 + 4*(ndim) (bytes) */
 
 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;
@@ -421,12 +420,12 @@ typedef struct {
   ca_size_t  *step;
   ca_size_t  *count;
   ca_size_t  *size0;
-} CABlock;                 /* 68 + 20*(rank) (bytes) */
+} CABlock;                 /* 68 + 20*(ndim) (bytes) */
 
 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;
@@ -442,12 +441,12 @@ typedef struct {
   ca_size_t  *count;
   ca_size_t  *size0;
   char     *fill;
-} CAWindow;                /* 56 + 16*(rank) + 1*(bytes) (bytes) */
+} CAWindow;                /* 56 + 16*(ndim) + 1*(bytes) (bytes) */
 
 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;
@@ -460,7 +459,7 @@ typedef struct {
   /* -------------*/
   CArray   *data;
   VALUE     self;
-} CAObject;                /* 48 + 4*(rank) (bytes) */
+} CAObject;                /* 48 + 4*(ndim) (bytes) */
 
 /* 
   CAObjectMask is an internal class 
@@ -470,7 +469,7 @@ typedef struct {
 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;
@@ -484,7 +483,7 @@ typedef struct {
 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;
@@ -500,12 +499,12 @@ typedef struct {
   ca_size_t   repeat_num;
   ca_size_t   contig_level;
   ca_size_t   contig_num;
-} CARepeat;                /* 60 + 8*(rank) (bytes) */
+} CARepeat;                /* 60 + 8*(ndim) (bytes) */
 
 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;
@@ -516,9 +515,9 @@ typedef struct {
   uint32_t  attach;
   uint8_t   nosync;
   /* -------------*/
-  int8_t    rep_rank;
+  int8_t    rep_ndim;
   ca_size_t  *rep_dim;
-} CAUnboundRepeat;         /* 44 + 8*(rank) (bytes) */
+} CAUnboundRepeat;         /* 44 + 8*(ndim) (bytes) */
 
 /* 
    CAReduce is an internal class 
@@ -528,7 +527,7 @@ typedef struct {
 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;
@@ -546,7 +545,7 @@ typedef struct {
 /* -------------------------------------------------------------------- */
 
 typedef struct {
-  int8_t  rank;
+  int8_t  ndim;
   ca_size_t dim[CA_RANK_MAX];
   CArray *reference;
   CArray * (*kernel_at_addr)(void *, ca_size_t, CArray *);
@@ -573,6 +572,23 @@ extern VALUE rb_mCA;
 extern VALUE rb_mCAMath;
 extern VALUE rb_eCADataTypeError;
 
+extern VALUE rb_cCArrayBoolean;
+extern VALUE rb_cCArrayUInt8;
+extern VALUE rb_cCArrayUInt16;
+extern VALUE rb_cCArrayUInt32;
+extern VALUE rb_cCArrayUInt64;
+extern VALUE rb_cCArrayInt8;
+extern VALUE rb_cCArrayInt16;
+extern VALUE rb_cCArrayInt32;
+extern VALUE rb_cCArrayInt64;
+extern VALUE rb_cCArrayFloat32;
+extern VALUE rb_cCArrayFloat64;
+extern VALUE rb_cCArrayFloat128;
+extern VALUE rb_cCArrayCmplx64;
+extern VALUE rb_cCArrayCmplx128;
+extern VALUE rb_cCArrayCmplx256;
+extern VALUE rb_cCArrayObject;
+
 /* -------------------------------------------------------------------- */
 
 extern const int ca_endian;
@@ -607,15 +623,15 @@ extern int ca_obj_num;
     rb_raise(rb_eRuntimeError, "invalid numeric data type"); \
   }
 
-#define CA_CHECK_RANK(rank) \
-  if ( rank <= 0 || rank > CA_RANK_MAX ) { \
-    rb_raise(rb_eRuntimeError, "invalid rank"); \
+#define CA_CHECK_RANK(ndim) \
+  if ( ndim <= 0 || ndim > CA_RANK_MAX ) { \
+    rb_raise(rb_eRuntimeError, "invalid ndim"); \
   }
 
-#define CA_CHECK_DIM(rank, dim)     \
+#define CA_CHECK_DIM(ndim, dim)     \
   { \
     int8_t i_; \
-    for (i_=0; i_<rank; i_++) { \
+    for (i_=0; i_<ndim; i_++) { \
       if ( dim[i_] < 0 ) { \
         rb_raise(rb_eRuntimeError, "negative size dimension at %i-dim", i_);  \
       } \
@@ -646,7 +662,7 @@ extern int ca_obj_num;
 #define CA_CHECK_BOUND(ca, idx) \
   { \
     int8_t i; \
-    for (i=0; i<ca->rank; i++) { \
+    for (i=0; i<ca->ndim; i++) { \
       if ( idx[i] < 0 || idx[i] >= ca->dim[i] )  { \
         rb_raise(rb_eRuntimeError, "index out of range at %i-dim ( %i <=> 0..%i )", i, idx[i], ca->dim[i]-1); \
       } \
@@ -736,12 +752,13 @@ typedef union {
 
 typedef struct {
   int16_t  type;
-  int16_t  rank;
+  int16_t  ndim;
   int32_t  index_type[CA_RANK_MAX];
   CAIndex  index[CA_RANK_MAX];
   CArray  *select;
   VALUE    block;
   VALUE    symbol;
+  int8_t   range_check;
 } CAIndexInfo;
 
 /* -------------------------------------------------------------------- */
@@ -767,10 +784,10 @@ VALUE rb_ca_call_binop (VALUE self, VALUE other, ca_binop_func_t func[]);
 VALUE rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[]);
 VALUE rb_ca_call_moncmp (VALUE self, ca_moncmp_func_t func[]);
 VALUE rb_ca_call_bincmp (VALUE self, VALUE other, ca_bincmp_func_t func[]);
-void  ca_monop_not_implement(ca_size_t n, char *ptr1, char *ptr2);
-void  ca_binop_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3);
-void  ca_moncmp_not_implement(ca_size_t n, char *ptr1, char *ptr2);
-void  ca_bincmp_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3);
+void  ca_monop_not_implement(ca_size_t n, char *ptr1, char *ptr2) __attribute__((noreturn));
+void  ca_binop_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3) __attribute__((noreturn));
+void  ca_moncmp_not_implement(ca_size_t n, char *ptr1, char *ptr2) __attribute__((noreturn));
+void  ca_bincmp_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3) __attribute__((noreturn));
 VALUE ca_math_call (VALUE mod, VALUE arg, ID id);
 
 /* -------------------------------------------------------------------- */
@@ -778,35 +795,38 @@ VALUE ca_math_call (VALUE mod, VALUE arg, ID id);
 /* --- ca_obj_array.c --- */
 
 int  carray_setup (CArray *ca,
-                   int8_t data_type, int8_t rank, ca_size_t *dim, 
+                   int8_t data_type, int8_t ndim, ca_size_t *dim, 
                    ca_size_t bytes, CArray *mask);
 
 int  carray_safe_setup (CArray *ca,
-                   int8_t data_type, int8_t rank, ca_size_t *dim, 
+                   int8_t data_type, int8_t ndim, ca_size_t *dim, 
                    ca_size_t bytes, CArray *mask);
 
 int  ca_wrap_setup_null (CArray *ca,
-                   int8_t data_type, int8_t rank, ca_size_t *dim, 
+                   int8_t data_type, int8_t ndim, ca_size_t *dim, 
                    ca_size_t bytes, CArray *mask);
 
 void free_carray (void *ap);
 void free_ca_wrap (void *ap);
 
 CArray  *carray_new (int8_t data_type,
-                     int8_t rank, ca_size_t *dim, ca_size_t bytes, CArray *ma);
+                     int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *ma);
 CArray  *carray_new_safe (int8_t data_type,
-                          int8_t rank, ca_size_t *dim, ca_size_t bytes, CArray *mask);
+                          int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *mask);
 VALUE    rb_carray_new (int8_t data_type,
-                        int8_t rank, ca_size_t *dim, ca_size_t bytes, CArray *mask);
+                        int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *mask);
 VALUE    rb_carray_new_safe (int8_t data_type,
-                             int8_t rank, ca_size_t *dim, ca_size_t bytes, CArray *mask);
+                             int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *mask);
+
+VALUE    rb_ca_wrap_new (int8_t data_type,
+                         int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *mask, char *ptr);
 
 CAWrap  *ca_wrap_new (int8_t data_type,
-                      int8_t rank, ca_size_t *dim, ca_size_t bytes,
+                      int8_t ndim, ca_size_t *dim, ca_size_t bytes,
                       CArray *mask, char *ptr);
 
 CAWrap  *ca_wrap_new_null (int8_t data_type,
-                          int8_t rank, ca_size_t *dim, ca_size_t bytes,
+                          int8_t ndim, ca_size_t *dim, ca_size_t bytes,
                           CArray *mask);
 
 CScalar *cscalar_new (int8_t data_type, ca_size_t bytes, CArray *ma);
@@ -817,10 +837,10 @@ VALUE    rb_cscalar_new_with_value (int8_t data_type, ca_size_t bytes, VALUE rva
 /* --- ca_obj_refer.c --- */
 
 CARefer *ca_refer_new (CArray *ca,
-                       int8_t data_type, int8_t rank, ca_size_t *dim,
+                       int8_t data_type, int8_t ndim, ca_size_t *dim,
                        ca_size_t bytes, ca_size_t offset);
 VALUE    rb_ca_refer_new (VALUE self,
-                       int8_t data_type, int8_t rank, ca_size_t *dim,
+                       int8_t data_type, int8_t ndim, ca_size_t *dim,
                        ca_size_t bytes, ca_size_t offset);
 
 /* --- ca_obj_farray.c --- */
@@ -830,10 +850,10 @@ VALUE    rb_ca_farray (VALUE self);
 /* --- ca_obj_block.c --- */
 
 CABlock *ca_block_new (CArray *carray,
-                       int8_t rank, ca_size_t *dim,
+                       int8_t ndim, ca_size_t *dim,
                        ca_size_t *start, ca_size_t *step, ca_size_t *count,
                        ca_size_t offset);
-VALUE    rb_ca_block_new (VALUE cary, int8_t rank, ca_size_t *dim,
+VALUE    rb_ca_block_new (VALUE cary, int8_t ndim, ca_size_t *dim,
                        ca_size_t *start, ca_size_t *step, ca_size_t *count,
                        ca_size_t offset);
 
@@ -865,12 +885,15 @@ VALUE   rb_ca_fake_type (VALUE self, VALUE rtype, VALUE rbytes);
 
 /* --- ca_obj_repeat.c --- */
 
-CARepeat *ca_repeat_new (CArray *carray, int8_t rank, ca_size_t *count);
+CARepeat *ca_repeat_new (CArray *carray, int8_t ndim, ca_size_t *count);
 
-VALUE   rb_ca_repeat_new (VALUE cary, int8_t rank, ca_size_t *count);
+VALUE   rb_ca_repeat_new (VALUE cary, int8_t ndim, ca_size_t *count);
 VALUE   rb_ca_repeat (int argc, VALUE *argv, VALUE self);
 
-VALUE   rb_ca_ubrep_new (VALUE cary, int32_t rep_rank, ca_size_t *rep_dim);
+/* --- ca_obj_unbound_repeat.c --- */
+
+VALUE   rb_ca_ubrep_shave (VALUE self, VALUE other);
+VALUE   rb_ca_ubrep_new (VALUE cary, int32_t rep_ndim, ca_size_t *rep_dim);
 VALUE   ca_ubrep_bind_with (VALUE self, VALUE other);
 
 /* --- ca_obj_reduce.c --- */
@@ -888,6 +911,7 @@ VALUE   rb_dim_iter_new (VALUE vca, CAIndexInfo *info);
 void * malloc_with_check(size_t size);
 
 int     ca_install_obj_type (VALUE klass, ca_operation_function_t func);
+VALUE   ca_data_type_class (int8_t data_type);
 
 void    ca_mark (void *ap);
 void    ca_free (void *ap);
@@ -922,16 +946,19 @@ int     ca_is_object_type (void *ap);
 
 void    ca_check_type (void *ap, int8_t data_type);
 #define ca_check_data_type(ap, data_type) ca_check_type(ap, data_type)
-void    ca_check_rank (void *ap, int rank);
-void    ca_check_shape (void *ap, int rank, ca_size_t *dim);
+void    ca_check_ndim (void *ap, int ndim);
+void    ca_check_shape (void *ap, int ndim, ca_size_t *dim);
 void    ca_check_same_data_type (void *ap1, void *ap2);
-void    ca_check_same_rank (void *ap1, void *ap2);
+void    ca_check_same_ndim (void *ap1, void *ap2);
 void    ca_check_same_elements (void *ap1, void *ap2);
 void    ca_check_same_shape (void *ap1, void *ap2);
 void    ca_check_index (void *ap, ca_size_t *idx);
 void    ca_check_data_class (VALUE rtype);
 int     ca_is_valid_index (void *ap, ca_size_t *idx);
 
+#define ca_ndim(ca) ((ca)->ndim)
+#define ca_shape(ca) ((ca)->dim)
+
 /* API : allocate, attach, update, sync, detach */
 
 void    ca_allocate (void *ap);
@@ -1022,7 +1049,7 @@ void    ca_block_from_carray(CArray *cs,
   (obj = rb_ca_wrap_readonly(obj, INT2NUM(data_type)), (CArray*) DATA_PTR(obj))
 
 VALUE   rb_carray_wrap_ptr (int8_t data_type,
-                            int8_t rank, ca_size_t *dim, ca_size_t bytes,
+                            int8_t ndim, ca_size_t *dim, ca_size_t bytes,
                             CArray *mask, char *ptr, VALUE refer);
 
 void * ca_to_cptr (void *ap);
@@ -1042,7 +1069,7 @@ void    ca_parse_range_without_check (VALUE arg, ca_size_t size,
                         ca_size_t *offset, ca_size_t *count, ca_size_t *step);
 
 int     ca_equal (void *ap, void *bp);
-void    ca_zerodiv(void);
+void    ca_zerodiv(void)  __attribute__((noreturn));
 int32_t ca_rand (double rmax);
 ca_size_t ca_bounds_normalize_index (int8_t bounds, ca_size_t size0, ca_size_t k);
 
@@ -1068,7 +1095,7 @@ void    rb_ca_guess_type_and_bytes (VALUE rtype, VALUE rbytes,
 int     rb_ca_is_type (VALUE arg, int type);
 
 /* scan index */ 
-void    rb_ca_scan_index (int ca_rank, ca_size_t *ca_dim, ca_size_t elements,
+void    rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t elements,
                           long argc, VALUE *argv, CAIndexInfo *info);
 
 
@@ -1095,7 +1122,7 @@ void    rb_ca_modify (VALUE self);
 /* attributes */
 VALUE   rb_ca_obj_type (VALUE self);
 VALUE   rb_ca_data_type (VALUE self);
-VALUE   rb_ca_rank (VALUE self);
+VALUE   rb_ca_ndim (VALUE self);
 VALUE   rb_ca_bytes (VALUE self);
 VALUE   rb_ca_elements (VALUE self);
 VALUE   rb_ca_dim (VALUE self);