numo-narray-alt 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f4c26235333f8e467b493aa8dda971e62599966dc12c0d81a5a0fae939bb6d
-  data.tar.gz: 134d4eafee1f7b1165c8700c3fb2038ed018c7e36043926ed382cc3f8d1e94c6
+  metadata.gz: b7fe2db61f420e9d120e010bd9e34bc9f5922c7fc49df6be8a2aca032889c483
+  data.tar.gz: 6a8db228589e11376512981a8da2eed248155cc558058c625f6cc90439ad053a
 SHA512:
-  metadata.gz: f9d2b83363362f38302ed35d4c3dba6807bdc90a343c0814adb78a0bd1055d7c0dd9690bbd4a69cab32b802d57f4c602f82405a17a0a5371a74d31602988165c
-  data.tar.gz: edd47b6629ca041b3db6b843cb15887ae0a8d64d2be53d0fd683009108091a4ea679cd2c41e030a31e67548d931fa328aa724cdd1c548ec6bda808fbe40ae773
+  metadata.gz: b8dd3b2c04fa09b87357a75a626ed2a10f7d53da4c2a39bc93358745edae562c397acbaa8e503b5bd9483ee47f569c1452734b18c3eb3f35e46bb0d655c4bede
+  data.tar.gz: 38089735d3d863a211b4a2fa8dc29c162763a607bafa0cfdd463a4276e31b4278420559257b9fb4b18f95367875ad306950e0963e9a271ae3d3a2c9f9e9f85e7

data/ext/numo/narray/narray.c

@@ -1262,6 +1262,9 @@ static VALUE nary_s_from_binary(int argc, VALUE* argv, VALUE type) {
   VALUE vstr, vshape, vna;
   VALUE velmsz;
 
+  if (RTEST(rb_class_inherited_p(type, numo_cRObject))) {
+    rb_raise(rb_eTypeError, "cannot restore %s from binary data", rb_class2name(type));
+  }
   narg = rb_scan_args(argc, argv, "11", &vstr, &vshape);
   Check_Type(vstr, T_STRING);
   str_len = RSTRING_LEN(vstr);
@@ -1341,6 +1344,9 @@ static VALUE nary_store_binary(int argc, VALUE* argv, VALUE self) {
   VALUE velmsz;
   narray_t* na;
 
+  if (RTEST(rb_obj_is_kind_of(self, numo_cRObject))) {
+    rb_raise(rb_eTypeError, "cannot store binary data to %s", rb_obj_classname(self));
+  }
   narg = rb_scan_args(argc, argv, "11", &vstr, &voffset);
   Check_Type(vstr, T_STRING);
   str_len = RSTRING_LEN(vstr);
@@ -1415,6 +1421,9 @@ static VALUE nary_to_binary(VALUE self) {
   narray_t* na;
   int offset_in_bits;
 
+  if (RTEST(rb_obj_is_kind_of(self, numo_cRObject))) {
+    rb_raise(rb_eTypeError, "cannot convert %s into binary data", rb_obj_classname(self));
+  }
   GetNArray(self, na);
   if (na->type == NARRAY_VIEW_T) {
     offset_in_bits = RTEST(rb_obj_is_kind_of(self, numo_cBit)) && NA_VIEW_OFFSET(na) != 0;
@@ -1443,7 +1452,7 @@ static VALUE nary_marshal_dump(VALUE self) {
   rb_ary_push(a, INT2FIX(1)); // version
   rb_ary_push(a, na_shape(self));
   rb_ary_push(a, INT2FIX(NA_FLAG0(self)));
-  if (rb_obj_class(self) == numo_cRObject) {
+  if (RTEST(rb_obj_is_kind_of(self, numo_cRObject))) {
     narray_t* na;
     VALUE* ptr;
     size_t offset = 0;
@@ -1497,7 +1506,7 @@ static VALUE nary_marshal_load(VALUE self, VALUE a) {
   na_initialize(self, RARRAY_AREF(a, 1));
   NA_FL0_SET(self, FIX2INT(RARRAY_AREF(a, 2)));
   v = RARRAY_AREF(a, 3);
-  if (rb_obj_class(self) == numo_cRObject) {
+  if (RTEST(rb_obj_is_kind_of(self, numo_cRObject))) {
     narray_t* na;
     char* ptr;
     if (TYPE(v) != T_ARRAY) {

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

@@ -13,10 +13,10 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.11.3"
+#define NARRAY_VERSION "0.12.0"
 #define NARRAY_VERSION_MAJOR 0
-#define NARRAY_VERSION_MINOR 11
-#define NARRAY_VERSION_PATCH 3
+#define NARRAY_VERSION_MINOR 12
+#define NARRAY_VERSION_PATCH 0
 #define NARRAY_VERSION_CODE                                                                    \
   (NARRAY_VERSION_MAJOR * 10000 + NARRAY_VERSION_MINOR * 100 + NARRAY_VERSION_PATCH)
 

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

@@ -34,7 +34,7 @@ static dtype pow_int(dtype x, int p) {
   case 3:
     return x * x * x;
   }
-  if (p < 0) return 0;
+  if (p < 0) rb_raise(nary_eValueError, "integers to negative integer powers are not allowed");
   while (p) {
     if (p & 1) r *= x;
     x *= x;

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

@@ -26,6 +26,7 @@ static dtype pow_int(dtype x, int p) {
   case 3:
     return x * x * x;
   }
+  if (p < 0) rb_raise(nary_eValueError, "integers to negative integer powers are not allowed");
   while (p) {
     if (p & 1) r *= x;
     x *= x;

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

@@ -405,7 +405,10 @@ void Init_numo_robject(void) {
   /* Stride size of contiguous RObject array. */
   rb_define_const(cT, "CONTIGUOUS_STRIDE", INT2FIX(sizeof(dtype)));
   rb_undef_method(rb_singleton_class(cT), "from_binary");
+  rb_undef_method(rb_singleton_class(cT), "from_string");
+  rb_undef_method(cT, "store_binary");
   rb_undef_method(cT, "to_binary");
+  rb_undef_method(cT, "to_string");
   rb_undef_method(cT, "swap_byte");
   rb_undef_method(cT, "to_network");
   rb_undef_method(cT, "to_vacs");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 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.3/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.12.0/
   rubygems_mfa_required: 'true'
 post_install_message: |
   ===