numo-narray-alt 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2e2bc7cc99b7ef2b868b588360ff66299a6570b4d6ea98c45bbb357eed661b
-  data.tar.gz: '0887ab3061ad5add393ecd99921ca88e3a06545c9617ffc9686550cb87b3e843'
+  metadata.gz: 62b615bb540e3a9d9783fa984943437f42ad5bbcf93041dead8d770317d8fcf6
+  data.tar.gz: 895c80b9b6544f09d04412a6a96439999752a9636d1b243127d96007f2574ba5
 SHA512:
-  metadata.gz: '09f47d21922f7e24e7915222eb9ddacadf4392156e53a15aee05d4f2fc6ebdafce244c3624de375b10411768d7f1a38de7d081504ef0fe21b6b1b82156ef9410'
-  data.tar.gz: 4cc3900b5631971fc76195eee5ecf66a6c1647a604d19997b0bcece1d1341f9245ace1c405c3f5e9dbc493389f456c4c9c817ea145a1c3a47f2180edea52ae36
+  metadata.gz: d6b5ac1dbfd8bb0f448a8c073de8f7951a9f571b20c9f88b864549f31dd828209cd67c4e7b629f2756ece9e98de6ad26a5b37a8f6131f836de259e25895bfd23
+  data.tar.gz: eea7716214274464d8e4fb4874d4415cf49a97ad7e0f15c15211257cb531604c7822913cf15d7a5ebba49df58de845b788a8558b04ac98ec3d5540fc62b527b3

data/ext/numo/narray/data.c

@@ -325,9 +325,17 @@ static void na_check_reshape(int argc, VALUE* argv, VALUE self, size_t* shape) {
   /* get shape from argument */
   for (i = 0; i < argc; ++i) {
     switch (TYPE(argv[i])) {
-    case T_FIXNUM:
-      total *= shape[i] = NUM2INT(argv[i]);
+    case T_FIXNUM: {
+      ssize_t x = NUM2SSIZET(argv[i]);
+      if (x < 0) {
+        rb_raise(rb_eArgError, "size must be non-negative");
+      }
+      if (x != 0 && total > SIZE_MAX / (size_t)x) {
+        rb_raise(rb_eArgError, "total size is too large");
+      }
+      total *= shape[i] = (size_t)x;
       break;
+    }
     case T_NIL:
     case T_TRUE:
       if (unfixed >= 0) {
@@ -341,6 +349,9 @@ static void na_check_reshape(int argc, VALUE* argv, VALUE self, size_t* shape) {
   }
 
   if (unfixed >= 0) {
+    if (total == 0) {
+      rb_raise(rb_eArgError, "cannot determine unfixed dimension when total size is zero");
+    }
     if (NA_SIZE(na) % total != 0) {
       rb_raise(rb_eArgError, "Total size size must be divisor");
     }

data/ext/numo/narray/index.c

@@ -126,7 +126,7 @@ static void na_parse_narray_index(VALUE a, int orig_dim, ssize_t size, na_index_
     GetNArray(idx, nidx);
     n = NA_SIZE(nidx);
     q->idx = ALLOC_N(size_t, n);
-    if (na->type != NARRAY_DATA_T) {
+    if (nidx->type != NARRAY_DATA_T) {
       rb_bug("NArray#where returned wrong type of NArray");
     }
     if (rb_obj_class(idx) == numo_cInt32) {
@@ -183,7 +183,13 @@ na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size, na_index_a
 
   rb_arithmetic_sequence_components_t x;
   rb_arithmetic_sequence_extract(range, &x);
+  if (!RB_INTEGER_TYPE_P(x.step)) {
+    rb_raise(rb_eArgError, "step must be an Integer");
+  }
   step = NUM2SSIZET(x.step);
+  if (step == 0) {
+    rb_raise(rb_eArgError, "step must not be zero");
+  }
 
   beg = beg_orig = NUM2SSIZET(x.begin);
   if (beg < 0) {
@@ -475,13 +481,17 @@ static void na_index_aref_nadata(
   na_get_strides_nadata(na1, strides_na1, elmsz);
 
   for (i = j = 0; i < ndim; i++) {
-    stride1 = strides_na1[q[i].orig_dim];
+    const int qi_orig_dim = q[i].orig_dim;
+    stride1 = 0;
+    if (qi_orig_dim < na1->base.ndim) {
+      stride1 = strides_na1[qi_orig_dim];
 
-    // numeric index -- trim dimension
-    if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
-      beg = q[i].beg;
-      na2->offset += stride1 * beg;
-      continue;
+      // numeric index -- trim dimension
+      if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
+        beg = q[i].beg;
+        na2->offset += stride1 * beg;
+        continue;
+      }
     }
 
     na2->base.shape[j] = size = q[i].n;
@@ -491,8 +501,11 @@ static void na_index_aref_nadata(
       na2->base.reduce = rb_funcall(m, '|', 1, na2->base.reduce);
     }
 
-    // array index
-    if (q[i].idx != NULL) {
+    if (qi_orig_dim >= na1->base.ndim) {
+      // new dimension
+      SDX_SET_STRIDE(na2->stridx[j], elmsz);
+    } else if (q[i].idx != NULL) {
+      // array index
       index = q[i].idx;
       SDX_SET_INDEX(na2->stridx[j], index);
       q[i].idx = NULL;

data/ext/numo/narray/narray.c

@@ -1322,6 +1322,7 @@ static VALUE nary_store_binary(int argc, VALUE* argv, VALUE self) {
   narray_t* na;
 
   narg = rb_scan_args(argc, argv, "11", &vstr, &voffset);
+  Check_Type(vstr, T_STRING);
   str_len = RSTRING_LEN(vstr);
   if (narg == 2) {
     offset = NUM2SIZET(voffset);

data/ext/numo/narray/numo/narray.h

@@ -13,10 +13,10 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.11.0"
+#define NARRAY_VERSION "0.11.2"
 #define NARRAY_VERSION_MAJOR 0
 #define NARRAY_VERSION_MINOR 11
-#define NARRAY_VERSION_PATCH 0
+#define NARRAY_VERSION_PATCH 2
 #define NARRAY_VERSION_CODE                                                                    \
   (NARRAY_VERSION_MAJOR * 10000 + NARRAY_VERSION_MINOR * 100 + NARRAY_VERSION_PATCH)
 

data/ext/numo/narray/numo/types/robj_macro.h

@@ -68,13 +68,6 @@
 
 #define m_mulsum_init INT2FIX(0)
 
-#define m_sprintf(s, x) robj_sprintf(s, x)
-
-static inline int robj_sprintf(char* s, VALUE x) {
-  VALUE v = rb_funcall(x, rb_intern("to_s"), 0);
-  return sprintf(s, "%s", StringValuePtr(v));
-}
-
 #define m_sqrt(x)                                                                              \
   rb_funcall(rb_const_get(rb_mKernel, rb_intern("Math")), rb_intern("sqrt"), 1, x);
 

data/ext/numo/narray/src/mh/format.h

@@ -1,7 +1,7 @@
 #ifndef NUMO_NARRAY_MH_FORMAT_H
 #define NUMO_NARRAY_MH_FORMAT_H 1
 
-#define DEF_NARRAY_FORMAT_METHOD_FUNC(tDType)                                                  \
+#define DEF_NARRAY_FORMAT_ELEMENT_FUNC(tDType)                                                 \
   static VALUE format_##tDType(VALUE fmt, tDType* x) {                                         \
     if (NIL_P(fmt)) {                                                                          \
       char s[48];                                                                              \
@@ -9,8 +9,22 @@
       return rb_str_new(s, n);                                                                 \
     }                                                                                          \
     return rb_funcall(fmt, '%', 1, m_data_to_num(*x));                                         \
-  }                                                                                            \
-                                                                                               \
+  }
+
+/* robject formats its element without the fixed buffer above: the element is an
+   arbitrary Ruby object, so the length of its to_s is not bounded by anything
+   this side controls. */
+#define DEF_NARRAY_ROBJ_FORMAT_ELEMENT_FUNC()                                                  \
+  static VALUE format_robject(VALUE fmt, robject* x) {                                         \
+    if (NIL_P(fmt)) {                                                                          \
+      VALUE v = rb_funcall(*x, id_to_s, 0);                                                    \
+      StringValue(v);                                                                          \
+      return rb_str_new(RSTRING_PTR(v), RSTRING_LEN(v));                                       \
+    }                                                                                          \
+    return rb_funcall(fmt, '%', 1, m_data_to_num(*x));                                         \
+  }
+
+#define DEF_NARRAY_FORMAT_LOOP_METHOD_FUNC(tDType)                                             \
   static void iter_##tDType##_format(na_loop_t* const lp) {                                    \
     size_t n;                                                                                  \
     char* p1;                                                                                  \
@@ -52,4 +66,12 @@
     return na_ndloop(&ndf, 2, self, fmt);                                                      \
   }
 
+#define DEF_NARRAY_FORMAT_METHOD_FUNC(tDType)                                                  \
+  DEF_NARRAY_FORMAT_ELEMENT_FUNC(tDType)                                                       \
+  DEF_NARRAY_FORMAT_LOOP_METHOD_FUNC(tDType)
+
+#define DEF_NARRAY_ROBJ_FORMAT_METHOD_FUNC()                                                   \
+  DEF_NARRAY_ROBJ_FORMAT_ELEMENT_FUNC()                                                        \
+  DEF_NARRAY_FORMAT_LOOP_METHOD_FUNC(robject)
+
 #endif /* NUMO_NARRAY_MH_FORMAT_H */

data/ext/numo/narray/src/t_robject.c

@@ -45,6 +45,7 @@ static ID id_reciprocal;
 static ID id_round;
 static ID id_square;
 static ID id_to_a;
+static ID id_to_s;
 static ID id_truncate;
 
 #include <numo/types/robject.h>
@@ -141,7 +142,7 @@ DEF_NARRAY_ASET_METHOD_FUNC(robject)
 DEF_NARRAY_COERCE_CAST_METHOD_FUNC(robject)
 DEF_NARRAY_TO_A_METHOD_FUNC(robject)
 DEF_NARRAY_FILL_METHOD_FUNC(robject)
-DEF_NARRAY_FORMAT_METHOD_FUNC(robject)
+DEF_NARRAY_ROBJ_FORMAT_METHOD_FUNC()
 DEF_NARRAY_FORMAT_TO_A_METHOD_FUNC(robject)
 DEF_NARRAY_ROBJ_INSPECT_METHOD_FUNC()
 DEF_NARRAY_EACH_METHOD_FUNC(robject)
@@ -365,6 +366,7 @@ void Init_numo_robject(void) {
   id_round = rb_intern("round");
   id_square = rb_intern("square");
   id_to_a = rb_intern("to_a");
+  id_to_s = rb_intern("to_s");
   id_truncate = rb_intern("truncate");
 
   /**

data/lib/numo/narray/extra.rb

@@ -137,6 +137,10 @@ module Numo
     #   # [[2, -3, 5],
     #   #  [4, 9, 7],
     #   #  [2, -1, 6]]
+    # @example
+    #   a = Numo::NArray.parse('true false nil')
+    #   # => Numo::Bit#shape=[1,3]
+    #   # [[1, 0, 0]]
 
     def self.parse(str, split1d: /\s+/, split2d: /;?$|;/,
                    split3d: /\s*\n(\s*\n)+/m)
@@ -151,7 +155,8 @@ module Numo
 
           c = []
           line.split(split1d).each do |item|
-            c << eval(item.strip) unless item.empty? # rubocop:disable Security/Eval
+            item = item.strip
+            c << parse_token(item) unless item.empty?
           end
           b << c unless c.empty?
         end
@@ -164,6 +169,42 @@ module Numo
       end
     end
 
+    # Convert one token of {parse} input into a value.
+    #
+    # Only the literals that describe an element are accepted: integer, float
+    # and complex numbers, and +true+, +false+ and +nil+, which {cast} turns
+    # into a {Numo::Bit}. Anything else -- an expression, a method call, a bare
+    # word -- raises ArgumentError, so text handed to {parse} is never executed
+    # as Ruby code.
+    #
+    # @param item [String] one whitespace-delimited token, already stripped
+    # @return [Integer, Float, Complex, true, false, nil] the parsed value
+    # @raise [ArgumentError] if the token is not one of those literals
+    def self.parse_token(item)
+      case item
+      when 'true' then return true
+      when 'false' then return false
+      when 'nil' then return nil
+      end
+
+      v = Integer(item, exception: false)
+      return v if v
+
+      v = Float(item, exception: false)
+      return v if v
+
+      if item.end_with?('i')
+        begin
+          return Complex(item)
+        rescue ArgumentError, TypeError
+          nil
+        end
+      end
+
+      raise ArgumentError, "invalid literal: #{item.inspect}"
+    end
+    private_class_method :parse_token
+
     # Iterate over an axis
     # @example
     #   > a = Numo::DFloat.new(2,2,2).seq

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - yoshoku
@@ -214,7 +214,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/yoshoku/numo-narray-alt
   changelog_uri: https://github.com/yoshoku/numo-narray-alt/blob/main/CHANGELOG.md
-  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.11.0/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.11.2/
   rubygems_mfa_required: 'true'
 post_install_message: |
   ===
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.13
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Numo::NArray Alternative is a project forked from Numo::NArray.
 test_files: []