ghazel-ffi_gen 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090018fd35c04887cedab97b06f59f1f875af9f3
-  data.tar.gz: 35da7c2e46992090c8f0b41f05ab1d4d110db502
+  metadata.gz: 32ad2abdaee3cc109a729362447b3938e4b66e4b
+  data.tar.gz: 0e553a6093fd7a600ffae764a8a232b8f36375d3
 SHA512:
-  metadata.gz: aa09c56a94eeb80506c71a9ba38b047d82761764f9a9847e5b5a116527f78273e7ef6d0f2a78663db7f4c3b5de666f287492c97656368aca2e9c87742af90124
-  data.tar.gz: fa44091cfeb2cec751bf8c0ac87eff4da369bc30502c8a4a4c3cdcfc4b815cb3361934411aa37cb695513a107b8efff11d11c55c0bb0c5da53fb8c763e4645c2
+  metadata.gz: 64e7336d1f6f8dd02fc6957b182c16fac32ab6177eabb5d85afd24e1838c9c2b21e9d5ad19189548389b85d0f7ea57a9767f9eb07dd6e7cefbb86cd7254f6c57
+  data.tar.gz: 750846ae5693d8ffd36b37cbc36c66191d5f8c943092566b76d5b568b9d46089b9d025d2da4f75d6abcd611e37f5151ba0fa2877e02a064cfef5f33b10b56b5c

data/lib/ffi_gen/java_output.rb

@@ -152,15 +152,8 @@ 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.puts "public static interface #{java_name.split('.').last} 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});"
@@ -168,6 +161,13 @@ class FFIGen
         writer.puts "}", ""
         return
       end
+
+      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)
+      return if @is_callback # must be in Library
       
       replace = {}
       parameters = []
@@ -221,7 +221,8 @@ class FFIGen
     end
     
     def java_name
-      @java_name ||= @name.to_java_downcase
+      n = (@is_callback ? (@generator.module_name + 'Interface.') : '') + @name.to_java_downcase
+      @java_name ||= n
     end
     
     def java_jna_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghazel-ffi_gen
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Richard Musiol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi