carray 1.5.1 → 1.5.6

data/ext/ca_obj_window.c

@@ -3,10 +3,8 @@
   ca_obj_window.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
 
 ---------------------------------------------------------------------------- */
 
@@ -17,7 +15,7 @@
 VALUE rb_cCAWindow; 
 int8_t CA_OBJ_WINDOW;
 
-/* rdoc:
+/* yard:
   class CAWindow < CAVirtual # :nodoc:
   end
 */
@@ -703,7 +701,7 @@ rb_ca_window_new (VALUE cary,
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def window (*argv)
     end
@@ -837,7 +835,7 @@ rb_ca_window_initialize_copy (VALUE self, VALUE other)
   return self;
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def index2addr0 (idx)
     end
@@ -874,7 +872,7 @@ rb_ca_window_idx2addr0 (int argc, VALUE *argv, VALUE self)
   }
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def addr2addr0 (addr)
     end
@@ -928,7 +926,7 @@ rb_ca_window_move (int argc, VALUE *argv, VALUE self)
   return self;
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def fill_value
     end
@@ -976,7 +974,7 @@ rb_ca_window_get_bounds (VALUE self)
     return ary;                                     \
 }
 
-/* rdoc:
+/* yard:
   class CAWindow
     def size0
     end

data/ext/carray.h

@@ -3,10 +3,8 @@
   carray.h
 
   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
 
 ---------------------------------------------------------------------------- */
 
@@ -15,6 +13,10 @@
 
 #include "ruby.h"
 
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+extern VALUE rb_cArithSeq;
+#endif
+
 /* -------------------------------------------------------------------- */
 
 #include "carray_config.h"
@@ -760,6 +762,7 @@ typedef struct {
   CArray  *select;
   VALUE    block;
   VALUE    symbol;
+  int8_t   range_check;
 } CAIndexInfo;
 
 /* -------------------------------------------------------------------- */
@@ -785,10 +788,10 @@ VALUE rb_ca_call_binop (VALUE self, VALUE other, ca_binop_func_t func[]);
 VALUE rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[]);
 VALUE rb_ca_call_moncmp (VALUE self, ca_moncmp_func_t func[]);
 VALUE rb_ca_call_bincmp (VALUE self, VALUE other, ca_bincmp_func_t func[]);
-void  ca_monop_not_implement(ca_size_t n, char *ptr1, char *ptr2);
-void  ca_binop_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3);
-void  ca_moncmp_not_implement(ca_size_t n, char *ptr1, char *ptr2);
-void  ca_bincmp_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3);
+void  ca_monop_not_implement(ca_size_t n, char *ptr1, char *ptr2) __attribute__((noreturn));
+void  ca_binop_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3) __attribute__((noreturn));
+void  ca_moncmp_not_implement(ca_size_t n, char *ptr1, char *ptr2) __attribute__((noreturn));
+void  ca_bincmp_not_implement(ca_size_t n, char *ptr1, char *ptr2, char *ptr3) __attribute__((noreturn));
 VALUE ca_math_call (VALUE mod, VALUE arg, ID id);
 
 /* -------------------------------------------------------------------- */
@@ -819,6 +822,9 @@ VALUE    rb_carray_new (int8_t data_type,
 VALUE    rb_carray_new_safe (int8_t data_type,
                              int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *mask);
 
+VALUE    rb_ca_wrap_new (int8_t data_type,
+                         int8_t ndim, ca_size_t *dim, ca_size_t bytes, CArray *mask, char *ptr);
+
 CAWrap  *ca_wrap_new (int8_t data_type,
                       int8_t ndim, ca_size_t *dim, ca_size_t bytes,
                       CArray *mask, char *ptr);
@@ -888,6 +894,9 @@ CARepeat *ca_repeat_new (CArray *carray, int8_t ndim, ca_size_t *count);
 VALUE   rb_ca_repeat_new (VALUE cary, int8_t ndim, ca_size_t *count);
 VALUE   rb_ca_repeat (int argc, VALUE *argv, VALUE self);
 
+/* --- ca_obj_unbound_repeat.c --- */
+
+VALUE   rb_ca_ubrep_shave (VALUE self, VALUE other);
 VALUE   rb_ca_ubrep_new (VALUE cary, int32_t rep_ndim, ca_size_t *rep_dim);
 VALUE   ca_ubrep_bind_with (VALUE self, VALUE other);
 
@@ -1064,7 +1073,7 @@ void    ca_parse_range_without_check (VALUE arg, ca_size_t size,
                         ca_size_t *offset, ca_size_t *count, ca_size_t *step);
 
 int     ca_equal (void *ap, void *bp);
-void    ca_zerodiv(void);
+void    ca_zerodiv(void)  __attribute__((noreturn));
 int32_t ca_rand (double rmax);
 ca_size_t ca_bounds_normalize_index (int8_t bounds, ca_size_t size0, ca_size_t k);
 

data/ext/carray_access.c

@@ -3,44 +3,17 @@
   carray_access.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 "carray.h"
 
-#if RUBY_VERSION_CODE >= 240
-#define RSTRUCT_EMBED_LEN_MAX RSTRUCT_EMBED_LEN_MAX
-enum {
-  RSTRUCT_EMBED_LEN_MAX = 3,
-  RSTRUCT_ENUM_END
-};
-struct RStruct {
-    struct RBasic basic;
-    union {
-        struct {
-            long len;
-            const VALUE *ptr;
-        } heap;
-        const VALUE ary[RSTRUCT_EMBED_LEN_MAX];
-    } as;
-};
-#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
-#endif
-
-#if RUBY_VERSION_CODE >= 190
-#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
-#define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
-#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2])
-#else
-static ID id_beg, id_end, id_excl;
-#define RANGE_BEG(r) (rb_ivar_get(r, id_beg))
-#define RANGE_END(r) (rb_ivar_get(r, id_end))
-#define RANGE_EXCL(r) (rb_ivar_get(r, id_excl))
-#endif
+static ID id_begin, id_end, id_excl_end;
+#define RANGE_BEG(r)  (rb_funcall(r, id_begin, 0))
+#define RANGE_END(r)  (rb_funcall(r, id_end, 0))
+#define RANGE_EXCL(r) (rb_funcall(r, id_excl_end, 0))
 
 static ID id_ca, id_to_ca;
 static VALUE sym_star, sym_perc;
@@ -208,7 +181,7 @@ rb_ca_fetch_addr (VALUE self, ca_size_t addr)
   return out;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def fill
     end
@@ -293,7 +266,7 @@ ary_guess_shape (VALUE ary, int level, int *max_level, ca_size_t *dim)
   }
 }
 
-/* rdoc:
+/* yard:
   def CArray.guess_array_shape (arg)
   end
 */  
@@ -533,7 +506,9 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
         info->type = CA_REG_ADDRESS;
         info->ndim = 1;
         addr = NUM2SIZE(arg);
-        CA_CHECK_INDEX(addr, ca_elements);
+        if ( info->range_check ) {
+          CA_CHECK_INDEX(addr, ca_elements);
+        }
         info->index[0].scalar = addr;
         return;
       }
@@ -594,7 +569,9 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
         ca_size_t scalar;
         index_type[i] = CA_IDX_SCALAR;
         scalar = NUM2SIZE(arg);
-        CA_CHECK_INDEX_AT(scalar, ca_dim[i], i);
+        if ( info->range_check ) {
+          CA_CHECK_INDEX_AT(scalar, ca_dim[i], i);
+        }
         index[i].scalar = scalar;
       }
       else if ( NIL_P(arg) ) { /* ca[--,nil,--] */
@@ -612,17 +589,17 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
         info->ndim = ca_ndim;
       }
       else if ( rb_obj_is_kind_of(arg, rb_cRange) ) { /* ca[--,i..j,--] */
-        ca_size_t first, last, excl, count, step;
+        ca_size_t start, last, excl, count, step;
         volatile VALUE iv_beg, iv_end, iv_excl;
         iv_beg  = RANGE_BEG(arg);
         iv_end  = RANGE_END(arg);
         iv_excl = RANGE_EXCL(arg);
         index_type[i] = CA_IDX_BLOCK; /* convert to block */
         if ( NIL_P(iv_beg) ) {
-          first = 0;                    
+          start = 0;                    
         }
         else {
-          first = NUM2SIZE(iv_beg);          
+          start = NUM2SIZE(iv_beg);          
         }
         if ( NIL_P(iv_end) ) {
           last  = -1;
@@ -631,30 +608,95 @@ rb_ca_scan_index (int ca_ndim, ca_size_t *ca_dim, ca_size_t ca_elements,
           last  = NUM2SIZE(iv_end);          
         }
         excl  = RTEST(iv_excl);
-        CA_CHECK_INDEX_AT(first, ca_dim[i], i);
+
+        if ( info->range_check ) {
+          CA_CHECK_INDEX_AT(start, ca_dim[i], i);
+        }
 
         if ( last < 0 ) { /* don't use CA_CHECK_INDEX for excl */
           last += ca_dim[i];
         }
-        if ( excl && ( first == last ) ) {
-          index[i].block.start = first;
+        if ( excl && ( start == last ) ) {
+          index[i].block.start = start;
+          index[i].block.count = 0;
+          index[i].block.step  = 1;
+        }
+        else {
+          if ( excl ) {
+            last += ( (last>=start) ? -1 : 1 );
+          }
+          if ( info->range_check ) {
+            if ( last < 0 || last >= ca_dim[i] ) {
+              rb_raise(rb_eIndexError,
+                       "index %lld is out of range (0..%lld) at %i-dim",
+                       (ca_size_t) last, (ca_size_t) (ca_dim[i]-1), i);
+            }
+          }
+          index[i].block.start = start;
+          index[i].block.count = count = llabs(last - start) + 1;
+          index[i].block.step  = step  = ( last >= start ) ? 1 : -1;
+        }
+      }
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+      else if ( rb_obj_is_kind_of(arg, rb_cArithSeq) ) { /* ca[--,ArithSeq,--]*/
+        ca_size_t start, last, excl, count, step, bound;
+        volatile VALUE iv_beg, iv_end, iv_excl;
+        rb_arithmetic_sequence_components_t x;
+        rb_arithmetic_sequence_extract(arg, &x);
+        iv_beg  = x.begin;
+        iv_end  = x.end;
+        iv_excl = x.exclude_end;
+        step    = NUM2SIZE(x.step);
+        if ( NIL_P(iv_beg) ) {
+          start = 0;                    
+        }
+        else {
+          start = NUM2SIZE(iv_beg);          
+        }
+        if ( NIL_P(iv_end) ) {
+          last  = -1;
+        }
+        else {
+          last  = NUM2SIZE(iv_end);          
+        }
+        excl  = RTEST(iv_excl);
+        if ( step == 0 ) {
+          rb_raise(rb_eRuntimeError, 
+                   "step in index equals to 0 in block reference");
+        }
+        index_type[i] = CA_IDX_BLOCK;
+        CA_CHECK_INDEX_AT(start, ca_dim[i], i);
+        if ( last < 0 ) {
+          last += ca_dim[i];
+        }
+        if ( excl && ( start == last ) ) {
+          index[i].block.start = start;
           index[i].block.count = 0;
           index[i].block.step  = 1;
         }
         else {
           if ( excl ) {
-            last += ( (last>=first) ? -1 : 1 );
+            last += ( (last>=start) ? -1 : 1 );
           }
           if ( last < 0 || last >= ca_dim[i] ) {
             rb_raise(rb_eIndexError,
                      "index %lld is out of range (0..%lld) at %i-dim",
                      (ca_size_t) last, (ca_size_t) (ca_dim[i]-1), i);
           }
-          index[i].block.start = first;
-          index[i].block.count = count = llabs(last - first) + 1;
-          index[i].block.step  = step  = ( last >= first ) ? 1 : -1;
+          if ( (last - start) * step < 0 ) {
+            count = 1;
+          }
+          else {
+            count = llabs(last - start)/llabs(step) + 1;
+          }
+          bound = start + (count - 1)*step;
+          CA_CHECK_INDEX_AT(bound, ca_dim[i], i);
+          index[i].block.start = start;
+          index[i].block.count = count;
+          index[i].block.step  = step;
         }
       }
+#endif
       else if ( TYPE(arg) == T_ARRAY ) { /* ca[--,[array],--] */
         if ( RARRAY_LEN(arg) == 1 ) {
           VALUE arg0 = rb_ary_entry(arg, 0);
@@ -1254,7 +1296,7 @@ rb_ca_refer_new_flatten (VALUE self)
   return rb_ca_refer_new(self, ca->data_type, 1, &dim0, ca->bytes, 0);
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def [] (*spec)
     end
@@ -1271,6 +1313,8 @@ rb_ca_fetch_method (int argc, VALUE *argv, VALUE self)
  retry:
 
   Data_Get_Struct(self, CArray, ca);
+
+  info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
 
   switch ( info.type ) {
@@ -1340,7 +1384,86 @@ rb_ca_fetch_method (int argc, VALUE *argv, VALUE self)
   return obj;
 }
 
-/* rdoc:
+static VALUE
+rb_cs_fetch_method (int argc, VALUE *argv, VALUE self)
+{
+  volatile VALUE obj = Qnil;
+  CArray *ca;
+  CAIndexInfo info;
+
+  Data_Get_Struct(self, CArray, ca);
+
+  info.range_check = 0;
+  rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
+
+  switch ( info.type ) {
+  case CA_REG_ADDRESS_COMPLEX:
+    obj = rb_ca_fetch_addr(self, 0);
+    break;
+  case CA_REG_ADDRESS:
+    obj = rb_ca_fetch_addr(self, 0);
+    break;
+  case CA_REG_FLATTEN:
+    obj = self; /* rb_funcall(self, rb_intern("refer"), 0); */
+    break;
+  case CA_REG_POINT:
+    obj = rb_ca_fetch_addr(self, 0);
+    break;
+  case CA_REG_ALL:
+    obj = self; /* rb_funcall(self, rb_intern("refer"), 0); */
+    break;
+  case CA_REG_BLOCK:
+    obj = self; /* rb_funcall(self, rb_intern("refer"), 0); */
+    break;
+  case CA_REG_SELECT:
+    obj = rb_ca_select_new(self, argv[0]);
+    break;
+  case CA_REG_ITERATOR:
+    obj = rb_dim_iter_new(self, &info);
+    break;
+  case CA_REG_REPEAT:
+    obj = rb_ca_repeat(argc, argv, self);
+    break;
+  case CA_REG_UNBOUND_REPEAT:
+    obj = rb_funcall2(self, rb_intern("unbound_repeat"), (int) argc, argv);
+    break;
+  case CA_REG_MAPPING:
+    obj = rb_ca_mapping(argc, argv, self);
+    break;
+  case CA_REG_GRID:
+    obj = rb_ca_grid(argc, argv, self);
+    break;
+  case CA_REG_METHOD_CALL: {
+    volatile VALUE idx;
+    idx = rb_funcall2(self, SYM2ID(info.symbol), argc-1, argv+1);
+    obj = rb_ca_fetch(self, idx);
+    break;
+  }
+  case CA_REG_MEMBER: {
+    volatile VALUE data_class = rb_ca_data_class(self);
+    if ( ! NIL_P(data_class) ) {
+      obj = rb_ca_field_as_member(self, info.symbol);
+      break;
+    }
+    else {
+      rb_raise(rb_eIndexError, 
+               "can't refer member of carray doesn't have data_class");
+    }
+    break;
+  }
+  case CA_REG_ATTRIBUTE: {
+    obj = rb_funcall(self, rb_intern("attribute"), 0);
+    obj = rb_hash_aref(obj, info.symbol);
+    break;
+  }
+  default:
+    rb_raise(rb_eIndexError, "invalid index specified");
+  }
+
+  return obj;
+}
+
+/* yard:
   class CArray
     def []= (*spec)
     end
@@ -1363,6 +1486,7 @@ rb_ca_store_method (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
+  info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
 
   switch ( info.type ) {
@@ -1487,7 +1611,7 @@ rb_ca_store2 (VALUE self, int n, VALUE *rindex, VALUE rval)
   return rb_ca_store_method((int)RARRAY_LEN(index), RARRAY_PTR(index), self);
 }
 
-/* rdoc:
+/* yard:
   def CArray.scan_index(dim, idx)
   end
 */
@@ -1515,6 +1639,7 @@ rb_ca_s_scan_index (VALUE self, VALUE rdim, VALUE ridx)
   CA_CHECK_RANK(ndim);
   CA_CHECK_DIM(ndim, dim);
 
+  info.range_check = 1;
   rb_ca_scan_index(ndim, dim, elements,
                    RARRAY_LEN(ridx), RARRAY_PTR(ridx), &info);
 
@@ -1596,7 +1721,7 @@ rb_ca_s_scan_index (VALUE self, VALUE rdim, VALUE ridx)
   return rb_struct_new(S_CAInfo, rtype, rindex);
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def normalize_index (idx)
     end
@@ -1614,6 +1739,7 @@ rb_ca_normalize_index (VALUE self, VALUE ridx)
   Data_Get_Struct(self, CArray, ca);
   Check_Type(ridx, T_ARRAY);
 
+  info.range_check = 1;
   rb_ca_scan_index(ca->ndim, ca->dim, ca->elements,
                    RARRAY_LEN(ridx), RARRAY_PTR(ridx), &info);
 
@@ -1668,7 +1794,7 @@ rb_ca_normalize_index (VALUE self, VALUE ridx)
 
 /* ------------------------------------------------------------------- */
 
-/* rdoc:
+/* yard:
   class CArray
     # converts addr to index
     def addr2index (addr)
@@ -1703,7 +1829,7 @@ rb_ca_addr2index (VALUE self, VALUE raddr)
   return out;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def index2addr (*index)
     end
@@ -1823,12 +1949,9 @@ void
 Init_carray_access ()
 {
 
-#if RUBY_VERSION_CODE >= 190
-#else
-  id_beg   = rb_intern("begin");
-  id_end   = rb_intern("end");
-  id_excl  = rb_intern("excl");
-#endif
+  id_begin    = rb_intern("begin");
+  id_end      = rb_intern("end");
+  id_excl_end = rb_intern("exclude_end?");
 
   id_ca    = rb_intern("ca");
   id_to_ca = rb_intern("to_ca");
@@ -1838,6 +1961,8 @@ Init_carray_access ()
   rb_define_method(rb_cCArray, "[]", rb_ca_fetch_method, -1);
   rb_define_method(rb_cCArray, "[]=", rb_ca_store_method, -1);
 
+  rb_define_method(rb_cCScalar, "[]", rb_cs_fetch_method, -1);
+
   rb_define_method(rb_cCArray, "fill", rb_ca_fill, 1);
   rb_define_method(rb_cCArray, "fill_copy", rb_ca_fill_copy, 1);