gir_ffi 0.0.10 → 0.0.11

data/lib/gir_ffi/builder/function.rb

@@ -80,6 +80,8 @@ module GirFFI::Builder
       po = (@data.map(&:post) + @data.map(&:postpost) + @rvdata.post)
       po.unshift @errarg.post
 
+      po += @data.map {|d| d.cleanup}
+
       retvals = ([@rvdata.retval] + @data.map(&:retval)).compact
       po << "return #{retvals.join(', ')}" unless retvals.empty?
 

data/lib/gir_ffi/builder/module.rb

@@ -18,7 +18,7 @@ module GirFFI
       build_module
     end
 
-    def setup_function method
+    def setup_method method
       go = function_introspection_data method.to_s
 
       return false if go.nil?
@@ -34,7 +34,7 @@ module GirFFI
       true
     end
 
-    def build_class classname
+    def build_namespaced_class classname
       info = gir.find_by_name @namespace, classname.to_s
       Builder.build_class info
     end

data/lib/gir_ffi/builder/type/base.rb

@@ -10,6 +10,13 @@ module GirFFI
           @classname = @info.name.gsub(/^(.)/) { $1.upcase }
         end
 
+        def build_class
+          unless defined? @klass
+            instantiate_class
+          end
+          @klass
+        end
+
         private
 
         def info

data/lib/gir_ffi/builder/type/callback.rb

@@ -7,14 +7,7 @@ module GirFFI
       # attached to the appropriate namespace module, and will be defined
       # as a callback for FFI.
       class Callback < Base
-        def build_class
-          unless defined? @klass
-            instantiate_callback_class
-          end
-          @klass
-        end
-
-        def instantiate_callback_class
+        def instantiate_class
           @klass = optionally_define_constant namespace_module, @classname do
             args = Builder.ffi_function_argument_types info
             ret = Builder.ffi_function_return_type info

data/lib/gir_ffi/builder/type/constant.rb

@@ -14,12 +14,7 @@ module GirFFI
           :utf8 => :v_string
         }
 
-        def build_class
-          unless defined? @klass
-            instantiate_class
-          end
-          @klass
-        end
+        private
 
         def instantiate_class
           @klass = optionally_define_constant namespace_module, @classname do

data/lib/gir_ffi/builder/type/enum.rb

@@ -7,12 +7,7 @@ module GirFFI
       # attached to the appropriate namespace module, and will be defined
       # as an enum for FFI.
       class Enum < RegisteredType
-        def build_class
-          unless defined? @klass
-            instantiate_enum_class
-          end
-          @klass
-        end
+        private
 
         def value_spec
           return info.values.map {|vinfo|
@@ -21,7 +16,7 @@ module GirFFI
           }.flatten
         end
 
-        def instantiate_enum_class
+        def instantiate_class
           if const_defined_for namespace_module, @classname
             @klass = namespace_module.const_get @classname
           else

data/lib/gir_ffi/builder/type/interface.rb

@@ -1,29 +1,27 @@
-require 'gir_ffi/builder/type/struct_based'
+require 'gir_ffi/builder/type/registered_type'
+require 'gir_ffi/builder/type/with_methods'
+require 'gir_ffi/interface_base'
+
 module GirFFI
   module Builder
     module Type
 
-      # Implements the creation of a class representing an Interface.
+      # Implements the creation of a module representing an Interface.
       class Interface < RegisteredType
-        def build_class
-          unless defined? @klass
-            instantiate_module
-          end
-          @klass
-        end
+        include WithMethods
+
+        private
 
-        def instantiate_module
+        # FIXME: The word 'class' is not really correct.
+        def instantiate_class
           @klass = optionally_define_constant(namespace_module, @classname) do
-            ::Module.new do
-              def self.gir_ffi_builder
-                const_get :GIR_FFI_BUILDER
-              end
-            end
+            ::Module.new
           end
           setup_module unless already_set_up
         end
 
         def setup_module
+          @klass.extend InterfaceBase
           setup_constants
           stub_methods
         end

data/lib/gir_ffi/builder/type/object.rb

@@ -10,7 +10,7 @@ module GirFFI
             return true
           else
             if parent
-              return superclass.gir_ffi_builder.setup_method method
+              return superclass._setup_method method
             else
               return false
             end
@@ -21,22 +21,36 @@ module GirFFI
           if super
             return true
           else
-            info.interfaces.each do |ifinfo|
-              iface = GirFFI::Builder.build_class ifinfo
-              if iface.gir_ffi_builder.setup_instance_method method
-                return true
-              end
-            end
-            if parent
-              return superclass.gir_ffi_builder.setup_instance_method method
-            else
-              return false
+            setup_instance_method_in_ancestor method
+          end
+        end
+
+        def find_signal signal_name
+          signal_definers.each do |inf|
+            inf.signals.each do |sig|
+              return sig if sig.name == signal_name
             end
           end
+          if parent
+            return superclass._find_signal signal_name
+          end
         end
 
         private
 
+        def setup_instance_method_in_ancestor method
+          interfaces.each do |iface|
+            if iface._setup_instance_method method
+              return true
+            end
+          end
+          if parent
+            return superclass._setup_instance_method method
+          else
+            return false
+          end
+        end
+
         def setup_class
           super
           setup_vfunc_invokers
@@ -70,8 +84,7 @@ module GirFFI
         end
 
         def setup_interfaces
-          info.interfaces.each do |ifinfo|
-            iface = GirFFI::Builder.build_class ifinfo
+          interfaces.each do |iface|
             @klass.class_eval do
               include iface
             end
@@ -81,6 +94,12 @@ module GirFFI
         def signal_definers
           [info] + info.interfaces
         end
+
+        def interfaces
+          info.interfaces.map do |ifinfo|
+            GirFFI::Builder.build_class ifinfo
+          end
+        end
       end
     end
   end

data/lib/gir_ffi/builder/type/registered_type.rb

@@ -9,72 +9,8 @@ module GirFFI
       # of IRegisteredTypeInfo. These are types whose C representation is
       # complex, i.e., a struct or a union.
       class RegisteredType < Base
-        def setup_method method
-          klass = build_class
-          meta = (class << klass; self; end)
-
-          go = method_introspection_data method
-          attach_and_define_method method, go, meta
-        end
-
-        def setup_instance_method method
-          go = instance_method_introspection_data method
-          attach_and_define_method method, go, build_class
-        end
-
         private
 
-        def method_introspection_data method
-          info.find_method method
-        end
-
-        def instance_method_introspection_data method
-          data = method_introspection_data method
-          return !data.nil? && data.method? ? data : nil
-        end
-
-        def function_definition go
-          Builder::Function.new(go, lib).generate
-        end
-
-        def attach_and_define_method method, go, modul
-          return false if go.nil?
-          Builder.attach_ffi_function lib, go
-          modul.class_eval { remove_method method }
-          modul.class_eval function_definition(go)
-          true
-        end
-
-        def setup_class
-          setup_layout
-          setup_constants
-          stub_methods
-          setup_gtype_getter
-        end
-
-        def setup_layout
-          spec = layout_specification
-          @structklass.class_eval { layout(*spec) }
-        end
-
-        def layout_specification
-          fields = info.fields
-
-          if fields.empty?
-            if parent
-              return [:parent, superclass.const_get(:Struct), 0]
-            else
-              return [:dummy, :char, 0]
-            end
-          end
-
-          fields.map do |finfo|
-            [ finfo.name.to_sym,
-              itypeinfo_to_ffitype_for_struct(finfo.field_type),
-              finfo.offset ]
-          end.flatten
-        end
-
         # FIXME: Move this into a class with the other type knowledge.
         def itypeinfo_to_ffitype_for_struct typeinfo
           ffitype = Builder.itypeinfo_to_ffitype typeinfo
@@ -96,21 +32,8 @@ module GirFFI
           const_defined_for @klass, :GIR_FFI_BUILDER
         end
 
-        def stub_methods
-          info.get_methods.each do |minfo|
-            @klass.class_eval method_stub(minfo.name, minfo.method?)
-          end
-        end
-
-        def method_stub symbol, is_instance_method
-          "
-            def #{is_instance_method ? '' : 'self.'}#{symbol} *args, &block
-              setup_and_call :#{symbol}, *args, &block
-            end
-          "
-        end
-
         # TODO: Rename the created method, or use a constant.
+        # FIXME: Only used in some of the subclases. Make mixin?
         def setup_gtype_getter
           gtype = info.g_type
           return if gtype.nil?

data/lib/gir_ffi/builder/type/struct.rb

@@ -5,6 +5,8 @@ module GirFFI
 
       # Implements the creation of a class representing a Struct.
       class Struct < StructBased
+        private
+
         def setup_class
           super
           provide_constructor

data/lib/gir_ffi/builder/type/struct_based.rb

@@ -1,39 +1,24 @@
 require 'gir_ffi/builder/type/registered_type'
+require 'gir_ffi/builder/type/with_layout'
+require 'gir_ffi/builder/type/with_methods'
+
 module GirFFI
   module Builder
     module Type
 
       # Implements the creation of a class representing one of the types
-      # whose C representation is a struct, i.e., :object, :struct, and
-      # :interface.
+      # whose C representation is a struct, i.e., :object and :struct.
       class StructBased < RegisteredType
-        def build_class
-          unless defined? @klass
-            instantiate_struct_class
-          end
-          @klass
-        end
+        include WithMethods
+        include WithLayout
 
-        def instantiate_struct_class
+        private
+
+        def instantiate_class
           @klass = get_or_define_class namespace_module, @classname, superclass
           @structklass = get_or_define_class @klass, :Struct, FFI::Struct
           setup_class unless already_set_up
         end
-
-        def find_signal signal_name
-          signal_definers.each do |inf|
-            inf.signals.each do |sig|
-              return sig if sig.name == signal_name
-            end
-          end
-          if parent
-            return superclass.gir_ffi_builder.find_signal signal_name
-          end
-        end
-
-        def signal_definers
-          [info]
-        end
       end
     end
   end

data/lib/gir_ffi/builder/type/unintrospectable.rb

@@ -0,0 +1,63 @@
+require 'gir_ffi/builder/type/object'
+module GirFFI
+  module Builder
+    module Type
+
+      # Implements the creation of a class representing an object type for
+      # which no data is found in the GIR. Typically, these are created to
+      # cast objects returned by a function that returns an interface.
+      class Unintrospectable < Object
+        CACHE = {}
+
+        # FIXME: Breaks parent interface.
+        def initialize gtype
+          @gtype = gtype
+          @info = nil
+        end
+
+        def instantiate_class
+          CACHE[@gtype] ||= Class.new(superclass)
+          @klass = CACHE[@gtype]
+          setup_class unless already_set_up
+        end
+
+        def setup_class
+          setup_constants
+          setup_interfaces
+        end
+
+        def setup_instance_method method
+          setup_instance_method_in_ancestor method
+        end
+
+        private
+
+        def parent
+          parent_type = ::GObject.type_parent @gtype
+          gir.find_by_gtype(parent_type)
+        end
+
+        def interface_infos
+          ::GObject.type_interfaces(@gtype).map do |gtype|
+            gir.find_by_gtype gtype
+          end
+        end
+
+        def interfaces
+          interface_infos.map do |info|
+            GirFFI::Builder.build_class info
+          end
+        end
+
+        def signal_definers
+          interface_infos
+        end
+
+        def gir
+          @gir ||= GirFFI::IRepository.default
+        end
+      end
+    end
+  end
+end
+

data/lib/gir_ffi/builder/type/union.rb

@@ -1,4 +1,7 @@
 require 'gir_ffi/builder/type/registered_type'
+require 'gir_ffi/builder/type/with_layout'
+require 'gir_ffi/builder/type/with_methods'
+
 module GirFFI
   module Builder
     module Type
@@ -6,14 +9,12 @@ module GirFFI
       # Implements the creation of a class representing union type. The
       # class will have a nested FFI::Union class to represent its C union.
       class Union < RegisteredType
-        def build_class
-          unless defined? @klass
-            instantiate_union_class
-          end
-          @klass
-        end
+        include WithMethods
+        include WithLayout
+
+        private
 
-        def instantiate_union_class
+        def instantiate_class
           @klass = get_or_define_class namespace_module, @classname, superclass
           @structklass = get_or_define_class @klass, :Struct, FFI::Union
           setup_class unless already_set_up

data/lib/gir_ffi/builder/type/with_layout.rb

@@ -0,0 +1,43 @@
+module GirFFI
+  module Builder
+    module Type
+
+      # Implements the creation of classes representing types with layout,
+      # i.e., :union, :struct, :object.
+      module WithLayout
+        private
+
+        # TODO: Move to client classes.
+        def setup_class
+          setup_layout
+          setup_constants
+          stub_methods
+          setup_gtype_getter
+        end
+
+        def setup_layout
+          spec = layout_specification
+          @structklass.class_eval { layout(*spec) }
+        end
+
+        def layout_specification
+          fields = info.fields
+
+          if fields.empty?
+            if parent
+              return [:parent, superclass.const_get(:Struct), 0]
+            else
+              return [:dummy, :char, 0]
+            end
+          end
+
+          fields.map do |finfo|
+            [ finfo.name.to_sym,
+              itypeinfo_to_ffitype_for_struct(finfo.field_type),
+              finfo.offset ]
+          end.flatten
+        end
+      end
+    end
+  end
+end

data/lib/gir_ffi/builder/type/with_methods.rb

@@ -0,0 +1,61 @@
+module GirFFI
+  module Builder
+    module Type
+
+      # Implements method creation for types such as, :union, :struct,
+      # :object, :interface.
+      module WithMethods
+        def setup_method method
+          klass = build_class
+          meta = (class << klass; self; end)
+
+          go = method_introspection_data method
+          attach_and_define_method method, go, meta
+        end
+
+        def setup_instance_method method
+          go = instance_method_introspection_data method
+          attach_and_define_method method, go, build_class
+        end
+
+        private
+
+        def method_introspection_data method
+          info.find_method method
+        end
+
+        def instance_method_introspection_data method
+          data = method_introspection_data method
+          return !data.nil? && data.method? ? data : nil
+        end
+
+        def function_definition go
+          Builder::Function.new(go, lib).generate
+        end
+
+        def attach_and_define_method method, go, modul
+          return false if go.nil?
+          Builder.attach_ffi_function lib, go
+          modul.class_eval { remove_method method }
+          modul.class_eval function_definition(go)
+          true
+        end
+
+        def stub_methods
+          info.get_methods.each do |minfo|
+            @klass.class_eval method_stub(minfo.name, minfo.method?)
+          end
+        end
+
+        def method_stub symbol, is_instance_method
+          "
+            def #{is_instance_method ? '' : 'self.'}#{symbol} *args, &block
+              setup_and_call :#{symbol}, *args, &block
+            end
+          "
+        end
+
+      end
+    end
+  end
+end

data/lib/gir_ffi/builder.rb

@@ -1,4 +1,5 @@
 require 'gir_ffi/builder/type'
+require 'gir_ffi/builder/type/unintrospectable'
 require 'gir_ffi/builder/module'
 require 'gir_ffi/builder_helper'
 
@@ -9,8 +10,12 @@ module GirFFI
   module Builder
     extend BuilderHelper
 
+    sz = FFI.type_size(:size_t) * 8
+    gtype_type = "uint#{sz}".to_sym
+
     TAG_TYPE_MAP = {
       :GType => :size_t,
+      :gtype => gtype_type,
       :gboolean => :bool,
       :gunichar => :uint32,
       :gint8 => :int8,
@@ -31,6 +36,15 @@ module GirFFI
       Builder::Type.build(info)
     end
 
+    def self.build_by_gtype gtype
+      info = IRepository.default.find_by_gtype gtype
+      if info.nil?
+        Builder::Type::Unintrospectable.new(gtype).build_class
+      else
+        build_class info
+      end
+    end
+
     def self.build_module namespace, version=nil
       Builder::Module.new(namespace, version).generate
     end
@@ -58,12 +72,37 @@ module GirFFI
       types
     end
 
+    def self.ffi_argument_types_for_signal info
+      types = info.args.map do |arg|
+        itypeinfo_to_callback_ffitype arg.argument_type
+      end
+      types.unshift(:pointer).push(:pointer)
+    end
+
     def self.ffi_function_return_type info
       rt = info.return_type
       return :string if rt.tag == :utf8
       itypeinfo_to_ffitype rt
     end
 
+    def self.itypeinfo_to_callback_ffitype info
+      tag = info.tag
+
+      return :string if tag == :utf8
+      return :pointer if info.pointer?
+
+      if tag == :interface
+        case info.interface.info_type
+        when :enum, :flags
+          :int32
+        else
+          :pointer
+        end
+      else
+        return TAG_TYPE_MAP[tag] || tag
+      end
+    end
+
     def self.itypeinfo_to_ffitype info
       return :pointer if info.pointer?