ghazel-ffi_gen 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814f926f32ab7a8092edafb03d11e41677c4fd30
-  data.tar.gz: 7c9df589bfc4da60582ffab234441e187445cbae
+  metadata.gz: 905c48454a26dbe7f5ccf7b1628ad0101f93c9a4
+  data.tar.gz: c56b7b4397a850020c2791d1db5fcecfcda3a6cf
 SHA512:
-  metadata.gz: 58190d289a912053875897844067f69e4b4f6c5b9f106ebdf291784caa688c7730fdc830fd69e7c8d7f1c1846e59c77a02aacec087b5bc4bcbf1e19ba018e193
-  data.tar.gz: 1ec94347d53eeb823c57a1bf112b23e67edf0632cc6272a0a73bdc6e6f21ec9be1f9e109e7114e932bc8ae8bcb4f757cda3ff482ec27cae0bd9b5a9e3736c2c7
+  metadata.gz: 5202d969e6113cfccb7eee7d5b2962b93f52a882119b0d3bbcf83e6b7cd8f20183db482484690392d1efbe6466cc576f308651c089cff3a0e976edbe9914d7ec
+  data.tar.gz: 68882a7d939d360f06df65c4d0b52f9e5457337576adf6fdc43615b01977d4a1cdd98ede7e8846d003ba381d4d5c89fb24abaac3dd6759361b777ace0a7fbefc

data/lib/ffi_gen/java_output.rb

@@ -152,20 +152,22 @@ class FFIGen
   
   class FunctionOrCallback
     def write_java(writer)
+      return if @is_callback # static only
+
       jna_signature = "#{@parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
+      writer.puts "@NativeName(\"#{@name.raw}\")", "#{@return_type.java_jna_type} #{java_name}(#{jna_signature});", ""
+    end
+    
+    def write_static_java(writer)
       if @is_callback
         writer.puts "public static interface #{java_name} extends Callback {"
         writer.indent do
+          jna_signature = "#{@parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
           writer.puts "#{@return_type.java_jna_type} invoke(#{jna_signature});"
         end
-        writer.puts "}"
-      else
-        writer.puts "@NativeName(\"#{@name.raw}\")", "#{@return_type.java_jna_type} #{java_name}(#{jna_signature});", ""
+        writer.puts "}", ""
+        return
       end
-    end
-    
-    def write_static_java(writer)
-      return if @is_callback # not yet supported
       
       replace = {}
       parameters = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghazel-ffi_gen
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Richard Musiol