gir_ffi 0.2.2 → 0.2.3

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

@@ -13,24 +13,20 @@ module GirFFI
           "until", "when", "while", "yield"
         ]
 
-        attr_reader :callarg, :name, :retname
+        attr_reader :name, :retname
 
         attr_accessor :length_arg, :array_arg
 
-        def initialize var_gen, name, typeinfo, libmodule
+        def initialize var_gen, name, typeinfo
           @typeinfo = typeinfo
           @inarg = nil
-          @callarg = nil
           @retname = nil
           @name = safe(name)
           @var_gen = var_gen
-          @libmodule = libmodule
           @length_arg = nil
           @array_arg = nil
         end
 
-        def prepare; end
-
         def type_info
           @typeinfo
         end
@@ -42,15 +38,18 @@ module GirFFI
 
         def subtype_tag index=0
           st = type_info.param_type(index)
-          t = st.tag
-          case t
+          tag = st.tag
+          case tag
           when :GType
             return :gtype
           when :interface
             return :interface_pointer if st.pointer?
             return :interface
+          when :void
+            return :gpointer if st.pointer?
+            return :void
           else
-            return t
+            return tag
           end
         end
 
@@ -100,6 +99,10 @@ module GirFFI
           @array_arg.nil? ? @retname : nil
         end
 
+        def callarg
+          @callarg ||= @var_gen.new_var
+        end
+
         def pre
           []
         end

data/lib/gir_ffi/builder/argument/in_base.rb

@@ -4,14 +4,10 @@ module GirFFI
       # Abstract base class implementing argument processing for arguments
       # with direction :in.
       class InBase < Base
-        # FIXME: Make class work without 'prepare' stage.
-        def prepare
+        def initialize var_gen, name, typeinfo
+          super var_gen, name, typeinfo
           @inarg = @name
         end
-
-        def callarg
-          @callarg ||= @var_gen.new_var
-        end
       end
     end
   end

data/lib/gir_ffi/builder/argument/in_out_base.rb

@@ -4,14 +4,11 @@ module GirFFI
       # Abstract base class implementing argument processing for arguments
       # with direction :inout.
       class InOutBase < Base
-        def prepare
+        def initialize var_gen, name, typeinfo
+          super var_gen, name, typeinfo
           @inarg = @name
         end
 
-        def callarg
-          @callarg ||= @var_gen.new_var
-        end
-
         def retname
           @retname ||= @var_gen.new_var
         end

data/lib/gir_ffi/builder/argument/out_base.rb

@@ -4,20 +4,9 @@ module GirFFI
       # Abstract base class implementing argument processing for arguments
       # with direction :out.
       class OutBase < Base
-        def prepare
-        end
-
-        def callarg
-          @callarg ||= @var_gen.new_var
-        end
-
         def retname
           @retname ||= @var_gen.new_var
         end
-
-        def pre
-          [ "#{callarg} = GirFFI::InOutPointer.for #{base_type.inspect}" ]
-        end
       end
     end
   end

data/lib/gir_ffi/builder/field.rb

@@ -0,0 +1,55 @@
+require 'gir_ffi/builder/argument'
+require 'gir_ffi/variable_name_generator'
+
+module GirFFI
+  module Builder
+    # Creates field getter and setter code for a given IFieldInfo.
+    class Field
+      def initialize field_info, lib_module
+        @info = field_info
+        @libmodule = lib_module
+      end
+
+      def getter_def
+        builder = return_value_builder
+
+        return <<-CODE
+        def #{@info.name}
+          #{builder.cvar} = @struct[#{field_symbol.inspect}]
+          #{builder.post.join("\n")}
+          #{builder.retval}
+        end
+        CODE
+      end
+
+      def setter_def
+        builder = setter_builder
+        name = @info.name
+
+        return <<-CODE
+        def #{name}= #{builder.inarg}
+          #{builder.pre.join("\n")}
+          @struct[#{name.to_sym.inspect}] = #{builder.callarg}
+        end
+        CODE
+      end
+
+      private
+
+      def field_symbol
+        @info.name.to_sym
+      end
+
+      def return_value_builder
+        @rv_builder ||= ReturnValueFactory.builder_for_field_getter(
+          VariableNameGenerator.new, @info.name, @info.field_type)
+      end
+
+      def setter_builder
+        type = @info.field_type
+        vargen = VariableNameGenerator.new
+        Builder::InArgument.builder_for vargen, "value", type, @libmodule
+      end
+    end
+  end
+end

data/lib/gir_ffi/builder/function.rb

@@ -13,12 +13,11 @@ module GirFFI::Builder
     def generate
       vargen = GirFFI::VariableNameGenerator.new
       @data = @info.args.map {|arg| Argument.build vargen, arg, @libmodule}
-      @rvdata = ReturnValue.build vargen, @info
+      @rvdata = ReturnValueFactory.build vargen, @info
 
       alldata = @data.dup << @rvdata
 
       alldata.each {|data|
-        data.prepare
 	idx = data.type_info.array_length
         if idx > -1
           data.length_arg = @data[idx] 
@@ -38,16 +37,17 @@ module GirFFI::Builder
 
     def setup_error_argument vargen
       klass = @info.throws? ? ErrorArgument : NullArgument
-      @errarg = klass.new vargen, nil, nil, nil
-      @errarg.prepare
+      @errarg = klass.new vargen, nil, nil
     end
 
     def filled_out_template
       lines = pre
-      lines << "#{capture}::#{@libmodule}.#{@info.symbol} #{callargs.join(', ')}"
+      lines << "#{capture}#{@libmodule}.#{@info.symbol} #{callargs.join(', ')}"
       lines << post
 
-      code = "def #{@info.safe_name} #{inargs.join(', ')}\n"
+      meta = @info.method? ? '' : "self."
+
+      code = "def #{meta}#{@info.safe_name} #{inargs.join(', ')}\n"
       code << lines.join("\n").indent
       code << "\nend\n"
     end
@@ -81,7 +81,7 @@ module GirFFI::Builder
       po = (@data.map(&:post) + @data.map(&:postpost) + @rvdata.post)
       po.unshift @errarg.post
 
-      po += @data.map {|d| d.cleanup}
+      po += @data.map {|item| item.cleanup}
 
       retvals = ([@rvdata.retval] + @data.map(&:retval)).compact
       po << "return #{retvals.join(', ')}" unless retvals.empty?

data/lib/gir_ffi/builder/module.rb

@@ -29,9 +29,7 @@ module GirFFI
       lib = modul.const_get(:Lib)
 
       Builder.attach_ffi_function lib, go
-
-      meta = (class << modul; self; end)
-      meta.class_eval function_definition(go, lib)
+      modul.class_eval function_definition(go, lib)
 
       true
     end
@@ -63,12 +61,12 @@ module GirFFI
     end
 
     def pretty_print
-      s = "module #{@safe_namespace}\n"
+      buf = "module #{@safe_namespace}\n"
       gir.infos(@namespace).each do |info|
-        s << sub_builder(info).pretty_print.indent
-        s << "\n"
+        buf << sub_builder(info).pretty_print.indent
+        buf << "\n"
       end
-      s << "end"
+      buf << "end"
     end
 
     private

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

@@ -5,26 +5,6 @@ module GirFFI
 
       # Implements the creation of a class representing a GObject Object.
       class Object < StructBased
-        def setup_method method
-          if super
-            return true
-          else
-            if parent
-              return superclass._setup_method method
-            else
-              return false
-            end
-          end
-        end
-
-        def setup_instance_method method
-          if super
-            return true
-          else
-            setup_instance_method_in_ancestor method
-          end
-        end
-
         def find_signal signal_name
           signal_definers.each do |inf|
             inf.signals.each do |sig|
@@ -49,19 +29,6 @@ module GirFFI
 
         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

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

@@ -11,22 +11,6 @@ module GirFFI
       class RegisteredType < Base
         private
 
-        # FIXME: Move this into a class with the other type knowledge.
-        def itypeinfo_to_ffitype_for_struct typeinfo
-          ffitype = Builder.itypeinfo_to_ffitype typeinfo
-          if ffitype.kind_of?(Class) and const_defined_for ffitype, :Struct
-            ffitype = ffitype.const_get :Struct
-          end
-          if ffitype == :bool
-            ffitype = :int
-          end
-          if ffitype == :array
-            subtype = itypeinfo_to_ffitype_for_struct typeinfo.param_type(0)
-            ffitype = [subtype, typeinfo.array_fixed_size]
-          end
-          ffitype
-        end
-
         def setup_constants
           @klass.const_set :GIR_INFO, info
           @klass.const_set :GIR_FFI_BUILDER, self

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

@@ -13,9 +13,9 @@ module GirFFI
         include WithLayout
 
         def pretty_print
-          s = "class #{@classname}\n"
-          s << pretty_print_methods
-          s << "end"
+          buf = "class #{@classname}\n"
+          buf << pretty_print_methods
+          buf << "end"
         end
 
         private

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

@@ -27,7 +27,7 @@ module GirFFI
         end
 
         def setup_instance_method method
-          setup_instance_method_in_ancestor method
+          false
         end
 
         private

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

@@ -1,5 +1,5 @@
-require 'gir_ffi/builder/argument'
-require 'gir_ffi/variable_name_generator'
+require 'gir_ffi/builder/field'
+require 'gir_ffi/info_ext/i_field_info'
 
 module GirFFI
   module Builder
@@ -7,6 +7,8 @@ module GirFFI
 
       # Implements the creation of classes representing types with layout,
       # i.e., :union, :struct, :object.
+      # Note: This module depends on the additional inclusion of
+      # WithMethods.
       module WithLayout
         private
 
@@ -15,73 +17,39 @@ module GirFFI
           @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.inject([]) do |spec, finfo|
-            spec +
-              [ finfo.name.to_sym,
-                itypeinfo_to_ffitype_for_struct(finfo.field_type),
-                finfo.offset ]
+        def dummy_layout_specification
+          if parent
+            [:parent, superclass.const_get(:Struct), 0]
+          else
+            [:dummy, :char, 0]
           end
         end
 
-        def setup_field_accessors
-          info.fields.each do |finfo|
-            unless info.find_method finfo.name
-              @klass.class_eval getter_def(finfo)
-            end
-            @klass.class_eval setter_def(finfo) if finfo.writable?
-          end
+        def base_layout_specification
+          info.fields.map { |finfo| finfo.layout_specification }.flatten(1)
         end
 
-        # TODO: Extract to new FieldBuilder class.
-        def getter_builder finfo
-          type = finfo.field_type
-          klass = Builder::ReturnValue.builder_for_field_getter type
-          vargen = VariableNameGenerator.new
-          klass.new vargen, finfo.name, type, nil
-        end
-
-        def getter_def finfo
-          builder = getter_builder finfo
-          name = finfo.name
-
-          return <<-CODE
-          def #{name}
-            #{builder.cvar} = @struct[#{name.to_sym.inspect}]
-            #{builder.post.join("\n")}
-            #{builder.retval}
+        def layout_specification
+          spec = base_layout_specification
+          if spec.empty?
+            dummy_layout_specification
+          else
+            spec
           end
-          CODE
         end
 
-        def setter_builder finfo
-          type = finfo.field_type
-          klass = Builder::InArgument.builder_for type
-          vargen = VariableNameGenerator.new
-          klass.new vargen, "value", type, lib
+        def setup_accessors_for_field_info finfo
+          builder = Builder::Field.new(finfo, lib)
+          unless has_instance_method finfo.name
+            @klass.class_eval builder.getter_def
+          end
+          @klass.class_eval builder.setter_def if finfo.writable?
         end
 
-        def setter_def finfo
-          builder = setter_builder finfo
-          builder.prepare
-          name = finfo.name
-
-          return <<-CODE
-          def #{name}= #{builder.inarg}
-            #{builder.pre.join("\n")}
-            @struct[#{name.to_sym.inspect}] = #{builder.callarg}
+        def setup_field_accessors
+          info.fields.each do |finfo|
+            setup_accessors_for_field_info finfo
           end
-          CODE
         end
 
         def instantiate_class