rust_require 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965d9bac57b7c7c943ecbd174a1e608f9d00ce22
-  data.tar.gz: 1bc2d94473b2ebde3854f693fdaebe5adf3c9ede
+  metadata.gz: 4bc920f52a113f72975ec221fca1fb106493c481
+  data.tar.gz: c2217f4c5a0abcca147ec2c05deb321c25e728eb
 SHA512:
-  metadata.gz: 613dbd5fed2cd485bb3f3cbeb64e27ab4f2a17c222a719d53b2d80322f3918909a3acaee7183af509e670ee1682a60a81c5e97c9f4ca1ac9af1f3de2eedc3614
-  data.tar.gz: c20418ae1136f036af523885bcb88405f0496445335d2381ff4ef614378f8ebb3f30ba9a7f3604ff2b97d2906f1a89ec69fdcaa122c754448f18cf87c481b1ac
+  metadata.gz: 0145328db7639bb2535230934fdf1848e0a684245e31cd6a9ca6066483a64d47fb14f556d34c20ad61f0d7dcddfecd6e516486dda87598338555150631c39441
+  data.tar.gz: 466cd131e3527f9f5877735a94f291544f468eaa0772f43412a8ef80c4078ac7a8b509c23481721a98e2abf419b68ac5d4365067eda990752c96cbc51f388cea

data/lib/rust_require/rustc.rb

@@ -35,11 +35,9 @@ module Rust
       gen = CWrapperGenerator.new(info_file)
 
       File.open(@tempfile, "w+") do |f|
-        # add necessary extern crate definitions
+        # add necessary extern crate definitions #FIXME: if this proves to be unnecessary remove it
         f << <<-SRC
-            #![allow(unused_features)]
-            #![feature(libc,cstr_to_str)]
-            extern crate libc;
+
         SRC
 
         # add the actual file content

data/lib/rust_require/types/primitives.rb

@@ -16,25 +16,68 @@ module Rust
         @rust_type = "bool"
     end
 
-    class Isize < Type
-        @rust_type = "isize"
-        def ffi_type; :int; end
+    class PrimitiveInteger < Type
+        def initialize
+            @bits = self.class.bits
+            @signed = self.class.signed
+            super
+        end
+
+        def self.bits; @bits; end
+        def self.signed; @signed; end
+
+        def rust_type_regex
+          @rust_type ? super : /.^/ # will never match
+        end
+
+        def type_check(num)
+          bounds = if @signed
+            (-2**(@bits-1)+1)..(2**(@bits-1)-1)
+          else
+            0..(2**@bits-1)
+          end
+
+          raise ArgumentError, "#{num.inspect} is no integer." unless [Fixnum, Bignum].include? num.class
+          raise ArgumentError, "#{num} is not in the expected input range #{bounds}" unless bounds.include? num
+        end
+
+        def ruby_input_conversion(num)
+          type_check(num)
+          num
+        end
     end
 
-    class Usize < Type
+    class Usize < PrimitiveInteger
         @rust_type = "usize"
-        def ffi_type; :uint; end
+        @bits = FFI::Pointer.size * 8
+        @signed = false
+
+        def ffi_type; :ulong; end
     end
 
-    # more metaprogramming!!
+    class Isize < PrimitiveInteger
+        @rust_type = "isize"
+        @bits = FFI::Pointer.size * 8
+        @signed = true
+
+        def ffi_type; :long; end
+    end
+
+    # metaprogramming!!
     %w[8 16 32 64].each do |x|
-      usize = Class.new(Type) do
+      usize = Class.new(PrimitiveInteger) do
+        @bits = x.to_i
+        @signed = false
         @rust_type = "u#{x}"
+
         def ffi_type; rust_type.sub('u', 'uint').to_sym; end
       end
 
-      isize = Class.new(Type) do
+      isize = Class.new(PrimitiveInteger) do
         @rust_type = "i#{x}"
+        @bits = x.to_i
+        @signed = true
+
         def ffi_type; rust_type.sub('i', 'int').to_sym; end
       end
 
@@ -51,11 +94,25 @@ module Rust
       def c_output_conversion(name); "#{name} as f64"; end
 
       def ffi_type; :double; end
+
+      def ruby_input_conversion(float)
+        bounds = -3.4028234663852886e+38 .. 3.4028234663852886e+38
+        raise ArgumentError, "#{float.inspect} is no Float." unless float.is_a? Float
+        raise ArgumentError, "#{float} is not in the expected input range #{bounds}" unless bounds.include? float
+        float
+      end
     end
 
     class F64 < Type
       @rust_type = 'f64'
       def ffi_type; :double; end
+
+      def ruby_input_conversion(float)
+        bounds = Float::MIN..Float::MAX
+        raise ArgumentError, "#{float.inspect} is no Float." unless float.is_a? Float
+        raise ArgumentError, "#{float} is not in the expected input range #{bounds}" unless bounds.include? float
+        float
+      end
     end
   end
 end

data/lib/rust_require/types/string.rb

@@ -47,7 +47,7 @@ module Rust
       end
 
       def not_implemented
-        raise NotImplementedError, '&str as rust output parameter is not supported, use String instead!'
+        raise NotImplementedError, '&mut str/&str as rust output parameter is not supported, use String instead!'
       end
 
       def c_output_type
@@ -71,8 +71,8 @@ module Rust
       def ruby_input_conversion(str)
         str.encode!(Encoding::UTF_8)
         len = str.bytesize
-        start = FFI::MemoryPointer.from_string(str).address
-        Rust::Slice.from(start, len)
+        start = FFI::MemoryPointer.from_string(str)
+        Rust::Slice.from(start.address, len)
       end
     end
   end

data/lib/rust_require/version.rb

@@ -1,3 +1 @@
-module Rust
-  VERSION = "0.2.0"
-end
+VERSION = "0.2.1"

data/lib/rust_require.rb

@@ -3,7 +3,10 @@ require 'ffi'
 require 'active_support/core_ext/string/inflections'
 
 # Libs
-require_relative 'rust_require/version.rb'
+module Rust
+  require_relative 'rust_require/version.rb'
+end
+
 require_relative 'rust_require/rust_require.rb'
 require_relative 'rust_require/rustc.rb'
 require_relative 'rust_require/types.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rust_require
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Florian Lackner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi