carray 1.2.0 → 1.3.0

data/carray_attribute.c

@@ -17,7 +17,7 @@
 /* rdoc
   class CArray
     # returns the object type (e.g. CA_OBJ_ARRAY, CA_OBJ_BLOCK, ...).
-    # Because the object type can be known from the class of the object,
+    # Since the object type can be known from the class of the object,
     # this attribute method is rarely used.
     def obj_type
     end
@@ -29,7 +29,7 @@ rb_ca_obj_type (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return LONG2NUM(ca->obj_type);
+  return INT2NUM(ca->obj_type);
 }
 
 /* rdoc
@@ -45,14 +45,17 @@ rb_ca_data_type (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return LONG2NUM(ca->data_type);
+  return INT2NUM(ca->data_type);
 }
 
 /* rdoc
   class CArray
-    # returns the rank (e.g. 1 for 1D array, 3 for 3D array, ...).
+		# use CArray#ndims instead of this methods after carray-1.3.0
     def rank
     end
+    # returns the rank (e.g. 1 for 1D array, 3 for 3D array, ...).
+    def ndims
+    end
   end
 */
 
@@ -61,7 +64,7 @@ rb_ca_rank (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return LONG2NUM(ca->rank);
+  return INT2NUM(ca->rank);
 }
 
 /* rdoc
@@ -81,7 +84,7 @@ rb_ca_bytes (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return LONG2NUM(ca->bytes);
+  return SIZE2NUM(ca->bytes);
 }
 
 /* rdoc:
@@ -103,16 +106,22 @@ rb_ca_elements (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return LONG2NUM(ca->elements);
+  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
@@ -140,7 +149,7 @@ rb_ca_dim (VALUE self)
   Data_Get_Struct(self, CArray, ca);
   dim = rb_ary_new2(ca->rank);
   for (i=0; i<ca->rank; i++) {
-    rb_ary_store(dim, i, LONG2NUM(ca->dim[i]));
+    rb_ary_store(dim, i, SIZE2NUM(ca->dim[i]));
   }
   return dim;
 }
@@ -150,7 +159,7 @@ rb_ca_dim0 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return INT2NUM(ca->dim[0]);
+  return SIZE2NUM(ca->dim[0]);
 }
 
 VALUE
@@ -158,7 +167,7 @@ rb_ca_dim1 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return ( ca->rank >= 2 ) ? INT2NUM(ca->dim[1]) : Qnil;
+  return ( ca->rank >= 2 ) ? SIZE2NUM(ca->dim[1]) : Qnil;
 }
 
 VALUE
@@ -166,7 +175,7 @@ rb_ca_dim2 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return ( ca->rank >= 3 ) ? INT2NUM(ca->dim[2]) : Qnil;
+  return ( ca->rank >= 3 ) ? SIZE2NUM(ca->dim[2]) : Qnil;
 }
 
 VALUE
@@ -174,7 +183,7 @@ rb_ca_dim3 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return ( ca->rank >= 4 ) ? INT2NUM(ca->dim[3]) : Qnil;
+  return ( ca->rank >= 4 ) ? SIZE2NUM(ca->dim[3]) : Qnil;
 }
 
 /* rdoc:
@@ -859,7 +868,9 @@ Init_carray_attribute ()
   rb_define_method(rb_cCArray, "obj_type", rb_ca_obj_type, 0);
   rb_define_method(rb_cCArray, "data_type", rb_ca_data_type, 0);
   rb_define_method(rb_cCArray, "bytes", rb_ca_bytes, 0);
-  rb_define_method(rb_cCArray, "rank", rb_ca_rank, 0);
+  rb_define_method(rb_cCArray, "rank", rb_ca_rank, 0); 
+  rb_define_method(rb_cCArray, "ndim", rb_ca_rank, 0); /* after carray-1.3.0 */
+  rb_define_method(rb_cCArray, "shape", rb_ca_dim, 0); /* after carray-1.3.0 */
   rb_define_method(rb_cCArray, "dim", rb_ca_dim, 0);
   rb_define_method(rb_cCArray, "dim0", rb_ca_dim0, 0);
   rb_define_method(rb_cCArray, "dim1", rb_ca_dim1, 0);

data/carray_call_cfunc.c

@@ -17,7 +17,7 @@ ca_call_cfunc_1 (void (*func)(void *p0), const char *fsync,
                           VALUE rcx0)
 {
   CArray *cx0;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 1 ) {
     rb_raise(rb_eRuntimeError,
@@ -31,8 +31,8 @@ ca_call_cfunc_1 (void (*func)(void *p0), const char *fsync,
   {
     char      *p0;
     char      *q0;
-    int32_t    s0;
-    int32_t    k;
+    ca_size_t    s0;
+    ca_size_t    k;
     n = ca_set_iterator(1, cx0, &q0, &s0);
     s0 *= cx0->bytes;
     #ifdef _OPENMP
@@ -57,7 +57,7 @@ ca_call_cfunc_2 (void (*func)(void *p0, void *p1), const char *fsync,
 {
   CArray *cx0, *cx1;
   boolean8_t *m0 = NULL, *m;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 2 ) {
     rb_raise(rb_eRuntimeError,
@@ -82,8 +82,8 @@ ca_call_cfunc_2 (void (*func)(void *p0, void *p1), const char *fsync,
   {
     char      *p0, *p1;
     char      *q0, *q1;
-    int32_t    s0,  s1;
-    int32_t    k;
+    ca_size_t    s0,  s1;
+    ca_size_t    k;
 
     n = ca_set_iterator(2, cx0, &q0, &s0,
                            cx1, &q1, &s1);
@@ -129,7 +129,7 @@ ca_call_cfunc_3 (void (*func)(void *p0, void *p1, void *p2), const char *fsync,
 {
   CArray *cx0, *cx1, *cx2;
   boolean8_t *m0 = NULL, *m;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 3 ) {
     rb_raise(rb_eRuntimeError,
@@ -157,8 +157,8 @@ ca_call_cfunc_3 (void (*func)(void *p0, void *p1, void *p2), const char *fsync,
   {
     char      *p0, *p1, *p2;
     char      *q0, *q1, *q2;
-    int32_t    s0,  s1,  s2;
-    int32_t    k;
+    ca_size_t    s0,  s1,  s2;
+    ca_size_t    k;
 
     n = ca_set_iterator(3, cx0, &q0, &s0,
                            cx1, &q1, &s1,
@@ -209,7 +209,7 @@ ca_call_cfunc_4 (void (*func)(void *p0, void *p1, void *p2, void *p3), const cha
 {
   CArray *cx0, *cx1, *cx2, *cx3;
   boolean8_t *m0 = NULL, *m;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 4 ) {
     rb_raise(rb_eRuntimeError,
@@ -240,8 +240,8 @@ ca_call_cfunc_4 (void (*func)(void *p0, void *p1, void *p2, void *p3), const cha
   {
     char      *p0, *p1, *p2, *p3;
     char      *q0, *q1, *q2, *q3;
-    int32_t    s0,  s1,  s2,  s3;
-    int32_t    k;
+    ca_size_t    s0,  s1,  s2,  s3;
+    ca_size_t    k;
 
     n = ca_set_iterator(4, cx0, &q0, &s0,
                            cx1, &q1, &s1,
@@ -298,7 +298,7 @@ ca_call_cfunc_5 (void (*func)(void*,void*,void*,void*,void*), const char *fsync,
 {
   CArray *cx0, *cx1, *cx2, *cx3, *cx4;
   boolean8_t *m0 = NULL, *m;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 5 ) {
     rb_raise(rb_eRuntimeError,
@@ -332,8 +332,8 @@ ca_call_cfunc_5 (void (*func)(void*,void*,void*,void*,void*), const char *fsync,
   {
     char      *p0, *p1, *p2, *p3, *p4;
     char      *q0, *q1, *q2, *q3, *q4;
-    int32_t    s0,  s1,  s2,  s3,  s4;
-    int32_t    k;
+    ca_size_t    s0,  s1,  s2,  s3,  s4;
+    ca_size_t    k;
 
     n = ca_set_iterator(5, cx0, &q0, &s0,
                            cx1, &q1, &s1,
@@ -395,7 +395,7 @@ ca_call_cfunc_6 (void (*func)(void*,void*,void*,void*,void*,void*), const char *
 {
   CArray *cx0, *cx1, *cx2, *cx3, *cx4, *cx5;
   boolean8_t *m0 = NULL, *m;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 6 ) {
     rb_raise(rb_eRuntimeError,
@@ -432,8 +432,8 @@ ca_call_cfunc_6 (void (*func)(void*,void*,void*,void*,void*,void*), const char *
   {
     char      *p0, *p1, *p2, *p3, *p4, *p5;
     char      *q0, *q1, *q2, *q3, *q4, *q5;
-    int32_t    s0,  s1,  s2,  s3,  s4,  s5;
-    int32_t    k;
+    ca_size_t    s0,  s1,  s2,  s3,  s4,  s5;
+    ca_size_t    k;
 
     n = ca_set_iterator(6, cx0, &q0, &s0,
                            cx1, &q1, &s1,
@@ -500,7 +500,7 @@ ca_call_cfunc_7 (void (*func)(void*,void*,void*,void*,void*,void*,void*), const
 {
   CArray *cx0, *cx1, *cx2, *cx3, *cx4, *cx5, *cx6;
   boolean8_t *m0 = NULL, *m;
-  int32_t n;
+  ca_size_t n;
 
   if ( strlen(fsync) != 7 ) {
     rb_raise(rb_eRuntimeError,
@@ -540,8 +540,8 @@ ca_call_cfunc_7 (void (*func)(void*,void*,void*,void*,void*,void*,void*), const
   {
     char      *p0, *p1, *p2, *p3, *p4, *p5, *p6;
     char      *q0, *q1, *q2, *q3, *q4, *q5, *q6;
-    int32_t    s0,  s1,  s2,  s3,  s4,  s5,  s6;
-    int32_t    k;
+    ca_size_t    s0,  s1,  s2,  s3,  s4,  s5,  s6;
+    ca_size_t    k;
 
     n = ca_set_iterator(7, cx0, &q0, &s0,
                            cx1, &q1, &s1,

data/carray_cast.c

@@ -22,7 +22,7 @@ OBJ2BOOL (VALUE v)
     return 1;
   }
   else if ( rb_obj_is_kind_of(v, rb_cInteger) ) {
-    int flag = NUM2LONG(v);
+    int flag = NUM2INT(v);
     if ( flag == 0 || flag == 1 ) {
       return flag;
     }
@@ -37,7 +37,7 @@ OBJ2BOOL (VALUE v)
 VALUE
 BOOL2OBJ (boolean8_t x)
 {
-  return ( x != 0 ) ? INT2FIX(1) : INT2FIX(0);
+  return ( x != 0 ) ? INT2NUM(1) : INT2NUM(0);
 }
 
 double
@@ -80,7 +80,7 @@ rb_obj2long (VALUE val)
 {
   switch ( TYPE(val) ) {
   case T_FIXNUM:
-    return FIX2LONG(val);
+    return NUM2LONG(val);
   case T_BIGNUM:
     return (long) NUM2LL(val);
   case T_NIL:
@@ -96,7 +96,7 @@ rb_obj2ulong (VALUE val)
 {
   switch ( TYPE(val) ) {
   case T_FIXNUM:
-    return FIX2ULONG(val);
+    return NUM2ULONG(val);
   case T_BIGNUM:
     return (unsigned long) rb_num2ull(val);
   case T_NIL:
@@ -112,7 +112,7 @@ rb_obj2ll (VALUE val)
 {
   switch ( TYPE(val) ) {
   case T_FIXNUM:
-    return FIX2LONG(val);
+    return NUM2LONG(val);
   case T_NIL:
     rb_raise(rb_eTypeError, "no implicit conversion fron nil to integer");
     break;
@@ -126,7 +126,7 @@ rb_obj2ull (VALUE val)
 {
   switch ( TYPE(val) ) {
   case T_FIXNUM:
-    return FIX2ULONG(val);
+    return NUM2ULONG(val);
   case T_NIL:
     rb_raise(rb_eTypeError, "no implicit conversion from nil to integer");
     break;
@@ -136,7 +136,7 @@ rb_obj2ull (VALUE val)
 }
 
 void
-ca_cast_block (int32_t n, void *ap1, void *ptr1,
+ca_cast_block (ca_size_t n, void *ap1, void *ptr1,
                void *ap2, void *ptr2)
 {
   CArray *ca1 = (CArray *) ap1;
@@ -149,7 +149,7 @@ ca_cast_block (int32_t n, void *ap1, void *ptr1,
 }
 
 void
-ca_cast_block_with_mask (int32_t n, void *ap1, void *ptr1,
+ca_cast_block_with_mask (ca_size_t n, void *ap1, void *ptr1,
                          void *ap2, void *ptr2, boolean8_t *m)
 {
   CArray *ca1 = (CArray *) ap1;
@@ -251,7 +251,7 @@ rb_ca_data_class_to_object (VALUE self)
 }
 
 static VALUE
-rb_ca_object_to_data_class (VALUE self, VALUE rtype, int32_t bytes) 
+rb_ca_object_to_data_class (VALUE self, VALUE rtype, ca_size_t bytes) 
 {
   volatile VALUE obj, rval;
   CArray *ca;
@@ -289,11 +289,11 @@ rb_ca_to_type_internal (int argc, VALUE *argv, VALUE self)
   volatile VALUE obj, rtype = Qnil, ropt, rbytes = Qnil;
   CArray *ca, *cb;
   int8_t data_type;
-  int32_t bytes;
+  ca_size_t bytes;
 
   Data_Get_Struct(self, CArray, ca);
 
-  rb_scan_args(argc, argv, "11", &rtype, &ropt);
+  rb_scan_args(argc, argv, "11", (VALUE *) &rtype, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
 
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
@@ -425,9 +425,9 @@ rb_ca_as_type_internal (int argc, VALUE *argv, VALUE self)
   volatile VALUE obj, rtype = Qnil, ropt, rbytes = Qnil;
   CArray *ca;
   int8_t data_type;
-  int32_t bytes;
+  ca_size_t bytes;
 
-  rb_scan_args(argc, argv, "11", &rtype, &ropt);
+  rb_scan_args(argc, argv, "11", (VALUE *) &rtype, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
 
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
@@ -470,7 +470,7 @@ rb_ca_as_fixlen (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE rtype, ropt = rb_pop_options(&argc, &argv);
   VALUE list[2];
-  rb_scan_args(argc, argv, "01", &rtype);
+  rb_scan_args(argc, argv, "01", (VALUE *)  &rtype);
   list[0] = ( NIL_P(rtype) ) ? INT2NUM(CA_FIXLEN) : rtype;
   list[1] = ropt;
   return rb_ca_as_type_internal(2, list, self);
@@ -530,7 +530,7 @@ VALUE rb_ca_as_type_method(VALUE,    CA_OBJECT);
 /* ------------------------------------------------------------------------*/
 
 VALUE
-rb_ca_cast_block (int32_t n, VALUE ra1, void *ptr1,
+rb_ca_cast_block (ca_size_t n, VALUE ra1, void *ptr1,
                   VALUE ra2, void *ptr2)
 {
   CArray *ca1, *ca2;
@@ -652,7 +652,7 @@ static VALUE
 rb_ca_s_wrap_writable (int argc, VALUE *argv, VALUE klass)
 {
   volatile VALUE obj, rtype;
-  rb_scan_args(argc, argv, "11", &obj, &rtype);
+  rb_scan_args(argc, argv, "11", (VALUE *) &obj, (VALUE *) &rtype);
   return rb_ca_wrap_writable(obj, rtype);
 }
 
@@ -770,7 +770,7 @@ static VALUE
 rb_ca_s_wrap_readonly (int argc, VALUE *argv, VALUE klass)
 {
   volatile VALUE obj, rtype;
-  rb_scan_args(argc, argv, "11", &obj, &rtype);
+  rb_scan_args(argc, argv, "11", (VALUE *) &obj, (VALUE *) &rtype);
   return rb_ca_wrap_readonly(obj, rtype);
 }
 
@@ -781,15 +781,8 @@ rb_ca_cast (volatile VALUE self)
   if ( ! rb_obj_is_carray(obj) ) {
     switch ( TYPE(obj) ) {
     case T_FIXNUM:
-      obj = rb_cscalar_new_with_value(CA_INT32, 0, obj);
-      break;
     case T_BIGNUM:
-        if ( ca_valid[CA_INT64] ) {
-          obj = rb_cscalar_new_with_value(CA_INT64, 0, obj);          
-        }
-        else {
-          obj = rb_cscalar_new_with_value(CA_INT32, 0, obj);
-        }
+      obj = rb_cscalar_new_with_value(CA_INT64, 0, obj);
       break;
     case T_FLOAT:
       obj = rb_cscalar_new_with_value(CA_FLOAT64, 0, obj);
@@ -837,37 +830,37 @@ rb_ca_cast_self_or_other (volatile VALUE *self, volatile VALUE *other)
     self_is_object = 1;
     if ( rb_ca_is_object_type(*other) ) {
       *self = rb_cscalar_new_with_value(CA_OBJECT, 0, *self);
-      return;
     }
-    switch ( TYPE(*self) ) {
-    case T_FIXNUM:
-      *self = rb_cscalar_new_with_value(CA_INT32, 0, *self);
-      break;
-    case T_BIGNUM:
-      if ( ca_valid[CA_INT64] ) {
-        *self = rb_cscalar_new_with_value(CA_INT64, 0, *self);          
-      }
-      else {
-        *self = rb_cscalar_new_with_value(CA_INT32, 0, *self);
-      }
-      break;
-    case T_FLOAT:
+    else if ( rb_ca_is_float_type(*other) ) {
       *self = rb_cscalar_new_with_value(CA_FLOAT64, 0, *self);
-      break;
-    case T_TRUE:
-    case T_FALSE:
-      *self = rb_cscalar_new_with_value(CA_BOOLEAN, 0, *self);
-      break;
-    default:
+    }
 #ifdef HAVE_COMPLEX_H
-      if ( rb_obj_is_kind_of(*self, rb_cCComplex) ) {
-        *self = rb_cscalar_new_with_value(CA_CMPLX128, 0, *self);
+    else if ( rb_ca_is_complex_type(*other) ) {
+      *self = rb_cscalar_new_with_value(CA_CMPLX128, 0, *self);
+    }
+#endif
+    else {
+      switch ( TYPE(*self) ) {
+      case T_FIXNUM:
+        *self = rb_cscalar_new_with_value(CA_INT64, 0, *self);
+        break;
+      case T_FLOAT:
+        *self = rb_cscalar_new_with_value(CA_FLOAT64, 0, *self);
+        break;
+      case T_TRUE:
+      case T_FALSE:
+        *self = rb_cscalar_new_with_value(CA_BOOLEAN, 0, *self);
+        break;
+      default:
+  #ifdef HAVE_COMPLEX_H
+        if ( rb_obj_is_kind_of(*self, rb_cCComplex) ) {
+          *self = rb_cscalar_new_with_value(CA_CMPLX128, 0, *self);
+          break;
+        }
+  #endif
+        *self = rb_cscalar_new_with_value(CA_OBJECT, 0, *self);
         break;
       }
-#endif
-
-      *self = rb_cscalar_new_with_value(CA_OBJECT, 0, *self);
-      break;
     }
   }
 
@@ -876,38 +869,38 @@ rb_ca_cast_self_or_other (volatile VALUE *self, volatile VALUE *other)
 
     if ( rb_ca_is_object_type(*self) ) {
       *other = rb_cscalar_new_with_value(CA_OBJECT, 0, *other);
-      return;
     }
-
-    switch ( TYPE(*other) ) {
-    case T_FIXNUM:
-      *other = rb_cscalar_new_with_value(CA_INT32, 0, *other);
-      break;
-    case T_BIGNUM:
-        if ( ca_valid[CA_INT64] ) {
-          *other = rb_cscalar_new_with_value(CA_INT64, 0, *other);          
-        }
-        else {
-          *other = rb_cscalar_new_with_value(CA_INT32, 0, *other);
-        }
-      break;
-    case T_FLOAT:
+    else if ( rb_ca_is_float_type(*self) ) {
       *other = rb_cscalar_new_with_value(CA_FLOAT64, 0, *other);
-      break;
-    case T_TRUE:
-    case T_FALSE:
-      *other = rb_cscalar_new_with_value(CA_BOOLEAN, 0, *other);
-      break;
-    default:
+    }
 #ifdef HAVE_COMPLEX_H
-      if ( rb_obj_is_kind_of(*other, rb_cCComplex) ) {
-        *other = rb_cscalar_new_with_value(CA_CMPLX128, 0, *other);
+    else if ( rb_ca_is_complex_type(*self) ) {
+      *other = rb_cscalar_new_with_value(CA_CMPLX128, 0, *other);
+    }
+#endif
+    else {
+      switch ( TYPE(*other) ) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+        *other = rb_cscalar_new_with_value(CA_INT64, 0, *other);
         break;
-      }
+      case T_FLOAT:
+        *other = rb_cscalar_new_with_value(CA_FLOAT64, 0, *other);
+        break;
+      case T_TRUE:
+      case T_FALSE:
+        *other = rb_cscalar_new_with_value(CA_BOOLEAN, 0, *other);
+        break;
+      default:
+#ifdef HAVE_COMPLEX_H
+        if ( rb_obj_is_kind_of(*other, rb_cCComplex) ) {
+          *other = rb_cscalar_new_with_value(CA_CMPLX128, 0, *other);
+          break;
+        }
 #endif
-
-      *other = rb_cscalar_new_with_value(CA_OBJECT, 0, *other);
-      break;
+        *other = rb_cscalar_new_with_value(CA_OBJECT, 0, *other);
+        break;
+      }
     }
   }
 
@@ -934,7 +927,7 @@ rb_ca_cast_self_or_other (volatile VALUE *self, volatile VALUE *other)
         return;
       }
       else if ( test > 0 ) {
-        *other = rb_ca_wrap_readonly(*other, INT2FIX(ca->data_type));
+        *other = rb_ca_wrap_readonly(*other, INT2NUM(ca->data_type));
         return;
       }
     }
@@ -945,7 +938,7 @@ rb_ca_cast_self_or_other (volatile VALUE *self, volatile VALUE *other)
         return;
       }
       else if ( test > 0 ) {
-        *self = rb_ca_wrap_readonly(*self, INT2FIX(cb->data_type));
+        *self = rb_ca_wrap_readonly(*self, INT2NUM(cb->data_type));
         return;
       }
     }
@@ -957,14 +950,14 @@ rb_ca_cast_self_or_other (volatile VALUE *self, volatile VALUE *other)
     return;
   }
   else if ( test > 0 ) {
-    *other = rb_ca_wrap_readonly(*other, INT2FIX(ca->data_type));
+    *other = rb_ca_wrap_readonly(*other, INT2NUM(ca->data_type));
     return;
   }
 
   test = ca_cast_table[ca->data_type][cb->data_type];
 
   if ( test > 0 ) {
-    *self = rb_ca_wrap_readonly(*self, INT2FIX(cb->data_type));
+    *self = rb_ca_wrap_readonly(*self, INT2NUM(cb->data_type));
     return;
   }
 
@@ -998,44 +991,47 @@ rb_ca_cast_other (VALUE *self, volatile VALUE *other)
   if ( ! rb_obj_is_carray(*other) ) {
     if ( rb_ca_is_object_type(*self) ) {
       *other = rb_cscalar_new_with_value(CA_OBJECT, 0, *other);
-      return;
     }
-    switch ( TYPE(*other) ) {
-    case T_FIXNUM:
-      *other = rb_cscalar_new_with_value(CA_INT32, 0, *other);
-      break;
-    case T_BIGNUM:
-        if ( ca_valid[CA_INT64] ) {
-          *other = rb_cscalar_new_with_value(CA_INT64, 0, *other);          
-        }
-        else {
-          *other = rb_cscalar_new_with_value(CA_INT32, 0, *other);
-        }
-      break;
-    case T_FLOAT:
+    else if ( rb_ca_is_float_type(*self) ) {
       *other = rb_cscalar_new_with_value(CA_FLOAT64, 0, *other);
-      break;
-    case T_TRUE:
-    case T_FALSE:
-      *other = rb_cscalar_new_with_value(CA_BOOLEAN, 0, *other);
-      break;
-    default:
+    }
 #ifdef HAVE_COMPLEX_H
-      if ( rb_obj_is_kind_of(*other, rb_cCComplex) ) {
-        *other = rb_cscalar_new_with_value(CA_CMPLX128, 0, *other);
+    else if ( rb_ca_is_complex_type(*self) ) {
+      *other = rb_cscalar_new_with_value(CA_CMPLX128, 0, *other);
+      return;
+    }
+#endif
+    else {
+      switch ( TYPE(*other) ) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+        *other = rb_cscalar_new_with_value(CA_INT64, 0, *other);
+        break;
+      case T_FLOAT:
+        *other = rb_cscalar_new_with_value(CA_FLOAT64, 0, *other);
+        break;
+      case T_TRUE:
+      case T_FALSE:
+        *other = rb_cscalar_new_with_value(CA_BOOLEAN, 0, *other);
+        break;
+      default:
+  #ifdef HAVE_COMPLEX_H
+        if ( rb_obj_is_kind_of(*other, rb_cCComplex) ) {
+          *other = rb_cscalar_new_with_value(CA_CMPLX128, 0, *other);
+          break;
+        }
+  #endif
+        *other = rb_cscalar_new_with_value(CA_OBJECT, 0, *other);
         break;
       }
-#endif
-      *other = rb_cscalar_new_with_value(CA_OBJECT, 0, *other);
-      break;
     }
-
+    
     Data_Get_Struct(*other, CScalar, cs);
 
     test0 = ca_cast_table2[cs->data_type][ca->data_type];
 
     if ( test0 > 0 ) {
-      *other = rb_ca_wrap_readonly(*other, INT2FIX(ca->data_type));
+      *other = rb_ca_wrap_readonly(*other, INT2NUM(ca->data_type));
     }
 
   }
@@ -1053,7 +1049,7 @@ rb_ca_cast_other (VALUE *self, volatile VALUE *other)
     return;
   }
   else if ( test1 > 0 ) {
-    *other = rb_ca_wrap_readonly(*other, INT2FIX(ca->data_type));
+    *other = rb_ca_wrap_readonly(*other, INT2NUM(ca->data_type));
     return;
   }