ffi 1.2.0.pre3-x86-mingw32 → 1.2.0.pre6-x86-mingw32

data/lib/ffi.rb

@@ -12,4 +12,13 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
   end
 
   require 'ffi/ffi'
+
+elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  $LOAD_PATH.delete(File.dirname(__FILE__))
+  $LOAD_PATH.delete(File.join(File.dirname(__FILE__), 'ffi'))
+  unless $LOADED_FEATURES.nil?
+    $LOADED_FEATURES.delete(__FILE__)
+    $LOADED_FEATURES.delete('ffi.rb')
+  end
+  require 'ffi.rb'
 end

data/lib/ffi/library.rb

@@ -212,7 +212,7 @@ module FFI
       cname, arg_types, ret_type, opts = (a4 && (a2.is_a?(String) || a2.is_a?(Symbol))) ? [ a2, a3, a4, a5 ] : [ mname.to_s, a2, a3, a4 ]
 
       # Convert :foo to the native type
-      arg_types.map! { |e| find_type(e) }
+      arg_types = arg_types.map { |e| find_type(e) }
       options = {
         :convention => ffi_convention,
         :type_map => defined?(@ffi_typedefs) ? @ffi_typedefs : nil,
@@ -361,10 +361,12 @@ code
         [ nil, args[0], args[1] ]
       end
 
+      native_params = params.map { |e| find_type(e) }
+      raise ArgumentError, "callbacks cannot have variadic parameters" if native_params.include?(FFI::Type::VARARGS)
       options = Hash.new
       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)
+      cb = FFI::CallbackInfo.new(find_type(ret), native_params, options)
 
       # Add to the symbol -> type map (unless there was no name)
       unless name.nil?

data/spec/ffi/callback_spec.rb

@@ -665,4 +665,14 @@ describe "Callback with " do
     v.pointer.should eq FFI::Pointer::NULL
   end
 
-end # unless true
+  it "varargs parameters are rejected" do
+    lambda {
+      Module.new do
+        extend FFI::Library
+        ffi_lib TestLibrary::PATH
+        callback :cbVrL, [ :varargs ], :long
+      end
+    }.should raise_error(ArgumentError)
+  end
+
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  hash: -810651450
+  hash: 2496615925
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - pre
-  - 3
-  version: 1.2.0.pre3
+  - 6
+  version: 1.2.0.pre6
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-11 00:00:00 Z
+date: 2012-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -516,7 +516,6 @@ rdoc_options: []
 
 require_paths: 
 - lib
-- lib/ffi
 - ext/ffi_c
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false