numo-narray-alt 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2514ae8d0bcdfaaad3dee1d3c082e9439ff20fd70d4b8177bfab43f480912dc
-  data.tar.gz: 116204c7ba7d8aecc77a89bf202adad0ac1aad126495956fc12305045b8cc91d
+  metadata.gz: 2567fb1002a21b25cf82239f1ecb39cfd3765c52847d431f814c1c1933f5af9d
+  data.tar.gz: 9737f59071d0078da064bc1fdc983d5bacaf80e90f871297f72cefd3f944d781
 SHA512:
-  metadata.gz: b6936f60723f6e5e84998deb9ecccb1a9390973880f5b0b264dd6a972878cae27570e03cfd84d36f996efacbf53548aa8237785b0df36704bf3fa3a4ccc02295
-  data.tar.gz: 51d5f9120ba716fcfde216f0fd2dc9039eaa44c372ca449050dc89f75a49b8ed4b7a93d83c95e1c23606d3794c015291e9215930559611242973362a55224e13
+  metadata.gz: b8191bdf1b90645a3ef109a84d6c3446b7e8321a4091ea2acd01469f71add1e4832b9acff113edc5ca5cd151a7e68cede491453e2d8040d1ecadfe3fec3ae3e7
+  data.tar.gz: f7894fd10299190e1b2ec16a8270990edb80cc5524bd2f279983479f4b9ab266c83ec288683a63fbcffcfef09bd68946b2c939b6b91d2c6e1acd06e067f60d12

data/ext/numo/narray/narray.c

@@ -202,11 +202,9 @@ static void na_view_free(void* ptr) {
     xfree(na->stridx);
     na->stridx = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }
@@ -292,6 +290,10 @@ void na_alloc_shape(narray_t* na, int ndim) {
     if (ndim > NA_MAX_DIMENSION) {
       rb_raise(nary_eDimensionError, "ndim=%d is too many", ndim);
     }
+    if (na->shape != NULL && na->shape != &(na->size)) {
+      xfree(na->shape);
+      na->shape = NULL;
+    }
     na->shape = ALLOC_N(size_t, ndim);
   }
 }

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

@@ -111,11 +111,4 @@ int nary_get_result_dimension(
 #define na_aref_main nary_aref_main
 VALUE nary_aref_main(int nidx, VALUE* idx, VALUE self, int keep_dim, int nd);
 
-#include "ruby/version.h"
-
-#if RUBY_API_VERSION_CODE == 20100 // 2.1.0
-int rb_get_kwargs(VALUE keyword_hash, const ID* table, int required, int optional, VALUE*);
-VALUE rb_extract_keywords(VALUE* orighash);
-#endif
-
 #endif /* ifndef INTERN_H */

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

@@ -13,10 +13,10 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.10.0"
+#define NARRAY_VERSION "0.10.1"
 #define NARRAY_VERSION_MAJOR 0
 #define NARRAY_VERSION_MINOR 10
-#define NARRAY_VERSION_PATCH 0
+#define NARRAY_VERSION_PATCH 1
 #define NARRAY_VERSION_CODE                                                                    \
   (NARRAY_VERSION_MAJOR * 10000 + NARRAY_VERSION_MINOR * 100 + NARRAY_VERSION_PATCH)
 

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

@@ -27,7 +27,7 @@
         return m_from_real(*(float*)(ptr + pos));                                              \
       }                                                                                        \
       if (klass == numo_cInt64) {                                                              \
-        return m_from_int64(*(int64_t*)(ptr + pos));                                           \
+        return (tDType)m_from_int64(*(int64_t*)(ptr + pos));                                   \
       }                                                                                        \
       if (klass == numo_cInt32) {                                                              \
         return m_from_int32(*(int32_t*)(ptr + pos));                                           \
@@ -39,7 +39,7 @@
         return m_from_sint(*(int8_t*)(ptr + pos));                                             \
       }                                                                                        \
       if (klass == numo_cUInt64) {                                                             \
-        return m_from_uint64(*(u_int64_t*)(ptr + pos));                                        \
+        return (tDType)m_from_uint64(*(u_int64_t*)(ptr + pos));                                \
       }                                                                                        \
       if (klass == numo_cUInt32) {                                                             \
         return m_from_uint32(*(u_int32_t*)(ptr + pos));                                        \

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

@@ -92,11 +92,9 @@ static void bit_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -236,11 +236,9 @@ static void dcomplex_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -306,11 +306,9 @@ static void dfloat_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void int16_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -219,11 +219,9 @@ static void int32_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void int64_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void int8_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -242,11 +242,9 @@ static void robject_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -234,11 +234,9 @@ static void scomplex_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -304,11 +304,9 @@ static void sfloat_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void uint16_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void uint32_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void uint64_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

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

@@ -218,11 +218,9 @@ static void uint8_free(void* ptr) {
     }
     na->ptr = NULL;
   }
-  if (na->base.size > 0) {
-    if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-      xfree(na->base.shape);
-      na->base.shape = NULL;
-    }
+  if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
+    xfree(na->base.shape);
+    na->base.shape = NULL;
   }
   xfree(na);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - yoshoku
@@ -32,7 +32,6 @@ files:
 - ext/numo/narray/data.c
 - ext/numo/narray/extconf.rb
 - ext/numo/narray/index.c
-- ext/numo/narray/kwargs.c
 - ext/numo/narray/math.c
 - ext/numo/narray/narray.c
 - ext/numo/narray/narray.def
@@ -215,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.10.0/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.10.1/
   rubygems_mfa_required: 'true'
 post_install_message: |
   ===
@@ -239,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Numo::NArray Alternative is a project forked from Numo::NArray.
 test_files: []

data/ext/numo/narray/kwargs.c

@@ -1,144 +0,0 @@
-/**********************************************************************
-
-  Function to extract Keyword argument for ruby-2.1.x
-  Copied from class.c in ruby-2.4.2
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-#include <ruby.h>
-#define rb_hash_tbl_raw(hash) rb_hash_tbl(hash)
-
-/* from internal.h */
-struct RBasicRaw {
-  VALUE flags;
-  VALUE klass;
-};
-
-#define RBASIC_SET_CLASS(obj, cls)                                                             \
-  do {                                                                                         \
-    VALUE _obj_ = (obj);                                                                       \
-    RB_OBJ_WRITE(_obj_, &((struct RBasicRaw*)(_obj_))->klass, cls);                            \
-  } while (0)
-
-/* from class.c */
-VALUE
-rb_keyword_error_new(const char* error, VALUE keys) {
-  const char* msg = "";
-  VALUE error_message;
-
-  if (RARRAY_LEN(keys) == 1) {
-    keys = RARRAY_AREF(keys, 0);
-  } else {
-    keys = rb_ary_join(keys, rb_usascii_str_new2(", "));
-    msg = "s";
-  }
-
-  error_message = rb_sprintf("%s keyword%s: %" PRIsVALUE, error, msg, keys);
-
-  return rb_exc_new_str(rb_eArgError, error_message);
-}
-
-NORETURN(static void rb_keyword_error(const char* error, VALUE keys));
-static void rb_keyword_error(const char* error, VALUE keys) {
-  rb_exc_raise(rb_keyword_error_new(error, keys));
-}
-
-NORETURN(static void unknown_keyword_error(VALUE hash, const ID* table, int keywords));
-static void unknown_keyword_error(VALUE hash, const ID* table, int keywords) {
-  st_table* tbl = rb_hash_tbl_raw(hash);
-  VALUE keys;
-  int i;
-  for (i = 0; i < keywords; i++) {
-    st_data_t key = ID2SYM(table[i]);
-    st_delete(tbl, &key, NULL);
-  }
-  keys = rb_funcallv(hash, rb_intern("keys"), 0, 0);
-  if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
-  rb_keyword_error("unknown", keys);
-}
-
-static int separate_symbol(st_data_t key, st_data_t value, st_data_t arg) {
-  VALUE* kwdhash = (VALUE*)arg;
-
-  if (!SYMBOL_P(key)) kwdhash++;
-  if (!*kwdhash) *kwdhash = rb_hash_new();
-  rb_hash_aset(*kwdhash, (VALUE)key, (VALUE)value);
-  return ST_CONTINUE;
-}
-
-VALUE
-rb_extract_keywords(VALUE* orighash) {
-  VALUE parthash[2] = { 0, 0 };
-  VALUE hash = *orighash;
-
-  if (RHASH_EMPTY_P(hash)) {
-    *orighash = 0;
-    return hash;
-  }
-  st_foreach(rb_hash_tbl_raw(hash), separate_symbol, (st_data_t)&parthash);
-  *orighash = parthash[1];
-  if (parthash[1] && RBASIC_CLASS(hash) != rb_cHash) {
-    RBASIC_SET_CLASS(parthash[1], RBASIC_CLASS(hash));
-  }
-  return parthash[0];
-}
-
-int rb_get_kwargs(
-  VALUE keyword_hash, const ID* table, int required, int optional, VALUE* values
-) {
-  int i = 0, j;
-  int rest = 0;
-  VALUE missing = Qnil;
-  st_data_t key;
-
-#define extract_kwarg(keyword, val)                                                            \
-  (key = (st_data_t)(keyword), values ? st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val))  \
-                                      : st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
-
-  if (NIL_P(keyword_hash)) keyword_hash = 0;
-
-  if (optional < 0) {
-    rest = 1;
-    optional = -1 - optional;
-  }
-  if (values) {
-    for (j = 0; j < required + optional; j++) {
-      values[j] = Qundef;
-    }
-  }
-  if (required) {
-    for (; i < required; i++) {
-      VALUE keyword = ID2SYM(table[i]);
-      if (keyword_hash) {
-        st_data_t val;
-        if (extract_kwarg(keyword, &val)) {
-          if (values) values[i] = (VALUE)val;
-          continue;
-        }
-      }
-      if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
-      rb_ary_push(missing, keyword);
-    }
-    if (!NIL_P(missing)) {
-      rb_keyword_error("missing", missing);
-    }
-  }
-  j = i;
-  if (optional && keyword_hash) {
-    for (i = 0; i < optional; i++) {
-      st_data_t val;
-      if (extract_kwarg(ID2SYM(table[required + i]), &val)) {
-        if (values) values[required + i] = (VALUE)val;
-        j++;
-      }
-    }
-  }
-  if (!rest && keyword_hash) {
-    if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
-      unknown_keyword_error(keyword_hash, table, required + optional);
-    }
-  }
-  return j;
-#undef extract_kwarg
-}