carray 3.0.3 → 3.0.4

data/ext/ca_obj_record.c

@@ -100,6 +100,12 @@ ca_record_setup (CARecord *ca, CArray *parent, VALUE data_class)
              parent->data_type);
   }
 
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
+
   ca->obj_type   = CA_OBJ_RECORD;
   ca->data_type  = CA_FIXLEN;
   ca->flags      = CA_FLAG_IS_FACE;
@@ -119,9 +125,6 @@ ca_record_setup (CARecord *ca, CArray *parent, VALUE data_class)
 
   ca->data_class = data_class;
 
-  if ( ca_has_mask(parent) ) {
-    ca_create_mask((CArray *) ca);
-  }
 
   if ( ca_is_scalar(parent) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -137,8 +140,11 @@ ca_record_setup (CARecord *ca, CArray *parent, VALUE data_class)
 CARecord *
 ca_record_new (CArray *parent, VALUE data_class)
 {
-  CARecord *ca = (CARecord *) ca_array_alloc(CA_OBJ_RECORD, parent->ndim);
+  CARecord *ca;
+  ca_record_setup(NULL, parent, data_class);
+  ca = (CARecord *) ca_array_alloc(CA_OBJ_RECORD, parent->ndim);
   ca_record_setup(ca, parent, data_class);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -270,9 +276,7 @@ rb_ca_record_s_new (int argc, VALUE *argv, VALUE klass)
     shape_offset = 1;
   }
   ndim = argc - shape_offset;
-  if ( ndim < 0 || ndim > CA_RANK_MAX ) {
-    rb_raise(rb_eArgError, "invalid number of shape arguments (%d)", ndim);
-  }
+  ca_check_rank_fits(ndim, NULL);
   for ( i = 0; i < ndim; i++ ) {
     dim[i] = NUM2SIZE(argv[shape_offset + i]);
   }
@@ -362,6 +366,7 @@ rb_ca_record_initialize_copy (VALUE self, VALUE other)
     ca_array_pool_alloc(ca, CA_OBJ_RECORD, cs->parent->ndim);
   }
   ca_record_setup(ca, cs->parent, cs->data_class);
+  ca_view_inherit_mask((VALUE) ca);
   /* Marshal loads into an empty instance through here without copying
      ivars, so the parent pin is set from `other`, not inherited. */
   rb_ca_set_parent(self, rb_ca_parent(other));

data/ext/ca_obj_reduce.c

@@ -56,6 +56,12 @@ ca_reduce_setup (CAReduce *ca, CArray *parent, ca_size_t count, ca_size_t offset
              "[BUG] CAReduce can't inherit other than boolean array");
   }
 
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
+
   elements  = parent->elements / count;
 
   ca->obj_type  = CA_OBJ_REDUCE;
@@ -75,9 +81,6 @@ ca_reduce_setup (CAReduce *ca, CArray *parent, ca_size_t count, ca_size_t offset
   ca->count     = count;
   ca->offset    = offset;
 
-  if ( ca_has_mask(parent) ) {
-    ca_create_mask(ca);
-  }
 
   if ( ca_is_scalar(parent) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -89,8 +92,11 @@ ca_reduce_setup (CAReduce *ca, CArray *parent, ca_size_t count, ca_size_t offset
 CAReduce *
 ca_reduce_new (CArray *parent, ca_size_t count, ca_size_t offset)
 {
-  CAReduce *ca = ALLOC(CAReduce);
+  CAReduce *ca;
+  ca_reduce_setup(NULL, parent, count, offset);
+  ca = ALLOC(CAReduce);
   ca_reduce_setup(ca, parent, count, offset);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -193,8 +199,7 @@ ca_reduce_func_allocate (void *ap)
 {
   CAReduce *ca = (CAReduce *) ap;
   ca_attach(ca->parent);
-  /* ca->ptr = ALLOC_N(char, ca->elements); */
-  ca->ptr = xmalloc(ca_length(ca));  
+  ca->ptr = ca_alloc_cells((CArray *) ca);
 }
 
 static void
@@ -204,8 +209,7 @@ ca_reduce_func_attach (void *ap)
   char *p;
   ca_size_t i;
   ca_attach(ca->parent);
-  /* ca->ptr = ALLOC_N(char, ca->elements); */
-  ca->ptr = xmalloc(ca_length(ca));  
+  ca->ptr = ca_alloc_cells((CArray *) ca);
   p = ca->ptr;
   for (i=0; i<ca->elements; i++) {
     ca_reduce_func_xfer_addrs(ca, 1, &i, p, CA_XFER_GET);
@@ -314,6 +318,7 @@ rb_ca_reduce_initialize_copy (VALUE self, VALUE other)
   TypedData_Get_Struct(other, CAReduce, &careduce_data_type, cs);
 
   ca_reduce_setup(ca, cs->parent, cs->count, cs->offset);
+  ca_view_inherit_mask((VALUE) ca);
 
   return self;
 }

data/ext/ca_obj_refer.c

@@ -74,10 +74,10 @@ ca_refer_setup (CARefer *ca, CArray *parent,
   ca_size_t s;
   int8_t i;
 
-  CA_CHECK_DATA_TYPE(data_type);
-  CA_CHECK_RANK(ndim);
-  CA_CHECK_DIM(ndim, dim);
-  CA_CHECK_BYTES(data_type, bytes);
+  CA_CHECK_DATA_TYPE_GIVEN(data_type);
+  CA_CHECK_RANK_GIVEN(ndim);
+  CA_CHECK_DIM_GIVEN(ndim, dim);
+  CA_CHECK_BYTES_GIVEN(data_type, bytes);
 
   /* An object cell is a VALUE the GC marks: reading other bytes as one
      marks garbage, and reading one as bytes exposes an address. */
@@ -89,6 +89,14 @@ ca_refer_setup (CARefer *ca, CArray *parent,
     rb_raise(rb_eCADataTypeError,
              "non-object array can't be referred as object data type");
   }
+  /* A boolean cell holds 0 or 1, and a view that reads other bytes as
+     boolean cannot keep them so: the parent is written as what it is. */
+  if (data_type == CA_BOOLEAN && parent->data_type != CA_BOOLEAN) {
+    rb_raise(rb_eCADataTypeError,
+             "%s: a %s array can't be referred as boolean (its bytes need not "
+             "be 0 or 1); compare it instead, e.g. ne(0)",
+             ca_calling_method_name(), ca_type_name[parent->data_type]);
+  }
   if (parent->elements && bytes > parent_bytes * parent->elements) {
     rb_raise(rb_eArgError, "bytes exceeds the data size of referent");
   }
@@ -129,14 +137,13 @@ ca_refer_setup (CARefer *ca, CArray *parent,
     return 0;
   }
 
-  /* CAREFUL: initialise mask0 before ca_stride_setup — the setup
-     may dispatch to ca_refer_func_create_mask, which writes to
-     mask0.  Leaving it uninitialised risks freeing a garbage
-     pointer during error unwind. */
+  /* mask0 is written by ca_refer_func_create_mask when the constructor
+     takes the parent's mask, and freed on error unwind, so it starts
+     NULL. */
   ca->mask0 = NULL;
 
-  ca_stride_setup((CAStride *) ca, CA_OBJ_REFER, parent,
-                  data_type, bytes, ndim, dim, strides, base_offset);
+  ca_stride_setup_view((CAStride *) ca, CA_OBJ_REFER, parent,
+                       data_type, bytes, ndim, dim, strides, base_offset);
 
   if (ca_is_scalar(parent)) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -153,6 +160,7 @@ ca_refer_new (CArray *parent,
   ca_refer_setup(NULL, parent, data_type, ndim, dim, bytes, offset);
   ca = (CARefer *) ca_array_alloc(CA_OBJ_REFER, ndim);
   ca_refer_setup(ca, parent, data_type, ndim, dim, bytes, offset);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -260,6 +268,7 @@ rb_ca_refer_initialize_copy (VALUE self, VALUE other)
      unusual mod-bytes alignments. */
   ca_refer_setup(ca, cs->parent, cs->data_type, cs->ndim, cs->dim,
                  cs->bytes, cs->base_offset / cs->parent->bytes);
+  ca_view_inherit_mask((VALUE) ca);
   return self;
 }
 
@@ -488,7 +497,7 @@ rb_ca_refer_kw (int argc, VALUE *argv, VALUE ropt, VALUE self)
       }
     }
     Check_Type(rdim, T_ARRAY);
-    CA_CHECK_RANK(RARRAY_LEN(rdim));   /* before dim[] is filled */
+    CA_CHECK_RANK_GIVEN(RARRAY_LEN(rdim));   /* before dim[] is filled */
     ndim = RARRAY_LEN(rdim);
     for (i = 0; i < ndim; i++) dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
     if (! NIL_P(roffset)) offset = NUM2SIZE(roffset);
@@ -610,9 +619,7 @@ rb_ca_reshape (int argc, VALUE *argv, VALUE self)
 
   TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
-  if (argc < 0 || argc > CA_RANK_MAX) {
-    rb_raise(rb_eArgError, "reshape: invalid number of dims (%d)", argc);
-  }
+  ca_check_rank_fits(argc, "reshape");
 
   /* Locate the (at most one) auto-infer placeholder.  `-1` is the
      conventional spelling; `:~` is the unified auto-fill sigil
@@ -775,7 +782,7 @@ rb_ca_flatten (VALUE self)
      before axis 0 twice              -> [1, 1, 2, 3]
 
    Returns a CARefer view (zero-copy alias to +self+'s data, via reshape).
-   Bound to the internal name __insert_axis_size1__; the user-facing
+   Bound to the private method insert_size_one_axes; the user-facing
    insert_axis (with the repeat: keyword) is the Ruby method in
    lib/carray/basics.rb, which builds on this primitive.
 
@@ -795,11 +802,7 @@ rb_ca_insert_axis (int argc, VALUE *argv, VALUE self)
 
   ndim     = (int) ca->ndim;
   new_ndim = ndim + argc;
-  if (new_ndim > CA_RANK_MAX) {
-    rb_raise(rb_eArgError,
-             "insert_axis: resulting ndim %d exceeds CA_RANK_MAX %d",
-             new_ndim, CA_RANK_MAX);
-  }
+  ca_check_rank_fits(new_ndim, "insert_axis");
 
   ngap = ndim + 1;   /* gaps live in [0, ndim] (ndim = the end gap) */
 
@@ -809,12 +812,7 @@ rb_ca_insert_axis (int argc, VALUE *argv, VALUE self)
     gap_count[i] = 0;
   }
   for (i = 0; i < argc; i++) {
-    int raw = (int) ca_axis_integer(argv[i], "insert_axis");
-    int g   = (raw < 0) ? raw + ngap : raw;
-    if (g < 0 || g >= ngap) {
-      rb_raise(rb_eArgError,
-               "insert_axis: axis %d out of range for ndim %d", raw, ndim);
-    }
+    int g = ca_normalize_axis_arg(argv[i], ngap, "insert_axis");
     gap_count[g]++;
   }
 
@@ -858,7 +856,7 @@ Init_ca_obj_refer (void)
   /* The bare size-1 primitive.  The user-facing `insert_axis` (with its
      `repeat:` keyword) is the Ruby method in lib/carray/basics.rb, which
      owns the name and calls this primitive. */
-  rb_define_method(rb_cCArray, "__insert_axis_size1__", rb_ca_insert_axis, -1);
+  rb_define_private_method(rb_cCArray, "insert_size_one_axes", rb_ca_insert_axis, -1);
   rb_define_alloc_func(rb_cCARefer, rb_ca_refer_s_allocate);
   rb_define_method(rb_cCARefer, "initialize_copy",
                                        rb_ca_refer_initialize_copy, 1);

data/ext/ca_obj_remap.c

@@ -129,6 +129,12 @@ ca_remap_setup (CARemap *ca, CArray *ref, CArray *idx)
 {
   ca_remap_check_constraints(ref, idx);
 
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
+
   ca->obj_type  = CA_OBJ_REMAP;
   ca->data_type = ref->data_type;
   ca->flags     = 0;
@@ -147,9 +153,6 @@ ca_remap_setup (CARemap *ca, CArray *ref, CArray *idx)
   ca->nosync    = 0;
   ca->idx       = idx;
 
-  if ( ca_has_mask(ref) ) {
-    ca_create_mask(ca);
-  }
 
   if ( ca_is_scalar(ref) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -161,8 +164,11 @@ ca_remap_setup (CARemap *ca, CArray *ref, CArray *idx)
 CARemap *
 ca_remap_new (CArray *ref, CArray *idx)
 {
-  CARemap *ca = (CARemap *) ca_array_alloc(CA_OBJ_REMAP, ref->ndim);
+  CARemap *ca;
+  ca_remap_setup(NULL, ref, idx);
+  ca = (CARemap *) ca_array_alloc(CA_OBJ_REMAP, ref->ndim);
   ca_remap_setup(ca, ref, idx);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -211,7 +217,7 @@ static void
 ca_remap_func_allocate (void *ap)
 {
   CARemap *ca = (CARemap *) ap;
-  ca->ptr = xmalloc(ca_length(ca));
+  ca->ptr = ca_alloc_cells((CArray *) ca);
 }
 
 static void
@@ -435,8 +441,9 @@ rb_ca_remap_new (VALUE cary, VALUE rmapper)
 }
 
 /* Read-only accessor for the per-cell index CArray that defines this
-   CARemap's mapping.  Returns the same CArray VALUE the caller passed
-   to ca[mapper] (= shared reference, not a copy).  Companion to
+   CARemap's mapping: the array the view reads.  For ca[mapper] it is a
+   copy of mapper taken at the call, so a later change to mapper does
+   not reach the view.  Companion to
    CABlock#start / CAStride#strides / CAWindow#count etc. — the view
    hierarchy is preserved so each named view class exposes its own
    defining semantic state. */
@@ -453,8 +460,22 @@ rb_ca_remap_mapper (VALUE self)
 static VALUE
 rb_ca_remap_dup (VALUE self)
 {
-  return rb_ca_remap_new(rb_ca_parent(self),
-                         rb_ivar_get(self, rb_intern("remap_idx")));
+  volatile VALUE rmapper = rb_ivar_get(self, rb_intern("remap_idx"));
+  if ( NIL_P(rmapper) ) {
+    /* The mask of a CARemap (it holds no index array of its own): another
+       remap over the same parent mask and index.  The array it is the mask
+       of keeps both alive, so the copy holds that array too. */
+    volatile VALUE obj;
+    CArray *ca, *cp;
+    TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
+    cp = (CArray *) ca_remap_func_clone(ca);
+    ca_keep_chain_flags(cp, ca);
+    obj = TypedData_Wrap_Struct(rb_obj_class(self), &caremap_data_type, cp);
+    rb_ivar_set(obj, rb_intern("masked_array"),
+                rb_ivar_get(self, rb_intern("masked_array")));
+    return obj;
+  }
+  return rb_ca_remap_new(rb_ca_parent(self), rmapper);
 }
 
 static VALUE

data/ext/ca_obj_repeat.c

@@ -39,9 +39,7 @@ ca_repeat_setup (CAStride *ca, CArray *parent, int8_t ndim, ca_size_t *count)
   int8_t data_ndim = 0;
   int8_t i, j;
 
-  if ( ndim < 0 || ndim > CA_RANK_MAX ) {
-    rb_raise(rb_eArgError, "invalid ndim %d", (int) ndim);
-  }
+  ca_check_rank_fits(ndim, NULL);
   for (i = 0; i < ndim; i++) {
     if (count[i] < 0) {
       rb_raise(rb_eArgError,
@@ -86,9 +84,9 @@ ca_repeat_setup (CAStride *ca, CArray *parent, int8_t ndim, ca_size_t *count)
     return 0;
   }
 
-  ca_stride_setup(ca, CA_OBJ_REPEAT, parent,
-                  parent->data_type, parent->bytes,
-                  ndim, newdim, strides, 0);
+  ca_stride_setup_view(ca, CA_OBJ_REPEAT, parent,
+                       parent->data_type, parent->bytes,
+                       ndim, newdim, strides, 0);
 
   ca_set_flag(ca, CA_FLAG_READ_ONLY);
   if (ca->mask) {
@@ -104,6 +102,7 @@ ca_repeat_new (CArray *parent, int8_t ndim, ca_size_t *count)
   ca_repeat_setup(NULL, parent, ndim, count);
   ca = (CAStride *) ca_array_alloc(CA_OBJ_REPEAT, ndim);
   ca_repeat_setup(ca, parent, ndim, count);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -216,12 +215,12 @@ rb_ca_repeat (int argc, VALUE *argv, VALUE self)
         self = rb_ca_refer_new(self, ca->data_type, ndim, dim, ca->bytes, 0);
       }
     }
-    return rb_ca_repeat((int)RARRAY_LEN(args), (VALUE *)RARRAY_CONST_PTR(args), self);
+    self = rb_ca_repeat((int)RARRAY_LEN(args), (VALUE *)RARRAY_CONST_PTR(args), self);
+    RB_GC_GUARD(args);   /* the repeat reads its arguments out of args */
+    return self;
   }
 
-  if ( argc > CA_RANK_MAX ) {         /* count[] and dim[] hold CA_RANK_MAX */
-    rb_raise(rb_eArgError, "invalid ndim %d", argc);
-  }
+  ca_check_rank_fits(argc, NULL);     /* count[] and dim[] hold CA_RANK_MAX */
 
   repeat = 1;
   for (i=0; i<argc; i++) {

data/ext/ca_obj_roll.c

@@ -126,9 +126,6 @@ ca_roll_setup (CARoll *ca, CArray *parent, ca_size_t *shift)
     ca->reps[i] = s;
   }
 
-  if ( ca_has_mask(parent) ) {
-    ca_create_mask(ca);
-  }
 
   return 0;
 }
@@ -140,6 +137,7 @@ ca_roll_new (CArray *parent, ca_size_t *shift)
   ca_roll_setup(NULL, parent, shift);
   ca = ALLOC(CARoll);
   ca_roll_setup(ca, parent, shift);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -261,6 +259,7 @@ ca_roll_func_xfer_stride (void *ap, ca_size_t *starts, ca_size_t *counts,
     ca_size_t idx[CA_RANK_MAX], doff = 0, base = 0;
     for (k = 0; k < ndim; k++) base += starts[k] * rnative[k];
     for (k = 0; k < ndim; k++) idx[k] = 0;
+    /* empty: the slot returns on an empty region at its entry */
     while (1) {
       ca_size_t roff = base, ridx[CA_RANK_MAX];
       for (k = 0; k < ndim; k++) roff += idx[k] * strides[k];
@@ -364,6 +363,7 @@ ca_roll_func_xfer_stride (void *ap, ca_size_t *starts, ca_size_t *counts,
   }
 
   for (k = 0; k < ndim; k++) o[k] = 0;
+  /* empty: the slot returns on an empty region at its entry */
   while (1) {
     ca_size_t pbase = 0, doff = 0, i;
     for (k = 0; k < inner; k++) {
@@ -506,7 +506,7 @@ ca_roll_func_allocate (void *ap)
 {
   CARoll *ca = (CARoll *) ap;
   ca_attach(ca->parent);
-  ca->ptr = xmalloc(ca_length(ca));
+  ca->ptr = ca_alloc_cells((CArray *) ca);
 }
 
 static void
@@ -514,7 +514,7 @@ ca_roll_func_attach (void *ap)
 {
   CARoll *ca = (CARoll *) ap;
   ca_attach(ca->parent);
-  ca->ptr = xmalloc(ca_length(ca));
+  ca->ptr = ca_alloc_cells((CArray *) ca);
   ca_roll_iterate_regions(ca, ca->ptr, 0);
 }
 
@@ -659,6 +659,7 @@ rb_ca_roll_initialize_copy (VALUE self, VALUE other)
   ca_check_uninitialized(ca);
   TypedData_Get_Struct(other, CARoll, &caroll_data_type, cs);
   ca_roll_setup(ca, cs->parent, cs->reps);
+  ca_view_inherit_mask((VALUE) ca);
   return self;
 }
 

data/ext/ca_obj_select.c

@@ -162,15 +162,19 @@ ca_select_setup (CASelect *ca, CArray *parent, CArray *snapshot)
       if ( s[i] ) count++;
     }
     ca->elements = count;
-    /* Placeholder 1-element allocation when count == 0 to avoid
-       malloc(0) implementation variance; the engine treats
-       elements==0 as a no-op so the contents are irrelevant. */
-    ca->indices  = (ca_size_t *) xmalloc(
-                     sizeof(ca_size_t) * (count > 0 ? count : 1));
+    /* One slot more than count: the loop below writes every position
+       and advances only on TRUE, so a run of FALSE after the last TRUE
+       writes slot `count`.  Writing without a branch keeps a selector
+       with TRUE and FALSE mixed at random from mispredicting on most
+       cells.  The extra slot also keeps count == 0 from malloc(0). */
+    ca->indices  = (ca_size_t *) xmalloc(sizeof(ca_size_t) * (count + 1));
     {
-      ca_size_t j = 0;
-      for (i = 0; i < ca->select->elements; i++) {
-        if ( s[i] ) ca->indices[j++] = i;
+      ca_size_t *ix = ca->indices;
+      ca_size_t n   = ca->select->elements;
+      ca_size_t j   = 0;
+      for (i = 0; i < n; i++) {
+        ix[j] = i;
+        j += ( s[i] != 0 );
       }
     }
     /* Constant-step detection: promotes to STRIDE descriptor kind
@@ -211,6 +215,7 @@ CArray *
 ca_select_new (CArray *parent, CArray *select)
 {
   CArray *snapshot = ca_select_snapshot(select);
+  /* check: the setup checks nothing */
   CASelect *ca = ALLOC(CASelect);
   ca_select_setup(ca, parent, snapshot);
   return (CArray*) ca;
@@ -431,7 +436,7 @@ ca_select_func_allocate (void *ap)
   if ( ! ca_parent_lends_no_memory(ca->parent) ) {
     ca_attach(ca->parent);
   }
-  ca->ptr = xmalloc(ca_length(ca));
+  ca->ptr = ca_alloc_cells((CArray *) ca);
 }
 
 static void

data/ext/ca_obj_select_axis.c

@@ -311,6 +311,7 @@ ca_select_axis_new (CArray *parent, int8_t indirect_axis,
                     CArray *selector,
                     ca_size_t *ap_start, ca_size_t *ap_count, ca_size_t *ap_step)
 {
+  /* check: the callers (clone, create_mask) pass an existing view's checked selector */
   CASelectAxis *ca = (CASelectAxis *) ca_array_alloc(CA_OBJ_SELECT_AXIS, parent->ndim);
   ca_select_axis_setup(ca, parent, indirect_axis, selector,
                        ap_start, ap_count, ap_step);
@@ -590,6 +591,7 @@ ca_select_axis_func_xfer_stride (void *ap, ca_size_t *starts, ca_size_t *counts,
     ca_size_t idx[CA_RANK_MAX], doff = 0, base = 0;
     for (k = 0; k < ndim; k++) base += starts[k] * cnative[k];
     for (k = 0; k < ndim; k++) idx[k] = 0;
+    /* empty: the slot returns on an empty region at its entry */
     while (1) {
       ca_size_t coff = base, cidx[CA_RANK_MAX];
       for (k = 0; k < ndim; k++) coff += idx[k] * strides[k];
@@ -673,6 +675,7 @@ ca_select_axis_func_xfer_stride (void *ap, ca_size_t *starts, ca_size_t *counts,
      ca_xfer_stride/ca_xfer_addrs. */
   for (k = 0; k < ndim; k++) o[k] = 0;
 
+  /* empty: the slot returns on an empty region at its entry */
   while (1) {
     ca_size_t pbase = 0, doff = 0;
     for (k = 0; k < inner; k++) {
@@ -725,7 +728,7 @@ ca_select_axis_func_allocate (void *ap)
   if ( ! ca_parent_lends_no_memory(ca->parent) ) {
     ca_attach(ca->parent);
   }
-  ca->ptr = xmalloc(ca_length(ca));
+  ca->ptr = ca_alloc_cells((CArray *) ca);
 }
 
 static void
@@ -895,6 +898,7 @@ rb_ca_select_axis_s_new_debug (VALUE klass, VALUE rparent, VALUE rindirect,
                                 VALUE rap_count, VALUE rap_step)
 {
   CArray *parent, *selector;
+  /* fits: an axis number from the view that made it */
   int8_t indirect_axis = (int8_t) NUM2INT(rindirect);
   int8_t ndim;
   int8_t k;
@@ -966,15 +970,15 @@ rb_ca_select_axis_eligible_p (int argc, VALUE *argv, VALUE self)
   TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   if ( argc != ca->ndim ) return 0;
 
-  /* axis 0 is the boolean (indirect).  Walk rest; require nil/Integer/Range. */
+  /* axis 0 is the boolean (indirect).  The rest are read as the indexer
+     reads them; a run of more than one step, or of no cells, goes to
+     CAGrid. */
   for ( i = 1; i < argc; i++ ) {
     VALUE arg = argv[i];
-    if ( NIL_P(arg) ) continue;
-    if ( FIXNUM_P(arg) ) continue;
-    if ( TYPE(arg) == T_DATA ) return 0;   /* CArray at axis > 0 → bail */
-    if ( rb_obj_is_kind_of(arg, rb_cRange) ) continue;
-    if ( rb_obj_is_kind_of(arg, rb_cInteger) ) continue;
-    return 0;
+    ca_size_t start, count, step;
+    if ( rb_obj_is_carray(arg) ) return 0;   /* CArray at axis > 0 → bail */
+    ca_index_axis_key(arg, ca->dim[i], i, &start, &count, &step);
+    if ( step != 1 || count < 1 ) return 0;
   }
 
   return 1;
@@ -1006,45 +1010,9 @@ rb_ca_select_axis (int argc, VALUE *argv, VALUE self)
   for ( i = 0; i < argc; i++ ) {
     VALUE arg = argv[i];
 
-    if ( NIL_P(arg) ) {
-      ap_start[i] = 0;
-      ap_count[i] = parent->dim[i];
-      ap_step[i]  = 1;
-    }
-    else if ( FIXNUM_P(arg) || rb_obj_is_kind_of(arg, rb_cInteger) ) {
-      ca_size_t n = NUM2LL(arg);
-      if ( n < 0 ) n += parent->dim[i];
-      if ( n < 0 || n >= parent->dim[i] ) {
-        rb_raise(rb_eIndexError,
-                 "CASelectAxis: index %lld out of range at axis %d",
-                 (long long) n, i);
-      }
-      ap_start[i] = n;
-      ap_count[i] = 1;
-      ap_step[i]  = 1;
-    }
-    else if ( rb_obj_is_kind_of(arg, rb_cRange) ) {
-      VALUE rfirst = rb_funcall(arg, rb_intern("first"), 0);
-      VALUE rlast  = rb_funcall(arg, rb_intern("last"),  0);
-      int exclusive = RTEST(rb_funcall(arg, rb_intern("exclude_end?"), 0));
-      ca_size_t a = NUM2LL(rfirst);
-      ca_size_t b = NUM2LL(rlast);
-      if ( a < 0 ) a += parent->dim[i];
-      if ( b < 0 ) b += parent->dim[i];
-      ca_size_t cnt = exclusive ? (b - a) : (b - a + 1);
-      if ( cnt <= 0 ) {
-        rb_raise(rb_eIndexError,
-                 "CASelectAxis: empty range at axis %d", i);
-      }
-      if ( a < 0 || a >= parent->dim[i] ||
-           (a + cnt - 1) < 0 || (a + cnt - 1) >= parent->dim[i] ) {
-        rb_raise(rb_eIndexError,
-                 "CASelectAxis: range [%lld..%lld] out of bounds at axis %d",
-                 (long long) a, (long long) (a + cnt - 1), i);
-      }
-      ap_start[i] = a;
-      ap_count[i] = cnt;
-      ap_step[i]  = 1;
+    if ( ! rb_obj_is_carray(arg) ) {
+      ca_index_axis_key(arg, parent->dim[i], i,
+                        &ap_start[i], &ap_count[i], &ap_step[i]);
     }
     else if ( rb_obj_is_carray(arg) && rb_ca_is_boolean_type(arg) ) {
       TypedData_Get_Struct(arg, CArray, &carray_data_type, selector);

data/ext/ca_obj_shift.c

@@ -16,6 +16,7 @@
 ---------------------------------------------------------------------------- */
 
 #include "carray.h"
+#include "carray_internal.h"   /* ca_window_create_bounds_mask */
 #include "ca_obj_face.h"  /* CA_FACE_LIFT_IF_FACE */
 
 /* External: CAWindow's operation table + setup are the basis for CAShift. */
@@ -127,6 +128,7 @@ ca_shift_new (CArray *parent, ca_size_t *shift, char *fill, int8_t *roll,
   ca_shift_setup(NULL, parent, shift, fill, roll, fill_mask);
   ca = (CAShift *) ca_array_alloc(CA_OBJ_SHIFT, parent->ndim);
   ca_shift_setup(ca, parent, shift, fill, roll, fill_mask);
+  ca_fill_or_free((CArray *) ca, ca_window_create_bounds_mask, (VALUE) ca);
   return ca;
 }
 
@@ -152,7 +154,11 @@ ca_shift_func_clone (void *ap)
     }
   }
 
-  return ca_shift_new(ca->parent, shift, ca->fill, roll, fill_mask);
+  {
+    CAShift *cp = ca_shift_new(ca->parent, shift, ca->fill, roll, fill_mask);
+    cp->mask_owner = ca->mask_owner;
+    return cp;
+  }
 }
 
 
@@ -306,6 +312,10 @@ rb_ca_shift_initialize_copy (VALUE self, VALUE other)
     ca_array_pool_alloc(ca, CA_OBJ_SHIFT, cs->ndim);
   }
   ca_shift_setup(ca, cs->parent, shift, cs->fill, roll, fill_mask);
+  ca_window_create_bounds_mask((VALUE) ca);
+  /* a copy of a mask over a stand-in gives way to the parent's mask as
+     the original does */
+  ca->mask_owner = cs->mask_owner;
 
   return self;
 }