ffi 1.0.10 → 1.0.11

data/Rakefile

@@ -20,13 +20,13 @@ LIBEXT = case RbConfig::CONFIG['host_os'].downcase
   when /mswin|mingw/
     "dll"
   else
-    Config::CONFIG['DLEXT']
+    RbConfig::CONFIG['DLEXT']
   end
 
 CPU = case RbConfig::CONFIG['host_cpu'].downcase
   when /i[3456]86/
     # Darwin always reports i686, even when running in 64bit mode
-    if Config::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
+    if RbConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
       "x86_64"
     else
       "i386"
@@ -42,10 +42,10 @@ CPU = case RbConfig::CONFIG['host_cpu'].downcase
     "powerpc"
 
   else
-    Config::CONFIG['host_cpu']
+    RbConfig::CONFIG['host_cpu']
   end
 
-OS = case Config::CONFIG['host_os'].downcase
+OS = case RbConfig::CONFIG['host_os'].downcase
   when /linux/
     "linux"
   when /darwin/
@@ -59,23 +59,23 @@ OS = case Config::CONFIG['host_os'].downcase
   when /mswin|mingw/
     "win32"
   else
-    Config::CONFIG['host_os'].downcase
+    RbConfig::CONFIG['host_os'].downcase
   end
 
-CC=ENV['CC'] || Config::CONFIG['CC'] || "gcc"
+CC=ENV['CC'] || RbConfig::CONFIG['CC'] || "gcc"
 
 GMAKE = system('which gmake >/dev/null') && 'gmake' || 'make'
 
 LIBTEST = "build/libtest.#{LIBEXT}"
 BUILD_DIR = "build"
-BUILD_EXT_DIR = File.join(BUILD_DIR, "#{Config::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
+BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
 
 # Project general information
 PROJ.name = 'ffi'
 PROJ.authors = 'Wayne Meissner'
 PROJ.email = 'wmeissner@gmail.com'
 PROJ.url = 'http://wiki.github.com/ffi/ffi'
-PROJ.version = '1.0.10'
+PROJ.version = '1.0.11'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 
@@ -116,23 +116,23 @@ TEST_DEPS = [ LIBTEST ]
 if RUBY_PLATFORM == "java"
   desc "Run all specs"
   task :specs => TEST_DEPS do
-    sh %{#{Gem.ruby} -S rspec #{Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
+    sh %{#{Gem.ruby} -w -S rspec #{Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
   end
   desc "Run rubinius specs"
   task :rbxspecs => TEST_DEPS do
-    sh %{#{Gem.ruby} -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
+    sh %{#{Gem.ruby} -w -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
   end
 else
   TEST_DEPS.unshift :compile
   desc "Run all specs"
   task :specs => TEST_DEPS do
     ENV["MRI_FFI"] = "1"
-    sh %{#{Gem.ruby} -Ilib -I#{BUILD_EXT_DIR} -S rspec #{Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
+    sh %{#{Gem.ruby} -w -Ilib -I#{BUILD_EXT_DIR} -S rspec #{Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
   end
   desc "Run rubinius specs"
   task :rbxspecs => TEST_DEPS do
     ENV["MRI_FFI"] = "1"
-    sh %{#{Gem.ruby} -Ilib -I#{BUILD_EXT_DIR} -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
+    sh %{#{Gem.ruby} -w -Ilib -I#{BUILD_EXT_DIR} -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
   end
 end
 
@@ -146,7 +146,7 @@ task :install => 'gem:install'
 desc "Clean all built files"
 task :distclean => :clobber do
   FileUtils.rm_rf('build')
-  FileUtils.rm_rf(Dir["lib/**/ffi_c.#{Config::CONFIG['DLEXT']}"])
+  FileUtils.rm_rf(Dir["lib/**/ffi_c.#{RbConfig::CONFIG['DLEXT']}"])
   FileUtils.rm_rf('lib/1.8')
   FileUtils.rm_rf('lib/1.9')
   FileUtils.rm_rf('lib/ffi/types.conf')

data/ext/ffi_c/AbstractMemory.c

@@ -645,7 +645,7 @@ MemoryOps rbffi_AbstractMemoryOps = {
     &memory_op_float64, //.float64
     &memory_op_pointer, //.pointer
     &memory_op_strptr, //.strptr
-	NULL //.boolOp
+    &memory_op_bool //.boolOp
 };
 
 void

data/ext/ffi_c/compat.h

@@ -62,11 +62,11 @@
 #  define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
-#ifndef RB_GC_GUARD(x)
+#ifndef RB_GC_GUARD
 #  define RB_GC_GUARD(x) (x)
 #endif
 
-#ifndef RB_GC_GUARD_PTR(x)
+#ifndef RB_GC_GUARD_PTR
 #  define RB_GC_GUARD_PTR(x) (x)
 #endif
 

data/ext/ffi_c/extconf.rb

@@ -5,9 +5,9 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
   require 'rbconfig'
   dir_config("ffi_c")
   
-  if pkg_config("libffi") ||
+  if ENV['RUBY_CC_VERSION'].nil? && (pkg_config("libffi") ||
      have_header("ffi.h") ||
-     find_header("ffi.h", "/usr/local/include")
+     find_header("ffi.h", "/usr/local/include"))
 
     # We need at least ffi_call and ffi_prep_closure
     libffi_ok = have_library("ffi", "ffi_call", [ "ffi.h" ]) ||
@@ -43,7 +43,7 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
         mf.puts "include ${srcdir}/libffi.darwin.mk"
       elsif RbConfig::CONFIG['host_os'].downcase =~ /bsd/
         mf.puts '.include "${srcdir}/libffi.bsd.mk"'
-      elsif RbConfig::CONFIG['host_os'] !~ /mswin32|mingw32/
+      else
         mf.puts "include ${srcdir}/libffi.mk"
       end
     end

data/lib/ffi/library.rb

@@ -136,8 +136,10 @@ module FFI
     #
     # @param [Symbol] convention one of +:default+, +:stdcall+
     # @return [Symbol] the new calling convention
-    def ffi_convention(convention)
-      @ffi_convention = convention
+    def ffi_convention(convention = nil)
+      @ffi_convention ||= :default
+      @ffi_convention = convention if convention
+      @ffi_convention
     end
 
     # @see #ffi_lib
@@ -212,7 +214,7 @@ module FFI
       # Convert :foo to the native type
       arg_types.map! { |e| find_type(e) }
       options = {
-        :convention => defined?(@ffi_convention) ? @ffi_convention : :default,
+        :convention => ffi_convention,
         :type_map => defined?(@ffi_typedefs) ? @ffi_typedefs : nil,
         :blocking => defined?(@blocking) && @blocking,
         :enums => defined?(@ffi_enums) ? @ffi_enums : nil,
@@ -227,8 +229,8 @@ module FFI
         if invokers.empty?
           begin
             function = nil
-            function_names(cname, arg_types).find do |name|
-              function = lib.find_function(name)
+            function_names(cname, arg_types).find do |fname|
+              function = lib.find_function(fname)
             end
             raise LoadError unless function
 
@@ -239,7 +241,7 @@ module FFI
               Function.new(find_type(ret_type), arg_types, function, options)
             end
 
-          rescue LoadError => ex
+          rescue LoadError
           end
         end
       end
@@ -262,7 +264,7 @@ module FFI
     #   windows api, although using, doesn't have decorated names.
     def function_names(name, arg_types)
       result = [name.to_s]
-      if @ffi_convention == :stdcall
+      if ffi_convention == :stdcall
         # Get the size of each parameter
         size = arg_types.inject(0) do |mem, arg|
           mem + arg.size
@@ -360,7 +362,7 @@ code
       end
 
       options = Hash.new
-      options[:convention] = defined?(@ffi_convention) ? @ffi_convention : :default
+      options[:convention] = ffi_convention
       options[:enums] = @ffi_enums if defined?(@ffi_enums)
       cb = FFI::CallbackInfo.new(find_type(ret), params.map { |e| find_type(e) }, options)
 

data/lib/ffi/platform.rb

@@ -20,8 +20,6 @@
 #
 
 require 'rbconfig'
-require 'ffi_c'
-
 module FFI
   class PlatformError < LoadError; end
 

data/lib/ffi/struct.rb

@@ -123,10 +123,6 @@ module FFI
       @layout.alignment
     end
 
-    def self.align
-      @layout.alignment
-    end
-
     def self.members
       @layout.members
     end
@@ -228,7 +224,7 @@ module FFI
         begin
           mod = self.name.split("::")[0..-2].inject(Object) { |obj, c| obj.const_get(c) }
           mod.respond_to?(:find_type) ? mod : nil
-        rescue Exception => ex
+        rescue Exception
           nil
         end
       end

data/lib/ffi/tools/const_generator.rb

@@ -36,7 +36,7 @@ module FFI
     #  When passed a block, {#calculate} is automatically called at the end of
     #  the block, otherwise you must call it yourself.
     def initialize(prefix = nil, options = {})
-      @includes = []
+      @includes = ['stdio.h', 'stddef.h']
       @constants = {}
       @prefix = prefix
 
@@ -61,10 +61,10 @@ module FFI
       @options
     end
     # @param [String] name
-    # @return constant value
+    # @return constant value (converted if a +converter+ was defined).
     # Access a constant by name.
     def [](name)
-      @constants[name].value
+      @constants[name].converted_value
     end
 
     # Request the value for C constant +name+.
@@ -107,14 +107,10 @@ module FFI
       binary = File.join Dir.tmpdir, "rb_const_gen_bin_#{Process.pid}"
 
       Tempfile.open("#{@prefix}.const_generator") do |f|
-        f.puts "#include <stdio.h>"
-
         @includes.each do |inc|
           f.puts "#include <#{inc}>"
         end
-
-        f.puts "#include <stddef.h>\n\n"
-        f.puts "int main(int argc, char **argv)\n{"
+        f.puts "\nint main(int argc, char **argv)\n{"
 
         @constants.each_value do |const|
           f.puts <<-EOF
@@ -175,11 +171,12 @@ module FFI
       end.join "\n"
     end
 
-    # Add a C include file to calculate constants from.
-    # @param [String] i include file
-    # @return [Array<String>] array of include files (stdio.h is omitted)
-    def include(i)
-      @includes << i
+    # Add additional C include file(s) to calculate constants from.
+    # @note +stdio.h+ and +stddef.h+ automatically included
+    # @param [List<String>, Array<String>] i include file(s)
+    # @return [Array<String>] array of include files
+    def include(*i)
+      @includes |= i.flatten
     end
 
   end

data/spec/ffi/async_callback_spec.rb

@@ -32,7 +32,7 @@ describe "async callback" do
     cb = Proc.new {|i| v = i; called = true }
     LibTest.testAsyncCallback(cb, 0x7fffffff) 
     called.should be_true
-    v.should == 0x7fffffff
+    v.should eq 0x7fffffff
   end
   
   it "called a second time" do
@@ -41,6 +41,6 @@ describe "async callback" do
     cb = Proc.new {|i| v = i; called = true }
     LibTest.testAsyncCallback(cb, 0x7fffffff) 
     called.should be_true
-    v.should == 0x7fffffff
+    v.should eq 0x7fffffff
   end
 end

data/spec/ffi/bool_spec.rb

@@ -25,14 +25,14 @@ describe "Function with primitive boolean arguments and return values" do
     attach_function :bool_reverse_val, [ :bool ], :bool
   end
   it "bools" do
-    LibTest.bool_return_true.should == true
-    LibTest.bool_return_false.should == false
+    LibTest.bool_return_true.should eq true
+    LibTest.bool_return_false.should eq false
 
-    LibTest.bool_return_val(true).should == true
-    LibTest.bool_return_val(false).should == false
+    LibTest.bool_return_val(true).should eq true
+    LibTest.bool_return_val(false).should eq false
 
-    LibTest.bool_reverse_val(true).should == false
-    LibTest.bool_reverse_val(false).should == true
+    LibTest.bool_reverse_val(true).should eq false
+    LibTest.bool_reverse_val(false).should eq true
   end
   it "raise error on invalid types" do
     lambda { LibTest.bool_return_val(nil) }.should raise_error(::TypeError)

data/spec/ffi/buffer_spec.rb

@@ -23,13 +23,13 @@ describe "Buffer#total" do
       :long_long => 8, :ulong_long => 8, :float => 4, :double => 8
     }.each_pair do |t, s|
       it "Buffer.alloc_in(#{t}, #{i}).total == #{i * s}" do
-        FFI::Buffer.alloc_in(t, i).total.should == i * s
+        FFI::Buffer.alloc_in(t, i).total.should eq i * s
       end
       it "Buffer.alloc_out(#{t}, #{i}).total == #{i * s}" do
-        FFI::Buffer.alloc_out(t, i).total.should == i * s
+        FFI::Buffer.alloc_out(t, i).total.should eq i * s
       end
       it "Buffer.alloc_inout(#{t}, #{i}).total == #{i * s}" do
-        FFI::Buffer.alloc_inout(t, i).total.should == i * s
+        FFI::Buffer.alloc_inout(t, i).total.should eq i * s
       end
     end
   end
@@ -40,7 +40,7 @@ describe "Buffer#put_char" do
   (0..127).each do |i|
     (0..bufsize-1).each do |offset|
       it "put_char(#{offset}, #{i}).get_char(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_char(offset, i).get_char(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_char(offset, i).get_char(offset).should eq i
       end
     end
   end
@@ -50,7 +50,7 @@ describe "Buffer#put_uchar" do
   (0..255).each do |i|
     (0..bufsize-1).each do |offset|
       it "Buffer.put_uchar(#{offset}, #{i}).get_uchar(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_uchar(offset, i).get_uchar(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_uchar(offset, i).get_uchar(offset).should eq i
       end
     end
   end 
@@ -60,7 +60,7 @@ describe "Buffer#put_short" do
   [0, 1, 128, 32767].each do |i|
     (0..bufsize-2).each do |offset|
       it "put_short(#{offset}, #{i}).get_short(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_short(offset, i).get_short(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_short(offset, i).get_short(offset).should eq i
       end
     end
   end
@@ -70,7 +70,7 @@ describe "Buffer#put_ushort" do
   [ 0, 1, 128, 32767, 65535, 0xfee1, 0xdead, 0xbeef, 0xcafe ].each do |i|
     (0..bufsize-2).each do |offset|
       it "put_ushort(#{offset}, #{i}).get_ushort(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_ushort(offset, i).get_ushort(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_ushort(offset, i).get_ushort(offset).should eq i
       end
     end
   end
@@ -80,7 +80,7 @@ describe "Buffer#put_int" do
   [0, 1, 128, 32767, 0x7ffffff ].each do |i|
     (0..bufsize-4).each do |offset|
       it "put_int(#{offset}, #{i}).get_int(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_int(offset, i).get_int(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_int(offset, i).get_int(offset).should eq i
       end
     end
   end
@@ -90,7 +90,7 @@ describe "Buffer#put_uint" do
   [ 0, 1, 128, 32767, 65535, 0xfee1dead, 0xcafebabe, 0xffffffff ].each do |i|
     (0..bufsize-4).each do |offset|
       it "put_uint(#{offset}, #{i}).get_uint(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_uint(offset, i).get_uint(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_uint(offset, i).get_uint(offset).should eq i
       end
     end
   end
@@ -100,7 +100,7 @@ describe "Buffer#put_long" do
   [0, 1, 128, 32767, 0x7ffffff ].each do |i|
     (0..bufsize-FFI::Type::LONG.size).each do |offset|
       it "put_long(#{offset}, #{i}).get_long(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_long(offset, i).get_long(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_long(offset, i).get_long(offset).should eq i
       end
     end
   end
@@ -110,7 +110,7 @@ describe "Buffer#put_ulong" do
   [ 0, 1, 128, 32767, 65535, 0xfee1dead, 0xcafebabe, 0xffffffff ].each do |i|
     (0..bufsize-FFI::Type::LONG.size).each do |offset|
       it "put_ulong(#{offset}, #{i}).get_ulong(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_ulong(offset, i).get_ulong(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_ulong(offset, i).get_ulong(offset).should eq i
       end
     end
   end
@@ -120,7 +120,7 @@ describe "Buffer#put_long_long" do
   [0, 1, 128, 32767, 0x7ffffffffffffff ].each do |i|
     (0..bufsize-8).each do |offset|
       it "put_long_long(#{offset}, #{i}).get_long_long(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_long_long(offset, i).get_long_long(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_long_long(offset, i).get_long_long(offset).should eq i
       end
     end
   end
@@ -130,7 +130,7 @@ describe "Buffer#put_ulong_long" do
   [ 0, 1, 128, 32767, 65535, 0xdeadcafebabe, 0x7fffffffffffffff ].each do |i|
     (0..bufsize-8).each do |offset|
       it "put_ulong_long(#{offset}, #{i}).get_ulong_long(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_ulong_long(offset, i).get_ulong_long(offset).should == i
+        FFI::Buffer.alloc_in(bufsize).put_ulong_long(offset, i).get_ulong_long(offset).should eq i
       end
     end
   end
@@ -141,21 +141,21 @@ describe "Reading/Writing binary strings" do
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str);
     s2 = buf.get_bytes(0, 11);
-    s2.should == str
+    s2.should eq str
   end
   it "Buffer#put_bytes with index and length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str, 5, 6);
     s2 = buf.get_bytes(0, 6);
-    s2.should == str[5..-1]
+    s2.should eq str[5..-1]
   end
   it "Buffer#put_bytes with only index" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str, 5);
     s2 = buf.get_bytes(0, 6);
-    s2.should == str[5..-1]
+    s2.should eq str[5..-1]
   end
   it "Buffer#put_bytes with index > str.length" do
     str = "hello\0world"
@@ -179,21 +179,21 @@ describe "Reading/Writing ascii strings" do
     buf = FFI::Buffer.new 1024
     buf.put_string(0, str);
     s2 = buf.get_bytes(0, 11);
-    s2.should == str
+    s2.should eq str
   end
   it "Buffer#get_string with string containing zero byte" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str);
     s2 = buf.get_string(0, 11);
-    s2.should == "hello"
+    s2.should eq "hello"
   end
   it "Buffer#put_string without length should NUL terminate" do
     str = "hello"
     buf = FFI::Buffer.new 1024
     buf.put_string(0, str);
     s2 = buf.get_bytes(0, 6);
-    s2.should == "hello\0"
+    s2.should eq "hello\0"
   end
 end
 describe "Buffer#put_pointer" do
@@ -203,13 +203,13 @@ describe "Buffer#put_pointer" do
     buf = FFI::Buffer.alloc_inout 8
     p2 = buf.put_pointer(0, p).get_pointer(0)
     p2.should_not be_nil
-    p2.should == p
-    p2.get_uint(0).should == 0xdeadbeef
+    p2.should eq p
+    p2.get_uint(0).should eq 0xdeadbeef
   end
 end
 describe "Buffer#size" do
   it "should return size" do
     buf = FFI::Buffer.new 14
-    buf.size.should == 14
+    buf.size.should eq 14
   end
-end
+end