rbind 0.0.7 → 0.0.8

data/lib/rbind/core/rbase.rb

@@ -3,6 +3,7 @@ module Rbind
         attr_accessor :name
         attr_accessor :cname
         attr_accessor :alias
+        attr_accessor :auto_alias # set to true if rbind is aliasing the object
         attr_accessor :namespace
         attr_accessor :owner
         attr_accessor :flags

data/lib/rbind/core/rnamespace.rb

@@ -11,10 +11,12 @@ module Rbind
         attr_reader :consts
         attr_reader :used_namespaces
         attr_accessor :root
+        attr_accessor :types_alias
 
         def initialize(name,*flags)
             @consts = Hash.new
             @types = Hash.new
+            @types_alias = Hash.new
             @operations = Hash.new{|hash,key| hash[key] = Array.new}
             @operation_alias = Hash.new{|hash,key| hash[key] = Array.new}
             @used_namespaces = Hash.new
@@ -177,10 +179,12 @@ module Rbind
                            ::Rbind.log.debug "name clash: aliasing #{op.alias} --> #{name}"
                            name
                        else
+                           op.auto_alias = true
                            name = "#{op.name}#{@operations[op.name].size+1}"
                            ::Rbind.log.debug "name clash: #{op.name} --> #{name}"
                            name
                        end
+            op.index = @operations[op.name].size
             @operations[op.name] << op
             @operation_alias[op.alias] << op if op.alias
             op
@@ -247,6 +251,12 @@ module Rbind
                 t.add_type(type)
             else
                 type.owner = self
+                if type.alias
+                    if type(type.alias,false,false)
+                        raise ArgumentError,"A type with the name alias #{type.alias} already exists"
+                    end
+                    @types_alias[type.alias] = type
+                end
                 @types[type.name] = type
             end
             type
@@ -262,6 +272,8 @@ module Rbind
             name = name.chomp(" ")
             t = if @types.has_key?(name)
                     @types[name]
+                elsif @types_alias.has_key?(name)
+                    @types_alias[name]
                 else
                     if !!(ns = RBase.namespace(name))
                         ns = ns.split("::")

data/lib/rbind/core/roperation.rb

@@ -6,6 +6,7 @@ module Rbind
         attr_accessor :cparameters
         attr_accessor :base_class
         attr_accessor :ambiguous_name
+        attr_accessor :index            # index if overloaded
 
         def initialize(name,return_type,*args)
             super(name)

data/lib/rbind/default_parser.rb

@@ -23,7 +23,8 @@ module Rbind
         end
 
         def normalize_default_value(value)
-            val = value.gsub(/(.?)std::vector<(.*)>/,'\1vector_\2')
+            value = value.gsub(/std::vector</,"vector<")
+            val = value.gsub(/(.?)vector<(.*)>/,'\1vector_\2')
             if value != val
                 normalize_default_value(val)
             else

data/lib/rbind/generator_ruby.rb

@@ -4,6 +4,9 @@ require 'erb'
 
 module Rbind
     class GeneratorRuby
+        @@ruby_default_value_map ||= {"true" => "true","TRUE" => "true", "false" => "false","FALSE" => "false"}
+        @@ffi_type_map ||= {"char *" => "string","unsigned char" => "uchar" ,"const char *" => "string" }
+
         def self.keyword?(name)
             %w{__FILE__ __LINE__ alias and begin BEGIN break case class def defined? do else elsif end END ensure false for if in module next nil not or redo rescue retry return self super then true undef unless until when while yield}.include? name
         end
@@ -26,10 +29,12 @@ module Rbind
         def self.normalize_default_value(parameter)
             return nil unless parameter.default_value
             val = if parameter.type.basic_type? || parameter.type.ptr?
-                      if parameter.type.name == "float"
+                      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","")
                       elsif parameter.type.name == "double"
-                          parameter.default_value.gsub(/\.$/,".0")
+                          parameter.default_value.gsub(/\.$/,".0").gsub(/^\./,"0.")
                       else
                           normalize_type_name(parameter.default_value)
                       end
@@ -72,6 +77,10 @@ module Rbind
 
 
         def self.normalize_type_name(name)
+            if name =~ /^u?int\d*$/ || name =~ /^u?int\d+_t$/
+                return "Fixnum"
+            end
+            name = name.gsub(/^_/,"")
             names = name.split("::").map do |n|
                 n.gsub(/^(\w)(.*)/) do 
                     $1.upcase+$2
@@ -88,9 +97,8 @@ module Rbind
             end.join("")
         end
 
-        def self.normalize_basic_type_name(name)
-            @@basic_type_map ||= {"char *" => "string","unsigned char" => "uchar" ,"const char *" => "string" }
-            n = @@basic_type_map[name]
+        def self.normalize_basic_type_name_ffi(name)
+            n = @@ffi_type_map[name]
             n ||= name
             if n =~ /\*/
                 "pointer"
@@ -179,7 +187,7 @@ module Rbind
             end
 
             def normalize_bt(name)
-                GeneratorRuby.normalize_basic_type_name name
+                GeneratorRuby.normalize_basic_type_name_ffi name
             end
 
             def normalize_m(name)
@@ -248,6 +256,26 @@ module Rbind
 
         class RTypeHelper < HelperBase
             class OperationHelper < SimpleDelegator
+                def min_number_of_parameters
+                    count = 0
+                    parameters.each do |p|
+                        break if p.default_value
+                        count +=1
+                    end
+                    count
+                end
+
+                def signature_default_values
+                    str = parameters.map do |p|
+                        if p.default_value 
+                            GeneratorRuby.normalize_default_value p
+                        else
+                            "nil"
+                        end
+                    end.join(", ")
+                    "[#{str}]"
+                end
+
                 def wrap_parameters_signature
                     parameters.map do |p|
                         n = GeneratorRuby.normalize_arg_name p.name
@@ -257,11 +285,6 @@ module Rbind
                             n
                         end
                     end.join(", ")
-                rescue RuntimeError
-                    ::Rbind.log.warn "ignoring all default parameter values for #{full_name} because of missing definitions."
-                    parameters.map do |p|
-                        GeneratorRuby.normalize_arg_name p.name
-                    end.join(", ")
                 end
 
                 def wrap_parameters_call
@@ -282,7 +305,12 @@ module Rbind
                             "#{name}="
                         end
                     else
-                        GeneratorRuby.normalize_method_name(__getobj__.alias || __getobj__.name)
+                        name = if auto_alias
+                                   __getobj__.name
+                               else
+                                   __getobj__.alias || __getobj__.name
+                               end
+                        GeneratorRuby.normalize_method_name(name)
                     end
                 end
 
@@ -295,12 +323,39 @@ module Rbind
                 end
             end
 
+            class OverloadedOperationHelper < HelperBase
+                def initialize(root)
+                    raise "expect an array of methods but got #{root}" if root.size < 1
+                    super(GeneratorRuby.normalize_method_name(root.first.alias || root.first.name),root)
+                    @overload_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","roverloaded_method_call.rb")).read,nil,"-")
+                end
+
+                def add_methods
+                    str = @root.map do |method|
+                        next if method.ignore?
+                        raise "Cannot overload attributes" if method.attribute?
+                        op = if method.is_a? OperationHelper
+                                 method
+                             else
+                                 OperationHelper.new(method)
+                             end
+                        @overload_wrapper.result(op.binding)
+                    end.join("\n")
+                end
+
+                def binding
+                    Kernel.binding
+                end
+            end
+
             def initialize(name, root,compact_namespace = false)
                 @type_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","rtype.rb")).read,nil,"-")
-                @type_constructor_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","rtype_constructor.rb")).read,nil,"-")
                 @namespace_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","rnamespace.rb")).read,nil,"-")
                 @static_method_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","rstatic_method.rb")).read)
                 @method_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","rmethod.rb")).read,nil,'-')
+                @overloaded_method_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","roverloaded_method.rb")).read,nil,"-")
+                @overloaded_static_method_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","roverloaded_static_method.rb")).read,nil,"-")
+                @overloaded_method_call_wrapper = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","ruby","roverloaded_method_call.rb")).read,nil,"-")
                 @compact_namespace = compact_namespace
                 super(name,root)
             end
@@ -319,10 +374,10 @@ module Rbind
 
             def add_specializing(root = @root)
                 str = if @root.respond_to?(:specialize_ruby)
-                    root.specialize_ruby
-                else 
-                    ""
-                end
+                          root.specialize_ruby
+                      else
+                          ""
+                      end
                 root.each_type(false) do |t|
                     next if t.basic_type? && !t.is_a?(RNamespace)
                     str += add_specialize(t) if name == GeneratorRuby.normalize_type_name(t.full_name)
@@ -333,11 +388,10 @@ module Rbind
             def add_constructor
                 raise "there is no constructor for namespaces!" if self.is_a?(RNamespace)
                 ops = Array(@root.operation(@root.name,false))
-                return until ops
                 ops.map do |c|
                     next if c.ignore?
                     ch = OperationHelper.new(c)
-                    @type_constructor_wrapper.result(ch.binding)
+                    @overloaded_method_call_wrapper.result(ch.binding)
                 end.join("\n")
             end
 
@@ -356,18 +410,39 @@ module Rbind
             end
 
             def add_methods(root=@root)
+                # sort all method according their target name
+                ops = Hash.new do |h,k|
+                    h[k] = Array.new
+                end
+                root.each_operation do |o|
+                    next if o.constructor? || o.ignore?
+                    op = OperationHelper.new(o)
+                    if op.instance_method?
+                        ops["rbind_instance_#{op.name}"] << op
+                    else
+                        ops["rbind_static_#{op.name}"] << op
+                    end
+                end
+                # render method
                 str = ""
-                @root.each_operation do |op|
-                    next if op.constructor?
-                    oph = OperationHelper.new(op)
-                    str += if op.instance_method?
-                               @method_wrapper.result(oph.binding)
-                           else
-                               @static_method_wrapper.result(oph.binding)
-                           end
+                ops.each_value do |o|
+                    if o.size == 1
+                        op = o.first
+                        str += if op.instance_method?
+                                   @method_wrapper.result(op.binding)
+                               else
+                                   @static_method_wrapper.result(op.binding)
+                               end
+                    else
+                        helper = OverloadedOperationHelper.new(o)
+                        str += if o.first.instance_method?
+                                   @overloaded_method_wrapper.result(helper.binding)
+                               else
+                                   @overloaded_static_method_wrapper.result(helper.binding)
+                               end
+                    end
                 end
                 return str unless @compact_namespace
-
                 root.each_type(false) do |t|
                     next if t.basic_type? && !t.is_a?(RNamespace)
                     str += add_methods(t) if name == GeneratorRuby.normalize_type_name(t.full_name)

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

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

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

@@ -0,0 +1,19 @@
+        # wrapper for <%= signature %>
+        @@<%=cname%>_defaults<%= index %> ||= <%= signature_default_values %>
+        if(args.size >= <%= min_number_of_parameters %> && args.size <= <%= parameters.size %>)
+            args.size.upto(<%= parameters.size-1%>) do |i|
+                args[i] = @@<%=cname%>_defaults<%=index%>[i]
+            end
+            begin
+                <%- if !return_type || return_type.basic_type? || operator? -%>
+                return Rbind::<%= cname %>(*args)
+                <%- else -%>
+                result = Rbind::<%= cname %>(*args)
+                # store owner insight the pointer to not get garbage collected
+                result.instance_variable_get(:@__obj_ptr__).instance_variable_set(:@__owner__,self) if !result.__owner__?
+                return result
+                <%- end -%>
+            rescue TypeError => e
+                @error = e
+            end
+        end

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

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

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.7'
-    s.date              = '2013-06-27'
+    s.version           = '0.0.8'
+    s.date              = '2013-06-30'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']

metadata

@@ -1,23 +1,28 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rbind
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.8
 platform: ruby
-authors:
+authors: 
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+
+date: 2013-06-30 00:00:00 Z
 dependencies: []
-description: ''
-email:
+
+description: ""
+email: 
 - Alexander.Duda@dfki.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rbind.rb
 - lib/rbind/core.rb
 - lib/rbind/core/.roperation.rb.swp
@@ -59,6 +64,9 @@ files:
 - lib/rbind/templates/ruby/rbind.rb
 - lib/rbind/templates/ruby/rmethod.rb
 - lib/rbind/templates/ruby/rnamespace.rb
+- lib/rbind/templates/ruby/roverloaded_method.rb
+- lib/rbind/templates/ruby/roverloaded_method_call.rb
+- lib/rbind/templates/ruby/roverloaded_static_method.rb
 - lib/rbind/templates/ruby/rstatic_method.rb
 - lib/rbind/templates/ruby/rtype.rb
 - lib/rbind/templates/ruby/rtype_constructor.rb
@@ -67,27 +75,30 @@ files:
 - test/test_generator_ruby.rb
 homepage: http://github.com/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Library for genereating automated ffi-bindings for c/c++ libraries
 test_files: []
-has_rdoc: 
+