remogatto-ffi-generator 0.1.0 → 0.2.0

data/.gitignore

@@ -1,4 +1,8 @@
 pkg/
 generated/
 *.gem
+*.xml
+*#
+.#*
+announcement.txt
 

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.0 / 2009-03-05
+
+* 1 major enhancement
+  * Added support for callbacks.
+* 1 minor enhancement
+  * C functions with one void argument are correctly generated as FFI
+    functions with no arguments.
+
 == 0.1.0 / 2009-02-16
 
 * a bunch of minor fixes

data/README.rdoc

@@ -5,10 +5,10 @@ ffi-generator
 == DESCRIPTION:
 
 ffi-generator is a ruby-ffi wrapper code generator based on SWIG
-interfaces. 
+interface files.
 
 ffi-generator is able to traverse a XML parse tree file generated by
-SWIG and to produce a ruby file with ruby-ffi wrapper code inside.
+SWIG and to produce a ruby-ffi interface file from it.
 
 ffi-generator is shipped with a command line tool (ffi-gen) and a rake
 task that automates the code generation process.
@@ -17,12 +17,13 @@ ffi-generator XML capabilities are provided by nokogiri.
 
 == FEATURES/PROBLEMS:
 
-* support for 
+* The program is able to generate:
   * all C native types
   * #define constants
   * typedefs
-  * struct, union, array and enum types 
-* naive indentation of the generated code
+  * struct, union, array and enum types
+  * callbacks (pointers to functions) 
+* Naive indentation of the generated code
 
 == SYNOPSIS:
 
@@ -40,7 +41,14 @@ From a Rakefile:
 * rake >= 0.8.3
 * nokogiri >= 1.1.1
 
-== INSTALL:
+== DOWNLOAD/INSTALL:
+
+To download and install the gem from github:
+
+  [sudo] gem sources -a http://gems.github.com
+  [sudo] gem install remogatto-ffi-generator
+
+To download the develpment trunk:
 
   git clone git://github.com/remogatto/ffi-generator.git
 

data/Rakefile

@@ -25,12 +25,17 @@ PROJ.url = 'http://github.com/remogatto/dokkit-core/tree/master'
 PROJ.version = FFI::Generator::VERSION
 PROJ.rubyforge.name = 'ffi-generator'
 
-depend_on 'rake'
-depend_on 'nokogiri'
-
 PROJ.readme_file = 'README.rdoc'
 
+PROJ.ann.paragraphs << 'FEATURES' << 'SYNOPSIS' << 'REQUIREMENTS' << 'DOWNLOAD' << 'EXAMPLES'
+PROJ.ann.email[:from] = 'andrea.fazzi@alca.le.it'
+PROJ.ann.email[:to] << 'dev@ruby-ffi.kenai.com' << 'users@ruby-ffi.kenai.com'
+PROJ.ann.email[:server] = 'smtp.gmail.com'
+
 PROJ.ruby_opts = []
 PROJ.spec.opts << '--color'
 
+depend_on 'rake'
+depend_on 'nokogiri'
+
 # EOF

data/ffi-generator.gemspec

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ffi-generator}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrea Fazzi"]
+  s.date = %q{2009-03-05}
+  s.default_executable = %q{ffi-gen}
+  s.description = %q{ffi-generator is a ruby-ffi wrapper code generator based on SWIG interfaces.   ffi-generator is able to traverse a XML parse tree file generated by SWIG and to produce a ruby file with ruby-ffi wrapper code inside.  ffi-generator is shipped with a command line tool (ffi-gen) and a rake task that automates the code generation process.  ffi-generator XML capabilities are provided by nokogiri.}
+  s.email = %q{andrea.fazzi@alcacoop.it}
+  s.executables = ["ffi-gen"]
+  s.extra_rdoc_files = ["History.txt", "README.rdoc", "bin/ffi-gen"]
+  s.files = [".gitignore", "History.txt", "README.rdoc", "Rakefile", "bin/ffi-gen", "examples/Rakefile", "examples/generated/libc_wrap.rb", "examples/generated/libc_wrap.xml", "examples/generated/wiiuse_wrap.rb", "examples/generated/wiiuse_wrap.xml", "examples/interfaces/libc.i", "examples/interfaces/wiiuse.i", "ffi-generator.gemspec", "lib/ffi-generator.rb", "lib/generator/application.rb", "lib/generator/generator.rb", "lib/generator/generatortask.rb", "spec/ffi-generator_spec.rb", "spec/generator/generator_spec.rb", "spec/generator/swig/constants.i", "spec/generator/swig/enums.i", "spec/generator/swig/functions.i", "spec/generator/swig/structs.i", "spec/generator/swig/testlib.i", "spec/generator/swig/typedefs.i", "spec/generator/swig/types.i", "spec/generator/swig/unions.i", "spec/spec.opts", "spec/spec_helper.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/remogatto/dokkit-core/tree/master}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{ffi-generator}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{ffi-generator is a ruby-ffi wrapper code generator based on SWIG interfaces}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rake>, [">= 0.8.3"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.2.1"])
+    else
+      s.add_dependency(%q<rake>, [">= 0.8.3"])
+      s.add_dependency(%q<nokogiri>, [">= 1.2.1"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 0.8.3"])
+    s.add_dependency(%q<nokogiri>, [">= 1.2.1"])
+  end
+end

data/lib/ffi-generator.rb

@@ -2,7 +2,7 @@
 module FFI
   module Generator
     # :stopdoc:
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
     LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
     PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
     # :startdoc:

data/lib/generator/generator.rb

@@ -43,65 +43,72 @@ module FFI
     end
     class Node
       attr_reader :symname
-      def initialize(node, indent = 0)
-        @node = node
-        @indent = ' ' * indent
+      def initialize(params = { })
+        params = { :indent => 0 }.merge(params)
+        @node, @indent = params[:node], params[:indent]
+        @indent_str = ' ' * @indent
         @symname = get_attr('name')
       end
       def get_attr(name)
-        attr = (@node / "./attributelist/attribute[@name='#{name}']").first
-        attr['value'] if attr
+        if @node
+          attr = (@node / "./attributelist/attribute[@name='#{name}']").first
+          attr['value'] if attr
+        end
       end
     end
     class Type < Node
-      def initialize(node, indent = 0)
+      def initialize(params = { })
         super
-        @type = get_attr('type')
-        @decl = get_attr('decl')
-        @statement = @type.to_s + @decl.to_s
+        @statement = params[:statement] || get_statement
       end
       def to_s
         get_type
       end
       private
+      def get_statement
+        get_attr('decl').to_s + get_attr('type').to_s if @node
+      end
       def is_native?
-        Generator::TYPES.has_key?(@type)
+        Generator::TYPES.has_key?(@statement)
       end
       def is_pointer?
-        @decl and @decl[/(\)\.p|^p)\./]
+        @statement[/^p\./] and not is_callback?
       end
       def is_enum?
-        @type[/^enum/]
+        @statement[/^enum/]
       end
       def is_array?
-        @decl and @decl[/\w+\(\d+\)/]
+        @statement and @statement[/\w+\(\d+\)/]
       end
       def is_struct?
-        @type[/^struct/]
+        @statement[/^struct/]
       end
       def is_union?
-        @type[/^union/]
+        @statement[/^union/]
       end
       def is_constant?
-        @type[/^q\(const\)/]
+        @statement[/^q\(const\)/]
+      end
+      def is_callback?
+        @statement[/^p.f\(/]
       end
       def native
         if is_native?
-          @type = Generator::TYPES[@type] 
+          @statement = Generator::TYPES[@statement] 
           get_type
         end
       end
       def constant
         if is_constant?
-          @type = @type.scan(/^q\(const\)\.(.+)/).flatten[0]
+          @statement = @statement.scan(/^q\(const\)\.(.+)/).flatten[0]
           get_type 
         end
       end
       def pointer
         if is_pointer?
-          if @type[/char/]
-            @type = ':string'
-            @decl.gsub!(/p./, '')
+          if @statement[/char/] and @statement.scan(/p\./).size == 1
+            @statement = ':string'
+            # @decl.gsub!(/p\./, '')
             get_type
           else
             return ':pointer'
@@ -110,58 +117,62 @@ module FFI
       end
       def array
         if is_array?
-          num = @decl.scan(/\w+\((\d+)\)/).flatten[0]
-          @decl.gsub!(/\w+\(\d+\)/, '')
+          num = @statement.scan(/\w+\((\d+)\)/).flatten[0]
+          @statement.gsub!(/\w+\(\d+\)\./, '')
           "[#{get_type}, #{num}]"
         end
       end
       def struct
         if is_struct?
-          @type = Structure.camelcase(@type.scan(/^struct\s(\w+)/).flatten[0])
+          @statement = Structure.camelcase(@statement.scan(/^struct\s(\w+)/).flatten[0])
           get_type
         end
       end
       def union
         if is_union?
-          @type = Union.camelcase(@type.scan(/^union\s(\w+)/).flatten[0])
+          @statement = Union.camelcase(@statement.scan(/^union\s(\w+)/).flatten[0])
           get_type
         end
       end
       def enum
         if is_enum?
-          @type = Generator::TYPES['int']
+          @statement = Generator::TYPES['int']
           get_type
         end
       end
+      def callback
+        Callback.new(:node => @node).to_s if is_callback?        
+      end
       def typedef
-        if Generator.typedefs.has_key?(@type)
-          @type = Generator.typedefs[@type]
+        if Generator.typedefs.has_key?(@statement)
+          @statement = Generator.typedefs[@statement]
           get_type
         end
       end
       def get_type
-        constant || pointer || enum || typedef || native || struct || union || array || "#{@type}"
+        constant || pointer || enum || typedef || native || struct || union || array || callback || "#{@statement}"
       end
     end
     class Typedef < Type
-      attr_reader :symname, :type
-      def initialize(node, indent = 0)
+      attr_reader :symname, :statement
+      def initialize(params = { })
         super
         @symname = get_attr('name')
-        @type = is_pointer? ? ':pointer' : get_attr('type')
+        # @type = is_pointer? ? ':pointer' : get_attr('type')
+        # p @statement
       end
     end
     class Constant < Node
-      def initialize(node, indent = 0)
+      def initialize(params = { })
         super
         @name, @value = get_attr('sym_name'), get_attr('value')
       end
       def to_s
-        @indent + "#{@name} = #{@value}"        
+        @indent_str + "#{@name} = #{@value}"        
       end
     end
     class Enum < Node
-      def initialize(node, indent = 0)
+      def initialize(params = { })
         super
         eval_items
       end
@@ -172,7 +183,7 @@ module FFI
       end
       private
       def assignment_str(name, value)
-        @indent + "#{name} = #{value}"
+        @indent_str + "#{name} = #{value}"
       end
       def eval_expr(expr)
         if expr.include?('+')
@@ -184,7 +195,7 @@ module FFI
       def eval_items
         @items = {}
         get_items.each do |i|
-          node = Node.new(i)
+          node = Node.new(:node => i)
           @items[node.get_attr('name')] = node.get_attr('enumvalueex') ? eval_expr(node.get_attr('enumvalueex')) : node.get_attr('enumvalue')
         end
         @items
@@ -197,49 +208,70 @@ module FFI
       def self.camelcase(name)
         name.gsub(/^\w|\_\w/).each {|c| c.upcase }.delete('_')
       end
-      def initialize(node, indent = 0)
+      def initialize(params = { })
         super
         @name = self.class.camelcase(@symname)
       end
       def to_s
         fields_str = fields.inject("") do |str, f|
-          str << @indent + ' ' * 9 << f.join(', ') << ",\n"
+          str << @indent_str + ' ' * 9 << f.join(', ') << ",\n"
         end
-        code = klass_string + @indent + "  layout(\n" + fields_str.chomp.chomp(',') + "\n" + @indent + "  )\n" + @indent + "end\n"
+        code = klass_string + @indent_str + "  layout(\n" + fields_str.chomp.chomp(',') + "\n" + @indent_str + "  )\n" + @indent_str + "end\n"
       end
       private
       def klass_string
-        @indent + "class #{@name} < FFI::Struct\n"
+        @indent_str + "class #{@name} < FFI::Struct\n"
       end
       def fields
         (@node / 'cdecl').inject([]) do |array, field|
-          array << [":#{Node.new(field).symname}", "#{Type.new(field)}"]
+          array << [":#{Node.new(:node => field).symname}", "#{Type.new(:node => field)}"]
         end
       end
     end
     class Union < Structure
       private
       def klass_string
-        @indent + "class #{@name} < FFI::Union\n"
+        @indent_str + "class #{@name} < FFI::Union\n"
       end
     end
-    class Function < Node
+    class Function < Type
       class Argument < Type
-        def initialize(node, indent = 0)
-          super
-          @decl = @type
+        def to_s
+          get_attr('type') == 'void' ? nil : super
         end
       end
+      def initialize(params = { })
+        super
+        @type = get_attr('type')
+      end
       def to_s
         params = get_params(@node).inject([]) do |array, node|
-          array << Argument.new(node).to_s
+          array << Argument.new(:node => node).to_s
         end.collect { |p| "#{p}" }
-        @indent + "attach_function :#{@symname}, [ #{params.join(', ')} ], #{Type.new(@node).to_s}"
+        @indent_str + "attach_function :#{@symname}, [ #{params.join(', ')} ], #{get_rvalue}"
       end
       private
       def get_params(node)
         parmlist = node / './attributelist/parmlist/parm'
       end
+      def get_rvalue
+        Type.new(:node => @node, :statement => @statement.scan(/^f\(.*\)\.(.+)/).flatten[0]).to_s
+      end
+    end
+    class Callback < Type
+      def to_s
+        params = get_params.inject([]) do |array, type|
+          array << (type == 'void' ? '' : Type.new(:statement => type).to_s)
+        end
+        @indent_str + "callback(:#{@symname}, [ #{params.join(', ')} ], #{get_rtype})"
+      end
+      private
+      def get_params
+        @statement.scan(/p.f\((.*)\)/).flatten[0].split(',')
+      end
+      def get_rtype
+        Type.new(:statement => @statement.scan(/\)\.(\w+)/).flatten[0]).to_s
+      end
     end
     class Parser
       @indent = 2
@@ -269,28 +301,36 @@ module FFI
         def is_typedef?(node)
           node.name == 'cdecl' and (node / "./attributelist/attribute[@name='kind']").first['value'] == 'typedef'
         end
+        def is_callback?(node)
+          (node / "./attributelist/attribute[@name='decl']").first['value'] =~ /^p\.f\(/
+        end
         def generate(node)
           result = ""
           node.traverse do |node|
             if is_constant?(node)
-              result << Constant.new(node, @indent).to_s << "\n"
+              result << Constant.new(:node => node, :indent => @indent).to_s << "\n"
             elsif is_typedef?(node)
-              typedef = Typedef.new(node)
-              Generator.add_type(typedef.symname, typedef.type)
+              typedef = Typedef.new(:node => node)
+              Generator.add_type(typedef.symname, typedef.statement)
+              if is_callback?(node)
+                cb = Callback.new(:node => node, :indent => @indent).to_s << "\n"
+                Generator.add_type(typedef.symname, ":#{typedef.symname}")
+                result << cb.to_s
+              end
             elsif is_enum?(node)
-              e = Enum.new(node, @indent)
+              e = Enum.new(:node => node, :indent => @indent)
               Generator.add_type(e.symname, Generator::TYPES['int'])
               result << e.to_s << "\n"
             elsif is_struct?(node)
-              s = Structure.new(node, @indent)
+              s = Structure.new(:node => node, :indent => @indent)
               Generator.add_type(s.symname, "struct #{s.symname}")
               result << s.to_s
             elsif is_union?(node)
-              s = Union.new(node, @indent)
+              s = Union.new(:node => node, :indent => @indent)
               Generator.add_type(s.symname, "union #{s.symname}")
               result << s.to_s
             elsif is_function_decl?(node)
-              result << Function.new(node, @indent).to_s << "\n"
+              result << Function.new(:node => node, :indent => @indent).to_s << "\n"
             elsif node.name == 'insert' and not is_insert_runtime?(node)
               result << get_verbatim(node)
             end       

data/spec/generator/generator_spec.rb

@@ -42,12 +42,13 @@ module TestLib
            :c, :char
     )
   end
+  callback(:cb, [ :string, :string ], :void)
   class TestStruct2 < FFI::Struct
     layout(
            :s, TestStruct,
            :s_3, TestStruct3,
            :e, :int,
-           :func, :pointer,
+           :func, :cb,
            :u, UnionT
     )
   end
@@ -68,7 +69,7 @@ describe Generator::Constant do
     @node = generate_xml_wrap_from('constants')
   end
   it 'should return a ruby constant assignment' do
-    Generator::Constant.new(@node / 'constant').to_s.should == "CONST_1 = 0x10"
+    Generator::Constant.new(:node => @node / 'constant').to_s.should == "CONST_1 = 0x10"
   end
 end
 
@@ -77,19 +78,19 @@ describe Generator::Enum do
     @node = generate_xml_wrap_from('enums')
   end
   it 'should generate constants' do
-    Generator::Enum.new((@node / 'enum')[0]).to_s.should == <<EOE
+    Generator::Enum.new(:node => (@node / 'enum')[0]).to_s.should == <<EOE
 ENUM_1 = 0
 ENUM_2 = 1
 ENUM_3 = 2
 EOE
   end
   it 'should generate constants starting from the latest assignment' do
-    Generator::Enum.new((@node / 'enum')[1]).to_s.should == <<EOE
+    Generator::Enum.new(:node => (@node / 'enum')[1]).to_s.should == <<EOE
 ENUM_21 = 2
 ENUM_22 = 3
 ENUM_23 = 4
 EOE
-    Generator::Enum.new((@node / 'enum')[2]).to_s.should == <<EOE
+    Generator::Enum.new(:node => (@node / 'enum')[2]).to_s.should == <<EOE
 ENUM_31 = 0
 ENUM_32 = 5
 ENUM_33 = 6
@@ -103,31 +104,32 @@ describe Generator::Type do
     @node = generate_xml_wrap_from('types')
   end
   it 'should generate string type' do
-    Generator::Type.new((@node / 'cdecl')[0]).to_s.should == ':string'
+    Generator::Type.new(:node => (@node / 'cdecl')[0]).to_s.should == ':string'
   end
   it 'should generate pointer type' do
-    Generator::Type.new((@node / 'cdecl')[1]).to_s.should == ':pointer'
+    Generator::Type.new(:node => (@node / 'cdecl')[1]).to_s.should == ':pointer'
+    Generator::Type.new(:node => (@node / 'cdecl')[2]).to_s.should == ':pointer'
   end
   it 'should generate array type' do
-    Generator::Type.new((@node / 'cdecl')[2]).to_s.should == '[:int, 5]'
-    Generator::Type.new((@node / 'cdecl')[3]).to_s.should == '[:string, 5]'
+    Generator::Type.new(:node => (@node / 'cdecl')[3]).to_s.should == '[:int, 5]'
+    Generator::Type.new(:node => (@node / 'cdecl')[4]).to_s.should == '[:string, 5]'
   end
   it 'should generate struct type' do
-    Generator::Type.new((@node / 'cdecl')[5]).to_s.should == 'TestStruct'
+    Generator::Type.new(:node => (@node / 'cdecl')[6]).to_s.should == 'TestStruct'
   end
   it 'should generate struct array type' do
-    Generator::Type.new((@node / 'cdecl')[6]).to_s.should == '[TestStruct, 5]'
+    Generator::Type.new(:node => (@node / 'cdecl')[7]).to_s.should == '[TestStruct, 5]'
   end
   it 'should generate enum array type' do
-    Generator::Type.new((@node / 'cdecl')[7]).to_s.should == '[:int, 5]'
+    Generator::Type.new(:node => (@node / 'cdecl')[8]).to_s.should == '[:int, 5]'
   end
   it 'should generate const type' do
-    Generator::Type.new((@node / 'cdecl')[8]).to_s.should == ':int'
-    Generator::Type.new((@node / 'cdecl')[9]).to_s.should == ':string'
+    Generator::Type.new(:node => (@node / 'cdecl')[9]).to_s.should == ':int'
+    Generator::Type.new(:node => (@node / 'cdecl')[10]).to_s.should == ':string'
   end
   Generator::TYPES.sort.each_with_index do |type, i|
     it "should generate #{type[0]} type" do
-      Generator::Type.new((@node / 'cdecl')[i + 10]).to_s.should == type[1]
+      Generator::Type.new(:node => (@node / 'cdecl')[i + 11]).to_s.should == type[1]
     end 
   end
 end
@@ -138,34 +140,43 @@ describe Generator::Function do
     @node = generate_xml_wrap_from('functions')
   end
   it 'should return a properly generated attach_method' do
-    Generator::Function.new((@node / 'cdecl')[0]).to_s.should == "attach_function :func_1, [ :char, :int ], :int"
+    Generator::Function.new(:node => (@node / 'cdecl')[0]).to_s.should == "attach_function :func_1, [ :char, :int ], :int"
   end
   it 'should properly generate pointer arguments' do
-    Generator::Function.new((@node / 'cdecl')[1]).to_s.should == "attach_function :func_2, [ :pointer, :pointer ], :uint"
+    Generator::Function.new(:node => (@node / 'cdecl')[1]).to_s.should == "attach_function :func_2, [ :pointer, :pointer, :pointer ], :uint"
   end
   it 'should properly generate string arguments' do
-    Generator::Function.new((@node / 'cdecl')[2]).to_s.should == "attach_function :func_3, [ :string ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[2]).to_s.should == "attach_function :func_3, [ :string ], :void"
   end
   it 'should properly generate return type' do
-    Generator::Function.new((@node / 'cdecl')[3]).to_s.should == "attach_function :func_4, [ :int ], :string"
+    Generator::Function.new(:node => (@node / 'cdecl')[3]).to_s.should == "attach_function :func_4, [ :int ], :string"
   end
   it 'should properly generate void return type' do
-    Generator::Function.new((@node / 'cdecl')[4]).to_s.should == "attach_function :func_5, [  ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[4]).to_s.should == "attach_function :func_5, [  ], :void"
   end
   it 'should properly generate pointer of pointer arguments' do
-    Generator::Function.new((@node / 'cdecl')[5]).to_s.should == "attach_function :func_6, [ :pointer ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[5]).to_s.should == "attach_function :func_6, [ :pointer ], :void"
   end
   it 'should properly generate enum arguments' do
-    Generator::Function.new((@node / 'cdecl')[6]).to_s.should == "attach_function :func_7, [ :int ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[6]).to_s.should == "attach_function :func_7, [ :int ], :void"
   end
   it 'should properly generate enum return type' do
-    Generator::Function.new((@node / 'cdecl')[7]).to_s.should == "attach_function :func_8, [  ], :int"
+    Generator::Function.new(:node => (@node / 'cdecl')[7]).to_s.should == "attach_function :func_8, [  ], :int"
   end
   it 'should properly generate struct arguments' do
-    Generator::Function.new((@node / 'cdecl')[9]).to_s.should == "attach_function :func_9, [ TestStruct ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[9]).to_s.should == "attach_function :func_9, [ TestStruct ], :void"
   end
   it 'should properly generate struct return type' do
-    Generator::Function.new((@node / 'cdecl')[10]).to_s.should == "attach_function :func_10, [  ], TestStruct"
+    Generator::Function.new(:node => (@node / 'cdecl')[10]).to_s.should == "attach_function :func_10, [  ], TestStruct"
+  end
+  it 'should properly generate a function with no parameters' do
+    Generator::Function.new(:node => (@node / 'cdecl')[11]).to_s.should == "attach_function :func_11, [  ], :void"
+  end
+  it 'should properly generate a function that takes a callback as argument' do
+    Generator::Function.new(:node => (@node / 'cdecl')[12]).to_s.should == "attach_function :func_12, [ callback(:callback, [ :float ], :void) ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[13]).to_s.should == "attach_function :func_13, [ callback(:callback, [ :double, :float ], :int) ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[14]).to_s.should == "attach_function :func_14, [ callback(:callback, [ :string ], :void) ], :void"
+    Generator::Function.new(:node => (@node / 'cdecl')[15]).to_s.should == "attach_function :func_15, [ callback(:callback, [  ], :void) ], :void"
   end
 end
 
@@ -175,7 +186,7 @@ describe Generator::Structure do
     @node = generate_xml_wrap_from('structs')
   end
   it 'should properly generate the layout of a FFI::Struct class' do
-    Generator::Structure.new((@node / 'class')[0]).to_s.should == <<EOC
+    Generator::Structure.new(:node => (@node / 'class')[0]).to_s.should == <<EOC
 class TestStruct1 < FFI::Struct
   layout(
          :i, :int,
@@ -188,7 +199,7 @@ EOC
 
   end
   it 'should properly generate the layout of a FFI::Struct containing pointer field' do
-    Generator::Structure.new((@node / 'class')[1]).to_s.should == <<EOC
+    Generator::Structure.new(:node => (@node / 'class')[1]).to_s.should == <<EOC
 class TestStruct2 < FFI::Struct
   layout(
          :ptr, :pointer
@@ -197,7 +208,7 @@ end
 EOC
 end
   it 'should properly generate the layout of a FFI::Struct containing array field' do
-    Generator::Structure.new((@node / 'class')[2]).to_s.should == <<EOC
+    Generator::Structure.new(:node => (@node / 'class')[2]).to_s.should == <<EOC
 class TestStruct3 < FFI::Struct
   layout(
          :c, [:char, 5]
@@ -207,7 +218,7 @@ EOC
 
   end
   it 'should properly generate the layout of a FFI::Struct containing array field' do
-    Generator::Structure.new((@node / 'class')[3]).to_s.should == <<EOC
+    Generator::Structure.new(:node => (@node / 'class')[3]).to_s.should == <<EOC
 class TestStruct4 < FFI::Struct
   layout(
          :s, [TestStruct3, 5]
@@ -224,7 +235,7 @@ describe Generator::Union do
     @node = generate_xml_wrap_from('unions')
   end
   it 'should properly generate the layout of a FFI::Union class' do
-    Generator::Union.new((@node / 'class')[0]).to_s.should == <<EOC
+    Generator::Union.new(:node => (@node / 'class')[0]).to_s.should == <<EOC
 class UnionT < FFI::Union
   layout(
          :c, :char,

data/spec/generator/swig/functions.i

@@ -1,22 +1,24 @@
 %module function_testlib
 
 int func_1(char c, int i);
-unsigned int func_2(int* p1, int* p2);
+unsigned int func_2(int* p1, int* p2, char** p3);
 void func_3(char* str);
 char *func_4(int i);
 extern void func_5();
 void func_6(void** ptr);
 void func_7(enum e e1);
-
 enum e { E_1, E_2 };
-
 enum e func_8();
-
 struct test_struct {
   char c;
 };
-
 void func_9(struct test_struct s);
 struct test_struct func_10();
+void func_11(void);
+void func_12(void (*callback)(float));
+void func_13(int (*callback)(double, float));
+void func_14(void (*callback)(char* str));
+void func_15(void (*callback)(void));
+
 
 

data/spec/generator/swig/testlib.i

@@ -9,7 +9,6 @@ module TestLib
 #define CONST_2 0x20
 
 typedef unsigned char byte;
-typedef void (*PFI)(char*, char*);
 typedef enum e_1 { 
   ENUM_1, ENUM_2, ENUM_3 
 } enum_t;
@@ -29,11 +28,13 @@ typedef struct {
   char c;
 } test_struct_3;
 
+typedef void (*cb)(char*, char*);
+
 struct test_struct_2 {
   struct test_struct s;
   test_struct_3 s_3;
   enum_t e;
-  PFI func;
+  cb func;
   union_t u;
 };
 

data/spec/generator/swig/types.i

@@ -2,6 +2,7 @@
 
 char *string;
 void *ptr;
+char **ptr_2;
 
 int array[5];
 char* ptr_array[5];

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remogatto-ffi-generator
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -08:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: ffi-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,17 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 1.2.1
     version: 
 description: ffi-generator is a ruby-ffi wrapper code generator based on SWIG interfaces.   ffi-generator is able to traverse a XML parse tree file generated by SWIG and to produce a ruby file with ruby-ffi wrapper code inside.  ffi-generator is shipped with a command line tool (ffi-gen) and a rake task that automates the code generation process.  ffi-generator XML capabilities are provided by nokogiri.
 email: andrea.fazzi@alcacoop.it
@@ -65,6 +55,7 @@ files:
 - examples/generated/wiiuse_wrap.xml
 - examples/interfaces/libc.i
 - examples/interfaces/wiiuse.i
+- ffi-generator.gemspec
 - lib/ffi-generator.rb
 - lib/generator/application.rb
 - lib/generator/generator.rb