carray 1.5.1 → 1.5.6

data/ext/carray_stat.c

@@ -3,10 +3,8 @@
   carray_stat.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/ext/carray_stat_proc.rb

@@ -286,12 +286,10 @@ header = <<HERE_END
   carray_stat_proc.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_stat_proc.rb
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  This file is automatically generated from carray_stat_proc.rb
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 

data/ext/carray_test.c

@@ -3,10 +3,8 @@
   carray_test.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
 
   This file includes the modified routine (ca_mem_hash) from 
 
@@ -218,13 +216,18 @@ rb_obj_is_data_class (VALUE rtype)
   return Qfalse;
 }
 
+static VALUE
+rb_ca_s_is_data_class (VALUE self, VALUE rklass)
+{
+  return rb_obj_is_data_class(rklass);
+}
+
 /* ------------------------------------------------------------- */
 
-/* rdoc:
-  class CArray
-    def valid_index? (*index)
-    end
-  end
+/* @overload valid_index? (*idx)
+
+(Inquiry) 
+Returns true if the given number list is valid as array index for the object
 */
 
 static VALUE
@@ -242,9 +245,11 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
   }
   for (i=0; i<ca->ndim; i++) {
     idx = NUM2SIZE(argv[i]);
+		/*
     if ( idx < 0 ) {
       idx += ca->dim[i];
     }
+		*/
     if ( idx < 0 || idx >= ca->dim[i] ) {
       return Qfalse;
     }
@@ -253,11 +258,10 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
   return Qtrue;
 }
 
-/* rdoc:
-  class CArray
-    def valid_addr? (addr)
-    end
-  end
+/* @overload valid_addr? (*addr)
+
+(Inquiry) 
+Returns true if the given number is valid as array address for the object
 */
 
 static VALUE
@@ -268,9 +272,11 @@ rb_ca_is_valid_addr (VALUE self, VALUE raddr)
 
   Data_Get_Struct(self, CArray, ca);
   addr = NUM2SIZE(raddr);
+	/*
   if ( addr < 0 ) {
     addr += ca->elements;
   }
+	*/
   if ( addr < 0 || addr >= ca->elements ) {
     return Qfalse;
   }
@@ -279,11 +285,10 @@ rb_ca_is_valid_addr (VALUE self, VALUE raddr)
   }
 }
 
-/* rdoc:
-  class CArray
-    def has_same_shape? (other)
-    end
-  end
+/* @overload has_same_shape?
+
+(Inquiry) 
+Returns true if the object has the same shape with the given array.
 */
 
 static VALUE
@@ -453,12 +458,10 @@ ca_equal (void *ap, void *bp)
   return flag;
 }
 
-/* rdoc:
-  class CArray
-    def == (other)
-    end
-    alias eql? ==
-  end
+/* @overload == (other)
+
+(Inquiry) 
+Returns true if the object equals the given array.
 */
 
 static VALUE
@@ -545,11 +548,10 @@ ca_hash (CArray *ca)
   return hash;
 }
 
-/* rdoc:
-  class CArray
-    def hash
-    end
-  end
+/* @overload hash
+
+(Inquiry) 
+Returns the hash value of the object.
 */
 
 VALUE
@@ -578,6 +580,12 @@ rb_ca_modify (VALUE self)
   */
 }
 
+/* @overload freeze
+
+Freeze the object.
+
+*/
+
 VALUE
 rb_ca_freeze (VALUE self)
 {
@@ -598,6 +606,9 @@ Init_carray_test ()
   rb_define_method(rb_cCArray, "freeze",  rb_ca_freeze, 0);
 
   rb_define_method(rb_cCArray, "==", rb_ca_equal, 1);
-  rb_define_method(rb_cCArray, "eql?", rb_ca_equal, 1);
+  rb_define_alias(rb_cCArray, "eql?", "==");
   rb_define_method(rb_cCArray, "hash", rb_ca_hash, 0);
+
+  rb_define_singleton_method(rb_cCArray, "data_class?", rb_ca_s_is_data_class, 1);
+
 }

data/ext/carray_undef.c

@@ -3,10 +3,8 @@
   carray_undef.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
 
 ---------------------------------------------------------------------------- */
 
@@ -43,12 +41,6 @@ static VALUE rb_ud_equal (VALUE self, VALUE other)
   return ( self == other ) ? Qtrue : Qfalse;
 }
 
-
-static VALUE rb_obj_is_undef (VALUE self)
-{
-  return ( self == CA_UNDEF ) ? Qtrue : Qfalse;
-}
-
 void
 Init_carray_undef ()
 {
@@ -63,7 +55,5 @@ Init_carray_undef ()
   CA_UNDEF  = rb_funcall(rb_cUNDEF, rb_intern("new"), 0);
   rb_undef_method(CLASS_OF(rb_cUNDEF), "new");
   rb_const_set(rb_cObject, rb_intern("UNDEF"), CA_UNDEF);
-
-  rb_define_method(rb_cObject, "undef?", rb_obj_is_undef, 0);
 }
 

data/ext/carray_utils.c

@@ -3,10 +3,8 @@
   carray_utils.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
 
 ---------------------------------------------------------------------------- */
 
@@ -20,36 +18,10 @@
 #include "st.h"
 #endif
 
-#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))
 
 /* ------------------------------------------------------------------- */
 
@@ -165,7 +137,7 @@ void
 ca_parse_range (VALUE arg, ca_size_t size, 
                 ca_size_t *poffset, ca_size_t *pcount, ca_size_t *pstep)
 {
-  ca_size_t first, start, last, count, step, bound, excl;
+  ca_size_t start, last, count, step, bound, excl;
 
  retry:
 
@@ -184,24 +156,59 @@ ca_parse_range (VALUE arg, ca_size_t size,
   }
   else if ( rb_obj_is_kind_of(arg, rb_cRange) ) {
                                      /* i..j */
-    first = NUM2SIZE(RANGE_BEG(arg));
+    start = NUM2SIZE(RANGE_BEG(arg));
     last  = NUM2SIZE(RANGE_END(arg));
     excl  = RTEST(RANGE_EXCL(arg));
-    CA_CHECK_INDEX(first, size);
+    CA_CHECK_INDEX(start, size);
     if ( last < 0 ) {
       last += size;
     }
     if ( excl ) {
-      last += ( (last>=first) ? -1 : 1 );
+      last += ( (last>=start) ? -1 : 1 );
     }
     if ( last < 0 || last >= size ) {
       rb_raise(rb_eIndexError,
                "invalid index range");
     }
-    *poffset = first;
-    *pcount  = llabs(last - first) + 1;
+    *poffset = start;
+    *pcount  = llabs(last - start) + 1;
     *pstep   = 1;
   }
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+  else if ( rb_obj_is_kind_of(arg, rb_cArithSeq) ) { /* ca[--,ArithSeq,--]*/
+    rb_arithmetic_sequence_components_t x;
+    rb_arithmetic_sequence_extract(arg, &x);
+
+    start = NUM2SIZE(x.begin);
+    last  = NUM2SIZE(x.end);
+    excl  = RTEST(x.exclude_end);
+    step  = NUM2SIZE(x.step);
+    if ( step == 0 ) {
+      rb_raise(rb_eRuntimeError, "step should not be 0");
+    }
+    if ( last < 0 ) {
+      last += size;
+    }
+    if ( excl ) {
+      last += ( (last>=start) ? -1 : 1 );
+    }
+    if ( last < 0 || last >= size ) {
+      rb_raise(rb_eIndexError, "index out of range");
+    }
+    CA_CHECK_INDEX(start, size);
+    if ( (last - start) * step < 0 ) {
+      count = 1;
+    }
+    else {
+      count = llabs(last - start)/llabs(step) + 1;
+    }
+    bound = start + (count - 1)*step;
+    CA_CHECK_INDEX(bound, size);
+    *poffset = start;
+    *pcount  = count;
+    *pstep   = step;
+  }
+#endif
   else if ( TYPE(arg) == T_ARRAY ) {
     if ( RARRAY_LEN(arg) == 1 ) {     /* [nil] or [i..j] or [i] */
       arg = rb_ary_entry(arg, 0);
@@ -254,6 +261,41 @@ ca_parse_range (VALUE arg, ca_size_t size,
         *pcount  = count;
         *pstep   = step;
       }
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+      else if ( rb_obj_is_kind_of(arg0, rb_cArithSeq) ) { /* ca[--,ArithSeq,--]*/
+        rb_arithmetic_sequence_components_t x;
+        rb_arithmetic_sequence_extract(arg0, &x);
+
+        start = NUM2SIZE(x.begin);
+        last  = NUM2SIZE(x.end);
+        excl  = RTEST(x.exclude_end);
+        step  = NUM2SIZE(x.step);
+        if ( step == 0 ) {
+          rb_raise(rb_eRuntimeError, "step should not be 0");
+        }
+        if ( last < 0 ) {
+          last += size;
+        }
+        if ( excl ) {
+          last += ( (last>=start) ? -1 : 1 );
+        }
+        if ( last < 0 || last >= size ) {
+          rb_raise(rb_eIndexError, "index out of range");
+        }
+        CA_CHECK_INDEX(start, size);
+        if ( (last - start) * step < 0 ) {
+          count = 1;
+        }
+        else {
+          count = llabs(last - start)/llabs(step) + 1;
+        }
+        bound = start + (count - 1)*step;
+        CA_CHECK_INDEX(bound, size);
+        *poffset = start;
+        *pcount  = count;
+        *pstep   = step;
+      }
+#endif      
       else {                            /* [i,n] */
         start = NUM2SIZE(arg0);
         count = NUM2SIZE(arg1);
@@ -292,7 +334,7 @@ void
 ca_parse_range_without_check (VALUE arg, ca_size_t size,
                               ca_size_t *poffset, ca_size_t *pcount, ca_size_t *pstep)
 {
-  ca_size_t first, start, last, count, step, bound, excl;
+  ca_size_t start, last, count, step, bound, excl;
 
  retry:
 
@@ -310,16 +352,35 @@ ca_parse_range_without_check (VALUE arg, ca_size_t size,
   }
   else if ( rb_obj_is_kind_of(arg, rb_cRange) ) {
                                      /* i..j */
-    first = NUM2SIZE(RANGE_BEG(arg));
+    start = NUM2SIZE(RANGE_BEG(arg));
     last  = NUM2SIZE(RANGE_END(arg));
     excl  = RTEST(RANGE_EXCL(arg));
     if ( excl ) {
-      last += ( (last>=first) ? -1 : 1 );
+      last += ( (last>=start) ? -1 : 1 );
     }
-    *poffset = first;
-    *pcount  = last - first + 1;
+    *poffset = start;
+    *pcount  = last - start + 1;
     *pstep   = 1;
   }
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+  else if ( rb_obj_is_kind_of(arg, rb_cArithSeq) ) { /* ca[--,ArithSeq,--]*/
+    rb_arithmetic_sequence_components_t x;
+    rb_arithmetic_sequence_extract(arg, &x);
+
+    start = NUM2SIZE(x.begin);
+    last  = NUM2SIZE(x.end);
+    excl  = RTEST(x.exclude_end);
+    step  = NUM2SIZE(x.step);
+    if ( excl ) {
+      last += ( (last>=start) ? -1 : 1 );
+    }
+    count = (last - start)/llabs(step) + 1;
+    bound = start + (count - 1)*step;
+    *poffset = start;
+    *pcount  = count;
+    *pstep   = step;
+  }
+#endif
   else if ( TYPE(arg) == T_ARRAY ) {
     if ( RARRAY_LEN(arg) == 1 ) {   /* [nil] or [i..j] or [i] */
       arg = rb_ary_entry(arg, 0);
@@ -351,6 +412,25 @@ ca_parse_range_without_check (VALUE arg, ca_size_t size,
         *pcount  = count;
         *pstep   = step;
       }
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+      else if ( rb_obj_is_kind_of(arg0, rb_cArithSeq) ) { /* ca[--,ArithSeq,--]*/
+        rb_arithmetic_sequence_components_t x;
+        rb_arithmetic_sequence_extract(arg0, &x);
+
+        start = NUM2SIZE(x.begin);
+        last  = NUM2SIZE(x.end);
+        excl  = RTEST(x.exclude_end);
+        step  = NUM2SIZE(x.step);
+        if ( excl ) {
+          last += ( (last>=start) ? -1 : 1 );
+        }
+        count = (last - start)/llabs(step) + 1;
+        bound = start + (count - 1)*step;
+        *poffset = start;
+        *pcount  = count;
+        *pstep   = step;
+      }
+#endif
       else {                            /* [i,n] */
         start = NUM2SIZE(arg0);
         count = NUM2SIZE(arg1);
@@ -422,6 +502,11 @@ ca_bounds_normalize_index (int8_t bounds, ca_size_t size0, ca_size_t k)
   }
 }
 
+/* @private
+@overload scan_float (str, fill_value=nil)
+
+*/
+
 static VALUE
 rb_ca_s_scan_float (int argc, VALUE *argv, VALUE self)
 {
@@ -447,6 +532,11 @@ rb_ca_s_scan_float (int argc, VALUE *argv, VALUE self)
   }
 }
 
+/* @private
+@overload scan_int (str, fill_value=nil)
+
+*/
+
 static VALUE
 rb_ca_s_scan_int (int argc, VALUE *argv, VALUE self)
 {
@@ -564,7 +654,7 @@ rb_ca_guess_type_and_bytes (VALUE rtype, VALUE rbytes,
   }
 }
 
-/* rdoc:
+/* @private
   def CArray.guess_type_and_bytes (type, bytes=0)
   end
 */
@@ -742,12 +832,9 @@ rb_set_options (VALUE ropt, const char *spec_in, ...)
 void
 Init_carray_utils ()
 {
-#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?");
 
   rb_define_singleton_method(rb_cCArray, "_scan_float",
            rb_ca_s_scan_float, -1);