rbind 0.0.21 → 0.0.22

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c1d454d9b534689a66f1be06bc64fe72b14b8721
+  data.tar.gz: 546e600622265fda135f5bba965b4566693ae207
+SHA512:
+  metadata.gz: cb922be3df7b1180cf0a8ee5672884e918dde3db4755f7f115228887acc08af46626aae629994f254d668bd51e4dd1417e28ee79c03023a513b9ec7c8a46367f
+  data.tar.gz: e338f1e479038179af4316d48cce047d5a62638410a334d4da844cac3179dd8be9d6c26095b75af623ddba025a3d821fb7452cecaa7844d452dc3d6bd94834ce

data/lib/rbind/core.rb

@@ -1,3 +1,4 @@
+require 'hooks'
 require 'rbind/logger.rb'
 require 'rbind/core/rbase.rb'
 require 'rbind/core/rdata_type.rb'

data/lib/rbind/core/rbase.rb

@@ -51,12 +51,12 @@ module Rbind
 
             def split_name(name)
                 name = normalize(name)
-                # check for template
-                if(name =~/([\w:]*)(<.*)$/)
-                    result = split_name($1)
-                    [result[0],result[1]+$2]
-                elsif(name =~/(.*)::(.*)$/)
+                if(name =~/(.*>)::(.*)$/)
                     [$1,$2]
+                elsif(name =~ /^([\w\d]*)::(.*)/)
+                    b,n = split_name($2)
+                    b = b ? "::#{b}" : ""
+                    [$1+b,n]
                 else
                     [nil,name]
                 end

data/lib/rbind/core/rnamespace.rb

@@ -1,5 +1,3 @@
-require 'hooks'
-
 module Rbind
     class RNamespace< RDataType
         include Hooks

data/lib/rbind/default_parser.rb

@@ -138,13 +138,18 @@ module Rbind
                                                type(names.join("::"),false) if !names.empty?
                                            end
                                      # auto add parent class
-                                     t ||= add_type(RClass.new(RBase.normalize(name)))
+                                     t ||= begin
+                                               t = add_type(RClass.new(RBase.normalize(name)))
+                                               t.extern_package_name = @extern_package_name
+                                               t
+                                           end
                                  end
                              end
             flags = if flags
                        normalize_flags(line_number,flags.gsub(" ","").split("/").compact,:Simple)
                     end
             t = RClass.new(name,*parent_classes)
+            t.extern_package_name = @extern_package_name
             t = if t2 = type(t.full_name,false)
                     if !t2.is_a?(RClass) || (!t2.parent_classes.empty? && t2.parent_classes != t.parent_classes)
                         raise "Cannot add class #{t.full_name}. A different type #{t2} is already registered"
@@ -152,7 +157,7 @@ module Rbind
                         t.parent_classes.each do |p|
                             t2.add_parent p
                         end
-                        t2
+                        t2.extern_package_name = t.extern_package_name
                     end
                 else
                     t.name = t.name.gsub(">>","> >")
@@ -165,7 +170,6 @@ module Rbind
                 t.add_attribute(a)
                 line_counter += 1
             end
-            t.extern_package_name = @extern_package_name
             [t,line_counter]
         rescue RuntimeError  => e
             raise "input line #{line_number}: #{e}"
@@ -251,6 +255,7 @@ module Rbind
                      op
                  end
             type(op.namespace,true).add_operation(op)
+            op.extern_package_name = @extern_package_name
             [op,line_counter]
         end
 

data/lib/rbind/generator_extern.rb

@@ -11,6 +11,10 @@ module Rbind
             name.gsub('::','.').gsub(" ","")
         end
 
+        def self.normalize_operation_name(name)
+            name.gsub('::','.').gsub(" ","")
+        end
+
         def initialize(root)
             @root = root
         end
@@ -23,15 +27,34 @@ module Rbind
             file_extern = File.new(File.join(path,"extern.rbind"),"w")
             file_config = File.new(File.join(path,"config.rbind"),"w")
 
+            #write all types so they get parsed first
             @root.each_type do |t|
                 if t.is_a? RClass
-                    file_extern.write "class #{GeneratorExtern.normalize_type_name(t.full_name)} /Extern\n"
+                    file_extern.write "class #{GeneratorExtern.normalize_type_name(t.full_name)}\n"
                 end
             end
 
+            # write all consts
             @root.each_const do |c|
-                file_extern.write "const #{GeneratorExtern.normalize_type_name(c.full_name)} /Extern\n"
+                file_extern.write "const #{GeneratorExtern.normalize_type_name(c.full_name)}\n"
             end
+
+            #write all operations
+            @root.each_type do |t|
+                if t.is_a? RClass
+                    t.each_operation do |op|
+                        r = if op.return_type
+                                GeneratorExtern.normalize_type_name(op.return_type.full_name)
+                            end
+                        file_extern.write "#{GeneratorExtern.normalize_operation_name(op.full_name)} #{r}\n"
+                        op.parameters.each do |p|
+                            file_extern.write "   #{GeneratorExtern.normalize_type_name(p.type.full_name)} #{p.name}"\
+                                              "#{" #{p.default_value}" if p.default_value}#{" /O" unless p.const?}\n"
+                        end
+                    end
+                end
+            end
+
             file_extern.write("\n")
             file_config.write Config.new(ruby_module_name,file_prefix).to_yaml
         end

data/lib/rbind/generator_ruby.rb

@@ -5,6 +5,9 @@ require 'open-uri'
 
 module Rbind
     class GeneratorRuby
+        include Hooks
+        define_hook :on_normalize_default_value
+
         class << self
             attr_accessor :ruby_default_value_map
             attr_accessor :on_normalize_type_name
@@ -49,6 +52,12 @@ module Rbind
 
         def self.normalize_default_value(parameter)
             return nil unless parameter.default_value
+            if self.callbacks_for_hook(:on_normalize_default_value)
+                results = self.run_hook(:on_normalize_default_value,parameter)
+                results.compact!
+                return results.first unless results.empty?
+            end
+
             val = if parameter.type.basic_type? || parameter.type.ptr?
                       if ruby_default_value_map.has_key?(parameter.default_value)
                           ruby_default_value_map[parameter.default_value]
@@ -79,13 +88,21 @@ module Rbind
                                   end
                           s = if ops && !ops.empty?
                                   if t
-                                      "#{normalize_type_name(t.full_name)}::#{normalize_method_name(ops.first.name)}(#{(value)})"
+                                      if t.extern_package_name
+                                          "::#{t.extern_package_name}::#{normalize_type_name(t.full_name)}::#{normalize_method_name(ops.first.name)}(#{(value)})"
+                                      else
+                                          "#{normalize_type_name(t.full_name)}::#{normalize_method_name(ops.first.name)}(#{(value)})"
+                                      end
                                   else
                                       "#{normalize_method_name(ops.first.name)}(#{(value)})"
                                   end
                               elsif t
                                   t = t.to_ptr if parameter.type.ptr?
-                                  "#{normalize_type_name(t.full_name)}.new(#{(value)})"
+                                  if t.extern_package_name
+                                      "::#{t.extern_package_name}::#{normalize_type_name(t.full_name)}.new(#{(value)})"
+                                  else
+                                      "#{normalize_type_name(t.full_name)}.new(#{(value)})"
+                                  end
                               end
                       else
                           parameter.default_value

data/lib/rbind/rbind.rb

@@ -94,6 +94,7 @@ module Rbind
                 config = YAML.load(File.open(File.join(pkg,"config.rbind")).read)
                 path = File.join(pkg,"extern.rbind")
                 ::Rbind.log.info "parsing extern rbind pkg file #{path}"
+                raise "no module name found" if !config.ruby_module_name || config.ruby_module_name.empty?
                 local_parser.parse(File.open(path).read,config.ruby_module_name)
             end
             @gems.each do |gem|

data/manifest.xml

@@ -0,0 +1,12 @@
+<package>
+  <description brief="ruby ffi binding generator">
+  
+  </description>
+  <author>Alexander Duda/Alexander.Duda@dfki.de</author>
+  <license></license>
+  <url>http://</url>
+  <logo>http://</logo>
+
+  <depend package="hooks" />
+  <depend package="ffi" />
+</package>

data/rbind.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.21'
-    s.date              = '2013-08-21'
+    s.version           = '0.0.22'
+    s.date              = '2013-10-29'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']

metadata

@@ -1,49 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbind
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.21
+version: !ruby/object:Gem::Version
+  version: 0.0.22
 platform: ruby
-authors: 
+authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hooks
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
-  version_requirements: *id002
-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.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !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.
+email:
 - Alexander.Duda@dfki.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - lib/rbind.rb
 - lib/rbind/clang/clang.rb
@@ -104,6 +107,7 @@ files:
 - lib/rbind/typelib.rb
 - lib/rbind/types/std_string.rb
 - lib/rbind/types/std_vector.rb
+- manifest.xml
 - rbind.gemspec
 - test/headers/cfunctions.h
 - test/headers/classes.hpp
@@ -119,31 +123,25 @@ files:
 - test/test_rparameter.rb
 homepage: http://github.com/D-Alex/rbind
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for genereating automated ffi-bindings for c/c++ libraries
 test_files: []
-
-has_rdoc: