jl4rb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee2b9429514424e01c99dcec41acf6066b5c399937723649159f411e714abfb
-  data.tar.gz: 623f3df43750d4f369cd9b221f4d68df83e6d87739d98b48136479e532ecece1
+  metadata.gz: 2f7cae52ad265d312103b5315bfd6280f2eba84b7745890046d0b5fcd2ae839f
+  data.tar.gz: 60e322b9e4f36c971156a754750b9b0de176a71556f437e4c2d28fbb30d51108
 SHA512:
-  metadata.gz: a440ce035beee6f21b263870cc3292fcc7ac54dd36778c743cdd30086d6952b1aae36e91bc1380734e63186bd90a81c6509115206292ca0111f79ed4a6d00215
-  data.tar.gz: cc61b73afa390b9b189f0454b73de020c9614c7bdd382c01ea6d218f1ddca10f47b5b1c3a41b09789847d41978476ca7be515e526c408e0041b98c9180c57c64
+  metadata.gz: aa638b61bf3d4cb80caa430299c7add73f039b55e93c8ebd55bb4d00de4dfdf71bda3b3d08e20b971ba71bb7e7d0958bdb4266ed23b171071ef685f6342e6697
+  data.tar.gz: 77cc18725d48204aafcd6fea6b8a0b460c5f8e74eb0de206b2e659bcf4f936b6e1a91e98b5ba87e5cc10bc980a3bc54bd426b976cb6093a03b76b7bb4f4f206f

data/ext/jl4rb/jl4rb.c

@@ -278,7 +278,7 @@ VALUE util_jl_value_to_VALUE(jl_value_t *ans)
 //-| Todo: when not a vector, avoid transform to vector first.
 jl_value_t* util_VALUE_to_jl_value(VALUE arr)
 {
-  jl_value_t *ans,*elt;
+  jl_value_t *ans,*elt,*array_type;
   VALUE res,class,tmp;
   int i,n=0,vect=1;
 
@@ -293,39 +293,43 @@ jl_value_t* util_VALUE_to_jl_value(VALUE arr)
   }
 
   class=rb_class_of(rb_ary_entry(arr,0));
-  ans=jl_alloc_cell_1d(n);
+  
   if(class==rb_cFloat) {
     //-| This is maybe faster and can be developped in julia-api as jl_vector_float64(n) for example.
-    //ans=jl_alloc_array_1d(jl_float64_type,n);
+    array_type=jl_apply_array_type((jl_value_t*)jl_float64_type, 1);
+    ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       elt=jl_box_float64(NUM2DBL(rb_ary_entry(arr,i)));
-      jl_arrayset(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
 #if RUBY_API_VERSION_CODE >= 20400
   } else if(class==rb_cInteger) {
 #else
   } else if(class==rb_cFixnum || class==rb_cBignum) {
 #endif
-    //ans=jl_alloc_array_1d(jl_long_type,n);
+    array_type=jl_apply_array_type((jl_value_t*)jl_long_type, 1);
+    ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       elt=jl_box_long(NUM2INT(rb_ary_entry(arr,i)));
-      jl_arrayset(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else if(class==rb_cTrueClass || class==rb_cFalseClass) {
-    //ans=jl_alloc_array_1d(jl_bool_type,n);
+    array_type=jl_apply_array_type((jl_value_t*)jl_bool_type, 1);
+    ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       elt=jl_box_bool(rb_class_of(rb_ary_entry(arr,i))==rb_cFalseClass ? 0 : 1);
-      jl_arrayset(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else if(class==rb_cString) {
-    //ans=jl_alloc_array_1d(jl_utf8_string_type,n);
+    array_type=jl_apply_array_type((jl_value_t*)jl_string_type, 1);
+    ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       tmp=rb_ary_entry(arr,i);
       elt=jl_cstr_to_string(StringValuePtr(tmp));
-      jl_arrayset(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else ans=NULL;
-  if(!vect && ans) ans=jl_arrayref(ans,0);
+  if(!vect && ans) ans=jl_arrayref((jl_array_t*)ans,0);
   return ans;
 }
 

data/jl4rb.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 
 PKG_NAME='jl4rb'
-PKG_VERSION='0.2.2'
+PKG_VERSION='0.2.3'
 PKG_FILES=FileList[
     'Rakefile','jl4rb.gemspec',
     'ext/jl4rb/*.c',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jl4rb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - CQLS