carray 3.0.6 → 3.0.7

data/ext/carray_kernels_monop.c

@@ -23726,11 +23726,9 @@ ca_monop_deg_360_float32_t (ca_size_t n, boolean8_t *m,
         p1 = q1 + k*i1;
         p2 = q2 + k*i2;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23754,11 +23752,9 @@ ca_monop_deg_360_float32_t (ca_size_t n, boolean8_t *m,
       for (k=0; k<n; k++) {
         p1 = r1 + k; p2 = r2 + k;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23769,11 +23765,9 @@ ca_monop_deg_360_float32_t (ca_size_t n, boolean8_t *m,
       for (k=0; k<n; k++) {
         p1 = q1 + k; p2 = q2 + k;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23782,11 +23776,9 @@ ca_monop_deg_360_float32_t (ca_size_t n, boolean8_t *m,
       for (k=0; k<n; k++) {
         p1 = q1 + k; p2 = q2 + k;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23797,11 +23789,9 @@ ca_monop_deg_360_float32_t (ca_size_t n, boolean8_t *m,
     ca_u_float32_t *p2 = q2;
     for (k=0; k<n; k++) {
       { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       p1 += i1; p2 += i2;
@@ -23827,11 +23817,9 @@ ca_monop_deg_360_float64_t (ca_size_t n, boolean8_t *m,
         p1 = q1 + k*i1;
         p2 = q2 + k*i2;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23855,11 +23843,9 @@ ca_monop_deg_360_float64_t (ca_size_t n, boolean8_t *m,
       for (k=0; k<n; k++) {
         p1 = r1 + k; p2 = r2 + k;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23870,11 +23856,9 @@ ca_monop_deg_360_float64_t (ca_size_t n, boolean8_t *m,
       for (k=0; k<n; k++) {
         p1 = q1 + k; p2 = q2 + k;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23883,11 +23867,9 @@ ca_monop_deg_360_float64_t (ca_size_t n, boolean8_t *m,
       for (k=0; k<n; k++) {
         p1 = q1 + k; p2 = q2 + k;
         { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       }
@@ -23898,11 +23880,9 @@ ca_monop_deg_360_float64_t (ca_size_t n, boolean8_t *m,
     ca_u_float64_t *p2 = q2;
     for (k=0; k<n; k++) {
       { {
-  double _a = (double)(*p1);
-  double _fa = _a / 360.0;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * 360.0
-           : (_fa - ceil(_fa) + 1.0) * 360.0;
+  double _fa = (double)(*p1) / 360.0;
+  (*p2) = (_fa - floor(_fa)) * 360.0;
+  if ( (*p2) >= 360.0 ) (*p2) = 0.0;     /* a tiny negative rounds to the top */
 }
  }
       p1 += i1; p2 += i2;
@@ -23930,10 +23910,9 @@ ca_monop_deg_360_VALUE (ca_size_t n, boolean8_t *m,
         { {
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / 360.0;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * 360.0
-                              : (_fa - ceil(_fa) + 1.0) * 360.0);
+    double _fa = NUM2DBL(_obj_arg) / 360.0;
+    double _r = (_fa - floor(_fa)) * 360.0;
+    (*p2) = DBL2NUM(_r >= 360.0 ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("deg_360"), 0);
   }
@@ -23962,10 +23941,9 @@ ca_monop_deg_360_VALUE (ca_size_t n, boolean8_t *m,
         { {
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / 360.0;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * 360.0
-                              : (_fa - ceil(_fa) + 1.0) * 360.0);
+    double _fa = NUM2DBL(_obj_arg) / 360.0;
+    double _r = (_fa - floor(_fa)) * 360.0;
+    (*p2) = DBL2NUM(_r >= 360.0 ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("deg_360"), 0);
   }
@@ -23981,10 +23959,9 @@ ca_monop_deg_360_VALUE (ca_size_t n, boolean8_t *m,
         { {
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / 360.0;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * 360.0
-                              : (_fa - ceil(_fa) + 1.0) * 360.0);
+    double _fa = NUM2DBL(_obj_arg) / 360.0;
+    double _r = (_fa - floor(_fa)) * 360.0;
+    (*p2) = DBL2NUM(_r >= 360.0 ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("deg_360"), 0);
   }
@@ -23998,10 +23975,9 @@ ca_monop_deg_360_VALUE (ca_size_t n, boolean8_t *m,
         { {
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / 360.0;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * 360.0
-                              : (_fa - ceil(_fa) + 1.0) * 360.0);
+    double _fa = NUM2DBL(_obj_arg) / 360.0;
+    double _r = (_fa - floor(_fa)) * 360.0;
+    (*p2) = DBL2NUM(_r >= 360.0 ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("deg_360"), 0);
   }
@@ -24017,10 +23993,9 @@ ca_monop_deg_360_VALUE (ca_size_t n, boolean8_t *m,
       { {
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / 360.0;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * 360.0
-                              : (_fa - ceil(_fa) + 1.0) * 360.0);
+    double _fa = NUM2DBL(_obj_arg) / 360.0;
+    double _r = (_fa - floor(_fa)) * 360.0;
+    (*p2) = DBL2NUM(_r >= 360.0 ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("deg_360"), 0);
   }
@@ -24477,11 +24452,9 @@ ca_monop_rad_2pi_float32_t (ca_size_t n, boolean8_t *m,
         p2 = q2 + k*i2;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24506,11 +24479,9 @@ ca_monop_rad_2pi_float32_t (ca_size_t n, boolean8_t *m,
         p1 = r1 + k; p2 = r2 + k;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24522,11 +24493,9 @@ ca_monop_rad_2pi_float32_t (ca_size_t n, boolean8_t *m,
         p1 = q1 + k; p2 = q2 + k;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24536,11 +24505,9 @@ ca_monop_rad_2pi_float32_t (ca_size_t n, boolean8_t *m,
         p1 = q1 + k; p2 = q2 + k;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24552,11 +24519,9 @@ ca_monop_rad_2pi_float32_t (ca_size_t n, boolean8_t *m,
     for (k=0; k<n; k++) {
       { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       p1 += i1; p2 += i2;
@@ -24583,11 +24548,9 @@ ca_monop_rad_2pi_float64_t (ca_size_t n, boolean8_t *m,
         p2 = q2 + k*i2;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24612,11 +24575,9 @@ ca_monop_rad_2pi_float64_t (ca_size_t n, boolean8_t *m,
         p1 = r1 + k; p2 = r2 + k;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24628,11 +24589,9 @@ ca_monop_rad_2pi_float64_t (ca_size_t n, boolean8_t *m,
         p1 = q1 + k; p2 = q2 + k;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24642,11 +24601,9 @@ ca_monop_rad_2pi_float64_t (ca_size_t n, boolean8_t *m,
         p1 = q1 + k; p2 = q2 + k;
         { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       }
@@ -24658,11 +24615,9 @@ ca_monop_rad_2pi_float64_t (ca_size_t n, boolean8_t *m,
     for (k=0; k<n; k++) {
       { {
   double _two_pi = 2.0 * M_PI;
-  double _a = (double)(*p1);
-  double _fa = _a / _two_pi;
-  (*p2) = (_a >= 0)
-           ? (_fa - floor(_fa)) * _two_pi
-           : (_fa - ceil(_fa) + 1.0) * _two_pi;
+  double _fa = (double)(*p1) / _two_pi;
+  (*p2) = (_fa - floor(_fa)) * _two_pi;
+  if ( (*p2) >= _two_pi ) (*p2) = 0.0;   /* a tiny negative rounds to the top */
 }
  }
       p1 += i1; p2 += i2;
@@ -24691,10 +24646,9 @@ ca_monop_rad_2pi_VALUE (ca_size_t n, boolean8_t *m,
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
     double _two_pi = 2.0 * M_PI;
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / _two_pi;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * _two_pi
-                              : (_fa - ceil(_fa) + 1.0) * _two_pi);
+    double _fa = NUM2DBL(_obj_arg) / _two_pi;
+    double _r = (_fa - floor(_fa)) * _two_pi;
+    (*p2) = DBL2NUM(_r >= _two_pi ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("rad_2pi"), 0);
   }
@@ -24724,10 +24678,9 @@ ca_monop_rad_2pi_VALUE (ca_size_t n, boolean8_t *m,
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
     double _two_pi = 2.0 * M_PI;
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / _two_pi;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * _two_pi
-                              : (_fa - ceil(_fa) + 1.0) * _two_pi);
+    double _fa = NUM2DBL(_obj_arg) / _two_pi;
+    double _r = (_fa - floor(_fa)) * _two_pi;
+    (*p2) = DBL2NUM(_r >= _two_pi ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("rad_2pi"), 0);
   }
@@ -24744,10 +24697,9 @@ ca_monop_rad_2pi_VALUE (ca_size_t n, boolean8_t *m,
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
     double _two_pi = 2.0 * M_PI;
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / _two_pi;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * _two_pi
-                              : (_fa - ceil(_fa) + 1.0) * _two_pi);
+    double _fa = NUM2DBL(_obj_arg) / _two_pi;
+    double _r = (_fa - floor(_fa)) * _two_pi;
+    (*p2) = DBL2NUM(_r >= _two_pi ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("rad_2pi"), 0);
   }
@@ -24762,10 +24714,9 @@ ca_monop_rad_2pi_VALUE (ca_size_t n, boolean8_t *m,
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
     double _two_pi = 2.0 * M_PI;
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / _two_pi;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * _two_pi
-                              : (_fa - ceil(_fa) + 1.0) * _two_pi);
+    double _fa = NUM2DBL(_obj_arg) / _two_pi;
+    double _r = (_fa - floor(_fa)) * _two_pi;
+    (*p2) = DBL2NUM(_r >= _two_pi ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("rad_2pi"), 0);
   }
@@ -24782,10 +24733,9 @@ ca_monop_rad_2pi_VALUE (ca_size_t n, boolean8_t *m,
   VALUE _obj_arg = (*p1);
   if (RB_FLOAT_TYPE_P(_obj_arg) || RB_INTEGER_TYPE_P(_obj_arg) || RB_TYPE_P(_obj_arg, T_RATIONAL)) {
     double _two_pi = 2.0 * M_PI;
-    double _a = NUM2DBL(_obj_arg);
-    double _fa = _a / _two_pi;
-    (*p2) = DBL2NUM((_a >= 0) ? (_fa - floor(_fa)) * _two_pi
-                              : (_fa - ceil(_fa) + 1.0) * _two_pi);
+    double _fa = NUM2DBL(_obj_arg) / _two_pi;
+    double _r = (_fa - floor(_fa)) * _two_pi;
+    (*p2) = DBL2NUM(_r >= _two_pi ? 0.0 : _r);
   } else {
     (*p2) = rb_funcall(_obj_arg, rb_intern("rad_2pi"), 0);
   }

data/ext/carray_lazy.c

@@ -788,6 +788,21 @@ ca_lazy_arena_acquire_object (ca_size_t n_elements)
   return ptr;
 }
 
+/* The caller is about to overwrite a scratch's VALUEs with cells of another
+   data type: from here on they are not to be marked. */
+void
+ca_lazy_arena_untag_objects (void *ptr)
+{
+  ca_lazy_arena_t *arena = ca_lazy_arena_get();
+  int i;
+  for ( i = 0; i < CA_LAZY_ARENA_SLOTS; i++ ) {
+    if ( arena->slots[i].ptr == ptr ) {
+      arena->slots[i].object_elements = 0;
+      return;
+    }
+  }
+}
+
 static void
 ca_lazy_arena_mark_object_slots (ca_lazy_arena_t *arena)
 {
@@ -1286,7 +1301,7 @@ ca_mask_of_operands_func_clone (void *ap)
 static int
 ca_mask_of_operands_operand_is_scalar (CAMaskOfOperands *lm, CArray *op)
 {
-  return ( op->elements == 1 && lm->elements > 1 );
+  return op->elements == 1;
 }
 
 static void

data/ext/carray_loop.c

@@ -20,6 +20,7 @@ rb_ca_s_each_index_internal (int ndim, VALUE *dim, uint8_t indim, VALUE ridx)
   int32_t is_leaf = (indim == ndim - 1);
   ca_size_t i;
 
+  if ( ! NIL_P(dim[indim]) ) ca_integer_arg(dim[indim], "a dimension", "each_index");
   if ( NIL_P(dim[indim]) ) {
     rb_ary_store(ridx, indim, Qnil);
     if ( is_leaf ) {
@@ -140,15 +141,21 @@ rb_ca_index_walk (VALUE self, CArray *ca, int8_t level,
          that want the whole subscript should write |*idx|. */
       if ( mode & CA_LOOP_WITH_VALUE ) {
         int argc = (int)ca->ndim + 1;
-        argv[0] = rb_ca_fetch_index(self, idx);
+        argv[0] = ( mode & CA_LOOP_STORE )
+                  ? rb_ca_fetch_addr(self, ca_index2addr(ca, idx))
+                  : rb_ca_fetch_index(self, idx);
         MEMCPY(argv + 1, RARRAY_CONST_PTR(ridx), VALUE, ca->ndim);
         obj = rb_yield_values2(argc, argv);
       }
       else {
         obj = rb_yield_values2((int)ca->ndim, RARRAY_CONST_PTR(ridx));
       }
+      /* map_index! writes in self's attach window.  The buffer is what the
+         sync sends to the parent; a store by subscript goes past it to the
+         root and the sync then puts the old values back (rule R5).  The
+         flat address reads and writes the buffer, as map! does. */
       if ( mode & CA_LOOP_STORE ) {
-        rb_ca_store_index(self, idx, obj);
+        rb_ca_store_addr(self, ca_index2addr(ca, idx), obj);
       }
       ret = obj;
     }