rbind 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49ac912bcaf33b590650a1a9764e4055e1324f6
-  data.tar.gz: 2711d7f9cfbbf28b32aa7765914971f9f07f1da6
+  metadata.gz: eba08b9155b23d4f0bbd4feffe778fc3ada80722
+  data.tar.gz: 42bc3877dd9b3d0573afbda392229c548a683c02
 SHA512:
-  metadata.gz: 2b5964e2a7e3b260879ded95cd659af9c918c16d78e7cd729ad34c720571d68a1eccdc620883ab8d246ef84dce2cea10ccb86eced4d7ee918bc42385967cb3f2
-  data.tar.gz: 8e855c1b6e0599cc5b9a966a794fe2badbdc4d7ba4ba1069d1b13560869c3c67319449ba5264a553014145ca46ec56fdd1b890c4b5ba6557e43aca00ff556086
+  metadata.gz: 8b4be23c15b9e23ea938117d4f5f96d17381efa49431cf9c51ec1431c47331883d39df3cc2300cc3310f903958fc1138b0800b35afeb94e7995c6a01d6cc4c04
+  data.tar.gz: a43976da4bd469baf51adc8c6c9e51a8b5fedb38f89ea7c36e77d5ed1327465df08f51e25cbb234bc3f057f2bc25a5700271860a916eb510a3fe74db508dfd61

data/lib/rbind/core.rb

@@ -11,9 +11,7 @@ require 'rbind/core/rsetter.rb'
 require 'rbind/core/rnamespace.rb'
 require 'rbind/core/rclass.rb'
 require 'rbind/core/rtemplate_class.rb'
-require 'rbind/core/rreference.rb'
-require 'rbind/core/rpointer.rb'
-require 'rbind/core/rtype_qualifier.rb'
+require 'rbind/core/rtype_annotation.rb'
 
 require 'rbind/types/std_vector.rb'
 require 'rbind/types/std_string.rb'

data/lib/rbind/core/rclass.rb

@@ -13,6 +13,9 @@ module Rbind
                 add_parent(p)
             end
             super(name)
+            # we have to disable the type check for classes
+            # otherwise derived types cannot be parsed
+            @check_type = false
         end
 
         def basic_type?
@@ -195,9 +198,6 @@ module Rbind
             if klass.full_name == full_name || klass == self
                 raise ArgumentError,"class #{klass.full_name} cannot be parent of its self"
             end
-            # we have to disable the type check for the parent class
-            # otherwise derived types cannot be parsed
-            klass.check_type = false
             @parent_classes[klass.name] = ParentClass.new(klass,accessor)
             self
         end

data/lib/rbind/core/rdata_type.rb

@@ -1,7 +1,6 @@
 
 module Rbind
     class RDataType < RBase
-        attr_accessor :ptr,:ref
         attr_accessor :typedef
         attr_accessor :invalid_value
         attr_accessor :cdelete_method
@@ -65,27 +64,50 @@ module Rbind
         end
 
         def to_single_ptr
-            t = to_raw
-            t = t.to_const if const?
-            t.to_ptr
+            self.to_ptr
         end
 
         def to_ptr
-            RPointer.new(self)
+            RTypeAnnotation.new(self,:ptr => 1)
         end
 
         def to_ref
-            RReference.new(self)
+            RTypeAnnotation.new(self,:ref => true)
         end
 
         def to_const
-            RTypeQualifier.new(self,:const => true)
+            RTypeAnnotation.new(self,:const => true)
+        end
+
+        def to_ownership(val)
+            raise "Cannot set memory owner for none pointer types!"
         end
 
         def remove_const
             self
         end
 
+        def remove_ownership
+            self
+        end
+
+        def remove_ref
+            self
+        end
+
+        def remove_ptr
+            self
+        end
+
+        # returns true if the type is owner of its memory
+        def ownership?
+            if ref?
+                false
+            else
+                true
+            end
+        end
+
         def raw?
             true
         end

data/lib/rbind/core/rtype_annotation.rb

@@ -0,0 +1,135 @@
+require 'delegate'
+
+module Rbind
+    class RTypeAnnotation < SimpleDelegator
+        attr_accessor :const
+
+        def initialize(type,options=Hash.new)
+            super(type)
+            @options = options
+        end
+
+        def to_annotation(key,val)
+            if @options.has_key?(key) && @options[key] == val
+                self
+            else
+                opt = @options.clone
+                opt[key] = val
+                RTypeAnnotation.new(__getobj__,opt)
+            end
+        end
+
+        def remove_annotation(key)
+            opt = @options.clone
+            opt.delete(key)
+            if opt.empty?
+                __getobj__
+            else
+                RTypeAnnotation.new(__getobj__,opt)
+            end
+        end
+
+        def const?
+            if @options.has_key? :const
+                !!@options[:const]
+            else
+                super
+            end
+        end
+
+        def to_const
+            to_annotation(:const,true)
+        end
+
+        def remove_const
+            remove_annotation(:const)
+        end
+
+        def ownership?
+            if @options.has_key? :ownership
+                !!@options[:ownership]
+            else
+                super
+            end
+        end
+
+        def to_ownership(val=true)
+            if ptr?
+                to_annotation(:ownership,val)
+            else
+                super
+            end
+        end
+
+        def remove_ownership
+            remove_annotation(:ownership)
+        end
+
+        def to_ptr
+            val = if ptr?
+                      @options[:ptr]+1
+                    else
+                        1
+                    end
+            to_annotation(:ptr,val)
+        end
+
+        def ptr?
+            if @options.has_key? :ptr
+                @options[:ptr] != 0
+            else
+                super
+            end
+        end
+
+        def remove_ptr
+            return self if !ptr?
+            val = @options[:ptr]-1
+            if val == 0
+                remove_annotation(:ptr)
+            else
+                to_annotation(:ptr,val)
+            end
+        end
+
+        def to_ref
+            to_annotation? :ref,true
+        end
+
+        def ref?
+            if @options.has_key? :ref
+                !!@options[:ref]
+            else
+                super
+            end
+        end
+
+        def remove_ref
+            remove_annotation :ref
+        end
+
+        def raw?
+            false
+        end
+
+        def signature(sig=nil)
+            generate_signatures[0]
+        end
+
+        def csignature(sig=nil)
+            generate_signatures[1]
+        end
+
+        def generate_signatures
+            str_pre = ""
+            str_post = ""
+
+            str_pre = "const " if const?
+            str_post += "&" if ref?
+            str_post += "*" * @options[:ptr] if ptr?
+            __getobj__.generate_signatures.map do |s|
+                str_pre + s + str_post
+            end
+        end
+    end
+end

data/lib/rbind/generator_c.rb

@@ -191,12 +191,12 @@ module Rbind
                              end
                          else
                              fct = if !constructor? && (return_type.name != "void" || return_type.ptr?)
+                                       # operator+, operator++ etc
                                        if operator? && parameters.size == 1
                                            if return_type.basic_type?
                                                "return *rbind_obj_ #{operator} #{paras};"
                                            elsif return_type.ref?
-                                               # the returned value is not the owner of the
-                                               # object
+                                               # the returned value is not the owner of the object
                                                "return toC(&(*rbind_obj_ #{operator} #{paras}),false);"
                                            else
                                                "return toC(new #{return_type.full_name}(*rbind_obj_ #{operator} #{paras}));"
@@ -204,10 +204,9 @@ module Rbind
                                        elsif return_type.basic_type?
                                            "return #{full_name}(#{paras});"
                                        elsif return_type.ptr?
-                                           "return toC(#{full_name}(#{paras}));"
+                                           "return toC(#{full_name}(#{paras}),#{return_type.ownership?});"
                                        elsif return_type.ref?
-                                           # the returned value is not the owner of the
-                                           # object
+                                           # the returned value is never owner of the memory
                                            "return toC(&#{full_name}(#{paras}),false);"
                                        else
                                            "return toC(new #{return_type.full_name}(#{full_name}(#{paras})));"
@@ -286,7 +285,7 @@ module Rbind
 
            def libs
                str = @root.map do |pkg|
-                   "${#{pkg.upcase}_LIBS} ${#{pkg.upcase}_LDFLAGS}"
+                   "${#{pkg.upcase}_LIBS} ${#{pkg.upcase}_LDFLAGS_OTHER}"
                end.join(" ")
                str += " " + @libs.join(" ")
            end

data/lib/rbind/generator_ruby.rb

@@ -65,6 +65,14 @@ module Rbind
                           parameter.default_value.gsub("f","")
                       elsif parameter.type.name == "double"
                           parameter.default_value.gsub(/\.$/,".0").gsub(/^\./,"0.")
+                      elsif parameter.type.ptr? &&(parameter.default_value == "0" || parameter.default_value = "NULL")
+                          # NULL pointer
+                          t = parameter.type.to_raw
+                          if t.extern_package_name
+                              "::#{t.extern_package_name}::#{normalize_type_name(t.full_name)}::null"
+                          else
+                              "#{normalize_type_name(t.full_name)}::null"
+                          end
                       else
                           normalize_type_name(parameter.default_value)
                       end
@@ -97,7 +105,7 @@ module Rbind
                                       "#{normalize_method_name(ops.first.name)}(#{(value)})"
                                   end
                               elsif t
-                                  t = t.to_ptr if parameter.type.ptr?
+                                  t = t.to_raw
                                   if t.extern_package_name
                                       "::#{t.extern_package_name}::#{normalize_type_name(t.full_name)}.new(#{(value)})"
                                   else

data/lib/rbind/templates/c/type_conversion.cc

@@ -19,6 +19,10 @@ const <%= cname %>* toC(const <%= full_name %>* ptr, bool owner)
 // converts const <%= cname %> to const <%= full_name %>
 const <%= full_name %>* fromC(const <%= cname %>* ptr)
 {
+    if(ptr == NULL)
+        throw std::runtime_error("<%= full_name %>: Null Pointer!");
+    if(!ptr->obj_ptr)
+        return NULL;
     <%- if check_type? -%>
     // check typeid if available
     if(ptr->type_id && typeid(<%= full_name %>) != *static_cast<const std::type_info*>(ptr->type_id))
@@ -34,14 +38,14 @@ const <%= full_name %>* fromC(const <%= cname %>* ptr)
     // check size
     if(ptr->size && sizeof(<%= full_name %>) > ptr->size)
         throw std::runtime_error("wrong object size for <%= full_name %>.");
-    if(!ptr->obj_ptr)
-        throw std::runtime_error("object for <%= full_name %> was deleted!");
     return static_cast<const <%= full_name %>*>(ptr->obj_ptr);
 }
 
 // converts <%= cname %>* to <%= full_name %>*
 <%= full_name %>* fromC(<%= cname %>* ptr)
 {
+    if(ptr == NULL)
+        return NULL;
     return const_cast<<%= full_name %>*>(fromC(static_cast<const <%= cname %>*>(ptr)));
 }
 

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

@@ -2,6 +2,7 @@
     # @note method wrapper for <%= signature %>
     def <%=name%>(<%= wrap_parameters_signature %>)
 <%= add_specialize_ruby -%>
+        __validate_pointer__
     <%- if return_type.basic_type? || operator? -%>
         Rbind::<%= cname %>( <%= wrap_parameters_call %>)
     <%- else -%>

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

@@ -1,6 +1,7 @@
 <%= add_doc -%>
     # @note wrapper for overloaded method <%= name %>
     def <%=name%>(*args)
+        __validate_pointer__
 <%= add_methods %>
         raise ArgumentError, "No overloaded signature fits to: #{args.map(&:class)}"
     end

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

@@ -29,6 +29,11 @@ class <%= name %>
         <%= name %>Struct
     end
 
+    # returns a null pointer to the object
+    def self.null
+        new(<%= name %>Struct.new)
+    end
+
 <%= add_constructor_doc -%>
     def self.new(*args)
         if args.first.is_a?(FFI::Pointer) || args.first.is_a?(<%= name %>Struct)
@@ -95,6 +100,13 @@ class <%= name %>
         @__obj_ptr__[:bowner]
     end
 
+    # @private
+    # raises if the underlying pointer is a null pointer
+    # the real object
+    def __validate_pointer__
+        raise "NullPointer" if @__obj_ptr__.null? || @__obj_ptr__[:obj_ptr].address == 0
+    end
+
     # converts <%= name %> into a string by crawling through all its attributes
     def to_s
         <%= add_to_s %>

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.23'
-    s.date              = '2013-10-29'
+    s.version           = '0.0.24'
+    s.date              = '2014-02-16'
     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.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -64,11 +64,9 @@ files:
 - lib/rbind/core/rnamespace.rb
 - lib/rbind/core/roperation.rb
 - lib/rbind/core/rparameter.rb
-- lib/rbind/core/rpointer.rb
-- lib/rbind/core/rreference.rb
 - lib/rbind/core/rsetter.rb
 - lib/rbind/core/rtemplate_class.rb
-- lib/rbind/core/rtype_qualifier.rb
+- lib/rbind/core/rtype_annotation.rb
 - lib/rbind/default_parser.rb
 - lib/rbind/generator_c.rb
 - lib/rbind/generator_extern.rb

data/lib/rbind/core/rpointer.rb

@@ -1,70 +0,0 @@
-require 'delegate'
-
-module Rbind
-    class RPointer < SimpleDelegator
-        attr_accessor :const
-
-        def initialize(type)
-            super(type)
-        end
-
-        def name
-            super.to_s + "*"
-        end
-
-        def full_name
-            super.to_s + "*"
-        end
-
-        def signature(sig=nil)
-            super.to_s + "*"
-        end
-
-        def csignature(sig=nil)
-            super.to_s + "*"
-        end
-
-        def ptr?
-            true
-        end
-
-        def ref?
-            false
-        end
-
-        def raw?
-            false
-        end
-
-        def remove_const
-            RPointer.new __getobj__.remove_const
-        end
-
-        def to_ptr
-            RPointer.new(self)
-        end
-
-        def to_ref
-            RReference.new(self)
-        end
-
-        def to_const
-            return self if const?
-            RTypeQualifier.new(self,:const => true)
-        end
-
-        def signature(sig=nil)
-            generate_signatures[0]
-        end
-
-        def csignature(sig=nil)
-            generate_signatures[1]
-        end
-
-        def generate_signatures
-            __getobj__.generate_signatures.map do |s|
-                s + "*"
-            end
-        end
-    end
-end

data/lib/rbind/core/rreference.rb

@@ -1,54 +0,0 @@
-require 'delegate'
-
-module Rbind
-    class RReference < SimpleDelegator
-        attr_accessor :const
-
-        def initialize(type)
-            super(type)
-        end
-
-        def ref?
-            true
-        end
-
-        def ptr?
-            false
-        end
-
-        def raw?
-            false
-        end
-
-        def to_ptr
-            RPointer.new(self)
-        end
-
-        def to_ref
-            RReference.new(self)
-        end
-
-        def to_const
-            return self if const?
-            RTypeQualifier.new(self,:const => true)
-        end
-
-        def remove_const
-            RReference.new __getobj__.remove_const
-        end
-
-        def signature(sig=nil)
-            generate_signatures[0]
-        end
-
-        def csignature(sig=nil)
-            generate_signatures[1]
-        end
-
-        def generate_signatures
-            __getobj__.generate_signatures.map do |s|
-                s + "&"
-            end
-        end
-    end
-end

data/lib/rbind/core/rtype_qualifier.rb

@@ -1,69 +0,0 @@
-require 'delegate'
-
-module Rbind
-    class RTypeQualifier < SimpleDelegator
-        attr_accessor :const
-
-        def initialize(type,options=Hash.new)
-            super(type)
-            @const = options[:const]
-        end
-
-        def const?
-            !!@const
-        end
-
-        def to_single_ptr
-            t = to_raw
-            t = t.to_const if const?
-            t.to_ptr
-        end
-
-        def to_ptr
-            RPointer.new(self)
-        end
-
-        def to_ref
-            RReference.new(self)
-        end
-
-        def to_const
-            return self if const?
-            RTypeQualifier.new(self,:const => true)
-        end
-
-        def remove_const
-            __getobj__
-        end
-
-        def raw?
-            false
-        end
-
-        def signature(sig=nil)
-            generate_signatures[0]
-        end
-
-        def csignature(sig=nil)
-            generate_signatures[1]
-        end
-
-        def generate_signatures
-            str = if const?
-                      "const "
-                  end
-            __getobj__.generate_signatures.map do |s|
-                str + s
-            end
-        end
-
-        # Resolve the current delegate to the underlying object
-        def get_base_delegate
-            obj = __getobj__
-            while obj.respond_to?(:__getobj__)
-                obj = obj.__getobj__
-            end
-            obj
-        end
-    end
-end