ffi 1.2.0 → 1.2.1

data/Rakefile

@@ -72,7 +72,9 @@ LIBTEST = "build/libtest.#{LIBEXT}"
 BUILD_DIR = "build"
 BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
 
-gem_spec = Gem::Specification.load('ffi.gemspec')
+def gem_spec
+  @gem_spec ||= Gem::Specification.load('ffi.gemspec')
+end
 
 Gem::PackageTask.new(gem_spec) do |pkg|
   pkg.need_zip = true

data/ext/ffi_c/Type.c

@@ -39,6 +39,7 @@ static void builtin_type_free(BuiltinType *);
 VALUE rbffi_TypeClass = Qnil;
 
 static VALUE classBuiltinType = Qnil;
+static VALUE moduleNativeType = Qnil;
 static VALUE typeMap = Qnil, sizeMap = Qnil;
 static ID id_find_type = 0, id_type_size = 0, id_size = 0;
 
@@ -243,7 +244,6 @@ rbffi_Type_Find(VALUE name)
 void
 rbffi_Type_Init(VALUE moduleFFI)
 {
-    VALUE moduleNativeType;
     /*
      * Document-class: FFI::Type
      * This class manages C types.

data/ext/ffi_c/ffi.c

@@ -56,7 +56,7 @@ Init_ffi_c(void) {
      * This module embbed type constants from {FFI::NativeType}.
      */
     rbffi_FFIModule = moduleFFI = rb_define_module("FFI");
-    rb_global_variable(&moduleFFI);
+    rb_global_variable(&rbffi_FFIModule);
 
 
     /* FFI::Type needs to be initialized before most other classes */

data/ffi.gemspec

@@ -0,0 +1,18 @@
+Gem::Specification.new do |s|
+  s.name = 'ffi'
+  s.version = '1.2.1'
+  s.author = 'Wayne Meissner'
+  s.email = 'wmeissner@gmail.com'
+  s.homepage = 'http://wiki.github.com/ffi/ffi'
+  s.summary = 'Ruby FFI'
+  s.description = 'Ruby FFI library'
+  s.files = %w(ffi.gemspec History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /lib\/1\.[89]/}
+  s.extensions << 'ext/ffi_c/extconf.rb'
+  s.has_rdoc = false
+  s.license = 'LGPL-3'
+  s.require_paths << 'ext/ffi_c'
+  s.required_ruby_version = '>= 1.8.7'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake-compiler', '>=0.6.0'
+  s.add_development_dependency 'rspec'
+end

data/lib/Lib.iml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RUBY_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="gem" name="Gem">
+      <configuration>
+        <option name="GEM_APP_ROOT_PATH" value="" />
+        <option name="GEM_APP_TEST_PATH" value="" />
+        <option name="GEM_APP_LIB_PATH" value="" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

data/spec/ffi/struct_spec.rb

@@ -740,10 +740,10 @@ describe "variable-length arrays" do
       layout :count, :int, :data, [ :long, 0 ]
     end
     s = struct_class.new(FFI::MemoryPointer.new(1024))
-    s[:data][0] = 0xdeadbeef
-    s[:data][1] = 0xfee1dead
-    s[:data][0].should eq 0xdeadbeef
-    s[:data][1].should eq 0xfee1dead
+    s[:data][0] = 0x1eadbeef
+    s[:data][1] = 0x12345678
+    s[:data][0].should eq 0x1eadbeef
+    s[:data][1].should eq 0x12345678
   end
 
   it "non-variable length array is bounds checked" do
@@ -751,9 +751,9 @@ describe "variable-length arrays" do
       layout :count, :int, :data, [ :long, 1 ]
     end
     s = struct_class.new(FFI::MemoryPointer.new(1024))
-    s[:data][0] = 0xdeadbeef
-    lambda { s[:data][1] = 0xfee1dead }.should raise_error
-    s[:data][0].should eq 0xdeadbeef
-    lambda { s[:data][1].should eq 0xfee1dead }.should raise_error
+    s[:data][0] = 0x1eadbeef
+    lambda { s[:data][1] = 0x12345678 }.should raise_error
+    s[:data][0].should eq 0x1eadbeef
+    lambda { s[:data][1].should eq 0x12345678 }.should raise_error
   end
 end

metadata

@@ -1,75 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffi
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rake
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  name: rake-compiler
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/ffi_c/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
+- ffi.gemspec
 - History.txt
 - LICENSE
 - COPYING
@@ -375,7 +372,6 @@ files:
 - ext/ffi_c/libffi.vc.mk
 - ext/ffi_c/libffi.vc64.mk
 - ext/ffi_c/LongDouble.c
-- ext/ffi_c/LongDouble.c.orig
 - ext/ffi_c/LongDouble.h
 - ext/ffi_c/MappedType.c
 - ext/ffi_c/MappedType.h
@@ -505,40 +501,29 @@ files:
 - libtest/UnionTest.c
 - libtest/VariadicTest.c
 homepage: http://wiki.github.com/ffi/ffi
-licenses: 
+licenses:
 - LGPL-3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext/ffi_c
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby FFI
 test_files: []
-

data/ext/ffi_c/LongDouble.c.orig

@@ -1,65 +0,0 @@
-#include "LongDouble.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <float.h>
-
-#if defined (__CYGWIN__) || defined(__INTERIX)
-
-#define strtold(str, endptr)    ((long double)strtod((str),(endptr)))
-
-#endif /* defined (__CYGWIN__) */
-
-static VALUE rb_cBigDecimal = Qnil;
-static VALUE bigdecimal_load(VALUE unused);
-static VALUE bigdecimal_failed(VALUE value);
-
-VALUE 
-rbffi_longdouble_new(long double ld)
-{
-    if (!RTEST(rb_cBigDecimal)) {
-        /* allow fallback if the bigdecimal library is unavailable in future ruby versions */
-        rb_cBigDecimal = rb_rescue(bigdecimal_load, Qnil, bigdecimal_failed, rb_cObject);
-    }
-
-    if (RTEST(rb_cBigDecimal) && rb_cBigDecimal != rb_cObject) {
-        char buf[128];
-        return rb_funcall(rb_cBigDecimal, rb_intern("new"), 1, rb_str_new(buf, sprintf(buf, "%.35Le", ld)));
-    }
-
-    /* Fall through to handling as a float */
-    return rb_float_new(ld);
-}
-
-long double 
-rbffi_num2longdouble(VALUE value)
-{
-    if (TYPE(value) == T_FLOAT) {
-        return rb_num2dbl(value);
-    }
-    
-    if (!RTEST(rb_cBigDecimal) && rb_const_defined(rb_cObject, rb_intern("BigDecimal"))) {
-        rb_cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
-    }
-
-    if (RTEST(rb_cBigDecimal) && rb_cBigDecimal != rb_cObject && RTEST(rb_obj_is_kind_of(value, rb_cBigDecimal))) {
-        VALUE s = rb_funcall(value, rb_intern("to_s"), 1, rb_str_new2("E"));
-        return strtold(RSTRING_PTR(s), NULL);
-    }
-
-    /* Fall through to handling as a float */
-    return rb_num2dbl(value);
-}
-
-
-static VALUE 
-bigdecimal_load(VALUE unused)
-{
-    rb_require("bigdecimal");
-    return rb_const_get(rb_cObject, rb_intern("BigDecimal"));
-}
-
-static VALUE 
-bigdecimal_failed(VALUE value)
-{
-    return value;
-}