carray 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e750df14d398beba90298203a253b80bf9f3f8a1
-  data.tar.gz: 372405f4be4af7621011dc3e725aad673903d618
+  metadata.gz: 86cecb4433272ac917562bf243d29b1e8aa3a29b
+  data.tar.gz: 36bb32592e1397ad672a64ca422e6c5e061fda64
 SHA512:
-  metadata.gz: 2d3eaf9c183473c1ae7a65120ee54d5f32b369229b29282936b5bcbb32b482a39e7da011b8b51479ef8f9dd4f941c58571455759065bce6eb81889b061bc11c4
-  data.tar.gz: 5283d53bae1c583c57fbe5459505a10f4d6bc5b45fc7647863c2ca4927f18ed205a70e4ade244b39f1ac3f5f403fbc83896dfd5fedf9d9444ec9ef51db70493e
+  metadata.gz: 4ac1417a702843bc61302022870872bbb353e8f0cd3408cd3d152bbb77cd08d62f78566f28a1f7b1d589624eb539322d24d94222435dad3defd741ea9d2b39e8
+  data.tar.gz: ad3f7f25ff4b2bd8122b36ba97d93b0b09c82298b729aa83c8647fa3a90380ed7c8fe4566023849542acb0772bd105197117a9c15184dfee6dbe9161e87a0b61

data/carray.h

@@ -505,7 +505,7 @@ typedef struct {
 
 /* 
    CAReduce is an internal class 
-   used only in reference as data_type with different byte size
+   used only in ca_obj_refer.c.
 */
 
 typedef struct {

data/carray_access.c

@@ -12,6 +12,25 @@
 
 #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])

data/carray_cast.c

@@ -357,7 +357,7 @@ rb_ca_to_fixlen (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE ropt = rb_pop_options(&argc, &argv);
   VALUE list[2];
-  rb_scan_args(argc, argv, "0");
+//  rb_scan_args(argc, argv, "0");
   list[0] = INT2NUM(CA_FIXLEN);
   list[1] = ropt;
   return rb_ca_to_type_internal(2, list, self);

data/carray_numeric.c

@@ -13,6 +13,11 @@
 #include "ruby.h"
 #include "carray.h"
 
+#if RUBY_VERSION_CODE >= 240
+# define rb_cFixnum rb_cInteger
+# define rb_cBignum rb_cInteger
+#endif
+
 VALUE CA_NAN, CA_INF;
 
 static ID id___or__;

data/carray_utils.c

@@ -20,6 +20,25 @@
 #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])

data/ext/fortio/lib/fortio/fortran_namelist.rb

@@ -62,7 +62,7 @@ def fortran_namelist (name, out)
     end
     " #{ident} = #{value}" 
   }
-  return ["&#{name}", list.join(",\n") + "  /"].join("\n")
+  return ["&#{name}", list.join(",\n") + "  /", ""].join("\n")
 end
 
 def fortran_namelist_read (io, name=nil, out={})

data/ext/fortio/test/test_namelist_write.rb

@@ -0,0 +1,10 @@
+require "fortio"
+
+a = {
+  :array => [1,2,3],
+  :x => 1,
+  :y => 2.2
+}
+
+fortran_namelist_write(STDOUT, "a", a)
+fortran_namelist_write(STDOUT, "a", a)

data/ruby_float_func.c

@@ -77,7 +77,12 @@ Init_numeric_float_function ()
   rb_define_method(mod, "distance", rb_num_distance, 1);    
 
   rb_include_module(rb_cFloat, mod);
+#if RUBY_VERSION_CODE >= 240
+  rb_include_module(rb_cInteger, mod);
+#else
   rb_include_module(rb_cFixnum, mod);
   rb_include_module(rb_cBignum, mod);  
+#endif
+
 }
 

data/version.h

@@ -10,9 +10,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.1.8"
-#define CA_VERSION_CODE 118
+#define CA_VERSION "1.2.0"
+#define CA_VERSION_CODE 120
 #define CA_VERSION_MAJOR 1
-#define CA_VERSION_MINOR 1
-#define CA_VERSION_TEENY 8
-#define CA_VERSION_DATE "2016/05/10"
+#define CA_VERSION_MINOR 2
+#define CA_VERSION_TEENY 0
+#define CA_VERSION_DATE "2017/02/09"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -178,6 +178,7 @@ files:
 - ext/fortio/test/test_T.rb
 - ext/fortio/test/test_fortran_format.rb
 - ext/fortio/test/test_namelist.rb
+- ext/fortio/test/test_namelist_write.rb
 - ext/fortio/test/test_sequential.rb
 - ext/fortio/test/test_sequential2.rb
 - ext/fortio/work/test.rb
@@ -392,9 +393,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Multi-dimesional array class
 test_files: []
-has_rdoc: true