gir_ffi 0.1.0 → 0.2.0

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

@@ -17,13 +17,13 @@ module GirFFI
 
         attr_accessor :length_arg, :array_arg
 
-        def initialize function_builder, arginfo=nil, libmodule=nil
-          @arginfo = arginfo
+        def initialize var_gen, name, typeinfo, libmodule
+          @typeinfo = typeinfo
           @inarg = nil
           @callarg = nil
           @retname = nil
-          @name = nil
-          @function_builder = function_builder
+          @name = safe(name)
+          @var_gen = var_gen
           @libmodule = libmodule
           @length_arg = nil
           @array_arg = nil
@@ -32,7 +32,7 @@ module GirFFI
         def prepare; end
 
         def type_info
-          @arginfo.argument_type
+          @typeinfo
         end
 
         def type_tag

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

@@ -4,13 +4,13 @@ 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
-          @name = safe(@arginfo.name)
           @inarg = @name
         end
 
         def callarg
-          @callarg ||= @function_builder.new_var
+          @callarg ||= @var_gen.new_var
         end
       end
     end

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

@@ -5,16 +5,15 @@ module GirFFI
       # with direction :inout.
       class InOutBase < Base
         def prepare
-          @name = safe(@arginfo.name)
           @inarg = @name
         end
 
         def callarg
-          @callarg ||= @function_builder.new_var
+          @callarg ||= @var_gen.new_var
         end
 
         def retname
-          @retname ||= @function_builder.new_var
+          @retname ||= @var_gen.new_var
         end
       end
     end

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

@@ -5,15 +5,14 @@ module GirFFI
       # with direction :out.
       class OutBase < Base
         def prepare
-          @name = safe(@arginfo.name)
         end
 
         def callarg
-          @callarg ||= @function_builder.new_var
+          @callarg ||= @var_gen.new_var
         end
 
         def retname
-          @retname ||= @function_builder.new_var
+          @retname ||= @var_gen.new_var
         end
 
         def pre

data/lib/gir_ffi/builder/function.rb

@@ -1,4 +1,5 @@
 require 'gir_ffi/builder/argument'
+require 'gir_ffi/variable_name_generator'
 
 module GirFFI::Builder
   # Implements the creation of a Ruby function definition out of a GIR
@@ -10,9 +11,9 @@ module GirFFI::Builder
     end
 
     def generate
-      setup_accumulators
-      @data = @info.args.map {|arg| Argument.build self, arg, @libmodule}
-      @rvdata = ReturnValue.build self, @info
+      vargen = GirFFI::VariableNameGenerator.new
+      @data = @info.args.map {|arg| Argument.build vargen, arg, @libmodule}
+      @rvdata = ReturnValue.build vargen, @info
 
       alldata = @data.dup << @rvdata
 
@@ -25,19 +26,19 @@ module GirFFI::Builder
         end
       }
 
-      adjust_accumulators
+      setup_error_argument vargen
       return filled_out_template
     end
 
-    private
-
-    def setup_accumulators
-      @varno = 0
+    def pretty_print
+      generate
     end
 
-    def adjust_accumulators
+    private
+
+    def setup_error_argument vargen
       klass = @info.throws? ? ErrorArgument : NullArgument
-      @errarg = klass.new(self)
+      @errarg = klass.new vargen, nil, nil, nil
       @errarg.prepare
     end
 
@@ -87,12 +88,5 @@ module GirFFI::Builder
 
       po.flatten
     end
-
-    def new_var
-      @varno += 1
-      "_v#{@varno}"
-    end
-
-    public :new_var
   end
 end

data/lib/gir_ffi/builder/module.rb

@@ -1,6 +1,7 @@
 require 'gir_ffi/builder_helper'
 require 'gir_ffi/module_base'
 require 'gir_ffi/builder/function'
+require 'indentation'
 
 module GirFFI
   # Builds a module based on information found in the introspection
@@ -37,6 +38,10 @@ module GirFFI
 
     def build_namespaced_class classname
       info = gir.find_by_name @namespace, classname.to_s
+      if info.nil?
+        raise NameError.new(
+          "Class #{classname} not found in namespace #{@namespace}")
+      end
       Builder.build_class info
     end
 
@@ -57,6 +62,15 @@ module GirFFI
       @module
     end
 
+    def pretty_print
+      s = "module #{@safe_namespace}\n"
+      gir.infos(@namespace).each do |info|
+        s << sub_builder(info).pretty_print.indent
+        s << "\n"
+      end
+      s << "end"
+    end
+
     private
 
     def build_dependencies
@@ -95,6 +109,18 @@ module GirFFI
       optionally_define_constant(@lib, :CALLBACKS) { [] }
     end
 
+    def sub_builder info
+      if info.info_type == :function
+        Builder::Function.new(info, libmodule)
+      else
+        Builder::Type.builder_for info
+      end
+    end
+
+    def libmodule
+      @module.const_get(:Lib)
+    end
+
     def function_introspection_data function
       info = gir.find_by_name @namespace, function.to_s
       return nil if info.nil?

data/lib/gir_ffi/builder/type.rb

@@ -27,6 +27,11 @@ module GirFFI
       def self.build info
         TYPE_MAP[info.info_type].new(info).build_class
       end
+
+      # TODO: Pull up to include :function and :module
+      def self.builder_for info
+        TYPE_MAP[info.info_type].new(info)
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module GirFFI
   module Builder
     module Type
+
+      # Base class for type builders.
       class Base
         include BuilderHelper
 

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

@@ -9,11 +9,26 @@ module GirFFI
       class Callback < Base
         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
-            lib.callback @classname.to_sym, args, ret
+            lib.callback callback_sym, argument_types, return_type
           end
         end
+
+        def pretty_print
+          return "#{@classname} = Lib.callback #{callback_sym.inspect}, " +
+            "#{argument_types.inspect}, #{return_type.inspect}"
+        end
+
+        def callback_sym
+          @classname.to_sym
+        end
+
+        def argument_types
+          Builder.ffi_function_argument_types info
+        end
+
+        def return_type
+          Builder.ffi_function_return_type info
+        end
       end
     end
   end

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

@@ -8,23 +8,15 @@ module GirFFI
       # triggered by a missing constant in the parent namespace.  The
       # constant will be attached to the appropriate namespace module.
       class Constant < Base
-        TYPE_TAG_TO_UNION_MEMBER = {
-          :gint32 => :v_int32,
-          :gdouble => :v_double,
-          :utf8 => :v_string
-        }
+        def pretty_print
+          "#{@classname} = #{info.value.inspect}"
+        end
 
         private
 
         def instantiate_class
           @klass = optionally_define_constant namespace_module, @classname do
-            tag = info.constant_type.tag
-            val = info.value[TYPE_TAG_TO_UNION_MEMBER[tag]]
-            if RUBY_VERSION >= "1.9" and tag == :utf8
-              val.force_encoding("utf-8")
-            else
-              val
-            end
+            info.value
           end
         end
       end

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

@@ -7,8 +7,16 @@ module GirFFI
       # attached to the appropriate namespace module, and will be defined
       # as an enum for FFI.
       class Enum < RegisteredType
+        def pretty_print
+          "#{@classname} = Lib.enum #{enum_sym.inspect}, #{value_spec.inspect}"
+        end
+
         private
 
+        def enum_sym
+          @classname.to_sym
+        end
+
         def value_spec
           return info.values.map {|vinfo|
             val = GirFFI::ArgHelper.cast_uint32_to_int32(vinfo.value)
@@ -17,13 +25,14 @@ module GirFFI
         end
 
         def instantiate_class
-          if const_defined_for namespace_module, @classname
-            @klass = namespace_module.const_get @classname
-          else
-            @klass = namespace_module.const_set @classname,
-              lib.enum(@classname.to_sym, value_spec)
-            setup_gtype_getter
+          @klass = optionally_define_constant namespace_module, @classname do
+            lib.enum(enum_sym, value_spec)
           end
+          setup_gtype_getter unless already_set_up
+        end
+
+        def already_set_up
+          @klass.respond_to? :get_gtype
         end
       end
     end

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

@@ -10,6 +10,10 @@ module GirFFI
       class Interface < RegisteredType
         include WithMethods
 
+        def pretty_print
+          "module #{@classname}\n  extend InterfaceBase\nend"
+        end
+
         private
 
         # FIXME: The word 'class' is not really correct.

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

@@ -34,6 +34,17 @@ module GirFFI
           if parent
             return superclass._find_signal signal_name
           end
+          raise "Signal #{signal_name} not found"
+        end
+
+        def find_property property_name
+          info.properties.each do |prop|
+            return prop if prop.name == property_name
+          end
+          if parent
+            return superclass._find_property property_name
+          end
+          raise "Property #{property_name} not found"
         end
 
         private

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

@@ -12,12 +12,22 @@ module GirFFI
         include WithMethods
         include WithLayout
 
+        def pretty_print
+          "class #{@classname}\nend"
+        end
+
         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
+        def setup_class
+          setup_layout
+          setup_constants
+          stub_methods
+          setup_gtype_getter
+          setup_field_accessors
+        end
+
+        def layout_superclass
+          FFI::Struct
         end
       end
     end

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

@@ -12,18 +12,24 @@ module GirFFI
         include WithMethods
         include WithLayout
 
-        private
-
-        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
+        def pretty_print
+          "class #{@classname}\nend"
         end
 
+        private
+
         def setup_class
-          super
+          setup_layout
+          setup_constants
+          stub_methods
+          setup_gtype_getter
+          setup_field_accessors
           provide_constructor
         end
+
+        def layout_superclass
+          FFI::Union
+        end
       end
     end
   end

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

@@ -1,3 +1,6 @@
+require 'gir_ffi/builder/argument'
+require 'gir_ffi/variable_name_generator'
+
 module GirFFI
   module Builder
     module Type
@@ -7,14 +10,6 @@ module GirFFI
       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) }
@@ -38,6 +33,62 @@ module GirFFI
                 finfo.offset ]
           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
+        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}
+          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
+        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}
+          end
+          CODE
+        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
       end
     end
   end