ghazel-ffi_gen 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d9a31a03b353773ac55436aceb61ed358db558
-  data.tar.gz: b1bc130c65b38f4cc1932198bed025608765cdde
+  metadata.gz: 43bc6326ee11945bede82eb49c7481a27217099a
+  data.tar.gz: fa9c1dcff4c9cc46df121774b78a3de43908df8b
 SHA512:
-  metadata.gz: e8a2ec67c9d5d03610b6567d5bfa877f88a4f01dfd7dc7d8346874af55a9274a9c89c87b771d6791267331a7d31d36f525969b294d52ebf45d670a7e56d5f66f
-  data.tar.gz: 69d90f9cf9ada7339e33e4ddebf7e847b26421f9814d6bccfccd419ec52968f00996cf9f94d9b0ecdb6a032b02fbe6f12eb363dd8d5de358cb06d05edb0973d4
+  metadata.gz: 22209a392916602e57e97af4f5577c53c4ba81d2d9b8a8baf4b7a8ef9330df791bf18ec8e1a0c68801a00e9d320aa9002f87cbd992f630ffecb9b8fdec66abe4
+  data.tar.gz: f85eef1eedd50c1f337f6d3d0df92d95498992d2d728069fb0603ece080f51eb55f3258fab0c9bf1fc9e40d762aa939aa87620518be15c419c1bf2acae429a85

data/lib/ffi_gen.rb

@@ -230,9 +230,10 @@ class FFIGen
   end
 
   class PointerType < Type
-    attr_reader :pointee_name, :depth
+    attr_reader :pointee_type, :pointee_name, :depth
 
-    def initialize(pointee_name, depth)
+    def initialize(pointee_type, pointee_name, depth)
+      @pointee_type = pointee_type
       @pointee_name = pointee_name
       @depth = depth
     end
@@ -677,7 +678,8 @@ class FFIGen
               break
             end
           end
-          type = PointerType.new pointee_name, pointer_depth
+          pointee_type = resolve_type current_type
+          type = PointerType.new pointee_type, pointee_name, pointer_depth
         end
 
         type
@@ -693,7 +695,7 @@ class FFIGen
     when :unexposed, :function_proto
       UnknownType.new
     when :incomplete_array
-      PointerType.new resolve_type(Clang.get_array_element_type(canonical_type)).name, 1
+      ArrayType.new resolve_type(Clang.get_array_element_type(canonical_type)), nil
     else
       raise NotImplementedError, "No translation for values of type #{canonical_type[:kind]}"
     end

data/lib/ffi_gen/java_output.rb

@@ -4,7 +4,7 @@ class FFIGen
     writer.puts "// Generated by ffi_gen. Please do not change this file by hand.", "import java.util.*;", "import com.sun.jna.*;", "import java.lang.annotation.*;", "import java.lang.reflect.Method;", "", "public class #{@module_name} {"
     writer.indent do
       writer.puts "private static #{@module_name}Interface INSTANCE = #{@module_name}Interface.JnaInstanceCreator.createInstance();"
-      writer.puts "", *IO.readlines(File.join(File.dirname(__FILE__), "java_enum.java")).map(&:rstrip), ""
+      writer.puts "", *IO.readlines(File.join(File.dirname(__FILE__), "java_static.java")).map(&:rstrip), ""
 
       declarations.each do |declaration|
         if declaration.respond_to? :write_static_java
@@ -17,7 +17,7 @@ class FFIGen
 
       writer.puts "private interface #{@module_name}Interface extends Library {"
       writer.indent do
-        writer.puts "", *IO.readlines(File.join(File.dirname(__FILE__), "java_pre.java")).map(&:rstrip), ""
+        writer.puts "", *IO.readlines(File.join(File.dirname(__FILE__), "java_interface.java")).map(&:rstrip), ""
         writer.puts "static class JnaInstanceCreator {"
         writer.indent do
           writer.puts "private static #{@module_name}Interface createInstance() {"
@@ -165,23 +165,49 @@ class FFIGen
     def write_static_java(writer)
       return if @is_callback # not yet supported
       
+      replace = {}
+      parameters = []
+      lp = nil
+      @parameters.each do |p|
+        if lp && lp[:type].is_a?(PointerType) && lp[:type].pointee_type.clang_type == :u_char && p[:type].clang_type == :u_long
+          n = lp[:name].to_java_downcase
+          replace[n] = "bytesToPointer(#{n})"
+          replace[p[:name].to_java_downcase] = "#{n}.length";
+          d = lp.dup
+          d[:type] = ArrayType.new(lp[:type].pointee_type, nil)
+          parameters << d
+          lp = nil
+        else
+          if lp
+            parameters << lp
+          end
+          lp = p
+        end
+      end
+      if lp
+        parameters << lp
+      end
+      
       writer.comment do
         writer.write_description @function_description
         writer.puts "", "<em>This entry is only for documentation and no real method.</em>" if @is_callback
-        writer.puts "", "@method #{@is_callback ? "_callback_#{java_name}_" : java_name}(#{@parameters.map{ |parameter| parameter[:name].to_java_downcase }.join(', ')})"
-        @parameters.each do |parameter|
+        writer.puts "", "@method #{@is_callback ? "_callback_#{java_name}_" : java_name}(#{parameters.map{ |parameter| parameter[:name].to_java_downcase }.join(', ')})"
+        parameters.each do |parameter|
           writer.write_description parameter[:description], false, "@param [#{parameter[:type].java_description}] #{parameter[:name].to_java_downcase} ", "  "
         end
         writer.write_description @return_value_description, false, "@return [#{@return_type.java_description}] ", "  "
         writer.puts "@scope class"
       end
       
-      args = @parameters.map{ |parameter| parameter[:name].to_java_downcase }.join(', ')
-      jna_signature = "#{@parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
+      args = @parameters.map{ |parameter|
+        n = parameter[:name].to_java_downcase
+        replace[n] || n
+      }.join(', ')
+      jna_signature = "#{parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
       writer.puts "static #{@return_type.java_jna_type} #{java_name}(#{jna_signature}) {"
       writer.indent do
         call = "INSTANCE.#{java_name}(#{args});"
-        if @return_type.respond_to? :no_return and @return_type.no_return
+        if @return_type.respond_to? :clang_type and @return_type.clang_type == :void
           writer.puts call
         else
           writer.puts "return #{call}"
@@ -225,6 +251,8 @@ class FFIGen
   end
   
   class PrimitiveType
+    attr_accessor :clang_type
+
     def java_name
       case @clang_type
       when :void
@@ -256,10 +284,6 @@ class FFIGen
       when :double          then "double"
       end
     end
-
-    def no_return
-      @clang_type == :void
-    end
   end
   
   class StringType
@@ -303,7 +327,7 @@ class FFIGen
     
     def java_jna_type
       if @constant_size
-        raise
+        "#{@element_type.java_jna_type}[#{@constant_size}]"
       else
         "#{@element_type.java_jna_type}[]"
       end

data/lib/ffi_gen/java_static.java

@@ -0,0 +1,9 @@
+interface NativeEnum {
+    public int toNativeInt();
+}
+
+static Pointer bytesToPointer(byte[] b) {
+    Pointer p = new Memory(b.length);
+    p.write(0, b, 0, b.length);
+    return p;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghazel-ffi_gen
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Richard Musiol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,8 +38,8 @@ files:
 - LICENSE
 - README.md
 - lib/ffi_gen/empty.h
-- lib/ffi_gen/java_pre.java
-- lib/ffi_gen/java_enum.java
+- lib/ffi_gen/java_interface.java
+- lib/ffi_gen/java_static.java
 homepage: https://github.com/neelance/ffi_gen
 licenses:
 - MIT

data/lib/ffi_gen/java_enum.java

@@ -1,3 +0,0 @@
-interface NativeEnum {
-    public int toNativeInt();
-}