gir_ffi 0.6.4 → 0.6.5

data/History.txt

@@ -1,3 +1,9 @@
+== 0.6.5 / 2013-08-03
+
+* Handle inline arrays of structs
+* Implement equality operator for container types
+* Fix element size calculation for GArray
+
 == 0.6.4 / 2013-06-30
 
 * Represent enum types by modules wrapping FFI::Enum

data/lib/ffi-glib/array.rb

@@ -30,6 +30,7 @@ module GLib
     # Re-implementation of the g_array_index macro
     def index idx
       ptr = @struct[:data].get_pointer(idx * get_element_size)
+      # FIXME: Does not work for class-like values of element_type.
       GirFFI::ArgHelper.cast_from_pointer(element_type, ptr)
     end
 
@@ -43,6 +44,10 @@ module GLib
       Lib.g_array_get_element_size self
     end
 
+    def ==(other)
+      self.to_a == other.to_a
+    end
+
     def self.wrap elmttype, ptr
       super(ptr).tap do |array|
         array.element_type = elmttype if array
@@ -60,8 +65,12 @@ module GLib
     private
 
     def self.calculated_element_size type
-      ffi_type = GirFFI::TypeMap.map_basic_type_or_string(type)
-      FFI.type_size(ffi_type)
+      ffi_type = GirFFI::TypeMap.type_specification_to_ffitype(type)
+      if ffi_type.is_a? Symbol
+        FFI.type_size(ffi_type)
+      else
+        ffi_type.size
+      end
     end
 
     def calculated_element_size
@@ -70,7 +79,7 @@ module GLib
 
     def check_element_size_match
       unless calculated_element_size == self.get_element_size
-        raise "Element sizes do not match"
+        warn "WARNING: Element sizes do not match"
       end
     end
   end

data/lib/ffi-glib/list_methods.rb

@@ -39,6 +39,10 @@ module GLib
       self
     end
 
+    def ==(other)
+      self.to_a == other.to_a
+    end
+
     private
 
     def reset_iterator

data/lib/ffi-glib/ptr_array.rb

@@ -56,5 +56,9 @@ module GLib
         yield index(idx)
       end
     end
+
+    def ==(other)
+      self.to_a == other.to_a
+    end
   end
 end

data/lib/ffi-glib/sized_array.rb

@@ -25,6 +25,10 @@ module GLib
       end
     end
 
+    def ==(other)
+      self.to_a == other.to_a
+    end
+
     def self.wrap element_type, size, pointer
       new element_type, size, pointer unless pointer.null?
     end

data/lib/ffi-glib/strv.rb

@@ -1,6 +1,10 @@
 module GLib
   # Extra methods for GLib::Strv. The bulk is defined in `gir_ffi-base/glib/strv.rb`
   class Strv
+    def ==(other)
+      self.to_a == other.to_a
+    end
+
     def self.from it
       case it
       when nil
@@ -19,4 +23,3 @@ module GLib
     end
   end
 end
-

data/lib/gir_ffi/arg_helper.rb

@@ -26,6 +26,8 @@ module GirFFI
     end
 
     def self.ptr_to_typed_array type, ptr, size
+      return [] if ptr.nil? or ptr.null?
+
       case type
       when Class
         ptr_to_interface_array type, ptr, size
@@ -33,37 +35,20 @@ module GirFFI
         ptr_to_enum_array type, ptr, size
       when Array
         ptr_to_interface_pointer_array type[1], ptr, size
-      when FFI::Enum
-        ptr_to_enum_array type, ptr, size
       when :utf8
         ptr_to_utf8_array ptr, size
       else
-        self.send "ptr_to_#{type}_array", ptr, size
-      end
-    end
-
-    def self.setup_ptr_to_type_array_handler_for *types
-      types.flatten.each do |type|
         ffi_type = TypeMap.map_basic_type type
-        defn =
-          "def self.ptr_to_#{type}_array ptr, size
-            return [] if ptr.nil? or ptr.null?
-            ptr.get_array_of_#{ffi_type}(0, size)
-          end"
-        eval defn
+        ptr.send "get_array_of_#{ffi_type}", 0, size
       end
     end
 
-    setup_ptr_to_type_array_handler_for SIMPLE_G_TYPES
-
     def self.ptr_to_utf8_array ptr, size
-      return [] if ptr.nil? or ptr.null?
       ptrs = ptr.read_array_of_pointer(size)
       ptrs.map { |pt| ptr_to_utf8 pt }
     end
 
     def self.ptr_to_interface_array klass, ptr, size
-      return [] if ptr.nil? or ptr.null?
       struct_size = klass::Struct.size
       size.times.map do |idx|
         klass.wrap(ptr + struct_size * idx)
@@ -71,7 +56,6 @@ module GirFFI
     end
 
     def self.ptr_to_interface_pointer_array klass, ptr, size
-      return [] if ptr.nil? or ptr.null?
       ptrs = ptr.read_array_of_pointer(size)
       ptrs.map do |optr|
         klass.wrap(optr)
@@ -79,7 +63,7 @@ module GirFFI
     end
 
     def self.ptr_to_enum_array enum, ptr, size
-      ptr_to_gint32_array(ptr, size).map {|val| enum[val] }
+      ptr.get_array_of_int32(0, size).map {|val| enum[val] }
     end
 
     if RUBY_VERSION < "1.9"
@@ -96,13 +80,6 @@ module GirFFI
       ptr.null? ? nil : ptr.read_string(len)
     end
 
-    # Set up gtype handlers depending on type size.
-    class << self
-      sz = FFI.type_size(:size_t) * 8
-      type = "guint#{sz}"
-      alias_method :ptr_to_GType_array, "ptr_to_#{type}_array"
-    end
-
     def self.check_error errpp
       err = GLib::Error.wrap(errpp.read_pointer)
       raise err.message if err
@@ -136,6 +113,7 @@ module GirFFI
       when :gint32
         cast_pointer_to_int32 it
       else
+        # FIXME: Only handles symbolic types.
         it.address
       end
     end

data/lib/gir_ffi/class_base.rb

@@ -21,6 +21,10 @@ module GirFFI
       self.send method, *arguments, &block
     end
 
+    def ==(other)
+      other.is_a?(self.class) && self.to_ptr == other.to_ptr
+    end
+
     def self.setup_and_call method, *arguments, &block
       result = self.ancestors.any? do |klass|
         klass.respond_to?(:setup_method) &&
@@ -43,6 +47,10 @@ module GirFFI
         self.const_get :GIR_FFI_BUILDER
       end
 
+      def to_ffitype
+        self::Struct
+      end
+
       def setup_method name
         gir_ffi_builder.setup_method name
       end

data/lib/gir_ffi/enum_base.rb

@@ -4,6 +4,10 @@ module GirFFI
       self::Enum[arg]
     end
 
+    def to_native *args
+      self::Enum.to_native(*args)
+    end
+
     def setup_and_call method, *arguments, &block
       result = setup_method method.to_s
 
@@ -18,6 +22,10 @@ module GirFFI
       self.const_get :GIR_FFI_BUILDER
     end
 
+    def to_ffitype
+      self::Enum
+    end
+
     def setup_method name
       gir_ffi_builder.setup_method name
     end

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -13,6 +13,18 @@ module GirFFI
         # TODO: Move implementation here.
         ArgHelper.object_pointer_to_object self
       end
+
+      # XXX: int32 is size 4, bool is size 1. Why u no crash?
+      def put_bool offset, value
+        int = value ? 1 : 0
+        put_int32 offset, int
+      end
+
+      # XXX: int32 is size 4, bool is size 1. Why u no crash?
+      def get_bool offset
+        int = get_int32 offset
+        return (int != 0)
+      end
     end
   end
 end

data/lib/gir_ffi/in_out_pointer.rb

@@ -5,7 +5,7 @@ module GirFFI
     attr_reader :value_type
 
     def initialize value, type
-      @ffi_type = TypeMap.map_basic_type_or_string type
+      @ffi_type = TypeMap.type_specification_to_ffitype type
       @value_type = type
 
       value = adjust_value_in value
@@ -19,8 +19,7 @@ module GirFFI
     private :initialize
 
     def to_value
-      value = self.send "get_#{@ffi_type}", 0
-      adjust_value_out value
+      self.send "get_#{@ffi_type}", 0
     end
 
     def self.for type
@@ -39,7 +38,7 @@ module GirFFI
     def adjust_value_in value
       case @value_type
       when :gboolean
-        (value ? 1 : 0)
+        value
       else
         value || nil_value
       end
@@ -48,14 +47,5 @@ module GirFFI
     def nil_value
       @ffi_type == :pointer ? nil : 0
     end
-
-    def adjust_value_out value
-      case @value_type
-      when :gboolean
-        (value != 0)
-      else
-        value
-      end
-    end
   end
 end

data/lib/gir_ffi/in_pointer.rb

@@ -10,8 +10,10 @@ module GirFFI
         from_utf8_array ary
       when Symbol
         from_basic_type_array type, ary
+      when Class
+        from_struct_array type, ary
       when Module
-        from_enum_array type::Enum, ary
+        from_enum_array type, ary
       when Array
         from_interface_pointer_array ary
       else
@@ -51,6 +53,22 @@ module GirFFI
         from_basic_type_array :pointer, ptr_ary
       end
 
+      def from_struct_array type, ary
+        type_size = type::Struct.size
+        length = ary.length
+
+        # TODO: Find method to directly copy bytes, rather than reading and
+        # putting them.
+        ptr = AllocationHelper.safe_malloc length * type_size
+        ary.each_with_index { |item, idx|
+          ptr.put_bytes(idx * type_size,
+                        item.to_ptr.read_bytes(type_size),
+                        0,
+                        type_size)
+        }
+        new ptr
+      end
+
       def from_enum_array type, ary
         from_basic_type_array :int32, ary.map {|sym| type.to_native sym, nil }
       end

data/lib/gir_ffi/info_ext/i_enum_info.rb

@@ -2,7 +2,6 @@ module GirFFI
   module InfoExt
     module IEnumInfo
       def to_ffitype
-        # TODO: It would make more sense if it were called Enum
         to_type::Enum
       end
     end
@@ -10,4 +9,3 @@ module GirFFI
 end
 
 GObjectIntrospection::IEnumInfo.send :include, GirFFI::InfoExt::IEnumInfo
-

data/lib/gir_ffi/info_ext/i_object_info.rb

@@ -2,7 +2,7 @@ module GirFFI
   module InfoExt
     module IObjectInfo
       def to_ffitype
-        to_type::Struct
+        :pointer
       end
     end
   end

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -48,7 +48,7 @@ module GirFFI
       end
 
       def interface_type
-        interface.info_type
+        tag == :interface && interface.info_type
       end
 
       def flattened_array_type
@@ -67,19 +67,8 @@ module GirFFI
         param_type(index).tag_or_class
       end
 
-      # TODO: Merge with tag_or_class
       def tag_or_class_name
-        type_tag = self.tag
-        base = if type_tag == :interface
-                 interface_type_name
-               else
-                 type_tag.inspect
-               end
-        if pointer? && type_tag != :utf8 && type_tag != :filename
-          "[:pointer, #{base}]"
-        else
-          base
-        end
+        tag_or_class.inspect
       end
 
       def tag_or_class
@@ -89,7 +78,7 @@ module GirFFI
                else
                  type_tag
                end
-        if pointer? && type_tag != :utf8 && type_tag != :filename
+        if pointer? && type_tag != :utf8 && type_tag != :filename || interface_type == :object
           [:pointer, base]
         else
           base

data/lib/gir_ffi/module_base.rb

@@ -10,6 +10,7 @@ module GirFFI
       load_class(classname) || super
     end
 
+    # TODO: Rename to setup_class to match setup and setup_method.
     def load_class classname
       gir_ffi_builder.build_namespaced_class classname.to_s
     end

data/lib/gir_ffi/type_map.rb

@@ -15,6 +15,7 @@ module GirFFI
       :struct => :pointer,
       :error => :pointer,
       :ptr_array => :pointer,
+      :array => :pointer,
       :utf8 => :pointer,
       :GType => gtype_type,
       :gboolean => :bool,
@@ -34,16 +35,13 @@ module GirFFI
     }
 
     def self.map_basic_type type
-      TAG_TYPE_MAP[type] || type
+      sym = type.to_sym
+      TAG_TYPE_MAP[sym] || sym
     end
 
-    # FIXME: Make name more descriptive.
-    def self.map_basic_type_or_string type
-      case type
-      when :gboolean
-        :int32
-      when :utf8, :array
-        :pointer
+    def self.type_specification_to_ffitype type
+      if Module === type
+        type.to_ffitype
       else
         map_basic_type(type)
       end

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/gir_ffi/zero_terminated.rb

@@ -34,6 +34,10 @@ module GirFFI
       end
     end
 
+    def ==(other)
+      self.to_a == other.to_a
+    end
+
     private
 
     def read_value offset
@@ -42,7 +46,7 @@ module GirFFI
     end
 
     def ffi_type
-      @ffi_type ||= TypeMap.map_basic_type_or_string basic_element_type
+      @ffi_type ||= TypeMap.type_specification_to_ffitype basic_element_type
     end
 
     def complex_element_type?