rbind 0.0.22 → 0.0.23

data/lib/rbind/rbind.rb

@@ -59,7 +59,8 @@ module Rbind
         end
 
         def parse(*files)
-            files.each do |path|
+            files.flatten.each do |path|
+                raise ArgumentError, "File '#{path}' does not exist" if not File.exists?(path)
                 parser.parse File.new(path).read
             end
         end
@@ -195,8 +196,9 @@ module Rbind
             @generator_c.libs
         end
 
-        def add_std_string
+        def add_std_string(with_c_string = true)
             @generator_c.includes << "<string>"
+            @generator_c.includes << "<cstring>" if with_c_string
             @parser.add_type(StdString.new("std::string",@parser))
             @parser.type_alias["basic_string"] = @parser.std.string
             self
@@ -208,9 +210,26 @@ module Rbind
             self
         end
 
+        def add_std_map
+            @generator_c.includes << "<map>"
+            @parser.add_type(StdMap.new("std::map"))
+        end
+
+        def add_std_except
+            @generator_c.includes << "<stdexcept>"
+            exception = RClass.new(RBase.normalize("std::exception"))
+            @parser.add_type(exception)
+
+            runtime_error = RClass.new(RBase.normalize("std::runtime_error"))
+            runtime_error.add_parent(exception)
+            @parser.add_type(runtime_error)
+        end
+
         def add_std_types
             add_std_vector
             add_std_string
+            add_std_map
+            add_std_except
         end
 
         def method_missing(m,*args)

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

@@ -1,4 +1,4 @@
-// wrapper for <%= attribute? ? "#{owner.full_name}.#{attribute.name}" : signature %>
+// operation wrapper for <%= attribute? ? "#{owner.full_name}.#{attribute.name}" : signature %>
 <%= csignature %>
 {
     try
@@ -7,9 +7,9 @@
     }
     catch(std::exception &error){strncpy(&last_error_message[0],error.what(),255);}
     catch(...){strncpy(&last_error_message[0],"Unknown Exception",255);}
-    <%- if !return_type || !return_type.basic_type? -%>
+    <%- if !return_type || return_type.ptr? || !return_type.basic_type? -%>
     return NULL;
-        <%- elsif return_type.name != "void" || return_type.ptr?-%>
-    return <%= return_type.invalid_value %>;
+    <%- elsif return_type.name != "void"  -%>
+    return (<%= return_type.cname %>) <%= return_type.invalid_value %>;
     <%- end -%>
 }

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

@@ -1,5 +1,6 @@
 // converts <%= full_name %>* to <%= cname %>*
-<%= cname %>* toC(<%= full_name %>* ptr, bool owner)
+
+const <%= cname %>* toC(const <%= full_name %>* ptr, bool owner)
 {
     <%= cname %>* r_ptr = new <%= cname %>;
     r_ptr->version = <%= version %>;
@@ -10,6 +11,11 @@
     return r_ptr;
 }
 
+<%= cname %>* toC(<%= full_name %>* ptr, bool owner)
+{
+    return const_cast<<%= cname %>*>(toC(static_cast<const <%= full_name %>*>(ptr),owner));
+}
+
 // converts const <%= cname %> to const <%= full_name %>
 const <%= full_name %>* fromC(const <%= cname %>* ptr)
 {

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

@@ -1,4 +1,5 @@
 // convert functions for <%= full_name %>* to and from <%= cname %>*
+const <%= cname %>* toC(const <%= full_name %>* ptr, bool owner = true);
 <%= cname %>* toC(<%= full_name %>* ptr, bool owner = true);
 const <%= full_name %>* fromC(const <%= cname %>* ptr);
 <%= full_name %>* fromC(<%= cname %>* ptr);

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

@@ -18,6 +18,10 @@ module <%= name %>
                end
         ffi_lib ["<%= library_name %>", path]
 
+        # @!group Enums
+        <%= add_enums%>
+        # @!endgroup
+
         #add error checking
         #rbindCreateMatrix -> create_matrix
         def self.attach_function(ruby_name,c_name, args, returns,error_checking=true)

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

@@ -1,5 +1,5 @@
 <%= add_doc -%>
-    # @note wrapper for <%= signature %>
+    # @note method wrapper for <%= signature %>
     def <%=name%>(<%= wrap_parameters_signature %>)
 <%= add_specialize_ruby -%>
     <%- if return_type.basic_type? || operator? -%>

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

@@ -1,10 +1,10 @@
 <%= add_doc -%>
-# @note wrapper for <%= full_name %>
+# @note namespace wrapper for <%= full_name %>
 module <%= name %>
     # @!group Constants
 <%= add_consts%>
     # @!endgroup
-#
+
 <%= add_methods %>
 <%= add_types %>
 end

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

@@ -1,4 +1,4 @@
-        # wrapper for <%= signature %>
+        # overloaded method wrapper for <%= signature %>
         @@<%=cname%>_defaults<%= index %> ||= <%= signature_default_values %>
         if(args.size >= <%= min_number_of_parameters %> && args.size <= <%= parameters.size %>)
             targs = args.clone

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

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

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

@@ -1,5 +1,5 @@
 <%= add_doc -%>
-    # @note wrapper for <%= signature %>
+    # @note wrapper for static method <%= signature %>
     def self.<%= name %>(<%= wrap_parameters_signature %>)
 <%= add_specialize_ruby -%>
         Rbind::<%= cname %>(<%= wrap_parameters_call %>)

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

@@ -1,4 +1,4 @@
-        # wrapper for <%= signature %>
+        # wrapper for type constructor <%= signature %>
         if args.size == <%= parameters.size %>
             return Rbind::<%= cname %>(*args)
         end

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

@@ -1,6 +1,6 @@
 # template <%= full_name %>
 class <%= name %>
-    # @!group Sepcializing
+    # @!group Specializing
 <%= add_specializing %>
     # @!endgroup
 end

data/lib/rbind/types/std_map.rb

@@ -0,0 +1,29 @@
+module Rbind
+    class StdMap < RTemplateClass
+        def specialize(klass,*parameters)
+            if parameters.size < 2
+                raise ArgumentError,"StdMap does require at least two template parameters. Got: #{parameters}}"
+            end
+            map_key_type = parameters.flatten[0]
+            map_value_type = parameters.flatten[1]
+            if parameters.size > 2
+                map_comp_type = parameters.flatten[2]
+            else
+                map_comp_type = nil
+            end
+
+            klass.add_operation ROperation.new(klass.name,nil)
+            klass.add_operation ROperation.new(klass.name,nil,RParameter.new("other",klass).to_const)
+
+            klass.add_operation ROperation.new("size",type("size_t"))
+            klass.add_operation ROperation.new("clear",type("void"))
+            klass.add_operation ROperation.new("capacity",type("size_t"))
+            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("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
+        end
+    end
+end

data/rbind.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.22'
+    s.version           = '0.0.23'
     s.date              = '2013-10-29'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']

data/test/headers/non_public_classes.hpp

@@ -0,0 +1,35 @@
+#ifndef RBIND_CLASSES_HPP
+#define RBIND_CLASSES_HPP
+
+
+class TestClass
+{
+public:
+    bool public_field;
+
+    void public_function();
+
+    class PublicClass
+    {
+    };
+
+private:
+    bool private_field;
+
+    void private_function();
+
+    class PrivateClass
+    {
+    };
+
+protected:
+    bool protected_field;
+
+    void protected_function();
+
+    class ProtectedClass
+    {
+    };
+};
+
+#endif

data/test/test_clang_parser.rb

@@ -12,7 +12,6 @@ describe Rbind::ClangParser do
     describe "parse" do
 
         it "must parse enums" do
-            next
             file = File.join(File.dirname(__FILE__),'headers','enums.hpp')
             parser = Rbind::ClangParser.new
             parser.parse file
@@ -24,7 +23,6 @@ describe Rbind::ClangParser do
         end
 
         it "must parse constants" do
-            next
             file = File.join(File.dirname(__FILE__),'headers','constants.hpp')
             parser = Rbind::ClangParser.new
             parser.parse file
@@ -41,7 +39,6 @@ describe Rbind::ClangParser do
         end
 
         it "must parse c functions" do
-            next
             file = File.join(File.dirname(__FILE__),'headers','cfunctions.h')
             parser = Rbind::ClangParser.new
             parser.parse file
@@ -80,22 +77,21 @@ describe Rbind::ClangParser do
         end
 
         it "must parse classes" do
-            next
             file = File.join(File.dirname(__FILE__),'headers','classes.hpp')
             parser = Rbind::ClangParser.new
             parser.parse file
 
-            assert_equal "void TestClass::TestClass(int i1, char c)", parser.TestClass.TestClass.signature
+            assert_equal "TestClass::TestClass(int i1, char c)", parser.TestClass.TestClass.signature
             assert_equal "void TestClass::setB(bool val)", parser.TestClass.setB.signature
             assert_equal "void TestClass::setF(float& val)", parser.TestClass.setF.signature
             assert_equal "void TestClass::setF2(const float& val)", parser.TestClass.setF2.signature
             assert_equal "void TestClass::setD(double& val)", parser.TestClass.setD.signature
-            assert_equal "TestClass TestClass::setS(TestClass other)", parser.TestClass.setS.signature
-            assert_equal "TestClass TestClass::setS2(TestClass* other)", parser.TestClass.setS2.signature
-            assert_equal "TestClass TestClass::setS3(TestClass** other)", parser.TestClass.setS3.signature
-            assert_equal "TestClass TestClass::setS4(TestClass& other)", parser.TestClass.setS4.signature
-            assert_equal "TestClass TestClass::setS5(const TestClass& other)", parser.TestClass.setS5.signature
-            assert_equal "TestClass TestClass::setS6(const TestClass* other)", parser.TestClass.setS6.signature
+            assert_equal "void TestClass::setS(TestClass other)", parser.TestClass.setS.signature
+            assert_equal "void TestClass::setS2(TestClass* other)", parser.TestClass.setS2.signature
+            assert_equal "void TestClass::setS3(TestClass** other)", parser.TestClass.setS3.signature
+            assert_equal "void TestClass::setS4(TestClass& other)", parser.TestClass.setS4.signature
+            assert_equal "void TestClass::setS5(const TestClass& other)", parser.TestClass.setS5.signature
+            assert_equal "void TestClass::setS6(const TestClass* other)", parser.TestClass.setS6.signature
             assert_equal "TestClass TestClass::getS()", parser.TestClass.getS.signature
             assert_equal "TestClass* TestClass::getS2()", parser.TestClass.getS2.signature
             assert_equal "TestClass& TestClass::getS3()", parser.TestClass.getS3.signature
@@ -104,10 +100,45 @@ describe Rbind::ClangParser do
             assert parser.TestClass.attribute("ifield")
         end
 
+        it "must ignore non public classes and attributes" do
+            file = File.join(File.dirname(__FILE__),'headers','non_public_classes.hpp')
+            parser = Rbind::ClangParser.new
+            parser.parse file
+
+            # Fields
+            assert parser.TestClass.attribute("public_field"), "Public field should exist"
+            assert !parser.TestClass.attribute("protected_field"), "Protected field should not exist"
+            assert !parser.TestClass.attribute("private_field"), "Private field should not exist"
+
+            # Functions
+            assert parser.TestClass.operations.select { |o| o == "void TestClass::public_function()" } , "Public function should exist: #{parser.TestClass.operations}"
+            protected_function = parser.TestClass.operations.select { |o| o == "void TestClass::protected_function()" }
+            assert protected_function.empty? , "Protected function not should exist: #{parser.TestClass.operations}"
+
+            private_function = parser.TestClass.operations.select { |o| o == "void TestClass::private_function()" }
+            assert private_function.empty? , "private function not should exist: #{parser.TestClass.operations}"
+
+            # Classes
+            assert parser.TestClass.PublicClass
+            begin
+                parser.TestClass.ProtectedClass
+                assert false, "Protected class should not be available"
+            rescue
+                assert true, "Protected class should be available"
+            end
+
+            begin
+                parser.TestClass.PrivateClass
+                assert false, "Private class should not be available"
+            rescue
+                assert true, "Private class should be available"
+            end
+        end
+
         it "must parse std vector types" do
-            next
             file = File.join(File.dirname(__FILE__),'headers','std_vector.hpp')
             parser = Rbind::ClangParser.new
+            parser.add_type(Rbind::StdVector.new("std::vector"), parser)
             parser.parse file
 
             assert_equal "void TestClass::setValues(std::vector<int> ints)", parser.TestClass.setValues.signature
@@ -136,11 +167,14 @@ describe Rbind::ClangParser do
         end
 
         # this is not fully supported yet
-        #it "must parse templates" do
-        #    file = File.join(File.dirname(__FILE__),'headers','templates.hpp')
-        #    parser = Rbind::ClangParser.new
-        #    parser.parse file
-        #    #assert_equal("_test123",result)
-        #end
+        it "must parse templates" do
+            file = File.join(File.dirname(__FILE__),'headers','templates.hpp')
+            parser = Rbind::ClangParser.new
+            parser.parse file
+
+            assert_equal "void Test::setType(TemplateType<int> type)", parser.Test.setType.signature
+            template_type = parser.type("TemplateType<int>")
+            assert_equal "void TemplateType<int>::setInt(int i)", template_type.setInt.signature
+        end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbind
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Alexander Duda
@@ -48,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- do_install.sh
 - lib/rbind.rb
 - lib/rbind/clang/clang.rb
 - lib/rbind/clang/clang_types.rb
@@ -105,6 +106,7 @@ files:
 - lib/rbind/templates/ruby/rtype_template.rb
 - lib/rbind/tools/hdr_parser.py
 - lib/rbind/typelib.rb
+- lib/rbind/types/std_map.rb
 - lib/rbind/types/std_string.rb
 - lib/rbind/types/std_vector.rb
 - manifest.xml
@@ -113,6 +115,7 @@ files:
 - test/headers/classes.hpp
 - test/headers/constants.hpp
 - test/headers/enums.hpp
+- test/headers/non_public_classes.hpp
 - test/headers/std_string.hpp
 - test/headers/std_vector.hpp
 - test/headers/structs.hpp
@@ -145,3 +148,4 @@ signing_key:
 specification_version: 4
 summary: Library for genereating automated ffi-bindings for c/c++ libraries
 test_files: []
+has_rdoc: