gir_ffi 0.6.7 → 0.7.0

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -0,0 +1,57 @@
+require 'gir_ffi/return_value_info'
+require 'gir_ffi/builders/base_type_builder'
+require 'gir_ffi/builders/mapping_method_builder'
+require 'gir_ffi/receiver_type_info'
+require 'gir_ffi/receiver_argument_info'
+require 'gir_ffi/vfunc_base'
+
+module GirFFI
+  module Builders
+    # Implements the creation of a class representing the implementation of a
+    # vfunc. This class will be able to turn a proc into an FFI::Function that
+    # can serve as such an implementation in C.
+    class VFuncBuilder < BaseTypeBuilder
+      def instantiate_class
+        unless already_set_up
+          setup_constants
+          klass.class_eval mapping_method_definition
+        end
+        klass
+      end
+
+      def klass
+        @klass ||= get_or_define_class container_class, @classname, CallbackBase
+      end
+
+      def mapping_method_definition
+        arg_infos = info.args
+
+        receiver_info = ReceiverArgumentInfo.new(receiver_type_info)
+
+        MappingMethodBuilder.for_vfunc(receiver_info,
+                                       arg_infos,
+                                       info.return_type).method_definition
+      end
+
+      def receiver_type_info
+        ReceiverTypeInfo.new(container_info)
+      end
+
+      def container_class
+        @container_class ||= Builder.build_class(container_info)
+      end
+
+      def container_info
+        @container_info ||= info.container
+      end
+
+      def argument_types
+        @argument_types ||= info.argument_ffi_types.unshift(receiver_type_info.to_ffitype)
+      end
+
+      def return_type
+        @return_type ||= info.return_ffi_type
+      end
+    end
+  end
+end

data/lib/gir_ffi/builders/with_layout.rb

@@ -20,7 +20,7 @@ module GirFFI
 
       def setup_layout
         spec = layout_specification
-        @structklass.class_eval { layout(*spec) }
+        struct_class.class_eval { layout(*spec) }
       end
 
       def dummy_layout_specification
@@ -35,21 +35,23 @@ module GirFFI
         fields.map { |finfo| finfo.layout_specification }.flatten(1)
       end
 
-      def setup_accessors_for_field_info finfo
-        FieldBuilder.new(finfo).build
-      end
-
       def setup_field_accessors
         fields.each do |finfo|
-          setup_accessors_for_field_info finfo
+          FieldBuilder.new(finfo).build
         end
       end
 
       def instantiate_class
-        @klass = get_or_define_class namespace_module, @classname, superclass
-        @structklass = get_or_define_class @klass, :Struct, layout_superclass
         setup_class unless already_set_up
       end
+
+      def klass
+        @klass ||= get_or_define_class namespace_module, @classname, superclass
+      end
+
+      def struct_class
+        @structklass ||= get_or_define_class klass, :Struct, layout_superclass
+      end
     end
   end
 end

data/lib/gir_ffi/builders/with_methods.rb

@@ -36,7 +36,7 @@ module GirFFI
 
       def stub_methods
         info.get_methods.each do |minfo|
-          @klass.class_eval MethodStubber.new(minfo).method_stub
+          klass.class_eval MethodStubber.new(minfo).method_stub
         end
       end
     end

data/lib/gir_ffi/callback_base.rb

@@ -1,31 +1,65 @@
 require 'gir_ffi/type_base'
 
 module GirFFI
-  module CallbackBase
-    CALLBACKS = []
+  # Base module for callbacks.
+  class CallbackBase < Proc
+    extend TypeBase
+    extend FFI::DataConverter
 
-    def store_callback prc
-      CALLBACKS << prc
+    def self.native_type
+      FFI::Type::POINTER
+    end
+
+    def self.from_native(value, _context)
+      return nil if !value || value.null?
+      FFI::Function.new gir_ffi_builder.return_type, gir_ffi_builder.argument_types, value
     end
 
+    def self.to_native(value, _context)
+      return nil unless value
+      return value if FFI::Function === value
+      value.to_native
+    end
+
+    CALLBACKS = []
+
     def self.store_callback prc
       CALLBACKS << prc
     end
 
     # Create Callback from a Proc. Makes sure arguments are properly wrapped,
     # and the callback is stored to prevent garbage collection.
-    def from prc
+    def self.from prc
       wrap_in_callback_args_mapper(prc).tap do |cb|
         store_callback cb
       end
     end
 
-    def wrap_in_callback_args_mapper prc
+    def self.wrap_in_callback_args_mapper prc
+      return nil unless prc
       return prc if FFI::Function === prc
-      return nil if prc.nil?
-      return Proc.new do |*args|
+      return self.new do |*args|
         call_with_argument_mapping(prc, *args)
       end
     end
+
+    def self.to_ffitype
+      self
+    end
+
+    def to_native
+      @to_native ||= begin
+                       builder = self.class.gir_ffi_builder
+                       FFI::Function.new builder.return_type, builder.argument_types, self
+                     end
+    end
+
+    def self.copy_value_to_pointer value, pointer
+      pointer.put_pointer 0, to_native(value, nil)
+    end
+
+    def self.get_value_from_pointer pointer
+      from_native pointer.get_pointer(0), nil
+    end
   end
 end

data/lib/gir_ffi/class_base.rb

@@ -7,9 +7,8 @@ module GirFFI
   # the generated Struct classes.
   class ClassBase
     extend TypeBase
-
-    # TODO: Make separate base for :struct, :union, :object.
     extend Forwardable
+
     def_delegators :@struct, :to_ptr
 
     GIR_FFI_BUILDER = NullBuilder.new

data/lib/gir_ffi/enum_base.rb

@@ -1,9 +1,23 @@
 require 'gir_ffi/type_base'
 
 module GirFFI
+  # Base module for enums.
   module EnumBase
+    include FFI::DataConverter
     include TypeBase
-    # TODO: Make this a DataConverter
+
+    def native_type
+      self::Enum.native_type
+    end
+
+    def to_native *args
+      self::Enum.to_native(*args)
+    end
+
+    def from_native *args
+      self::Enum.from_native(*args)
+    end
+
     def [](arg)
       self::Enum[arg]
     end
@@ -12,8 +26,16 @@ module GirFFI
       self[arg]
     end
 
-    def to_native *args
-      self::Enum.to_native(*args)
+    def from arg
+      self[arg]
+    end
+
+    def copy_value_to_pointer value, pointer
+      pointer.put_int32 0, to_native(value, nil)
+    end
+
+    def get_value_from_pointer pointer
+      from_native pointer.get_int32(0), nil
     end
 
     def setup_and_call method, *arguments, &block
@@ -27,7 +49,7 @@ module GirFFI
     end
 
     def to_ffitype
-      self::Enum
+      self
     end
 
     def setup_method name

data/lib/gir_ffi/error_argument_info.rb

@@ -0,0 +1,21 @@
+module GirFFI
+  # Represents an error argument with the same interface as IArgumentInfo
+  class ErrorArgumentInfo
+    def skip?
+      false
+    end
+
+    def direction
+      :error
+    end
+
+    def argument_type
+      nil
+    end
+
+    def name
+      nil
+    end
+  end
+end
+

data/lib/gir_ffi/{setter_argument_info.rb → field_argument_info.rb}

@@ -1,7 +1,8 @@
 module GirFFI
   # Class to represent argument info for the argument of a setter method.
   # Implements the necessary parts of IArgumentInfo's interface.
-  class SetterArgumentInfo
+  # TODO: Rename and add direction argument or subclass
+  class FieldArgumentInfo
     attr_reader :name, :argument_type
 
     def initialize name, type

data/lib/gir_ffi/g_type.rb

@@ -0,0 +1,25 @@
+# Wrapper class providing extended functionality for a GType, which is normally
+# just a kind of integer
+class GirFFI::GType
+  def initialize gtype
+    @gtype = gtype
+  end
+
+  def to_i
+    @gtype
+  end
+  
+  def class_size
+    type_query.class_size
+  end
+
+  def instance_size
+    type_query.instance_size
+  end
+
+  private
+
+  def type_query
+    @type_query ||= GObject.type_query @gtype
+  end
+end

data/lib/gir_ffi/in_out_pointer.rb

@@ -2,7 +2,7 @@ module GirFFI
   # The InOutPointer class handles conversion between ruby types and
   # pointers for arguments with direction :inout and :out.
   #
-  # TODO: This has now become a more general extende pointer class and should be renamed.
+  # TODO: This has now become a more general extended pointer class and should be renamed.
   class InOutPointer < FFI::Pointer
     attr_reader :value_type
 
@@ -18,16 +18,10 @@ module GirFFI
     # TODO: Create type classes that extract values from pointers.
     def to_value
       case value_ffi_type
-      when Class
+      when Module
         value_ffi_type.get_value_from_pointer(self)
-      # FIXME: This is a hack, since :c is not really a FFI type. Make
-      # SizedArray a type FFI understands instead.
-      when :c
-        self
       when Symbol
         self.send("get_#{value_ffi_type}", 0)
-      when FFI::Enum
-        value_ffi_type[self.get_int32(0)]
       else
         raise NotImplementedError
       end
@@ -50,15 +44,10 @@ module GirFFI
 
     def set_value value
       case value_ffi_type
-      when Class
+      when Module
         value_ffi_type.copy_value_to_pointer(value, self)
-      # FIXME: Make SizedArray an FFI DataConverter so it conflates with the code above.
-      when :c
-        GLib::SizedArray.copy_value_to_pointer(value, self)
       when Symbol
         self.send "put_#{value_ffi_type}", 0, value
-      when FFI::Enum
-        self.send "put_int32", 0, value_ffi_type.to_native(value, nil)
       else
         raise NotImplementedError, value_ffi_type
       end

data/lib/gir_ffi/in_pointer.rb

@@ -21,7 +21,9 @@ module GirFFI
       when Module
         from_enum_array type, ary
       when Array
-        from_interface_pointer_array ary
+        main_type, sub_type = *type
+        raise "Unexpected main type #{main_type}" if main_type != :pointer
+        from_pointer_array sub_type, ary
       else
         raise NotImplementedError, type
       end
@@ -34,21 +36,17 @@ module GirFFI
         from_utf8 val
       when :gint32, :guint32, :gint8
         self.new val
+      when Class, :void
+        val.to_ptr
       when Module
         self.new type[val]
-      when :void
-        from_object val
       else
         raise NotImplementedError, type
       end
     end
 
     class << self
-      # FIXME: Hideous
-      def from_object obj
-        return nil if obj.nil?
-        return obj.to_ptr if obj.respond_to? :to_ptr
-
+      def from_closure_data obj
         FFI::Pointer.new(obj.object_id).tap {|ptr|
           ArgHelper::OBJECT_STORE[ptr.address] = obj }
       end
@@ -63,8 +61,8 @@ module GirFFI
         from_basic_type_array :int, ary.map {|val| val ? 1 : 0}
       end
 
-      def from_interface_pointer_array ary
-        from_basic_type_array :pointer, ary.map {|ifc| ifc.to_ptr}
+      def from_pointer_array type, ary
+        from_basic_type_array :pointer, ary.map {|elem| from type, elem }
       end
 
       def from_gvalue_array type, ary
@@ -79,13 +77,15 @@ module GirFFI
       end
 
       def from_struct_array type, ary
-        type_size = type::Struct.size
+        ffi_type = TypeMap.type_specification_to_ffitype type
+        type_size = FFI.type_size(ffi_type)
         length = ary.length
 
-        ptr = AllocationHelper.safe_malloc length * type_size
+        ptr = AllocationHelper.safe_malloc type_size * (length + 1)
         ary.each_with_index do |item, idx|
           type.copy_value_to_pointer item, ptr, idx * type_size
         end
+        ptr.put_bytes length * type_size, "\0" * type_size, 0, type_size
         new ptr
       end
 
@@ -100,18 +100,17 @@ module GirFFI
       end
 
       def from_basic_type_array type, ary
-        ffi_type = TypeMap.map_basic_type type
-        length = ary.length
-        size = FFI.type_size ffi_type
-
-        block = AllocationHelper.safe_malloc size * (length + 1)
+        ffi_type = TypeMap.type_specification_to_ffitype type
+        ary = ary.dup << null_value(ffi_type)
+        type_size = FFI.type_size(ffi_type)
+        block = AllocationHelper.safe_malloc type_size * ary.length
         block.send "put_array_of_#{ffi_type}", 0, ary
-        block.send("put_#{ffi_type}",
-                   length * size,
-                   (ffi_type == :pointer ? nil : 0))
-
         new block
       end
+
+      def null_value ffi_type
+        ffi_type == :pointer ? nil : 0
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext.rb

@@ -1,10 +1,12 @@
 require 'gir_ffi/info_ext/i_arg_info'
 require 'gir_ffi/info_ext/i_callable_info'
+require 'gir_ffi/info_ext/i_callback_info'
 require 'gir_ffi/info_ext/i_field_info'
 require 'gir_ffi/info_ext/i_function_info'
 require 'gir_ffi/info_ext/i_property_info'
 require 'gir_ffi/info_ext/i_registered_type_info'
 require 'gir_ffi/info_ext/i_signal_info'
 require 'gir_ffi/info_ext/i_type_info'
+require 'gir_ffi/info_ext/i_vfunc_info'
 require 'gir_ffi/info_ext/safe_constant_name'
 require 'gir_ffi/info_ext/safe_function_name'