gir_ffi 0.7.10 → 0.8.0

data/lib/gir_ffi/builders/base_type_builder.rb

@@ -5,7 +5,7 @@ module GirFFI
   class BaseTypeBuilder
     include BuilderHelper
 
-    def initialize info
+    def initialize(info)
       @info = info
       @namespace = @info.namespace
       @classname = @info.safe_name

data/lib/gir_ffi/builders/boxed_builder.rb

@@ -20,9 +20,10 @@ module GirFFI
       def provide_constructor
         return if info.find_method 'new'
 
-        (class << klass; self; end).class_eval {
+        # TODO: Provide both new and initialize
+        (class << klass; self; end).class_eval do
           alias_method :new, :_allocate
-        }
+        end
       end
     end
   end

data/lib/gir_ffi/builders/c_to_ruby_convertor.rb

@@ -3,7 +3,7 @@ module GirFFI
     # Builder that generates code to convert values from C to Ruby. Used by
     # argument builders.
     class CToRubyConvertor
-      def initialize type_info, argument_name, length_arg
+      def initialize(type_info, argument_name, length_arg)
         @type_info = type_info
         @argument_name = argument_name
         @length_arg = length_arg

data/lib/gir_ffi/builders/closure_convertor.rb

@@ -3,7 +3,7 @@ module GirFFI
     # Builder that generates code to convert closure arguments ('user data')
     # from C to Ruby. Used by argument builders.
     class ClosureConvertor
-      def initialize argument_name
+      def initialize(argument_name)
         @argument_name = argument_name
       end
 

data/lib/gir_ffi/builders/closure_to_pointer_convertor.rb

@@ -3,7 +3,7 @@ module GirFFI
     # Builder that generates code to convert closure arguments ('user data')
     # from Ruby to C. Used by argument builders.
     class ClosureToPointerConvertor
-      def initialize argument_name
+      def initialize(argument_name)
         @argument_name = argument_name
       end
 

data/lib/gir_ffi/builders/constructor_builder.rb

@@ -0,0 +1,52 @@
+require 'gir_ffi/builders/argument_builder_collection'
+require 'gir_ffi/builders/method_template'
+require 'gir_ffi/builders/null_return_value_builder'
+
+module GirFFI
+  module Builders
+    # Implements the creation of a Ruby constructor definition out of a
+    # GIR IFunctionInfo.
+    class ConstructorBuilder
+      def initialize(info)
+        @info = info
+        return_value_builder = NullReturnValueBuilder.new
+        arg_builders = ArgumentBuilderCollection.new(return_value_builder, [])
+        @template = MethodTemplate.new(self, arg_builders)
+      end
+
+      def method_definition
+        @template.method_definition
+      end
+
+      def singleton_method?
+        true
+      end
+
+      def method_name
+        @info.safe_name
+      end
+
+      def method_arguments
+        ['*args']
+      end
+
+      def preparation
+        ['obj = allocate']
+      end
+
+      def invocation
+        "obj.__send__ #{initializer_name.to_sym.inspect}, #{method_arguments.join(', ')}"
+      end
+
+      def result
+        ['obj']
+      end
+
+      private
+
+      def initializer_name
+        @info.safe_name.sub(/^new/, 'initialize')
+      end
+    end
+  end
+end

data/lib/gir_ffi/builders/enum_builder.rb

@@ -14,10 +14,10 @@ module GirFFI
       end
 
       def value_spec
-        info.values.map {|vinfo|
+        info.values.map do|vinfo|
           val = GirFFI::ArgHelper.cast_uint32_to_int32(vinfo.value)
           [vinfo.name.to_sym, val]
-        }.flatten
+        end.flatten
       end
 
       def setup_class
@@ -47,7 +47,7 @@ module GirFFI
       end
 
       def already_set_up
-        klass.respond_to? :get_gtype
+        klass.respond_to? :gtype
       end
 
       def superclass

data/lib/gir_ffi/builders/field_builder.rb

@@ -9,7 +9,7 @@ module GirFFI
     class FieldBuilder
       # Builder for field getters
       class GetterBuilder
-        def initialize field_builder, return_value_builder
+        def initialize(field_builder, return_value_builder)
           @field_builder = field_builder
           @return_value_builder = return_value_builder
         end
@@ -62,7 +62,7 @@ module GirFFI
 
       attr_reader :info
 
-      def initialize field_info
+      def initialize(field_info)
         @info = field_info
       end
 
@@ -89,6 +89,7 @@ module GirFFI
         MethodTemplate.new(getter_builder, argument_builders).method_definition
       end
 
+      # TODO: Use MethodTemplate
       def setter_def
         builder = setter_builder
 

data/lib/gir_ffi/builders/function_builder.rb

@@ -1,55 +1,24 @@
-require 'gir_ffi/variable_name_generator'
-require 'gir_ffi/builders/argument_builder'
-require 'gir_ffi/return_value_info'
-require 'gir_ffi/error_argument_info'
 require 'gir_ffi/builders/return_value_builder'
-require 'gir_ffi/builders/error_argument_builder'
-require 'gir_ffi/builders/method_template'
+require 'gir_ffi/builders/base_method_builder'
 
 module GirFFI
   module Builders
     # Implements the creation of a Ruby function definition out of a GIR
     # IFunctionInfo.
-    class FunctionBuilder
-      def initialize info
+    class FunctionBuilder < BaseMethodBuilder
+      def initialize(info)
         @info = info
-        vargen = GirFFI::VariableNameGenerator.new
-        @argument_builders = @info.args.map { |arg| ArgumentBuilder.new vargen, arg }
-        return_value_info = ReturnValueInfo.new(@info.return_type,
-                                                @info.caller_owns,
-                                                @info.skip_return?)
         @return_value_builder = ReturnValueBuilder.new(vargen,
-                                                       return_value_info,
-                                                       @info.constructor?)
-        @argument_builder_collection = ArgumentBuilderCollection.new(
-          @return_value_builder, @argument_builders,
-          error_argument_builder: error_argument(vargen))
-        @template = MethodTemplate.new(self, @argument_builder_collection)
-      end
-
-      def generate
-        @template.method_definition
+                                                       return_value_info)
       end
 
       def method_name
         @info.safe_name
       end
 
-      def method_arguments
-        @argument_builder_collection.method_argument_names
-      end
-
-      def preparation
-        []
-      end
-
-      def invocation
-        "#{lib_name}.#{@info.symbol} #{function_call_arguments.join(', ')}"
-      end
-
       def result
-        if @argument_builder_collection.has_return_values?
-          ["return #{@argument_builder_collection.return_value_names.join(', ')}"]
+        if argument_builder_collection.has_return_values?
+          ["return #{argument_builder_collection.return_value_names.join(', ')}"]
         else
           []
         end
@@ -59,24 +28,14 @@ module GirFFI
         !@info.method?
       end
 
-      private
-
-      def lib_name
-        "#{@info.safe_namespace}::Lib"
-      end
-
-      def error_argument vargen
-        if @info.throws?
-          ErrorArgumentBuilder.new vargen, ErrorArgumentInfo.new if @info.throws?
-        end
-      end
-
       def function_call_arguments
-        ca = @argument_builder_collection.call_argument_names
+        ca = argument_builder_collection.call_argument_names
         ca.unshift receiver_call_argument if @info.method?
         ca
       end
 
+      private
+
       def receiver_call_argument
         if @info.instance_ownership_transfer == :everything
           'self.ref'

data/lib/gir_ffi/builders/initializer_builder.rb

@@ -0,0 +1,32 @@
+require 'gir_ffi/builders/initializer_return_value_builder'
+require 'gir_ffi/builders/base_method_builder'
+
+module GirFFI
+  module Builders
+    # Implements the creation of a Ruby object initializer definition out of a
+    # GIR IFunctionInfo.
+    class InitializerBuilder < BaseMethodBuilder
+      def initialize(info)
+        @info = info
+        @return_value_builder = InitializerReturnValueBuilder.new(vargen,
+                                                                  return_value_info)
+      end
+
+      def singleton_method?
+        false
+      end
+
+      def method_name
+        @info.safe_name.sub(/^new/, 'initialize')
+      end
+
+      def result
+        []
+      end
+
+      def function_call_arguments
+        argument_builder_collection.call_argument_names
+      end
+    end
+  end
+end

data/lib/gir_ffi/builders/initializer_return_value_builder.rb

@@ -0,0 +1,16 @@
+require 'gir_ffi/builders/base_argument_builder'
+
+module GirFFI
+  module Builders
+    # Implements post-conversion for initializer functions
+    class InitializerReturnValueBuilder < BaseArgumentBuilder
+      def capture_variable_name
+        @capture_variable_name ||= new_variable
+      end
+
+      def post_conversion
+        ["store_pointer(#{capture_variable_name})"]
+      end
+    end
+  end
+end

data/lib/gir_ffi/builders/mapping_method_builder.rb

@@ -10,16 +10,18 @@ module GirFFI
     # Implements the creation mapping method for a callback or vfunc
     # handler. This method converts arguments from C to Ruby, and the
     # result from Ruby to C.
+    #
+    # TODO: Inherit from BaseMethodBuilder
     class MappingMethodBuilder
-      def self.for_callback argument_infos, return_value_info
-        new argument_infos, return_value_info, CallbackArgumentBuilder
+      def self.for_callback(argument_infos, return_value_info)
+        new nil, argument_infos, return_value_info, CallbackArgumentBuilder
       end
 
-      def self.for_vfunc receiver_info, argument_infos, return_value_info
+      def self.for_vfunc(receiver_info, argument_infos, return_value_info)
         new receiver_info, argument_infos, return_value_info, VFuncArgumentBuilder
       end
 
-      def initialize receiver_info = nil, argument_infos, return_value_info, builder_class
+      def initialize(receiver_info, argument_infos, return_value_info, builder_class)
         @argument_builder_class = builder_class
         receiver_builder = make_argument_builder receiver_info if receiver_info
         argument_builders = argument_infos.map { |info| make_argument_builder info }
@@ -75,7 +77,7 @@ module GirFFI
         @variable_generator ||= VariableNameGenerator.new
       end
 
-      def make_argument_builder argument_info
+      def make_argument_builder(argument_info)
         @argument_builder_class.new variable_generator, argument_info
       end
     end

data/lib/gir_ffi/builders/marshalling_method_builder.rb

@@ -9,12 +9,14 @@ module GirFFI
     # Implements the creation mapping method for a signal
     # handler. This method converts arguments from C to Ruby, and the
     # result from Ruby to C.
+    #
+    # TODO: Inherit from BaseMethodBuilder
     class MarshallingMethodBuilder
-      def self.for_signal receiver_info, argument_infos, return_value_info
+      def self.for_signal(receiver_info, argument_infos, return_value_info)
         new receiver_info, argument_infos, return_value_info
       end
 
-      def initialize receiver_info, argument_infos, return_value_info
+      def initialize(receiver_info, argument_infos, return_value_info)
         receiver_builder = make_argument_builder receiver_info
         argument_builders = argument_infos.map { |arg| make_argument_builder arg }
         return_value_builder =
@@ -76,7 +78,7 @@ module GirFFI
         @variable_generator ||= VariableNameGenerator.new
       end
 
-      def make_argument_builder argument_info
+      def make_argument_builder(argument_info)
         ClosureArgumentBuilder.new variable_generator, argument_info
       end
     end

data/lib/gir_ffi/builders/method_template.rb

@@ -10,7 +10,7 @@ module GirFFI
     # The different method builders collaborate with MethodTemplate to build
     # the desired method.
     class MethodTemplate
-      def initialize builder, argument_builder_collection
+      def initialize(builder, argument_builder_collection)
         @builder = builder
         @argument_builder_collection = argument_builder_collection
       end

data/lib/gir_ffi/builders/module_builder.rb

@@ -1,6 +1,7 @@
 require 'gir_ffi/builder_helper'
 require 'gir_ffi/module_base'
 require 'gir_ffi/builders/function_builder'
+
 require 'indentation'
 
 module GirFFI
@@ -10,7 +11,7 @@ module GirFFI
     class ModuleBuilder
       include BuilderHelper
 
-      def initialize namespace, version = nil
+      def initialize(namespace, version = nil)
         @namespace = namespace
         @version = version
         # FIXME: Pass safe namespace as an argument
@@ -21,17 +22,17 @@ module GirFFI
         modul
       end
 
-      def setup_method method
+      def setup_method(method)
         go = function_introspection_data method.to_s
         return false unless go
 
         Builder.attach_ffi_function lib, go
-        modul.class_eval FunctionBuilder.new(go).generate
+        modul.class_eval FunctionBuilder.new(go).method_definition
 
         true
       end
 
-      def build_namespaced_class classname
+      def build_namespaced_class(classname)
         info = gir.find_by_name @namespace, classname.to_s
         unless info
           raise NameError,
@@ -54,10 +55,10 @@ module GirFFI
 
       def build_dependencies
         deps = gir.dependencies @namespace
-        deps.each {|dep|
+        deps.each do|dep|
           name, version = dep.split '-'
           Builder.build_module name, version
-        }
+        end
       end
 
       def instantiate_module
@@ -93,7 +94,7 @@ module GirFFI
         @lib ||= get_or_define_module modul, :Lib
       end
 
-      def function_introspection_data function
+      def function_introspection_data(function)
         info = gir.find_by_name @namespace, function.to_s
         return unless info
         info.info_type == :function ? info : nil

data/lib/gir_ffi/builders/null_convertor.rb

@@ -2,7 +2,7 @@ module GirFFI
   module Builders
     # Argument convertor that does nothing
     class NullConvertor
-      def initialize argument_name
+      def initialize(argument_name)
         @argument_name = argument_name
       end
 

data/lib/gir_ffi/builders/null_return_value_builder.rb

@@ -0,0 +1,21 @@
+module GirFFI
+  module Builders
+    # Implements a blank return value matching ReturnValueBuilder's interface.
+    class NullReturnValueBuilder
+      def initialize
+      end
+
+      def array_length_idx
+        -1
+      end
+
+      def capture_variable_name
+        nil
+      end
+
+      def post_conversion
+        []
+      end
+    end
+  end
+end