carray 1.4.0 → 1.5.5

data/{carray_math.rb → ext/carray_math.rb}

@@ -10,7 +10,7 @@
 #
 # ----------------------------------------------------------------------------
 
-require './mkmath.rb'
+require_relative './mkmath'
 
 HEADERS << <<HERE_END
 /* ---------------------------------------------------------------------------
@@ -18,12 +18,10 @@ HEADERS << <<HERE_END
   carray_math.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.
 
-  This file is automatically generated from carray_math.rb.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  This file is automatically generated from carray_math.rb.
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -157,6 +155,10 @@ monfunc("exp", "exp",
       FLOAT_TYPES => "(#2) = exp(#1);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = cexp(#1);" : nil,
       OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("exp"), 0);')
+monfunc("exp2", "exp2",
+      FLOAT_TYPES => "(#2) = exp2(#1);",
+      CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = cpow(2, (#1));" : nil,
+      OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("exp2"), 0);')
 monfunc("exp10", "exp10",
       FLOAT_TYPES => "(#2) = pow(10, (#1));",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = cpow(10, (#1));" : nil,
@@ -168,6 +170,12 @@ monfunc("log", "log",
 monfunc("log10", "log10",
       FLOAT_TYPES => "(#2) = log10(#1);",
       OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("log10"), 0);')
+monfunc("log2", "log2",
+      FLOAT_TYPES => "(#2) = log2(#1);",
+      OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("log2"), 0);')
+monfunc("logb", "logb",
+      FLOAT_TYPES => "(#2) = logb(#1);",
+      OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("logb"), 0);')
 monfunc("sin", "sin",
       FLOAT_TYPES => "(#2) = sin(#1);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = csin(#1);" : nil,
@@ -219,12 +227,14 @@ monfunc("atanh", "atanh",
 
 
 binop("pmax", "pmax",
-      ALL_TYPES =>"(#3) = (#1) > (#2) ? (#1) : (#2);",
+      INT_TYPES =>"(#3) = (#1) > (#2) ? (#1) : (#2);",
+      FLOAT_TYPES =>"(#3) = fmax(#1, #2);",
       CMPLX_TYPES => nil,
       OBJ_TYPES =>'(#3) = rb_funcall(rb_assoc_new((#1),(#2)), rb_intern("max"), 0);')
 
 binop("pmin", "pmin",
-      ALL_TYPES =>"(#3) = (#1) < (#2) ? (#1) : (#2);",
+      INT_TYPES =>"(#3) = (#1) < (#2) ? (#1) : (#2);",
+      FLOAT_TYPES =>"(#3) = fmin(#1, #2);",
       CMPLX_TYPES => nil,
       OBJ_TYPES =>'(#3) = rb_funcall(rb_assoc_new((#1),(#2)), rb_intern("min"), 0);')
 
@@ -249,7 +259,7 @@ binop("/", "div",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#1) / (#2);" : nil,
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_slash, 1, (#2));')
 
-binop("quo_i", nil,
+binop("quo_i", "quo_i",
       OBJ_TYPES => '(#3) = rb_funcall((#1), rb_intern("quo"), 1, (#2));')
 
 binop("rcp_mul", "rcp_mul",
@@ -260,6 +270,12 @@ binop("rcp_mul", "rcp_mul",
 
 binop("%", "mod",
       INT_TYPES => "if ((#2)==0) {ca_zerodiv();}; (#3) = (#1) % (#2);",
+      FLOAT_TYPES => "(#3) = fmod(#1, #2);",
+      OBJ_TYPES => '(#3) = rb_funcall((#1), id_percent, 1, (#2));')
+
+binop("reminder", "reminder",
+      INT_TYPES => "if ((#2)==0) {ca_zerodiv();}; (#3) = (#1) % (#2);",
+      FLOAT_TYPES => "(#3) = remainder(#1, #2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_percent, 1, (#2));')
 
 binop("&", "bit_and_i",
@@ -697,7 +713,7 @@ rb_ca_ipower (VALUE self, VALUE other)
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca;
-    obj = rb_ca_ubrep_new(obj, cx->rep_rank, cx->rep_dim);
+    obj = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, obj), cx->rep_ndim, cx->rep_dim);
   }
 
   return obj;
@@ -752,7 +768,7 @@ rb_ca_ipower_bang (VALUE self, VALUE other)
 
 }
 
-binop("**", "power",
+binop("power", "power",
       INT_TYPES   => "(#3) = op_powi_<type>((#1), (#2));",
       FLOAT_TYPES => "(#3) = pow((#1), (#2));",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = cpow((#1), (#2));" : nil,
@@ -775,8 +791,8 @@ static VALUE rb_ca_pow (VALUE self, VALUE other)
 
     /* unresolved unbound repeat array generates unbound repeat array again */
     if ( ca->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
-      CAUnboundRepeat *cx = (CAUnboundRepeat *) ca;
-      obj = rb_ca_ubrep_new(obj, cx->rep_rank, cx->rep_dim);
+      CAUnboundRepeat *cx = (CAUnboundRepeat *) ca;      
+      obj = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, obj), cx->rep_ndim, cx->rep_dim);
     }
 
     return obj;
@@ -803,7 +819,7 @@ METHODS << %{
   rb_define_method(rb_cCArray, "pow!", rb_ca_pow_bang, 1);
 }
 
-alias_op("pow", "**")
+alias_op("**", "pow")
 
 METHODS << %{
   id_equal = rb_intern("==");

data/ext/{mathfunc/carray_mathfunc.c → carray_mathfunc.c}

@@ -3,10 +3,8 @@
   carray/mathfunc/carray_mathfunc.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
 
 ---------------------------------------------------------------------------- */
 

data/{carray_numeric.c → ext/carray_numeric.c}

@@ -3,21 +3,14 @@
   carray_numeric.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
 
 ---------------------------------------------------------------------------- */
 
 #include "ruby.h"
 #include "carray.h"
 
-#if RUBY_VERSION_CODE >= 240
-# define rb_cFixnum rb_cInteger
-# define rb_cBignum rb_cInteger
-#endif
-
 VALUE CA_NAN, CA_INF;
 
 static ID id___or__;
@@ -26,24 +19,18 @@ static ID id___xor__;
 static ID id___rshift__;
 static ID id___lshift__;
 
-VALUE
-rb_num_nan (VALUE self)
-{
-  return CA_NAN;
-}
-
-VALUE
-rb_num_inf (VALUE self)
-{
-  return CA_INF;
-}
+static ID id_bit_or;
+static ID id_bit_and;
+static ID id_bit_xor;
+static ID id_lshift;
+static ID id_rshift;
 
 static VALUE
 rb_hack_or(VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
     if ( rb_ca_is_boolean_type(y) ) {
-      return rb_funcall(y, rb_intern("bit_or"), 1, x);
+      return rb_funcall(y, id_bit_or, 1, x);
     }
     else {
 #if RUBY_VERSION_CODE >= 190
@@ -63,7 +50,7 @@ rb_hack_and (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
     if ( rb_ca_is_boolean_type(y) ) {
-      return rb_funcall(y, rb_intern("bit_and"), 1, x);
+      return rb_funcall(y, id_bit_and, 1, x);
     }
     else {
 #if RUBY_VERSION_CODE >= 190
@@ -83,7 +70,7 @@ rb_hack_xor (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
     if ( rb_ca_is_boolean_type(y) ) {
-      return rb_funcall(y, rb_intern("bit_xor"), 1, x);
+      return rb_funcall(y, id_bit_xor, 1, x);
     }
     else {
 #if RUBY_VERSION_CODE >= 190
@@ -103,7 +90,7 @@ rb_hack_lshift (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
 #if RUBY_VERSION_CODE >= 190
-      return rb_num_coerce_bin(x, y, rb_intern("<<"));
+      return rb_num_coerce_bin(x, y, id_lshift);
 #else
       return rb_num_coerce_bin(x, y);
 #endif
@@ -118,7 +105,7 @@ rb_hack_rshift (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
 #if RUBY_VERSION_CODE >= 190
-      return rb_num_coerce_bin(x, y, rb_intern(">>"));
+      return rb_num_coerce_bin(x, y, id_rshift);
 #else
       return rb_num_coerce_bin(x, y);
 #endif
@@ -128,12 +115,6 @@ rb_hack_rshift (VALUE x, VALUE y)
   }
 }
 
-static VALUE
-rb_hack_star (VALUE x, VALUE y)
-{
-  return rb_funcall(y, rb_intern("*"), 1, x);
-}
-
 /* ------------------------------------------------------------------- */
 
 #ifdef HAVE_COMPLEX_H
@@ -168,7 +149,7 @@ rb_ca_arg (VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  co = carray_new(CA_FLOAT64, ca->rank, ca->dim, 0, NULL);
+  co = carray_new(CA_FLOAT64, ca->ndim, ca->dim, 0, NULL);
   obj = ca_wrap_struct(co);
 
   if ( ca_has_mask(ca) ) {
@@ -199,27 +180,52 @@ Init_carray_numeric ()
 {
   /* hack Fixnum and Bignum's "|", "&", "^", "<<", ">>" */
 
-  id___or__ = rb_intern("__or__");
-  id___and__ = rb_intern("__and__");
-  id___xor__ = rb_intern("__xor__");
+  id___or__     = rb_intern("__or__");
+  id___and__    = rb_intern("__and__");
+  id___xor__    = rb_intern("__xor__");
   id___rshift__ = rb_intern("__rshift__");
   id___lshift__ = rb_intern("__lshift__");
 
+  id_bit_or     = rb_intern("bit_or");
+  id_bit_and    = rb_intern("bit_and");
+  id_bit_xor    = rb_intern("bit_xor");
+  id_lshift     = rb_intern("<<");
+  id_rshift     = rb_intern(">>");
+
   CA_NAN = rb_float_new(0.0/0.0);
   CA_INF = rb_float_new(1.0/0.0);
   rb_define_const(rb_cObject, "CA_NAN", CA_NAN);
   rb_define_const(rb_cObject, "CA_INF", CA_INF);
-  rb_define_global_function("nan", rb_num_nan, 0);
-  rb_define_global_function("inf", rb_num_inf, 0);
 
   rb_define_alias(rb_cTrueClass, "__or__", "|");
   rb_define_alias(rb_cTrueClass, "__and__", "&");
   rb_define_alias(rb_cTrueClass, "__xor__", "^");
 
+  rb_define_method(rb_cTrueClass, "|", rb_hack_or, 1);
+  rb_define_method(rb_cTrueClass, "&", rb_hack_and, 1);
+  rb_define_method(rb_cTrueClass, "^", rb_hack_xor, 1);
+
   rb_define_alias(rb_cFalseClass, "__or__", "|");
   rb_define_alias(rb_cFalseClass, "__and__", "&");
   rb_define_alias(rb_cFalseClass, "__xor__", "^");
 
+  rb_define_method(rb_cFalseClass, "|", rb_hack_or, 1);
+  rb_define_method(rb_cFalseClass, "&", rb_hack_and, 1);
+  rb_define_method(rb_cFalseClass, "^", rb_hack_xor, 1);
+
+#if RUBY_VERSION_CODE >= 240
+  rb_define_alias(rb_cInteger, "__or__", "|");
+  rb_define_alias(rb_cInteger, "__and__", "&");
+  rb_define_alias(rb_cInteger, "__xor__", "^");
+  rb_define_alias(rb_cInteger, "__lshift__", "<<");
+  rb_define_alias(rb_cInteger, "__rshift__", ">>");
+
+  rb_define_method(rb_cInteger, "|", rb_hack_or, 1);
+  rb_define_method(rb_cInteger, "&", rb_hack_and, 1);
+  rb_define_method(rb_cInteger, "^", rb_hack_xor, 1);
+  rb_define_method(rb_cInteger, "<<", rb_hack_lshift, 1);
+  rb_define_method(rb_cInteger, ">>", rb_hack_rshift, 1);
+#else
   rb_define_alias(rb_cFixnum, "__or__", "|");
   rb_define_alias(rb_cFixnum, "__and__", "&");
   rb_define_alias(rb_cFixnum, "__xor__", "^");
@@ -232,16 +238,6 @@ Init_carray_numeric ()
   rb_define_alias(rb_cBignum, "__lshift__", "<<");
   rb_define_alias(rb_cBignum, "__rshift__", ">>");
 
-  rb_define_method(rb_cTrueClass, "|", rb_hack_or, 1);
-  rb_define_method(rb_cTrueClass, "&", rb_hack_and, 1);
-  rb_define_method(rb_cTrueClass, "^", rb_hack_xor, 1);
-  rb_define_method(rb_cTrueClass, "*", rb_hack_star, 1);
-
-  rb_define_method(rb_cFalseClass, "|", rb_hack_or, 1);
-  rb_define_method(rb_cFalseClass, "&", rb_hack_and, 1);
-  rb_define_method(rb_cFalseClass, "^", rb_hack_xor, 1);
-  rb_define_method(rb_cFalseClass, "*", rb_hack_star, 1);
-
   rb_define_method(rb_cFixnum, "|", rb_hack_or, 1);
   rb_define_method(rb_cFixnum, "&", rb_hack_and, 1);
   rb_define_method(rb_cFixnum, "^", rb_hack_xor, 1);
@@ -253,6 +249,7 @@ Init_carray_numeric ()
   rb_define_method(rb_cBignum, "^", rb_hack_xor, 1);
   rb_define_method(rb_cBignum, "<<", rb_hack_lshift, 1);
   rb_define_method(rb_cBignum, ">>", rb_hack_rshift, 1);
+#endif
 
 #ifdef HAVE_COMPLEX_H
   rb_define_method(rb_cCArray, "arg", rb_ca_arg, 0);

data/{carray_operator.c → ext/carray_operator.c}

@@ -3,10 +3,8 @@
   carray_operator.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
 
 ---------------------------------------------------------------------------- */
 
@@ -28,7 +26,6 @@ ca_zerodiv ()
   rb_raise(rb_eZeroDivError, "divided by 0");
 }
 
-
 VALUE
 rb_ca_call_monop (VALUE self, ca_monop_func_t func[])
 {
@@ -50,7 +47,7 @@ rb_ca_call_monop (VALUE self, ca_monop_func_t func[])
   ca_attach(ca1);
   ca_copy_mask_overlay(ca2, ca2->elements, 1, ca1);
   func[ca1->data_type](ca1->elements,
-                       ( ca2->mask ) ? ca2->mask->ptr : NULL,
+                       ( ca2->mask ) ? (boolean8_t *)ca2->mask->ptr : NULL,
                        ca1->ptr, 1,
                        ca2->ptr, 1);
   ca_detach(ca1);
@@ -58,7 +55,7 @@ rb_ca_call_monop (VALUE self, ca_monop_func_t func[])
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_rank, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -75,7 +72,7 @@ rb_ca_call_monop_bang (VALUE self, ca_monop_func_t func[])
 
   ca_attach(ca1);
   func[ca1->data_type](ca1->elements,
-                       ( ca1->mask ) ? ca1->mask->ptr : NULL,
+                       ( ca1->mask ) ? (boolean8_t *)ca1->mask->ptr : NULL,
                        ca1->ptr, 1,
                        ca1->ptr, 1);
   ca_sync(ca1);
@@ -134,7 +131,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 0,
                            ca3->ptr, 0);
@@ -149,7 +147,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca2->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca2->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 1,
                            ca3->ptr, 1);
@@ -166,7 +165,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 0,
                            ca3->ptr, 1);
@@ -185,7 +185,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 1,
                            ca3->ptr, 1);
@@ -197,13 +198,13 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_rank, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca2->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca2;
-    out = rb_ca_ubrep_new(out, cx->rep_rank, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(other, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -228,7 +229,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
   if ( rb_obj_is_cscalar(self) ) {
     if ( rb_obj_is_cscalar(other) ) { /* scalar vs scalar */
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 0,
                            ca1->ptr, 0);
@@ -240,7 +242,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
       }
 
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 0,
                            ca1->ptr, 0);
@@ -249,7 +252,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
   else {
     if ( rb_obj_is_cscalar(other) ) { /* array vs scalar */
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 0,
                            ca1->ptr, 1);
@@ -261,7 +265,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
       }
 
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 1,
                            ca1->ptr, 1);
@@ -287,22 +292,23 @@ rb_ca_call_moncmp (VALUE self, ca_moncmp_func_t func[])
     out = rb_cscalar_new(CA_BOOLEAN, 0, NULL);
   }
   else {
-    out = rb_carray_new(CA_BOOLEAN, ca1->rank, ca1->dim, 0, NULL);
+    out = rb_carray_new(CA_BOOLEAN, ca1->ndim, ca1->dim, 0, NULL);
   }
 
   Data_Get_Struct(out, CArray, ca2);
 
   ca_attach(ca1);
   ca_copy_mask_overlay(ca2, ca2->elements, 1, ca1);
-  func[ca1->data_type](ca1->elements, ( ca2->mask ) ? ca2->mask->ptr : NULL,
+  func[ca1->data_type](ca1->elements, 
+                       ( ca2->mask ) ? (boolean8_t *) ca2->mask->ptr : NULL,
                        ca1->ptr, 1,
-                       ca2->ptr, 1);
+                       (boolean8_t *) ca2->ptr, 1);
   ca_detach(ca1);
 
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_rank, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -321,10 +327,10 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
 
   /* check for comparison with CA_UNDEF */
   if ( other == CA_UNDEF ) {
-    if ( func == ca_bincmp_eq ) {      /* a.eq(UNDEF) -> a.is_masked */
+    if ( (ca_bincmp_func_t) func == (ca_bincmp_func_t) ca_bincmp_eq ) {  /* a.eq(UNDEF) -> a.is_masked */
       return rb_ca_is_masked(self);
     }
-    else if ( func == ca_bincmp_ne ) { /* a.ne(UNDEF) -> a.is_not_masked */
+    else if ( (ca_bincmp_func_t) func == (ca_bincmp_func_t) ca_bincmp_ne ) { /* a.ne(UNDEF) -> a.is_not_masked */
       return rb_ca_is_not_masked(self);
     }
     else {
@@ -347,17 +353,19 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 0,
                            ca2->ptr, ca2->bytes, 0,
                            ca3->ptr, ca3->bytes, 0);
     }
     else {                                          /* scalar vs array */
-      out = rb_carray_new(CA_BOOLEAN, ca2->rank, ca2->dim, 0, NULL);
+      out = rb_carray_new(CA_BOOLEAN, ca2->ndim, ca2->dim, 0, NULL);
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca2->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca2->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 0,
                            ca2->ptr, ca2->bytes, 1,
                            ca3->ptr, ca3->bytes, 1);
@@ -365,11 +373,12 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
   }
   else {
     if ( rb_obj_is_cscalar(other) ) {  /* array vs scalar */
-      out = rb_carray_new(CA_BOOLEAN, ca1->rank, ca1->dim, 0, NULL);
+      out = rb_carray_new(CA_BOOLEAN, ca1->ndim, ca1->dim, 0, NULL);
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 1,
                            ca2->ptr, ca2->bytes, 0,
                            ca3->ptr, ca3->bytes, 1);
@@ -379,11 +388,12 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
         rb_raise(rb_eRuntimeError, "elements mismatch in bincmp (%lld <-> %lld)",
                                  (ca_size_t) ca1->elements, (ca_size_t) ca2->elements);
       }
-      out = rb_carray_new(CA_BOOLEAN, ca1->rank, ca1->dim, 0, NULL);
+      out = rb_carray_new(CA_BOOLEAN, ca1->ndim, ca1->dim, 0, NULL);
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 1,
                            ca2->ptr, ca2->bytes, 1,
                            ca3->ptr, ca3->bytes, 1);
@@ -395,7 +405,7 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_rank, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -458,11 +468,9 @@ ca_math_call (VALUE mod, VALUE arg, ID id)
   }
 }
 
-/* rdoc:
-  class CArray
-    def coerce (other)
-    end
-  end
+/* @overload coerece (other)
+
+[TBD]
 */
 
 static VALUE
@@ -524,6 +532,11 @@ rb_ca_coerce (VALUE self, VALUE other)
     } \
   }
 
+/* @overload mul_add (weight, min_count=nil, fill_value=nil)
+
+[TBD]
+*/
+
 static VALUE
 rb_ca_mul_add (int argc, VALUE *argv, volatile VALUE self)
 {