malachite 0.0.19 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5d62979fa779720b2f8ab0e3c4833326fd1db9
-  data.tar.gz: d5e89effa2ebc4ba538bd97ff291fc922e603d44
+  metadata.gz: 233112bb95e12d25261f6ba2c8694c0634c6be04
+  data.tar.gz: ef2ce7c4b9bd83c50f19c8314e07dcd6e17ed664
 SHA512:
-  metadata.gz: 69194fea87ccc2b955780a7e47f262dfdd6082eb787441bbf615a05ed45a750b72720e4418e130f29deb4ea52f20df1530a84f6b6bd81d225dced7eb4592544b
-  data.tar.gz: ddb8e32010a15f635c0148446e819a8c7798bfe868779c3714c430c6b974a973b87726670a20d7291bd99f37d24d911a1c269eca7ab181e0326275daf313b3a9
+  metadata.gz: e2df3015621e0894ee169f4cae21d6dbf7f339a69e2537e6107ef0fe745e833c96ee464685dcd34124958ed2d8b72e81409a04b662f38a52d6bc0e81ccab9a31
+  data.tar.gz: 98799f8b8e9a723ad1f0befff9f110002b1f0f95995d1966e09f7eaaf041b02cebec451c3ab9953034b26219b7e73a8cd45ec58d71aaff53d9f57380f5cb4d6e

data/lib/malachite/cgo.tmpl

@@ -0,0 +1,8 @@
+package main
+
+// #cgo darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
+// #cgo !darwin LDFLAGS: -Wl,-unresolved-symbols=ignore-all
+// #include <stdlib.h>
+// #include "ruby/ruby.h"
+// VALUE rb_utf8_str_new(const char *str, long len);
+import "C"

data/lib/malachite/exporter.go.tmpl

@@ -1,11 +1,14 @@
 //export callXXXXXX
-func callXXXXXX(data *C.char) *C.char {
+func callXXXXXX(data *C.char) C.VALUE {
 	things := YYYYYY
 	err := Unmarshal(C.GoString(data), &things)
 	if err != nil {
-		return C.CString(err.Error())
+		str := err.Error()
+		cstr := GOSTRING_PTR(str)
+		return C.rb_utf8_str_new(cstr, C.long(len(str)))
+	} else {
+		str := Marshal(HandleXXXXXX(things))
+		cstr := GOSTRING_PTR(str)
+		return C.rb_utf8_str_new(cstr, C.long(len(str)))
 	}
-	marshaled := C.CString(Marshal(HandleXXXXXX(things)))
-	defer C.free(unsafe.Pointer(marshaled))
-	return marshaled
 }

data/lib/malachite/file_compiler.rb

@@ -7,10 +7,7 @@ module Malachite
     def compile
       File.open(path_to_tmp_file(@file), 'w') do |file|
         if file_has_handle_function?(@file)
-          file.puts 'package main'
-          file.puts '// #include <stdlib.h>'
-          file.puts "import \"C\""
-          file.puts "import \"unsafe\""
+          file.puts cgo_tmpl
           file.puts source_file(@file)
           file.puts exporter_boilerplate(@file)
         else
@@ -22,6 +19,10 @@ module Malachite
 
     private
 
+    def cgo_tmpl
+      File.read(File.expand_path('../cgo.tmpl', __FILE__))
+    end
+
     def source_file(f)
       source = File.read(f)
       source.gsub(/package main/, '')

data/lib/malachite/function.rb

@@ -8,7 +8,7 @@ module Malachite
     end
 
     def call
-      Malachite.from_function_cache(@name).call(@args).to_s
+      Malachite.from_function_cache(@name).call(@args).to_value
     end
   end
 end

data/lib/malachite/main.go.tmpl

@@ -1,6 +1,7 @@
 package main
 import "C"
 import "encoding/json"
+import "unsafe"
 
 func main() {}
 
@@ -16,3 +17,8 @@ func Marshal(v interface{}) string {
 	}
 	return string(b)
 }
+
+func GOSTRING_PTR(str string) *C.char {
+	bytes := *(*[]byte)(unsafe.Pointer(&str))
+	return (*C.char)(unsafe.Pointer(&bytes[0]))
+}

data/lib/malachite/version.rb

@@ -1,3 +1,3 @@
 module Malachite
-  VERSION = '0.0.19'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malachite
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.1.0
 platform: ruby
 authors:
 - Zack Hubert
@@ -65,6 +65,7 @@ files:
 - README.md
 - Rakefile
 - lib/malachite.rb
+- lib/malachite/cgo.tmpl
 - lib/malachite/client.rb
 - lib/malachite/compiler.rb
 - lib/malachite/errors.rb