carray 1.2.0 → 1.3.0

data/carray_element.c

@@ -26,9 +26,10 @@ VALUE
 rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
 {
   CArray *ca;
-  int32_t idx1[CA_RANK_MAX], idx2[CA_RANK_MAX];
-  int32_t addr1 = 0, addr2 = 0;
-  int32_t i,k;
+  ca_size_t idx1[CA_RANK_MAX], idx2[CA_RANK_MAX];
+  ca_size_t addr1 = 0, addr2 = 0;
+  int8_t  i;
+  ca_size_t k;
   int     has_mask, has_index1, has_index2;
   char   _val1[32], _val2[32];
   char   *val1 = _val1, *val2 = _val2;
@@ -48,7 +49,7 @@ rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
 
   if ( TYPE(ridx1) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx1, i));
+      k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
     }
@@ -59,7 +60,7 @@ rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
     }
   }
   else {
-    k = NUM2INT(ridx1);
+    k = NUM2SIZE(ridx1);
     CA_CHECK_INDEX(k, ca->elements);
     addr1 = k;
     has_index1 = 0;
@@ -71,7 +72,7 @@ rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
 
   if ( TYPE(ridx2) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx2, i));
+      k = NUM2SIZE(rb_ary_entry(ridx2, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx2[i] = k;
     }
@@ -82,7 +83,7 @@ rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
     }
   }
   else {
-    k = NUM2INT(ridx2);
+    k = NUM2SIZE(ridx2);
     CA_CHECK_INDEX(k, ca->elements);
     addr2 = k;
     has_index2 = 0;
@@ -137,9 +138,10 @@ VALUE
 rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
 {
   CArray *ca;
-  int32_t idx1[CA_RANK_MAX], idx2[CA_RANK_MAX];
-  int32_t addr1 = 0, addr2 = 0;
-  int32_t i,k;
+  ca_size_t idx1[CA_RANK_MAX], idx2[CA_RANK_MAX];
+  ca_size_t addr1 = 0, addr2 = 0;
+  int8_t  i;
+  ca_size_t k;
   int     has_mask;
   char   _val[32];
   char   *val = _val;
@@ -158,7 +160,7 @@ rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
 
   if ( TYPE(ridx1) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx1, i));
+      k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
     }
@@ -168,7 +170,7 @@ rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
     }
   }
   else {
-    k = NUM2INT(ridx1);
+    k = NUM2SIZE(ridx1);
     CA_CHECK_INDEX(k, ca->elements);
     addr1 = k;
     ca_fetch_addr(ca, addr1, val);
@@ -179,7 +181,7 @@ rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
 
   if ( TYPE(ridx2) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx2, i));
+      k = NUM2SIZE(rb_ary_entry(ridx2, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx2[i] = k;
     }
@@ -189,7 +191,7 @@ rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
     }
   }
   else {
-    k = NUM2INT(ridx2);
+    k = NUM2SIZE(ridx2);
     CA_CHECK_INDEX(k, ca->elements);
     addr2 = k;
     ca_store_addr(ca, addr2, val);
@@ -216,9 +218,10 @@ VALUE
 rb_ca_elem_store (VALUE self, VALUE ridx, VALUE obj)
 {
   CArray *ca;
-  int32_t idx[CA_RANK_MAX];
-  int32_t addr = 0;
-  int32_t i,k;
+  ca_size_t idx[CA_RANK_MAX];
+  ca_size_t addr = 0;
+  int8_t  i;
+  ca_size_t k;
 
   rb_ca_modify(self);
 
@@ -226,14 +229,14 @@ rb_ca_elem_store (VALUE self, VALUE ridx, VALUE obj)
 
   if ( TYPE(ridx) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx, i));
+      k = NUM2SIZE(rb_ary_entry(ridx, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx[i] = k;
     }
     rb_ca_store_index(self, idx, obj);
   }
   else {
-    k = NUM2INT(ridx);
+    k = NUM2SIZE(ridx);
     CA_CHECK_INDEX(k, ca->elements);
     addr = k;
     rb_ca_store_addr(self, addr, obj);
@@ -253,22 +256,23 @@ VALUE
 rb_ca_elem_fetch (VALUE self, VALUE ridx)
 {
   CArray *ca;
-  int32_t idx[CA_RANK_MAX];
-  int32_t addr = 0;
-  int32_t i,k;
+  ca_size_t idx[CA_RANK_MAX];
+  ca_size_t addr = 0;
+  int8_t  i;
+  ca_size_t k;
 
   Data_Get_Struct(self, CArray, ca);
 
   if ( TYPE(ridx) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx, i));
+      k = NUM2SIZE(rb_ary_entry(ridx, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx[i] = k;
     }
     return rb_ca_fetch_index(self, idx);
   }
   else {
-    k = NUM2INT(ridx);
+    k = NUM2SIZE(ridx);
     CA_CHECK_INDEX(k, ca->elements);
     addr = k;
     return rb_ca_fetch_addr(self, addr);
@@ -287,9 +291,10 @@ rb_ca_elem_incr (VALUE self, VALUE ridx1)
 {
   volatile VALUE out;
   CArray *ca;
-  int32_t idx1[CA_RANK_MAX];
-  int32_t addr1 = 0;
-  int32_t i,k;
+  ca_size_t idx1[CA_RANK_MAX];
+  ca_size_t addr1 = 0;
+  int8_t  i;
+  ca_size_t k;
   int     has_index1 = 0;
   int     has_mask;
   char   _val[8];
@@ -310,7 +315,7 @@ rb_ca_elem_incr (VALUE self, VALUE ridx1)
 
   if ( TYPE(ridx1) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx1, i));
+      k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
     }
@@ -326,7 +331,7 @@ rb_ca_elem_incr (VALUE self, VALUE ridx1)
     has_index1 = 1;
   }
   else {
-    k = NUM2INT(ridx1);
+    k = NUM2SIZE(ridx1);
     CA_CHECK_INDEX(k, ca->elements);
     addr1 = k;
     if ( has_mask ) {
@@ -347,8 +352,8 @@ rb_ca_elem_incr (VALUE self, VALUE ridx1)
   case CA_UINT16: out = UINT2NUM(++*((uint16_t*) val)); break;
   case CA_INT32:  out = INT2NUM(++*((int32_t*) val)); break;
   case CA_UINT32: out = UINT2NUM(++*((uint32_t*) val)); break;
-  case CA_INT64:  out = INT2NUM(++*((int64_t*) val)); break;
-  case CA_UINT64: out = UINT2NUM(++*((uint64_t*) val)); break;
+  case CA_INT64:  out = LL2NUM(++*((int64_t*) val)); break;
+  case CA_UINT64: out = ULL2NUM(++*((uint64_t*) val)); break;
   }
 
   if ( has_index1 ) {
@@ -373,9 +378,10 @@ rb_ca_elem_decr (VALUE self, VALUE ridx1)
 {
   volatile VALUE out;
   CArray *ca;
-  int32_t idx1[CA_RANK_MAX];
-  int32_t addr1 = 0;
-  int32_t i,k;
+  ca_size_t idx1[CA_RANK_MAX];
+  ca_size_t addr1 = 0;
+  int8_t  i;
+  ca_size_t k;
   int     has_index1 = 0;
   int     has_mask;
   char   _val[8];
@@ -396,7 +402,7 @@ rb_ca_elem_decr (VALUE self, VALUE ridx1)
 
   if ( TYPE(ridx1) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx1, i));
+      k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
     }
@@ -412,7 +418,7 @@ rb_ca_elem_decr (VALUE self, VALUE ridx1)
     has_index1 = 1;
   }
   else {
-    k = NUM2INT(ridx1);
+    k = NUM2SIZE(ridx1);
     CA_CHECK_INDEX(k, ca->elements);
     addr1 = k;
     if ( has_mask ) {
@@ -458,9 +464,10 @@ VALUE
 rb_ca_elem_test_masked (VALUE self, VALUE ridx1)
 {
   CArray *ca;
-  int32_t idx1[CA_RANK_MAX];
-  int32_t addr1 = 0;
-  int32_t i, k;
+  ca_size_t idx1[CA_RANK_MAX];
+  ca_size_t addr1 = 0;
+  int8_t  i;
+  ca_size_t k;
   boolean8_t m = 0;
 
   Data_Get_Struct(self, CArray, ca);
@@ -469,7 +476,7 @@ rb_ca_elem_test_masked (VALUE self, VALUE ridx1)
 
   if ( TYPE(ridx1) == T_ARRAY ) {
     for (i=0; i<ca->rank; i++) {
-      k = NUM2INT(rb_ary_entry(ridx1, i));
+      k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
     }
@@ -478,7 +485,7 @@ rb_ca_elem_test_masked (VALUE self, VALUE ridx1)
     }
   }
   else {
-    k = NUM2INT(ridx1);
+    k = NUM2SIZE(ridx1);
     CA_CHECK_INDEX(k, ca->elements);
     addr1 = k;
     if ( ca->mask ) {
@@ -503,22 +510,23 @@ static VALUE
 rb_ca_incr_addr (volatile VALUE self, volatile VALUE raddr)
 {
   CArray  *ca, *ci;
-  int32_t *q, *p, k, elements;
-  int32_t i;
+  int64_t *q, *p;
+  ca_size_t k, elements;
+  ca_size_t i;
   boolean8_t *m;
 
   rb_ca_modify(self);
 
-  self = rb_ca_wrap_writable(self, INT2FIX(CA_INT32));
-  raddr = rb_ca_wrap_readonly(raddr, INT2FIX(CA_INT32));
+  self = rb_ca_wrap_writable(self, INT2NUM(CA_INT64));
+  raddr = rb_ca_wrap_readonly(raddr, INT2NUM(CA_INT64));
   
   Data_Get_Struct(self, CArray, ca);
   Data_Get_Struct(raddr, CArray, ci);
 
   ca_attach_n(2, ca, ci);
 
-  q = (int32_t *) ca->ptr;
-  p = (int32_t *) ci->ptr;
+  q = (int64_t *) ca->ptr;
+  p = (int64_t *) ci->ptr;
   m = ( ci->mask ) ? (boolean8_t *) ci->mask->ptr : NULL;
 
   elements = ca->elements;

data/carray_generate.c

@@ -31,7 +31,7 @@
 static VALUE
 rb_ca_boolean_set (int argc, VALUE *argv, VALUE self)
 {
-  VALUE one = INT2FIX(1);
+  VALUE one = INT2NUM(1);
   rb_ca_modify(self);
   if ( ! rb_ca_is_boolean_type(self) ) {
     rb_raise(rb_eCADataTypeError, "reciever should be a boolean array");
@@ -43,7 +43,7 @@ rb_ca_boolean_set (int argc, VALUE *argv, VALUE self)
 static VALUE
 rb_ca_boolean_unset (int argc, VALUE *argv, VALUE self)
 {
-  VALUE zero = INT2FIX(0);
+  VALUE zero = INT2NUM(0);
   rb_ca_modify(self);
   if ( ! rb_ca_is_boolean_type(self) ) {
     rb_raise(rb_eCADataTypeError, "reciever should be a boolean array");
@@ -68,8 +68,8 @@ rb_ca_where (VALUE self)
   volatile VALUE bool, obj;
   CArray *ca, *co;
   boolean8_t *p, *m;
-  int32_t *q;
-  int32_t i, count;
+  ca_size_t *q;
+  ca_size_t i, count;
 
   bool = ( ! rb_ca_is_boolean_type(self) ) ? rb_ca_to_boolean(self) : self;
 
@@ -95,12 +95,12 @@ rb_ca_where (VALUE self)
   }
 
   /* create output array */
-  obj = rb_carray_new(CA_INT32, 1, &count, 0, NULL);
+  obj = rb_carray_new(CA_SIZE, 1, &count, 0, NULL);
   Data_Get_Struct(obj, CArray, co);
 
   /* store address which elements is true to output array */
   p = (boolean8_t *) ca->ptr;
-  q = (int32_t *) co->ptr;
+  q = (ca_size_t *) co->ptr;
   m = ca_mask_ptr(ca);
   if ( m )  {
     for (i=0; i<ca->elements; i++) {  /* not-masked && true */
@@ -125,25 +125,25 @@ rb_ca_where (VALUE self)
 #define proc_seq_bang(type, from, to)       \
   {                                         \
     type *p = (type *)ca->ptr;              \
-    int32_t i;                              \
+    ca_size_t i;                              \
     if ( NIL_P(roffset) && NIL_P(rstep) ) { \
       for (i=0; i<ca->elements; i++) {    \
-        *p++ = to(i);                     \
+        *p++ = (type) to(i);                     \
       }                                   \
     }                                     \
     else if ( rb_obj_is_kind_of(rstep, rb_cFloat) ||              \
               rb_obj_is_kind_of(roffset, rb_cFloat) ) {            \
-      type offset = (NIL_P(roffset)) ? (type) 0 : from(roffset);  \
+      type offset = (NIL_P(roffset)) ? (type) 0 : (type) from(roffset);  \
       double step = (NIL_P(rstep)) ? 1 : NUM2DBL(rstep);          \
       for (i=0; i<ca->elements; i++) {    \
-        *p++ = to(step*i+offset);         \
+        *p++ = (type) to(step*i+offset);         \
       }                                   \
     }                                     \
     else {                                \
-      type offset = (NIL_P(roffset)) ? (type) 0 : from(roffset); \
-      type step   = (NIL_P(rstep)) ? (type) 1 : from(rstep);     \
+      type offset = (NIL_P(roffset)) ? (type) 0 : (type) from(roffset); \
+      type step   = (NIL_P(rstep)) ? (type) 1 : (type) from(rstep);     \
       for (i=0; i<ca->elements; i++) {    \
-        *p++ = to(step*i+offset);         \
+        *p++ = (type) to(step*i+offset);         \
       }                                   \
     }                                     \
   }
@@ -151,25 +151,25 @@ rb_ca_where (VALUE self)
 #define proc_seq_bang_with_block(type, from, to)       \
   {                                                    \
     type *p = (type *)ca->ptr;                         \
-    int32_t i;                                         \
+    ca_size_t i;                                         \
     if ( NIL_P(roffset) && NIL_P(rstep) ) {            \
       for (i=0; i<ca->elements; i++) {                 \
-        *p++ = from(rb_yield(INT2NUM(i)));             \
+        *p++ = (type) from(rb_yield(SIZE2NUM(i)));             \
       }                                                \
     }                                                             \
     else if ( rb_obj_is_kind_of(rstep, rb_cFloat) ||              \
               rb_obj_is_kind_of(roffset, rb_cFloat)) {            \
-      type offset = (NIL_P(roffset)) ? (type) 0 : from(roffset);  \
+      type offset = (NIL_P(roffset)) ? (type) 0 : (type) from(roffset);  \
       double step = (NIL_P(rstep)) ? 1 : NUM2DBL(rstep);          \
       for (i=0; i<ca->elements; i++) {                            \
-        *p++ = from(rb_yield(rb_float_new(step*i+offset)));       \
+        *p++ = (type) from(rb_yield(rb_float_new(step*i+offset)));       \
       }                                                           \
     }                                                             \
     else {                                                        \
-      type offset = (NIL_P(roffset)) ? (type) 0 : from(roffset);  \
-      type step   = (NIL_P(rstep)) ? (type) 1 : from(rstep);      \
+      type offset = (NIL_P(roffset)) ? (type) 0 : (type) from(roffset);  \
+      type step   = (NIL_P(rstep)) ? (type) 1 : (type) from(rstep);      \
       for (i=0; i<ca->elements; i++) {                            \
-        *p++ = from(rb_yield(INT2NUM(step*i+offset)));            \
+        *p++ = (type) from(rb_yield(SIZE2NUM(step*i+offset)));            \
       }                                                           \
     }                                                             \
   }
@@ -180,11 +180,11 @@ rb_ca_seq_bang_object (int argc, VALUE *argv, VALUE self)
   volatile VALUE roffset, rstep, rval, rmethod = Qnil;
   CArray *ca;
   VALUE *p;
-  int32_t i;
+  ca_size_t i;
 
   Data_Get_Struct(self, CArray, ca);
 
-  rb_scan_args((argc>2) ? 2 : argc, argv, "02", &roffset, &rstep);
+  rb_scan_args((argc>2) ? 2 : argc, argv, "02", (VALUE *) &roffset, (VALUE *) &rstep);
 
   if ( TYPE(rstep) == T_SYMBOL ) {                /* e.g. a.seq("a", :succ) */
     rmethod = rstep;
@@ -280,7 +280,7 @@ rb_ca_seq_bang_method (int argc, VALUE *argv, VALUE self)
     return rb_ca_seq_bang_object(argc, argv, self);
   }
 
-  rb_scan_args(argc, argv, "02", &roffset, &rstep);
+  rb_scan_args(argc, argv, "02", (VALUE *) &roffset, (VALUE *) &rstep);
 
   ca_allocate(ca);
 
@@ -376,11 +376,11 @@ rb_ca_seq2 (VALUE self, int n, VALUE *args)
 
 
 void
-ca_swap_bytes (char *ptr, int32_t bytes, int32_t elements)
+ca_swap_bytes (char *ptr, ca_size_t bytes, ca_size_t elements)
 {
   char *p;
   char val;
-  int32_t i;
+  ca_size_t i;
 
 #define SWAP_BYTE(a, b) (val = (a), (a) = (b), (b) = val)
 
@@ -568,7 +568,7 @@ rb_ca_swap_bytes (VALUE self)
     boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
     type min  = (type) from(rmin);                                 \
     type max  = (type) from(rmax);                                 \
-    int32_t i;                                                     \
+    ca_size_t i;                                                     \
     if ( m && rfval == CA_UNDEF) {                                 \
       for (i=ca->elements; i; i--, ptr++, m++) {                   \
         if ( ! *m ) {                                              \
@@ -579,7 +579,7 @@ rb_ca_swap_bytes (VALUE self)
     }                                                              \
     else {                                                         \
       int  has_fill = ! ( NIL_P(rfval) );                          \
-      type fill = (has_fill) ? from(rfval) : (type) 0;             \
+      type fill = (has_fill) ? (type) from(rfval) : (type) 0;             \
       if ( m ) {                                                   \
         for (i=ca->elements; i; i--, ptr++) {                      \
           if ( ! *m++ ) {                                          \
@@ -624,7 +624,7 @@ rb_ca_trim_bang (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  rb_scan_args(argc, argv, "21", &rmin, &rmax, &rfval);
+  rb_scan_args(argc, argv, "21", (VALUE *) &rmin, (VALUE *) &rmax, (VALUE *) &rfval);
 
   if ( rfval == CA_UNDEF ) {
     ca_create_mask(ca);
@@ -633,10 +633,10 @@ rb_ca_trim_bang (int argc, VALUE *argv, VALUE self)
   ca_attach(ca);
 
   switch ( ca->data_type ) {
-  case CA_INT8:     proc_trim_bang(int8_t,     NUM2LONG);  break;
-  case CA_UINT8:    proc_trim_bang(uint8_t,   NUM2ULONG); break;
-  case CA_INT16:    proc_trim_bang(int16_t,    NUM2LONG);  break;
-  case CA_UINT16:   proc_trim_bang(uint16_t,  NUM2LONG);  break;
+  case CA_INT8:     proc_trim_bang(int8_t,    NUM2INT);  break;
+  case CA_UINT8:    proc_trim_bang(uint8_t,   NUM2UINT); break;
+  case CA_INT16:    proc_trim_bang(int16_t,    NUM2INT);  break;
+  case CA_UINT16:   proc_trim_bang(uint16_t,  NUM2INT);  break;
   case CA_INT32:    proc_trim_bang(int32_t,    NUM2LONG);  break;
   case CA_UINT32:   proc_trim_bang(uint32_t,  NUM2LONG);  break;
   case CA_INT64:    proc_trim_bang(int64_t,    NUM2LONG);  break;