rbind 0.0.31 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769543a90bfc2ffaac9767a4beaef69a6d3c350c5e97bc8aca027db1f69c5fd4
-  data.tar.gz: 855908c1da39e65bd80cc36218a4adb8b82dc9613b6687de6085aab05abe5ae4
+  metadata.gz: 4af779a4a5ab2c2ddebe6be732475e1ecf30c405760a70dbfe5f547af557bd40
+  data.tar.gz: aa14b3cd31d66748c8aed14b9a6ae4c232273d0db3e2fcdf997fb0d877ec7973
 SHA512:
-  metadata.gz: 1a5db203492358309ce27edc23b8be0e321c938c57df3befc75a9d24965184a426d9a835184c6b7ed9dbe38536e9f900e5de98d7d4f8f86093276b9d2e99c640
-  data.tar.gz: a3f3ea618b6d0ba64de0d40d5b573264b40dd8f4c49c2a923aaf6dd4af10eba7f03cab7c5d5408b2c3c294c0dd2a4d8237e14ede7e29115b9d93448f51e259a5
+  metadata.gz: 599b08d1f9706bfc53bc782666731fb00a8b3b027ba6c471e6973c9d1d14d97bde626534581a68cfe3e75b458417ce49b45aaff1e548b755470f8e7db3ecbf36
+  data.tar.gz: 1890afa6e1ac7843df9447082a384f4946950e4deb5d23f06cb907507ce88352a36e4b12a00bafb5389aa043fb395ad4415ad538f8060f5f2cfbc106bd671d16

data/lib/rbind/core/rbase.rb

@@ -208,5 +208,27 @@ module Rbind
                 @specialize_ruby.call
             end
         end
+
+        # overwrite c 
+	# depends on type
+	# at the moment only operations can be overwritten
+        def overwrite_c(&block)
+            if block
+                @overwrite_c = block
+            elsif @overwrite_c
+                @overwrite_c.call
+            end
+        end
+
+        # overwrite ruby
+	# depends on type
+	# at the moment only rbind_from_native can be overwritten
+        def overwrite_ruby(&block)
+            if block
+                @overwrite_ruby = block
+            elsif @overwrite_ruby
+                @overwrite_ruby.call
+            end
+        end
     end
 end

data/lib/rbind/core/rclass.rb

@@ -108,8 +108,8 @@ module Rbind
 			    o == other_op
 			end
 			next false if !op
-			next true if o.base_class == self
-			next true if o.base_class == other_op.base_class
+			next true if op.base_class == self
+			next true if op.base_class == other_op.base_class
 
 			# ambiguous name look up due to multi
 			# inheritance

data/lib/rbind/default_parser.rb

@@ -91,6 +91,7 @@ module Rbind
             type_name = array.shift
             para_name = array.shift
             default = unmask_template(array.join(" ").gsub("/C",""))
+            default.gsub!("/Ref","")
             type = find_type(owner,type_name)
             flags = normalize_flags(line_number,flags,:IO,:O)
             type = if flags.include?(:O) || flags.include?(:IO)
@@ -132,7 +133,7 @@ module Rbind
         def parse_class(line_number,string)
             lines = string.split("\n")
             a = lines.shift.rstrip
-            unless a =~ /class ([<>a-zA-Z\.\d_:]*) ?:?([<>a-zA-Z\.\:, \d_]*)(.*)/
+            unless a =~ /class ([,<>a-zA-Z\.\d_:]*) ?:?([<>a-zA-Z\.\:, \d_]*)(.*)/
                 raise "cannot parse class #{a}"
             end
             name = $1

data/lib/rbind/generator_c.rb

@@ -192,6 +192,8 @@ module Rbind
                end
 
                def wrap_call
+		   str = overwrite_c()
+		   return str if str
                    paras = parameters.map do |arg|
                        "#{"*" if (!arg.type.ptr? && !arg.type.basic_type?)}#{arg.name}#{"_" if !arg.type.basic_type?}"
                    end.join(", ")

data/lib/rbind/generator_ruby.rb

@@ -657,6 +657,13 @@ module Rbind
                 GeneratorRuby.normalize_method_name(@root.cdelete_method)
             end
 
+	    def rbind_from_native
+		overwrite = @root.overwrite_ruby
+		return overwrite if overwrite
+		"#{name}.new(ptr)"
+	    end
+
+
             def add_specializing(root = @root)
                 str = root.specialize_ruby.to_s
                 root.each_type(false) do |t|

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

@@ -5,10 +5,13 @@
     {
         <%= wrap_parameters %><%= wrap_call %>
     }
-    catch(std::exception &error){strncpy(&last_error_message[0],error.what(),255);}
-    catch(...){strncpy(&last_error_message[0],"Unknown Exception",255);}
+    catch(std::exception &error){strncpy(&last_error_message[0],error.what(),254);}
+    catch(...){strncpy(&last_error_message[0],"Unknown Exception",254);}
     <%- if !return_type || return_type.ptr? || !return_type.basic_type? -%>
     return NULL;
+    <%- elsif return_type.ref? -%>
+    static <%= return_type.cname %> invalid;
+    return invalid;
     <%- elsif return_type.name != "void"  -%>
     return (<%= return_type.cname %>) <%= return_type.invalid_value %>;
     <%- end -%>

data/lib/rbind/templates/c/type_delete.h

@@ -8,7 +8,7 @@ void <%= cdelete_method %>(<%= cname %> *ptr)
             delete fromC(ptr);
         ptr->obj_ptr = NULL;
     }
-    catch(std::exception &error){strncpy(&last_error_message[0],error.what(),255);}
-    catch(...){strncpy(&last_error_message[0],"Unknown Exception",255);}
+    catch(std::exception &error){strncpy(&last_error_message[0],error.what(),254);}
+    catch(...){strncpy(&last_error_message[0],"Unknown Exception",254);}
     delete ptr;
 }

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

@@ -55,7 +55,7 @@ class <%= name %>
 
     # @private
     def self.rbind_from_native(ptr,context)
-        <%= name %>.new(ptr)
+        <%= rbind_from_native %>
     end
 
     # @private

data/lib/rbind/types/std_map.rb

@@ -18,11 +18,42 @@ module Rbind
             klass.add_operation ROperation.new("size",type("size_t"))
             klass.add_operation ROperation.new("clear",type("void"))
             klass.add_operation ROperation.new("empty",type("bool"))
-            klass.add_operation ROperation.new("operator[]",map_value_type, RParameter.new("key_type", map_key_type))
+            klass.add_operation ROperation.new("operator[]",map_value_type.to_ref, RParameter.new("key_type", map_key_type))
+            klass.add_operation ROperation.new("add",type("void"), RParameter.new("key", map_key_type),RParameter.new("value", map_value_type.to_ref.to_const))
+            klass.operation("add").overwrite_c do
+                "(*rbind_obj_)[#{map_key_type.basic_type? ? "key" : "*key_"}] = #{map_value_type.basic_type? ? "value" : "*value_"};"
+            end
+
             klass.add_operation ROperation.new("at",map_value_type, RParameter.new("key_type",map_key_type))
             klass.add_operation ROperation.new("erase",type("void"), RParameter.new("key_type",map_key_type))
+            klass.add_operation ROperation.new("getKeys",type("std::vector<#{map_key_type}>"))
+            klass.operation("getKeys").overwrite_c do
+                str = %{
+                    auto keys = new std::vector<#{map_key_type}>();
+                    std::transform(std::begin(*rbind_obj_), std::end(*rbind_obj_), std::back_inserter(*keys), 
+                            [](std::pair<#{map_key_type},#{map_value_type}> const& pair) {
+                        return pair.first;
+                    }); 
+                    return toC(keys);
+                }
+            end
+	        klass
+        end
 
-            klass
+        # called from RTemplate when ruby_specialize is called for the instance
+        def specialize_ruby_specialization(klass)
+            %Q$ 
+            def to_hash
+	            hash = Hash.new
+	    	    keys = get_keys
+                keys.each do |k|
+                    hash[k] = self[k]
+                end
+		        hash
+            end
+            def []=(key,val)
+		        add(key,val)
+            end$
         end
     end
 end

data/lib/rbind/types/std_vector.rb

@@ -11,7 +11,12 @@ module Rbind
 
             para = Array.new
             para <<  RParameter.new("size",type("size_t"))
-            para <<  RParameter.new("val",vector_type).default_value(vector_type.full_name+"()").to_const
+            if vector_type.is_a? REnum 
+                para <<  RParameter.new("val",vector_type)
+            else
+               para <<  RParameter.new("val",vector_type).default_value(vector_type.full_name+"()").to_const
+            end
+
             klass.add_operation ROperation.new("resize",type("void"),para)
             klass.add_operation ROperation.new("size",type("size_t"))
             klass.add_operation ROperation.new("clear",type("void"))

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.31'
-    s.date              = '2020-02-24'
+    s.version           = '0.0.34'
+    s.date              = '2022-04-20'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@me.com']

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rbind
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.34
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 description: Rbind is developed to automatically generate ruby bindings for OpenCV
   but is not tight to this library.This gem is still under heavy development and the
   API might change in the future.
@@ -128,7 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library for genereating automated ffi-bindings for c/c++ libraries