carray 1.5.1 → 1.5.2

data/ext/carray_access.c

@@ -3,10 +3,8 @@
   carray_access.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
 
 ---------------------------------------------------------------------------- */
 
@@ -208,7 +206,7 @@ rb_ca_fetch_addr (VALUE self, ca_size_t addr)
   return out;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def fill
     end
@@ -293,7 +291,7 @@ ary_guess_shape (VALUE ary, int level, int *max_level, ca_size_t *dim)
   }
 }
 
-/* rdoc:
+/* yard:
   def CArray.guess_array_shape (arg)
   end
 */  
@@ -533,7 +531,9 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
         info->type = CA_REG_ADDRESS;
         info->ndim = 1;
         addr = NUM2SIZE(arg);
-        CA_CHECK_INDEX(addr, ca_elements);
+        if ( info->range_check ) {
+          CA_CHECK_INDEX(addr, ca_elements);
+        }
         info->index[0].scalar = addr;
         return;
       }
@@ -594,7 +594,9 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
         ca_size_t scalar;
         index_type[i] = CA_IDX_SCALAR;
         scalar = NUM2SIZE(arg);
-        CA_CHECK_INDEX_AT(scalar, ca_dim[i], i);
+        if ( info->range_check ) {
+          CA_CHECK_INDEX_AT(scalar, ca_dim[i], i);
+        }
         index[i].scalar = scalar;
       }
       else if ( NIL_P(arg) ) { /* ca[--,nil,--] */
@@ -631,7 +633,10 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
           last  = NUM2SIZE(iv_end);          
         }
         excl  = RTEST(iv_excl);
-        CA_CHECK_INDEX_AT(first, ca_dim[i], i);
+
+        if ( info->range_check ) {
+          CA_CHECK_INDEX_AT(first, ca_dim[i], i);
+        }
 
         if ( last < 0 ) { /* don't use CA_CHECK_INDEX for excl */
           last += ca_dim[i];
@@ -645,10 +650,12 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
           if ( excl ) {
             last += ( (last>=first) ? -1 : 1 );
           }
-          if ( last < 0 || last >= ca_dim[i] ) {
-            rb_raise(rb_eIndexError,
-                     "index %lld is out of range (0..%lld) at %i-dim",
-                     (ca_size_t) last, (ca_size_t) (ca_dim[i]-1), i);
+          if ( info->range_check ) {
+            if ( last < 0 || last >= ca_dim[i] ) {
+              rb_raise(rb_eIndexError,
+                       "index %lld is out of range (0..%lld) at %i-dim",
+                       (ca_size_t) last, (ca_size_t) (ca_dim[i]-1), i);
+            }
           }
           index[i].block.start = first;
           index[i].block.count = count = llabs(last - first) + 1;
@@ -1254,7 +1261,7 @@ rb_ca_refer_new_flatten (VALUE self)
   return rb_ca_refer_new(self, ca->data_type, 1, &dim0, ca->bytes, 0);
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def [] (*spec)
     end
@@ -1271,6 +1278,8 @@ rb_ca_fetch_method (int argc, VALUE *argv, VALUE self)
  retry:
 
   Data_Get_Struct(self, CArray, ca);
+
+  info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
 
   switch ( info.type ) {
@@ -1340,7 +1349,86 @@ rb_ca_fetch_method (int argc, VALUE *argv, VALUE self)
   return obj;
 }
 
-/* rdoc:
+static VALUE
+rb_cs_fetch_method (int argc, VALUE *argv, VALUE self)
+{
+  volatile VALUE obj = Qnil;
+  CArray *ca;
+  CAIndexInfo info;
+
+  Data_Get_Struct(self, CArray, ca);
+
+  info.range_check = 0;
+  rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
+
+  switch ( info.type ) {
+  case CA_REG_ADDRESS_COMPLEX:
+    obj = rb_ca_fetch_addr(self, 0);
+    break;
+  case CA_REG_ADDRESS:
+    obj = rb_ca_fetch_addr(self, 0);
+    break;
+  case CA_REG_FLATTEN:
+    obj = self; /* rb_funcall(self, rb_intern("refer"), 0); */
+    break;
+  case CA_REG_POINT:
+    obj = rb_ca_fetch_addr(self, 0);
+    break;
+  case CA_REG_ALL:
+    obj = self; /* rb_funcall(self, rb_intern("refer"), 0); */
+    break;
+  case CA_REG_BLOCK:
+    obj = self; /* rb_funcall(self, rb_intern("refer"), 0); */
+    break;
+  case CA_REG_SELECT:
+    obj = rb_ca_select_new(self, argv[0]);
+    break;
+  case CA_REG_ITERATOR:
+    obj = rb_dim_iter_new(self, &info);
+    break;
+  case CA_REG_REPEAT:
+    obj = rb_ca_repeat(argc, argv, self);
+    break;
+  case CA_REG_UNBOUND_REPEAT:
+    obj = rb_funcall2(self, rb_intern("unbound_repeat"), (int) argc, argv);
+    break;
+  case CA_REG_MAPPING:
+    obj = rb_ca_mapping(argc, argv, self);
+    break;
+  case CA_REG_GRID:
+    obj = rb_ca_grid(argc, argv, self);
+    break;
+  case CA_REG_METHOD_CALL: {
+    volatile VALUE idx;
+    idx = rb_funcall2(self, SYM2ID(info.symbol), argc-1, argv+1);
+    obj = rb_ca_fetch(self, idx);
+    break;
+  }
+  case CA_REG_MEMBER: {
+    volatile VALUE data_class = rb_ca_data_class(self);
+    if ( ! NIL_P(data_class) ) {
+      obj = rb_ca_field_as_member(self, info.symbol);
+      break;
+    }
+    else {
+      rb_raise(rb_eIndexError, 
+               "can't refer member of carray doesn't have data_class");
+    }
+    break;
+  }
+  case CA_REG_ATTRIBUTE: {
+    obj = rb_funcall(self, rb_intern("attribute"), 0);
+    obj = rb_hash_aref(obj, info.symbol);
+    break;
+  }
+  default:
+    rb_raise(rb_eIndexError, "invalid index specified");
+  }
+
+  return obj;
+}
+
+/* yard:
   class CArray
     def []= (*spec)
     end
@@ -1363,6 +1451,7 @@ rb_ca_store_method (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
+  info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
 
   switch ( info.type ) {
@@ -1487,7 +1576,7 @@ rb_ca_store2 (VALUE self, int n, VALUE *rindex, VALUE rval)
   return rb_ca_store_method((int)RARRAY_LEN(index), RARRAY_PTR(index), self);
 }
 
-/* rdoc:
+/* yard:
   def CArray.scan_index(dim, idx)
   end
 */
@@ -1515,6 +1604,7 @@ rb_ca_s_scan_index (VALUE self, VALUE rdim, VALUE ridx)
   CA_CHECK_RANK(ndim);
   CA_CHECK_DIM(ndim, dim);
 
+  info.range_check = 1;
   rb_ca_scan_index(ndim, dim, elements,
                    RARRAY_LEN(ridx), RARRAY_PTR(ridx), &info);
 
@@ -1596,7 +1686,7 @@ rb_ca_s_scan_index (VALUE self, VALUE rdim, VALUE ridx)
   return rb_struct_new(S_CAInfo, rtype, rindex);
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def normalize_index (idx)
     end
@@ -1614,6 +1704,7 @@ rb_ca_normalize_index (VALUE self, VALUE ridx)
   Data_Get_Struct(self, CArray, ca);
   Check_Type(ridx, T_ARRAY);
 
+  info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements,
                    RARRAY_LEN(ridx), RARRAY_PTR(ridx), &info);
 
@@ -1668,7 +1759,7 @@ rb_ca_normalize_index (VALUE self, VALUE ridx)
 
 /* ------------------------------------------------------------------- */
 
-/* rdoc:
+/* yard:
   class CArray
     # converts addr to index
     def addr2index (addr)
@@ -1703,7 +1794,7 @@ rb_ca_addr2index (VALUE self, VALUE raddr)
   return out;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def index2addr (*index)
     end
@@ -1838,6 +1929,8 @@ Init_carray_access ()
   rb_define_method(rb_cCArray, "[]", rb_ca_fetch_method, -1);
   rb_define_method(rb_cCArray, "[]=", rb_ca_store_method, -1);
 
+  rb_define_method(rb_cCScalar, "[]", rb_cs_fetch_method, -1);
+
   rb_define_method(rb_cCArray, "fill", rb_ca_fill, 1);
   rb_define_method(rb_cCArray, "fill_copy", rb_ca_fill_copy, 1);
 

data/ext/carray_attribute.c

@@ -3,10 +3,8 @@
   carray_attribute.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
 
 ---------------------------------------------------------------------------- */
 
@@ -14,14 +12,12 @@
 
 /* ------------------------------------------------------------------- */
 
-/* rdoc
-  class CArray
-    # returns the object type (e.g. CA_OBJ_ARRAY, CA_OBJ_BLOCK, ...).
-    # Since the object type can be known from the class of the object,
-    # this attribute method is rarely used.
-    def obj_type
-    end
-  end
+/* @overload obj_type
+
+(Attribute) 
+Returns the object type (e.g. CA_OBJ_ARRAY, CA_OBJ_BLOCK, ...).
+Since the object type can be known from the class of the object,
+this attribute method is rarely used.
 */
 
 VALUE
@@ -32,12 +28,10 @@ rb_ca_obj_type (VALUE self)
   return INT2NUM(ca->obj_type);
 }
 
-/* rdoc
-  class CArray
-    # returns the data type of each element (e.g. CA_INT32, CA_FLOAT64, ...).
-    def data_type
-    end
-  end
+/* @overload data_type
+
+(Attribute) 
+Returns the data type of each element (e.g. CA_INT32, CA_FLOAT64, ...).
 */
 
 VALUE
@@ -48,15 +42,10 @@ rb_ca_data_type (VALUE self)
   return INT2NUM(ca->data_type);
 }
 
-/* rdoc
-  class CArray
-		# use CArray#ndims instead of this methods after carray-1.3.0
-    def ndim
-    end
-    # returns the ndim (e.g. 1 for 1D array, 3 for 3D array, ...).
-    def ndims
-    end
-  end
+/* @overload ndim
+
+(Attribute) 
+Returns the rank (e.g. 1 for 1D array, 3 for 3D array, ...).
 */
 
 VALUE
@@ -67,16 +56,14 @@ rb_ca_ndim (VALUE self)
   return INT2NUM(ca->ndim);
 }
 
-/* rdoc
-  class CArray
-    # returns the byte size of each element (e.g. 4 for CA_INT32, 8 for CA_FLOAT64).
-    # The byte size can be known using CArray.sizeof(data_type)
-    # for the numerical data types, but
-    # the byte size of fixed-length data type can be known 
-    # only by this method.
-    def bytes
-    end
-  end
+/* @overload bytes
+
+(Attribute) 
+Returns the byte size of each element (e.g. 4 for CA_INT32, 8 for CA_FLOAT64).
+The byte size can be known using CArray.sizeof(data_type)
+for the numerical data types, but
+the byte size of fixed-length data type can be known 
+only by this method.
 */
 
 VALUE
@@ -87,18 +74,10 @@ rb_ca_bytes (VALUE self)
   return SIZE2NUM(ca->bytes);
 }
 
-/* rdoc:
-  class CArray
-    # returns the number of elements
-    def elements
-    end
-
-    # alias of `CArray#elements`
-    alias length elements
+/* @overload elements
 
-    # alias of `CArray#elements`
-    alias size elements
-  end
+(Attribute) 
+Returns the number of elements
 */
 
 VALUE
@@ -109,35 +88,11 @@ rb_ca_elements (VALUE self)
   return SIZE2NUM(ca->elements);
 }
 
-/* rdoc:
-  class CArray
-    # use CArray#shape instead of this method after carray-1.3.0
-    # returns the Array object contains the dimensional shape of array
-    # (e.g. [2,3] for 2D 2x3 array, ...).
-    def dim
-    end
-
-    # returns the Array object contains the dimensional shape of array
-    # (e.g. [2,3] for 2D 2x3 array, ...).
-    def shape
-    end
-
-    # short-hand for dim[0]
-    def dim0
-    end
-    
-    # short-hand for dim[1]
-    def dim1
-    end
-    
-    # short-hand for dim[2]
-    def dim2
-    end
-    
-    # short-hand for dim[3]
-    def dim3
-    end
-  end
+/* @overload dim
+
+(Attribute) 
+Returns the Array object contains the dimensional shape of array
+(e.g. [2,3] for 2D 2x3 array, ...).
 */
 
 VALUE
@@ -154,6 +109,13 @@ rb_ca_dim (VALUE self)
   return dim;
 }
 
+/*
+@overload dim0
+
+(Attribute) 
+Short-hand for "dim[0]"
+*/  
+
 VALUE
 rb_ca_dim0 (VALUE self)
 {
@@ -162,6 +124,13 @@ rb_ca_dim0 (VALUE self)
   return SIZE2NUM(ca->dim[0]);
 }
 
+/*
+@overload dim1
+
+(Attribute) 
+Short-hand for "dim[1]"
+*/  
+
 VALUE
 rb_ca_dim1 (VALUE self)
 {
@@ -170,6 +139,13 @@ rb_ca_dim1 (VALUE self)
   return ( ca->ndim >= 2 ) ? SIZE2NUM(ca->dim[1]) : Qnil;
 }
 
+/*
+@overload dim2
+
+(Attribute) 
+Short-hand for 'dim[2]'
+*/  
+
 VALUE
 rb_ca_dim2 (VALUE self)
 {
@@ -178,6 +154,13 @@ rb_ca_dim2 (VALUE self)
   return ( ca->ndim >= 3 ) ? SIZE2NUM(ca->dim[2]) : Qnil;
 }
 
+/*
+@overload dim3
+
+(Attribute) 
+Short-hand for "dim[3]"
+*/  
+
 VALUE
 rb_ca_dim3 (VALUE self)
 {
@@ -186,12 +169,10 @@ rb_ca_dim3 (VALUE self)
   return ( ca->ndim >= 4 ) ? SIZE2NUM(ca->dim[3]) : Qnil;
 }
 
-/* rdoc:
-   class CArray
-     # returns the string representaion of the data_type (e.g. "int32", "fixlen")
-     def data_type_name
-     end
-   end
+/* @overload data_type_name
+
+(Attribute) 
+Returns the string representaion of the data_type (e.g. "int32", "fixlen")
 */
 
 VALUE
@@ -211,12 +192,9 @@ ca_is_scalar (void *ap)
   return ca_test_flag(ca, CA_FLAG_SCALAR);
 }
 
-/* rdoc:
-   class CArray
-     # returns true if `self` is a CScalar object
-     def scalar?
-     end
-   end
+/* @overload scalar?
+
+(Inquiry) Returns true if the object is a CScalar
 */
 
 VALUE
@@ -249,16 +227,9 @@ ca_is_virtual (void *ap)
   return ( ca_func[ca->obj_type].entity_type == CA_VIRTUAL_ARRAY ) ? 1 : 0;
 }
 
-/* rdoc:
-  class CArray
-    # returns true if `self` is an entity array (not a virtual array).
-    def entity?
-    end
+/* @overload entity?
 
-    # returns true if `self` is a virtural array (not an entity array).
-    def virtual?
-    end
-  end
+(Inquiry) Returns true if `self` is an entity array (not a virtual array).
 */
 
 VALUE
@@ -269,6 +240,12 @@ rb_ca_is_entity (VALUE self)
   return ( ca_is_virtual(ca) ) ? Qfalse : Qtrue;
 }
 
+/*
+@overload virtual?
+
+(Inquiry) Returns true if `self` is a virtural array (not an entity array).
+*/
+
 VALUE
 rb_ca_is_virtual (VALUE self)
 {
@@ -279,12 +256,9 @@ rb_ca_is_virtual (VALUE self)
 
 /* ------------------------------------------------------------------- */
 
-/* rdoc
-   class CArray
-     # returns true if `self` is attached.
-     def attached?
-     end
-   end
+/* @overload attached?
+
+(Inquiry) Returns true if the object is attached.
 */
 
 VALUE
@@ -297,12 +271,9 @@ rb_ca_is_attached (VALUE self)
 
 /* ------------------------------------------------------------------- */
 
-/* rdoc
-   class CArray
-     # returns true if `self` is empty.
-     def empty?
-     end
-   end
+/* @overload empty?
+
+(Inquiry) Returns true if the object is empty.
 */
 
 VALUE
@@ -333,12 +304,9 @@ ca_is_readonly (void *ap)
   }
 }
 
-/* rdoc
-   class CArray
-     # returns true if `self` is read-only carray
-     def read_only?
-     end
-   end
+/* @overload read_only?
+
+(Inquiry) Returns true if the object is read-only
 */
 
 VALUE
@@ -369,12 +337,9 @@ ca_is_mask_array (void *ap)
   }
 }
 
-/* rdoc
-   class CArray
-     # returns true if `self` is mask array (don't confuse with "masked array")
-     def mask_array?
-     end
-   end
+/* @overload mask_array?
+
+(Inquiry) Returns true if `self` is mask array (don't confuse with "masked array")
 */
 
 VALUE
@@ -405,12 +370,9 @@ ca_is_value_array (void *ap)
   }
 }
 
-/* rdoc
-   class CArray
-     # returns true if `self` is a value array
-     def value_array?
-     end
-   end
+/* @overload value_array?
+
+(Inquiry) Returns true if `self` is a value array
 */
 
 VALUE
@@ -430,12 +392,9 @@ ca_is_fixlen_type (void *ap)
   return ( ca->data_type == CA_FIXLEN );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is fixed-length type array
-    def filxen?
-    end
-  end
+/* @overload fixlen?
+
+(Inquiry) Returns true if `self` is fixed-length type array
 */
 
 VALUE
@@ -455,12 +414,9 @@ ca_is_boolean_type (void *ap)
   return ( ca->data_type == CA_BOOLEAN );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is boolean type array  
-    def boolean?
-    end
-  end
+/* @overload boolean?
+
+(Inquiry) Return true if `self` is boolean type array  
 */
 
 VALUE
@@ -481,12 +437,9 @@ ca_is_numeric_type (void *ap)
            ( ca->data_type <= CA_CMPLX256 ) );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is numeric type array  
-    def numeric?
-    end
-  end
+/* @overload numeric?
+
+(Inquiry) Returns true if `self` is numeric type array  
 */
 
 VALUE
@@ -507,12 +460,9 @@ ca_is_integer_type (void *ap)
            ( ca->data_type <= CA_UINT64 ) );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is integer type array  
-    def integer?
-    end
-  end
+/* @overload integer?
+
+(Inquiry) Returns true if `self` is integer type array  
 */
 
 VALUE
@@ -540,12 +490,9 @@ ca_is_unsigned_type (void *ap)
   }
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is unsigned integer type array  
-    def unsigned?
-    end
-  end
+/* @overload unsigned?
+
+(Inquiry) Return true if `self` is unsigned integer type array  
 */
 
 VALUE
@@ -566,12 +513,9 @@ ca_is_float_type (void *ap)
            ( ca->data_type <= CA_FLOAT128 ) );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is float type array  
-    def float?
-    end
-  end
+/* @overload float?
+
+(Inquiry) Returns true if `self` is float type array  
 */
 
 VALUE
@@ -592,12 +536,9 @@ ca_is_complex_type (void *ap)
            ( ca->data_type <= CA_CMPLX256 ) );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is complex type array  
-    def complex?
-    end
-  end
+/* @overload complex?
+
+(Inquiry) Returns true if `self` is complex type array  
 */
 
 VALUE
@@ -617,12 +558,9 @@ ca_is_object_type (void *ap)
   return ( ca->data_type == CA_OBJECT );
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is object type array
-    def object?
-    end
-  end
+/* @overload object?
+
+(Inquiry) Returns true if `self` is object type array
 */
 
 VALUE
@@ -637,13 +575,11 @@ rb_ca_is_object_type (VALUE self)
 
 static ID id_parent;
 
-/* rdoc
-  class CArray
-    # returns the parent carray if `self` has parent,
-    # or returns nil if `self` has no parent.
-    def parent
-    end
-  end
+/* @overload parent
+
+(Attribute) 
+Returns the parent carray if `self` has parent,
+or returns nil if `self` has no parent.
 */
 
 VALUE
@@ -667,13 +603,11 @@ rb_ca_set_parent (VALUE self, VALUE obj)
 
 static ID id_data_class;
 
-/* rdoc
-  class CArray
-    # returns data_class if `self` is fixed-length type and it 
-    # has the data class.
-    def data_class
-    end
-  end
+/* @overload data_class
+
+(Attribute) 
+Returns data_class if `self` is fixed-length type and it 
+has the data class.
 */
 
 VALUE
@@ -727,12 +661,9 @@ rb_ca_data_class (VALUE self)
   }
 }
 
-/* rdoc
-  class CArray
-    # return true if `self` is fixed-length type and has the data class.
-    def has_data_class?
-    end
-  end
+/* @overload has_data_class?
+
+(Inquiry) Returns true if `self` is fixed-length type and has the data class.
 */
 
 VALUE
@@ -800,7 +731,11 @@ ca_root_array (void *ap)
   }
 }
 
-/* CArray#root_array */
+/* @overload root_array
+
+(Attribute) 
+Returns the object at the root of chain of reference.
+*/
 
 static VALUE
 rb_ca_root_array (VALUE self)
@@ -845,7 +780,11 @@ rb_ca_ancestors_loop (VALUE self, VALUE list)
   }
 }
 
-/* CArray#ancesters */
+/* @overload ancestors
+
+(Attribute) 
+Returns the list of objects in the chain of reference.
+*/
 
 static VALUE
 rb_ca_ancestors (VALUE self)