rbind 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba08b9155b23d4f0bbd4feffe778fc3ada80722
-  data.tar.gz: 42bc3877dd9b3d0573afbda392229c548a683c02
+  metadata.gz: 4addd5752b3f3efd61a87886b0477bed933dd49d
+  data.tar.gz: 58846356a9abff6108216bc40e2cceec6b8c5ec0
 SHA512:
-  metadata.gz: 8b4be23c15b9e23ea938117d4f5f96d17381efa49431cf9c51ec1431c47331883d39df3cc2300cc3310f903958fc1138b0800b35afeb94e7995c6a01d6cc4c04
-  data.tar.gz: a43976da4bd469baf51adc8c6c9e51a8b5fedb38f89ea7c36e77d5ed1327465df08f51e25cbb234bc3f057f2bc25a5700271860a916eb510a3fe74db508dfd61
+  metadata.gz: 5cad2805845c9c1ba1d57a2889fe826b3f1d75f2179478a0934ef7de90316736f2b0b4a404627bf2b0b8951a5ee77448ff4e682e23973393ee11e646e2fd35b8
+  data.tar.gz: 06fc64492a8122fa55c1c430c17d7177e184e1572c9f63df10ace56421c2f82782133f1fe404baf4ec471b702efeaf6b12b904582ec19108269494520613455f

data/lib/rbind/clang/clang_types.rb

@@ -41,7 +41,7 @@ module Clang
         # class Clang is taking care of this
         def self.release(pointer)
             Rbind::dispose_translation_unit(pointer) unless pointer.null?
-        rescue Exception => e
+        rescue => e
             puts e
         end
     end
@@ -268,7 +268,7 @@ module Clang
             def self.finalize(id)
                 Rbind::dispose_string(@@pointer[id])
                 @@pointer.delete(id)
-            rescue Exception => e
+            rescue => e
                 puts e
             end
 

data/lib/rbind/clang_parser.rb

@@ -32,7 +32,7 @@ module Rbind
                 pos_start = [location[2]-pos_width,0].max
                 con << "   \t " + " "*pos_start + "."*pos_width
                 "#{super}\n\n#{"#"*5}\nParsed File: #{location.join(":")}\n#{con.join()}\n#{"#"*5}\n\n"
-            rescue Exception => e
+            rescue => e
                 pp e
             end
         end
@@ -227,7 +227,7 @@ module Rbind
                                else
                                    #puts "skip: #{cu.spelling}"
                                end
-                    rescue Exception => e
+                    rescue => e
                         ClangParser.log.debug "Parsing failed -- skipping"
                     end
                     raise ClangParserError.new("jjj",cu) if last_obj.is_a? Fixnum

data/lib/rbind/core/rattribute.rb

@@ -11,7 +11,11 @@ module Rbind
         end
 
         def ==(other)
-            type == other.type
+            if other
+                type == other.type
+            else
+                false
+            end
         end
 
         def generate_signatures

data/lib/rbind/core/rtemplate_class.rb

@@ -73,7 +73,7 @@ module Rbind
                         end
 
                         klass.add_operation(op)
-                    rescue Exception => e
+                    rescue => e
                         RTemplateClass.log.warn "RTemplateClass: #{name} could not add parameter #{e} #{e.backtrace}"
 
                     end

data/lib/rbind/generator_ruby.rb

@@ -14,7 +14,8 @@ module Rbind
             attr_accessor :ffi_type_map
         end
         self.ruby_default_value_map ||= {"true" => "true","TRUE" => "true", "false" => "false","FALSE" => "false"}
-        self.ffi_type_map ||= {"char *" => "string","unsigned char" => "uchar" ,"const char *" => "string","uint8_t" => "uint8" }
+        self.ffi_type_map ||= {"char *" => "string","unsigned char" => "uchar" ,"const char *" => "string","uint8_t" => "uint8",
+                               "uint32_t" => "uint32","uint64_t" => "uint64","int8_t" => "int8","int32_t" => "int32","int64_t" => "int64" }
 
 
         def self.keyword?(name)
@@ -62,7 +63,7 @@ module Rbind
                       if ruby_default_value_map.has_key?(parameter.default_value)
                           ruby_default_value_map[parameter.default_value]
                       elsif parameter.type.name == "float"
-                          parameter.default_value.gsub("f","")
+                          parameter.default_value.gsub("f","").gsub(/\.$/,".0").gsub(/^\./,"0.")
                       elsif parameter.type.name == "double"
                           parameter.default_value.gsub(/\.$/,".0").gsub(/^\./,"0.")
                       elsif parameter.type.ptr? &&(parameter.default_value == "0" || parameter.default_value = "NULL")
@@ -124,13 +125,13 @@ module Rbind
         end
 
 
-        def self.normalize_type_name(name)
+        def self.normalize_type_name(name,template=false)
             name.gsub!(" ","")
 
             # map template classes
             # std::vector<std::string> -> Std::Vector::Std_String
             if name =~ /([\w:]*)<(.*)>$/
-                return "#{normalize_type_name($1)}::#{normalize_type_name($2).gsub("::","_")}"
+                return "#{normalize_type_name($1,true)}::#{normalize_type_name($2,true).gsub("::","_")}"
             else
                 name
             end
@@ -148,8 +149,10 @@ module Rbind
             end
 
             # map all uint ... to Fixnum
-            if name =~ /^u?int\d*$/ || name =~ /^u?int\d+_t$/
-                return "Fixnum"
+            if !template
+                if name =~ /^u?int\d*$/ || name =~ /^u?int\d+_t$/
+                    return "Fixnum"
+                end
             end
 
             name = name.gsub(/^_/,"")
@@ -563,6 +566,10 @@ module Rbind
                     @overload_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","roverloaded_method_call.rb")).read,nil,"-")
                 end
 
+                def static?
+                    @root.first.static?
+                end
+
                 def add_methods
                     str = @root.map do |method|
                         next if method.ignore?
@@ -704,7 +711,7 @@ module Rbind
                         else
                             ops["rbind_static_#{op.name}"] << op
                         end
-                    rescue Exception => e
+                    rescue => e
                         HelperBase.log.warn "Operation '#{o}' not added. #{e}"
                     end
                 end
@@ -727,8 +734,9 @@ module Rbind
                                        @overloaded_static_method_wrapper.result(helper.binding)
                                    end
                         end
-                    rescue Exception => e
-                        HelperBase.log.warn "Operation '#{o}' could not be rendered. #{e}"
+                    rescue => e
+                        pp e
+                        HelperBase.log.error "Operation '#{o}' could not be rendered. #{e}"
                     end
                 end
                 return str unless @compact_namespace

data/lib/rbind/templates/ruby/rtype.rb

@@ -9,7 +9,7 @@ class <%= name %>Struct < FFI::Struct
     # auto delete
     def self.release(pointer)
         Rbind::<%= cdelete_method %>_struct(pointer) unless pointer.null?
-    rescue Exception => e
+    rescue => e
         puts e
     end
 end

data/manifest.xml

@@ -7,6 +7,6 @@
   <url>http://</url>
   <logo>http://</logo>
 
-  <depend package="hooks" />
+  <depend package="gem-hooks" />
   <depend package="ffi" />
 </package>

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.24'
-    s.date              = '2014-02-16'
+    s.version           = '0.0.25'
+    s.date              = '2014-07-06'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbind
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Library for genereating automated ffi-bindings for c/c++ libraries