carray 1.5.1 → 1.5.6

data/ext/ca_obj_bitarray.c

@@ -3,10 +3,8 @@
   ca_obj_bitarray.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
 
 ---------------------------------------------------------------------------- */
 
@@ -34,7 +32,7 @@ static int8_t CA_OBJ_BITARRAY;
 
 static VALUE rb_cCABitarray;
 
-/* rdoc:
+/* yard:
   class CABitArray < CAVirtual # :nodoc:
   end
 */
@@ -464,12 +462,9 @@ rb_ca_bitarray_new (VALUE cary)
   return obj;
 }
 
-/* rdoc:
-  class CArray
-    def bits
-    end
-    alias bitarray bits
-  end
+/* @overload bitarray
+
+[TBD]
 */
 
 VALUE
@@ -513,8 +508,8 @@ Init_ca_obj_bitarray ()
   CA_OBJ_BITARRAY = ca_install_obj_type(rb_cCABitarray, ca_bitarray_func);
   rb_define_const(rb_cObject, "CA_OBJ_BITARRAY", INT2NUM(CA_OBJ_BITARRAY));
 
-  rb_define_method(rb_cCArray, "bits", rb_ca_bitarray, 0);
   rb_define_method(rb_cCArray, "bitarray", rb_ca_bitarray, 0);
+  rb_define_alias(rb_cCArray, "bits", "bitarray");
 
   rb_define_alloc_func(rb_cCABitarray, rb_ca_bitarray_s_allocate);
   rb_define_method(rb_cCABitarray, "initialize_copy",

data/ext/ca_obj_bitfield.c

@@ -3,10 +3,8 @@
   ca_obj_bitfield.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
 
 ---------------------------------------------------------------------------- */
 
@@ -35,7 +33,7 @@ static int8_t CA_OBJ_BITFIELD;
 
 static VALUE rb_cCABitfield;
 
-/* rdoc:
+/* yard:
   class CABitField < CAVirtual # :nodoc:
   end
 */
@@ -559,11 +557,9 @@ rb_ca_bitfield_new (VALUE cary, ca_size_t offset, ca_size_t bitlen)
   return obj;
 }
 
-/* rdoc:
-  class CArray
-    def bitfield (range, type)
-    end
-  end
+/* @overload bitfield (range, type)
+
+[TBD]
 */
 
 VALUE

data/ext/ca_obj_block.c

@@ -3,10 +3,8 @@
   ca_obj_block.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,11 +12,6 @@
 
 VALUE rb_cCABlock;
 
-/* rdoc:
-  class CABlock < CAVirtual # :nodoc:
-  end
-*/
-
 static int
 ca_block_setup (CABlock *ca, CArray *parent, int8_t ndim, ca_size_t *dim,
                ca_size_t *start, ca_size_t *step, ca_size_t *count, ca_size_t offset)
@@ -735,7 +728,7 @@ rb_cb_initialize_copy (VALUE self, VALUE other)
     return ary;                                     \
 }
 
-/* rdoc:
+/* @overload size0:
   class CABlock
     def size0
     end
@@ -763,7 +756,7 @@ rb_cb_offset (VALUE self)
   return SIZE2NUM(cb->offset);
 }
 
-/* rdoc:
+/* yard:
   class CABlock
     def idx2addr0 (idx)
     end
@@ -795,7 +788,7 @@ rb_cb_idx2addr0 (int argc, VALUE *argv, VALUE self)
   return SIZE2NUM(addr + cb->offset);
 }
 
-/* rdoc:
+/* yard:
   class CABlock
     def addr2addr0 (addr)
     end
@@ -824,7 +817,7 @@ rb_cb_addr2addr0 (VALUE self, VALUE raddr)
 }
 
 
-/* rdoc:
+/* yard:
   class CABlock
     def move (*index)
     end

data/ext/ca_obj_fake.c

@@ -3,10 +3,8 @@
   ca_obj_fake.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
 
 ---------------------------------------------------------------------------- */
 
@@ -31,7 +29,7 @@ static int8_t CA_OBJ_FAKE;
 
 static VALUE rb_cCAFake;
 
-/* rdoc: 
+/* yard: 
   class CAFake < CAVirtual # :nodoc:
   end
 */
@@ -328,7 +326,7 @@ rb_ca_fake_new (VALUE cary, int8_t data_type, ca_size_t bytes)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def fake (data_type, options={:bytes=>0})
     end

data/ext/ca_obj_farray.c

@@ -3,10 +3,8 @@
   ca_obj_farray.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
 
 ---------------------------------------------------------------------------- */
 
@@ -33,7 +31,7 @@ static int8_t CA_OBJ_FARRAY;
 
 static VALUE rb_cCAFarray;
 
-/* rdoc:
+/* yard:
   class CAFArray < CAVirtual # :nodoc:
   end
 */
@@ -429,7 +427,7 @@ rb_ca_farray_new (VALUE cary)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     # create the virtual transposed array which dimension order is reversed.
     def t

data/ext/ca_obj_field.c

@@ -3,10 +3,8 @@
   ca_obj_field.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
 
 ---------------------------------------------------------------------------- */
 
@@ -33,7 +31,7 @@ static int8_t CA_OBJ_FIELD;
 
 static VALUE rb_cCAField;
 
-/* rdoc:
+/* yard:
   class CAField < CAVirtual # :nodoc:
   end
 */
@@ -155,7 +153,7 @@ ca_field_func_ptr_at_index (void *ap, ca_size_t *idx)
     }
 
     if ( ca->parent->ptr == NULL ) {
-      return ca_ptr_at_addr(ca->parent, n) + ca->offset;
+      return (void *)((char *) ca_ptr_at_addr(ca->parent, n) + ca->offset);
     }
     else {
       return ca->parent->ptr + ca->parent->bytes * n + ca->offset;
@@ -324,7 +322,7 @@ ca_field_attach (CAField *ca)
   case CA_UINT8:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *q;
         p += 1; q += pbytes;
@@ -335,7 +333,7 @@ ca_field_attach (CAField *ca)
   case CA_UINT16:
     {
       int16_t *p = (int16_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *(int16_t*) q;
         p += 1; q += pbytes;
@@ -347,7 +345,7 @@ ca_field_attach (CAField *ca)
   case CA_FLOAT32:
     {
       int32_t *p = (int32_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *(int32_t*) q;
         p += 1; q += pbytes;
@@ -359,7 +357,7 @@ ca_field_attach (CAField *ca)
   case CA_FLOAT64:
     {
       float64_t *p = (float64_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *(float64_t*) q;
         p += 1; q += pbytes;
@@ -369,7 +367,7 @@ ca_field_attach (CAField *ca)
   default:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         memcpy(p, q, ca->bytes);
         p += bytes; q += pbytes;
@@ -391,7 +389,7 @@ ca_field_sync (CAField *ca)
   case CA_UINT8:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *q = *p;
         p += 1; q += pbytes;
@@ -402,7 +400,7 @@ ca_field_sync (CAField *ca)
   case CA_UINT16:
     {
       int16_t *p = (int16_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *(int16_t*) q = *p;
         p += 1; q += pbytes;
@@ -414,7 +412,7 @@ ca_field_sync (CAField *ca)
   case CA_FLOAT32:
     {
       int32_t *p = (int32_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *(int32_t*) q = *p;
         p += 1; q += pbytes;
@@ -426,7 +424,7 @@ ca_field_sync (CAField *ca)
   case CA_FLOAT64:
     {
       float64_t *p = (float64_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *(float64_t*) q = *p;
         p += 1; q += pbytes;
@@ -436,7 +434,7 @@ ca_field_sync (CAField *ca)
   default:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         memcpy(q, p, ca->bytes);
         p += bytes; q += pbytes;
@@ -450,7 +448,7 @@ ca_field_fill (CAField *ca, char *ptr)
 {
   ca_size_t pbytes = ca->parent->bytes;
   ca_size_t n = ca->elements;
-  char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+  char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
 
   switch ( ca->data_type ) {
   case CA_BOOLEAN:
@@ -545,7 +543,7 @@ rb_ca_field_initialize_copy (VALUE self, VALUE other)
 
 /* ----------------------------------------------------------------------- */
 
-/* rdoc:
+/* yard:
   class CArray
     # call-seq:
     #    CArray#field(offset, data_type[, :bytes=>bytes]) 

data/ext/ca_obj_grid.c

@@ -3,10 +3,8 @@
   ca_obj_grid.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
 
 ---------------------------------------------------------------------------- */
 
@@ -32,7 +30,7 @@ typedef struct {
 
 static VALUE rb_cCAGrid;
 
-/* rdoc:
+/* yard:
   class CAGrid < CAVirtual # :nodoc:
   end
 */
@@ -46,8 +44,9 @@ ca_grid_setup (CAGrid *ca, CArray *parent, ca_size_t *dim,
   int8_t ndim, data_type;
   ca_size_t *dim0;
   ca_size_t elements, bytes;
+  ca_size_t j, k;
   double  length;
-  int i, j, k;
+  int8_t i;
 
   data_type = parent->data_type;
   ndim      = parent->ndim;
@@ -602,7 +601,7 @@ rb_ca_grid_new (VALUE cary, ca_size_t *dim, CArray **grid)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def grid
     end

data/ext/ca_obj_mapping.c

@@ -3,10 +3,8 @@
   ca_obj_mapping.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
 
 ---------------------------------------------------------------------------- */
 
@@ -39,7 +37,7 @@ static int8_t CA_OBJ_MAPPING;
 
 static VALUE rb_cCAMapping;
 
-/* rdoc:
+/* yard:
   class CAMapping < CAVirtual # :nodoc: 
   end
 */

data/ext/ca_obj_object.c

@@ -3,10 +3,8 @@
   ca_obj_object.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
 
 ---------------------------------------------------------------------------- */
 
@@ -41,7 +39,7 @@
 VALUE rb_cCAObject;
 
 
-/* rdoc:
+/* yard:
   class CAObject < CAVirtual # :nodoc:
   end
 */
@@ -52,7 +50,7 @@ VALUE rb_cCAObject;
 static int8_t CA_OBJ_OBJECT_MASK;
 static VALUE rb_cCAObjectMask;
 
-/* rdoc:
+/* yard:
   class CAObjectMask < CAVirtual # :nodoc:
   end
 */

data/ext/ca_obj_reduce.c

@@ -3,10 +3,8 @@
   ca_obj_reduce.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
 
 ---------------------------------------------------------------------------- */
 
@@ -16,7 +14,7 @@ static int8_t CA_OBJ_REDUCE;
 
 static VALUE rb_cCAReduce;
 
-/* rdoc:
+/* yard:
   class CAReduce < CAVirtual # :nodoc:
   end
 */

data/ext/ca_obj_refer.c

@@ -3,10 +3,8 @@
   ca_obj_refer.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,7 +12,7 @@
 
 VALUE rb_cCARefer;
 
-/* rdoc:
+/* yard:
   class CARefer < CAVirtual # :nodoc:
   end
 */
@@ -34,11 +32,11 @@ ca_refer_setup (CARefer *ca, CArray *parent,
   CA_CHECK_BYTES(data_type, bytes);
 
   if ( ca_is_object_type(parent) && data_type != CA_OBJECT ) {
-    rb_raise(rb_eRuntimeError, "object carray can't be referred by other type");
+    rb_raise(rb_eRuntimeError, "object array can't be referred by other data type");
   }
 
   if ( parent->elements && bytes > parent->bytes * parent->elements ) {
-    rb_raise(rb_eRuntimeError, "byte size mismatch");
+    rb_raise(rb_eRuntimeError, "bytes exceeds the data size of referent");
   }
 
   /* calc datanum and check deformation */
@@ -53,27 +51,25 @@ ca_refer_setup (CARefer *ca, CArray *parent,
   }
   if ( bytes < parent->bytes ) {
     if ( parent->bytes % bytes != 0 ) {
-      rb_raise(rb_eArgError, "invalid bytes");
+      rb_raise(rb_eRuntimeError, "bytes of reference array must be a multiple of that of referent");
     }
     is_deformed = -2;
     ratio = parent->bytes / bytes;
   }
   else if ( bytes > parent->bytes ) {
     if ( bytes % parent->bytes != 0 ) {
-      rb_raise(rb_eArgError, "invalid bytes");
+      rb_raise(rb_eRuntimeError, "bytes of reference array must be a multiple of that of referent");
     }
     is_deformed = 2;
     ratio = bytes / parent->bytes;
   }
-
   if ( offset < 0 ) {
-    rb_raise(rb_eRuntimeError, 
-             "negative offset for CARefer");
+    rb_raise(rb_eRuntimeError, "negative offset is not permitted for CARefer");
   }
 
   if ( ( bytes * elements + parent->bytes * offset ) >
                                      ( parent->bytes * parent->elements ) ) {
-    rb_raise(rb_eRuntimeError, "data size too large for CARefer");
+    rb_raise(rb_eRuntimeError, "data size of reference array must not exceed that of referent");
   }
 
   ca->obj_type  = CA_OBJ_REFER;
@@ -206,7 +202,7 @@ ca_refer_func_fetch_addr (void *ap, ca_size_t addr, void *ptr)
     for (i=0; i<ca->ratio; i++) {
       ca_fetch_addr(ca->parent,
                        addr * ca->ratio + i + ca->offset,
-                       ptr + i * ca->parent->bytes);
+                       (char *) ptr + i * ca->parent->bytes);
     }
     break;
   }
@@ -267,7 +263,7 @@ ca_refer_func_store_addr (void *ap, ca_size_t addr, void *ptr)
     for (i=0; i<ca->ratio; i++) {
       ca_store_addr(ca->parent,
                        addr * ca->ratio + i + ca->offset,
-                       ptr + i * ca->parent->bytes);
+                       (char *) ptr + i * ca->parent->bytes);
     }
     break;
   }
@@ -491,7 +487,7 @@ rb_ca_refer_initialize_copy (VALUE self, VALUE other)
   return self;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     # call-seq: 
     #    CArray.refer()