carray 3.0.3 → 3.0.5

data/ext/ca_obj_farray.c

@@ -7,6 +7,7 @@
 ---------------------------------------------------------------------------- */
 
 #include "carray.h"
+#include "carray_internal.h"   /* ca_view_inherit_mask */
 
 extern ca_operation_function_t ca_stride_func;
 
@@ -46,9 +47,9 @@ ca_farray_setup (CAStride *ca, CArray *parent)
     strides[i] = parent_byte_stride[ndim - 1 - i];
   }
 
-  ca_stride_setup(ca, CA_OBJ_FARRAY, parent,
-                  parent->data_type, parent->bytes,
-                  ndim, newdim, strides, 0);
+  ca_stride_setup_view(ca, CA_OBJ_FARRAY, parent,
+                       parent->data_type, parent->bytes,
+                       ndim, newdim, strides, 0);
 
   if (ca_is_scalar(parent)) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -59,8 +60,10 @@ ca_farray_setup (CAStride *ca, CArray *parent)
 CAStride *
 ca_farray_new (CArray *parent)
 {
+  /* check: the parent's shape, reversed, is already valid */
   CAStride *ca = (CAStride *) ca_array_alloc(CA_OBJ_FARRAY, parent->ndim);
   ca_farray_setup(ca, parent);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 

data/ext/ca_obj_field.c

@@ -32,19 +32,30 @@ ca_field_setup (CAStride *ca, CArray *parent,
   ca_size_t strides[CA_RANK_MAX];
   int8_t i;
 
-  CA_CHECK_DATA_TYPE(data_type);
-  CA_CHECK_BYTES(data_type, bytes);
+  CA_CHECK_DATA_TYPE_GIVEN(data_type);
+  CA_CHECK_BYTES_GIVEN(data_type, bytes);
 
   if ( offset < 0 ) {
     rb_raise(rb_eArgError, "negative offset");
   }
   if ( data_type == CA_OBJECT ) {
     rb_raise(rb_eCADataTypeError,
-             "CA_OBJECT can not to be a data_type for CAField");
+             "%s: a field can't be read as object", ca_calling_method_name());
   }
   if ( ca_is_object_type(parent) ) {
     rb_raise(rb_eCADataTypeError,
-             "a field can not be taken from an object array");
+             "%s: a field can't be taken from an object array",
+             ca_calling_method_name());
+  }
+  /* A boolean cell holds 0 or 1, and a field of a numeric array is
+     written as that number.  A record's boolean member is a field of a
+     fixlen array, whose member stores keep it 0 or 1. */
+  if ( data_type == CA_BOOLEAN && parent->data_type != CA_BOOLEAN
+       && parent->data_type != CA_FIXLEN ) {
+    rb_raise(rb_eCADataTypeError,
+             "%s: a field of a %s array can't be read 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->bytes < offset + bytes ) {
     rb_raise(rb_eArgError, "offset or bytes out of range");
@@ -67,9 +78,9 @@ ca_field_setup (CAStride *ca, CArray *parent,
     return 0;
   }
 
-  ca_stride_setup(ca, CA_OBJ_FIELD, parent,
-                  data_type, bytes,
-                  parent->ndim, parent->dim, strides, offset);
+  ca_stride_setup_view(ca, CA_OBJ_FIELD, parent,
+                       data_type, bytes,
+                       parent->ndim, parent->dim, strides, offset);
 
   return 0;
 }
@@ -81,6 +92,7 @@ ca_field_new (CArray *parent, ca_size_t offset, int8_t data_type, ca_size_t byte
   ca_field_setup(NULL, parent, offset, data_type, bytes);
   ca = (CAStride *) ca_array_alloc(CA_OBJ_FIELD, parent->ndim);
   ca_field_setup(ca, parent, offset, data_type, bytes);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -94,6 +106,14 @@ rb_ca_field_new (VALUE cary, ca_size_t offset, int8_t data_type, ca_size_t bytes
   CAStride *ca;
   rb_check_carray_object(cary);
   TypedData_Get_Struct(cary, CArray, &carray_data_type, parent);
+  /* A record's boolean member is a byte of a fixlen array that other
+     fields (a uint8 one, a String store of the record) can write as any
+     byte.  It is read through a cast to boolean, which refuses a byte
+     that is not 0 or 1, as fake(:boolean) does. */
+  if ( data_type == CA_BOOLEAN && parent->data_type == CA_FIXLEN ) {
+    obj = rb_ca_field_new(cary, offset, CA_UINT8, 1);
+    return rb_ca_fake_new(obj, CA_BOOLEAN, 1);
+  }
   ca  = ca_field_new(parent, offset, data_type, bytes);
   obj = ca_wrap_struct(ca);
   rb_ca_set_parent(obj, cary);
@@ -128,7 +148,7 @@ rb_ca_field (int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "21", (VALUE *) &voffset, (VALUE *) &rtype, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
 
-  offset = NUM2SIZE(voffset);
+  offset = ca_integer_arg(voffset, "offset", NULL);
 
   if ( rb_obj_is_carray(rtype) ) {
     CArray *ct;
@@ -138,6 +158,7 @@ rb_ca_field (int argc, VALUE *argv, VALUE self)
     TypedData_Get_Struct(rtype, CArray, &carray_data_type, ct);
     data_type = CA_FIXLEN;
     bytes     = ct->bytes * ct->elements;
+    ca_check_rank_fits((long) ca->ndim + ct->ndim, "field");
     obj = rb_ca_field_new(self, offset, data_type, bytes);
     ndim = ca->ndim + ct->ndim;
     for (i=0; i<ca->ndim; i++) {
@@ -181,6 +202,7 @@ rb_ca_field_initialize_copy (VALUE self, VALUE other)
   /* Reconstruct from the source's base_offset / data_type / bytes;
      ca_field_setup recomputes strides from parent's shape. */
   ca_field_setup(ca, cs->parent, cs->base_offset, cs->data_type, cs->bytes);
+  ca_view_inherit_mask((VALUE) ca);
 
   return self;
 }

data/ext/ca_obj_fixlen_string.c

@@ -137,9 +137,6 @@ ca_fixlen_string_setup (CAFixlenString *ca, CArray *parent)
   ca->attach    = 0;
   ca->nosync    = 0;
 
-  if ( ca_has_mask(parent) ) {
-    ca_create_mask((CArray *) ca);
-  }
 
   if ( ca_is_scalar(parent) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -159,6 +156,7 @@ ca_fixlen_string_new (CArray *parent)
   ca_fixlen_string_setup(NULL, parent);
   ca = (CAFixlenString *) ca_array_alloc(CA_OBJ_FIXLEN_STRING, parent->ndim);
   ca_fixlen_string_setup(ca, parent);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -282,6 +280,7 @@ rb_ca_fixlen_string_initialize_copy (VALUE self, VALUE other)
     ca_array_pool_alloc(ca, CA_OBJ_FIXLEN_STRING, cs->parent->ndim);
   }
   ca_fixlen_string_setup(ca, cs->parent);
+  ca_view_inherit_mask((VALUE) ca);
   return self;
 }