carray 1.2.0 → 1.3.0

data/carray_test.c

@@ -45,7 +45,7 @@ ca_check_rank (void *ap, int rank)
 }
 
 void
-ca_check_shape (void *ap, int rank, int32_t *dim)
+ca_check_shape (void *ap, int rank, ca_size_t *dim)
 {
   CArray *ca = (CArray *) ap;
   int i;
@@ -110,7 +110,7 @@ ca_check_same_shape (void *ap1, void *ap2)
 }
 
 void
-ca_check_index (void *ap, int32_t *idx)
+ca_check_index (void *ap, ca_size_t *idx)
 {
   CArray *ca = (CArray *) ap;
   int i;
@@ -154,10 +154,10 @@ ca_has_same_shape (void *ap1, void *ap2)
 }
 
 int
-ca_is_valid_index (void *ap, int32_t *idx)
+ca_is_valid_index (void *ap, ca_size_t *idx)
 {
   CArray *ca = (CArray *) ap;
-  int32_t i;
+  int8_t i;
   for (i=0; i<ca->rank; i++) {
     if ( idx[i] < 0 || idx[i] >= ca->dim[i] ) {
       return 0;
@@ -231,7 +231,7 @@ static VALUE
 rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
 {
   CArray *ca;
-  int32_t idx;
+  ca_size_t idx;
   int i;
 
   Data_Get_Struct(self, CArray, ca);
@@ -241,7 +241,7 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
              "invalid # of arguments (%i for %i)", argc, ca->rank);
   }
   for (i=0; i<ca->rank; i++) {
-    idx = NUM2INT(argv[i]);
+    idx = NUM2SIZE(argv[i]);
     if ( idx < 0 ) {
       idx += ca->dim[i];
     }
@@ -264,10 +264,10 @@ static VALUE
 rb_ca_is_valid_addr (VALUE self, VALUE raddr)
 {
   CArray *ca;
-  int32_t addr;
+  ca_size_t addr;
 
   Data_Get_Struct(self, CArray, ca);
-  addr = NUM2LONG(raddr);
+  addr = NUM2SIZE(raddr);
   if ( addr < 0 ) {
     addr += ca->elements;
   }
@@ -363,8 +363,8 @@ ca_equal (void *ap, void *bp)
   int flag = 1;
   int masked_a, masked_b;
   boolean8_t *ma, *mb;
-  int32_t i;
-  int32_t bytes;
+  ca_size_t i;
+  ca_size_t bytes;
   char *pa;
   char *pb;
   ca_eql_func eql;
@@ -497,9 +497,9 @@ rb_ca_equal (VALUE self, VALUE other)
  */
 
 int32_t
-ca_mem_hash (char *mp, int32_t mlen)
+ca_mem_hash (char *mp, ca_size_t mlen)
 {
-  register int32_t len = mlen;
+  register ca_size_t len = mlen;
   register char   *p   = mp;
   register int32_t key = 0;
   while (len--) {
@@ -509,13 +509,13 @@ ca_mem_hash (char *mp, int32_t mlen)
   return key;
 }
 
-static long
+static int32_t
 ca_hash (CArray *ca)
 {
-  long hash;
+  int32_t hash;
 
   if ( ca_is_any_masked(ca) ) {
-    int32_t bytes = ca->bytes;
+    ca_size_t bytes = ca->bytes;
     boolean8_t *m = (boolean8_t*) ca->mask->ptr;
     /* char *tptr = ALLOC_N(char, ca_length(ca)); */
     char *tptr = malloc_with_check(ca_length(ca));
@@ -556,7 +556,7 @@ VALUE
 rb_ca_hash (VALUE self)
 {
   CArray *ca;
-  long hash;
+  int32_t hash;
 
   Data_Get_Struct(self, CArray, ca);
   hash = ca_hash(ca);

data/carray_utils.c

@@ -71,20 +71,20 @@ ca_debug () {}
 
 /* ------------------------------------------------------------------- */
 
-int32_t
+ca_size_t
 ca_set_iterator (int n, ...)
 {
   CArray *ca;
   char   **p;
-  int    *s;
-  int32_t max = -1;
+  ca_size_t *s;
+  ca_size_t max = -1;
   int     all_scalar = 1;
   va_list args;
   va_start(args, n);
   while ( n-- ) {
     ca = va_arg(args, CArray *);
     p  = va_arg(args, char **);
-    s  = va_arg(args, int *);
+    s  = va_arg(args, ca_size_t *);
     *p = ca->ptr;
     if ( ca_is_scalar(ca) ) {
       *s = 0;
@@ -112,11 +112,11 @@ ca_set_iterator (int n, ...)
 
 /* ------------------------------------------------------------------- */
 
-int32_t
+ca_size_t
 ca_get_loop_count (int n, ...)
 {
   CArray *ca;
-  int32_t elements = -1;
+  ca_size_t elements = -1;
   int32_t is_scalar = 1;
   va_list args;
   va_start(args, n);
@@ -162,9 +162,10 @@ ca_get_loop_count (int n, ...)
 */
 
 void
-ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
+ca_parse_range (VALUE arg, ca_size_t size, 
+                ca_size_t *poffset, ca_size_t *pcount, ca_size_t *pstep)
 {
-  int32_t first, start, last, count, step, bound, excl;
+  ca_size_t first, start, last, count, step, bound, excl;
 
  retry:
 
@@ -175,7 +176,7 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
   }
   else if ( rb_obj_is_kind_of(arg, rb_cInteger) ) {
                                      /* i */
-    start = FIX2INT(arg);
+    start = NUM2SIZE(arg);
     CA_CHECK_INDEX(start, size);
     *poffset = start;
     *pcount  = 1;
@@ -183,8 +184,8 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
   }
   else if ( rb_obj_is_kind_of(arg, rb_cRange) ) {
                                      /* i..j */
-    first = NUM2INT(RANGE_BEG(arg));
-    last  = NUM2INT(RANGE_END(arg));
+    first = NUM2SIZE(RANGE_BEG(arg));
+    last  = NUM2SIZE(RANGE_END(arg));
     excl  = RTEST(RANGE_EXCL(arg));
     CA_CHECK_INDEX(first, size);
     if ( last < 0 ) {
@@ -198,7 +199,7 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
                "invalid index range");
     }
     *poffset = first;
-    *pcount  = abs(last - first) + 1;
+    *pcount  = llabs(last - first) + 1;
     *pstep   = 1;
   }
   else if ( TYPE(arg) == T_ARRAY ) {
@@ -210,12 +211,12 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
       VALUE arg0 = rb_ary_entry(arg, 0);
       VALUE arg1 = rb_ary_entry(arg, 1);
       if ( NIL_P(arg0) ) {              /* [nil,k] */
-        step  = NUM2INT(arg1);
+        step  = NUM2SIZE(arg1);
         if ( step == 0 ) {
           rb_raise(rb_eRuntimeError, "step should not be 0");
         }
         start = 0;
-        count = (size-1)/abs(step) + 1;
+        count = (size-1)/llabs(step) + 1;
         bound = start + (count - 1)*step;
         CA_CHECK_INDEX(start, size);
         CA_CHECK_INDEX(bound, size);
@@ -224,10 +225,10 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
         *pstep   = step;
       }
       else if ( rb_obj_is_kind_of(arg0, rb_cRange) ) { /* [i..j,k] */
-        start = NUM2INT(RANGE_BEG(arg0));
-        last  = NUM2INT(RANGE_END(arg0));
+        start = NUM2SIZE(RANGE_BEG(arg0));
+        last  = NUM2SIZE(RANGE_END(arg0));
         excl  = RTEST(RANGE_EXCL(arg0));
-        step  = NUM2INT(arg1);
+        step  = NUM2SIZE(arg1);
         if ( step == 0 ) {
           rb_raise(rb_eRuntimeError, "step should not be 0");
         }
@@ -245,7 +246,7 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
           count = 1;
         }
         else {
-          count = abs(last - start)/abs(step) + 1;
+          count = llabs(last - start)/llabs(step) + 1;
         }
         bound = start + (count - 1)*step;
         CA_CHECK_INDEX(bound, size);
@@ -254,8 +255,8 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
         *pstep   = step;
       }
       else {                            /* [i,n] */
-        start = NUM2INT(arg0);
-        count = NUM2INT(arg1);
+        start = NUM2SIZE(arg0);
+        count = NUM2SIZE(arg1);
         bound = start + (count - 1);
         CA_CHECK_INDEX(start, size);
         CA_CHECK_INDEX(bound, size);
@@ -265,9 +266,9 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
       }
     }
     else if ( RARRAY_LEN(arg) == 3 ) { /* [i,n,k] */
-      start = NUM2INT(rb_ary_entry(arg, 0));
-      count = NUM2INT(rb_ary_entry(arg, 1));
-      step  = NUM2INT(rb_ary_entry(arg, 2));
+      start = NUM2SIZE(rb_ary_entry(arg, 0));
+      count = NUM2SIZE(rb_ary_entry(arg, 1));
+      step  = NUM2SIZE(rb_ary_entry(arg, 2));
       if ( step == 0 ) {
         rb_raise(rb_eRuntimeError, "step should not be 0");
       }
@@ -288,10 +289,10 @@ ca_parse_range (VALUE arg, int size, int *poffset, int *pcount, int *pstep)
 }
 
 void
-ca_parse_range_without_check (VALUE arg, int size,
-                              int *poffset, int *pcount, int *pstep)
+ca_parse_range_without_check (VALUE arg, ca_size_t size,
+                              ca_size_t *poffset, ca_size_t *pcount, ca_size_t *pstep)
 {
-  int32_t first, start, last, count, step, bound, excl;
+  ca_size_t first, start, last, count, step, bound, excl;
 
  retry:
 
@@ -302,15 +303,15 @@ ca_parse_range_without_check (VALUE arg, int size,
   }
   else if ( rb_obj_is_kind_of(arg, rb_cInteger) ) {
                                      /* i */
-    start = FIX2INT(arg);
+    start = NUM2SIZE(arg);
     *poffset = start;
     *pcount  = 1;
     *pstep   = 1;
   }
   else if ( rb_obj_is_kind_of(arg, rb_cRange) ) {
                                      /* i..j */
-    first = NUM2INT(RANGE_BEG(arg));
-    last  = NUM2INT(RANGE_END(arg));
+    first = NUM2SIZE(RANGE_BEG(arg));
+    last  = NUM2SIZE(RANGE_END(arg));
     excl  = RTEST(RANGE_EXCL(arg));
     if ( excl ) {
       last += ( (last>=first) ? -1 : 1 );
@@ -329,30 +330,30 @@ ca_parse_range_without_check (VALUE arg, int size,
       VALUE arg1 = rb_ary_entry(arg, 1);
       if ( NIL_P(arg0) ) {              /* [nil,k] */
         start = 0;
-        step  = NUM2INT(arg1);
-        count = (size-1)/abs(step) + 1;
+        step  = NUM2SIZE(arg1);
+        count = (size-1)/llabs(step) + 1;
         bound = start + (count - 1)*step;
         *poffset = start;
         *pcount  = count;
         *pstep   = step;
       }
       else if ( rb_obj_is_kind_of(arg0, rb_cRange) ) { /* [i..j,k] */
-        start = NUM2INT(RANGE_BEG(arg0));
-        last  = NUM2INT(RANGE_END(arg0));
+        start = NUM2SIZE(RANGE_BEG(arg0));
+        last  = NUM2SIZE(RANGE_END(arg0));
         excl  = RTEST(RANGE_EXCL(arg0));
-        step  = NUM2INT(arg1);
+        step  = NUM2SIZE(arg1);
         if ( excl ) {
           last += ( (last>=start) ? -1 : 1 );
         }
-        count = (last - start)/abs(step) + 1;
+        count = (last - start)/llabs(step) + 1;
         bound = start + (count - 1)*step;
         *poffset = start;
         *pcount  = count;
         *pstep   = step;
       }
       else {                            /* [i,n] */
-        start = NUM2INT(arg0);
-        count = NUM2INT(arg1);
+        start = NUM2SIZE(arg0);
+        count = NUM2SIZE(arg1);
         bound = start + (count - 1);
         *poffset = start;
         *pcount  = count;
@@ -360,9 +361,9 @@ ca_parse_range_without_check (VALUE arg, int size,
       }
     }
     else if ( RARRAY_LEN(arg) == 3 ) { /* [i,n,k] */
-      start = NUM2INT(rb_ary_entry(arg, 0));
-      count = NUM2INT(rb_ary_entry(arg, 1));
-      step  = NUM2INT(rb_ary_entry(arg, 2));
+      start = NUM2SIZE(rb_ary_entry(arg, 0));
+      count = NUM2SIZE(rb_ary_entry(arg, 1));
+      step  = NUM2SIZE(rb_ary_entry(arg, 2));
       bound = start + (count - 1)*step;
       *poffset = start;
       *pcount  = count;
@@ -377,8 +378,8 @@ ca_parse_range_without_check (VALUE arg, int size,
   }
 }
 
-int32_t
-ca_bounds_normalize_index (int8_t bounds, int32_t size0, int32_t k)
+ca_size_t
+ca_bounds_normalize_index (int8_t bounds, ca_size_t size0, ca_size_t k)
 {
   switch ( bounds ) {
   case CA_BOUNDS_MASK:
@@ -428,7 +429,7 @@ rb_ca_s_scan_float (int argc, VALUE *argv, VALUE self)
   double value;
   int count;
 
-  rb_scan_args(argc, argv, "11", &rstr, &rfval);
+  rb_scan_args(argc, argv, "11", (VALUE *)&rstr, (VALUE *)&rfval);
 
   if ( NIL_P(rstr) ) {
     return ( NIL_P(rfval) ) ? rb_float_new(0.0/0.0) : rfval;
@@ -453,10 +454,10 @@ rb_ca_s_scan_int (int argc, VALUE *argv, VALUE self)
   long value;
   int count;
 
-  rb_scan_args(argc, argv, "11", &rstr, &rfval);
+  rb_scan_args(argc, argv, "11", (VALUE *) &rstr, (VALUE *) &rfval);
 
   if ( NIL_P(rstr) ) {
-    return ( NIL_P(rfval) ) ? INT2FIX(0) : rfval;
+    return ( NIL_P(rfval) ) ? INT2NUM(0) : rfval;
   }
 
   Check_Type(rstr, T_STRING);
@@ -464,15 +465,15 @@ rb_ca_s_scan_int (int argc, VALUE *argv, VALUE self)
   count = sscanf(StringValuePtr(rstr), "%li", &value);
 
   if ( count == 1 ) {
-    return LONG2NUM(value);
+    return SIZE2NUM(value);
   }
   else {
-    return ( NIL_P(rfval) ) ? INT2FIX(0) : rfval;
+    return ( NIL_P(rfval) ) ? INT2NUM(0) : rfval;
   }
 }
 
 static const struct {
-  char *name;
+  const char *name;
   int  data_type;
 } ca_name_to_type[] = {
   { "fixlen", CA_FIXLEN },
@@ -510,10 +511,11 @@ rb_ca_guess_type (VALUE obj)
   VALUE inspect;
 
   if ( TYPE(obj) == T_FIXNUM ) {
-    return NUM2INT(obj);
+    return NUM2SIZE(obj);
   }
   else if ( TYPE(obj) == T_STRING ) {
-    char *name0, *name = StringValuePtr(obj);
+    const char *name0;
+    char *name = StringValuePtr(obj);
     int i;
     i = 0;
     while ( ( name0 = ca_name_to_type[i].name ) ) {
@@ -539,20 +541,20 @@ rb_ca_guess_type (VALUE obj)
 
 void
 rb_ca_guess_type_and_bytes (VALUE rtype, VALUE rbytes,
-                            int8_t *data_type, int32_t *bytes)
+                            int8_t *data_type, ca_size_t *bytes)
 {
   *data_type = rb_ca_guess_type(rtype);
 
   if ( *data_type == CA_FIXLEN ) {
     if ( TYPE(rtype) == T_CLASS ) {
-      *bytes = NUM2INT(rb_const_get(rtype, rb_intern("DATA_SIZE")));
+      *bytes = NUM2SIZE(rb_const_get(rtype, rb_intern("DATA_SIZE")));
     }
     else {
       if ( NIL_P(rbytes) ) {
         *bytes = 0;
       }
       else {
-        *bytes = NUM2INT(rbytes);
+        *bytes = NUM2SIZE(rbytes);
       }
     }
   }
@@ -572,10 +574,10 @@ rb_ca_s_guess_type_and_bytes (int argc, VALUE *argv, VALUE klass)
 {
   VALUE rtype, rbytes;
   int8_t data_type;
-  int32_t bytes;
-  rb_scan_args(argc, argv, "11", &rtype, &rbytes);
+  ca_size_t bytes;
+  rb_scan_args(argc, argv, "11", (VALUE *) &rtype, (VALUE *) &rbytes);
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
-  return rb_assoc_new(INT2FIX(data_type), LONG2NUM(bytes));
+  return rb_assoc_new(INT2NUM(data_type), SIZE2NUM(bytes));
 }
 
 VALUE

data/ext/calculus/carray_calculus.c

@@ -18,7 +18,7 @@
 /* ----------------------------------------------------------------- */
 
 static double
-simpson (double *x, double *y, int n)
+simpson (double *x, double *y, ca_size_t n)
 {
   double s;
 
@@ -53,7 +53,7 @@ simpson (double *x, double *y, int n)
   else {
     double x0, x1, x2;
     double h, m, c0, c1, c2;
-    int i;
+    ca_size_t i;
     s = 0.0;
     for (i=0; i<n-2; i+=2) {
       x0 = x[i];
@@ -100,10 +100,10 @@ rb_ca_integrate (volatile VALUE self, volatile VALUE vsc)
 
 /* ----------------------------------------------------------------- */
 
-static int
-linear_index (int n, double *y, double yy, double *idx)
+static ca_size_t
+linear_index (ca_size_t n, double *y, double yy, double *idx)
 {
-  int   a, b, c, x1;
+  ca_size_t a, b, c, x1;
   double ya, yb, yc;
   double y1, y2;
   double rest;
@@ -120,7 +120,7 @@ linear_index (int n, double *y, double yy, double *idx)
 
   /* check for equally spaced scale */
 
-  a = (int)((yy-y[0])/(y[n-1]-y[0])*(n-1));
+  a = (ca_size_t)((yy-y[0])/(y[n-1]-y[0])*(n-1));
 
   if ( a >= 0 && a < n-1 ) {
     if ( (y[a] - yy) * (y[a+1] - yy) <= 0 ) { /* lucky case */
@@ -193,11 +193,11 @@ rb_ca_binary_search_linear_index (volatile VALUE self, volatile VALUE vx)
 {
   volatile VALUE out, out0;
   CArray *ca, *sc, *cx, *co0, *co;
-  int32_t n;
+  ca_size_t n;
   double *x;
   double *px;
   double *po;
-  int i;
+  ca_size_t i;
 
   Data_Get_Struct(self, CArray, ca);
 
@@ -246,7 +246,7 @@ rb_ca_binary_search_linear_index (volatile VALUE self, volatile VALUE vx)
   ca_detach_n(3, sc, cx, co);
 
   if ( rb_ca_is_scalar(vx) ) {
-    return rb_funcall(out0, rb_intern("[]"), 1, INT2FIX(0));
+    return rb_funcall(out0, rb_intern("[]"), 1, INT2NUM(0));
   }
   else {
     return out0;
@@ -496,10 +496,10 @@ deriv_penta (double *x, double *y, double xx)
 }
 
 static double
-interpolate_linear (double *x, double *y, int n, double xx)
+interpolate_linear (double *x, double *y, ca_size_t n, double xx)
 {
   double ri;
-  int i0;
+  ca_size_t i0;
   if ( n == 1) {
     return y[0];
   }
@@ -524,10 +524,10 @@ interpolate_linear (double *x, double *y, int n, double xx)
 }
 
 static double
-interpolate_cubic (double *x, double *y, int n, double xx)
+interpolate_cubic (double *x, double *y, ca_size_t n, double xx)
 {
   double ri;
-  int i0;
+  ca_size_t i0;
   if ( n == 1) {
     return y[0];
   }
@@ -558,10 +558,10 @@ interpolate_cubic (double *x, double *y, int n, double xx)
 }
 
 static double
-differentiate (double *x, double *y, int n, double xx)
+differentiate (double *x, double *y, ca_size_t n, double xx)
 {
   double ri;
-  int i0;
+  ca_size_t i0;
   switch ( n ) {
   case 1:
     return 0.0/0.0;
@@ -600,7 +600,7 @@ rb_ca_interpolate (int argc, VALUE *argv, VALUE self)
   char *typename = NULL;
   int type = 0;
   double *px, *po;
-  int32_t i;
+  ca_size_t i;
 
   Data_Get_Struct(self, CArray, ca);
 
@@ -612,7 +612,6 @@ rb_ca_interpolate (int argc, VALUE *argv, VALUE self)
     typename = StringValuePtr(rtype);
   }
 
-
   if ( typename == NULL || ! strncmp("cubic", typename, 5) ) {
     type = 3;
   }
@@ -698,7 +697,7 @@ rb_ca_interpolate (int argc, VALUE *argv, VALUE self)
   ca_detach_n(4, cv, sc, cx, co);
 
   if ( rb_ca_is_scalar(vx) ) {
-    return rb_funcall(out0, rb_intern("[]"), 1, INT2FIX(0));
+    return rb_funcall(out0, rb_intern("[]"), 1, INT2NUM(0));
   }
   else {
     return out0;
@@ -713,7 +712,7 @@ rb_ca_differentiate (volatile VALUE self,
   volatile VALUE out0, out;
   CArray *ca, *cv, *sc, *cx, *co0, *co;
   double *px, *po;
-  int32_t i;
+  ca_size_t i;
 
   Data_Get_Struct(self, CArray, ca);
 
@@ -769,7 +768,7 @@ rb_ca_differentiate (volatile VALUE self,
   ca_detach_n(4, cv, sc, cx, co);
 
   if ( rb_ca_is_scalar(vx) ) {
-    return rb_funcall(out0, rb_intern("[]"), 1, INT2FIX(0));
+    return rb_funcall(out0, rb_intern("[]"), 1, INT2NUM(0));
   }
   else {
     return out0;