ffi-swig-generator 0.2.1 → 0.3.0

data/spec/generator/struct_spec.rb

@@ -0,0 +1,77 @@
+require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+
+include FFI
+
+describe Generator::Struct do
+  it_should_behave_like 'All specs'
+  before :all do
+    @node = generate_xml_wrap_from('structs')
+  end
+  it 'should properly generate the layout of a FFI::Struct class' do
+    Generator::Struct.new(:node => (@node / 'class')[0]).to_s.should == <<EOC
+class TestStruct1 < FFI::Struct
+  layout(
+         :i, :int,
+         :c, :char,
+         :s, :pointer,
+         :a, [:char, 5]
+  )
+  def s=(str)
+    @s = FFI::MemoryPointer.from_string(str)
+    self[:s] = @s
+  end
+  def s
+    @s.get_string(0)
+  end
+
+end
+EOC
+
+  end
+  it 'should properly generate the layout of a FFI::Struct containing pointer field' do
+    Generator::Struct.new(:node => (@node / 'class')[1]).to_s.should == <<EOC
+class TestStruct2 < FFI::Struct
+  layout(
+         :ptr, :pointer
+  )
+end
+EOC
+end
+  it 'should properly generate the layout of a FFI::Struct containing array field' do
+    Generator::Struct.new(:node => (@node / 'class')[2]).to_s.should == <<EOC
+class TestStruct3 < FFI::Struct
+  layout(
+         :c, [:char, 5]
+  )
+end
+EOC
+
+  end
+  it 'should properly generate the layout of a FFI::Struct containing array field' do
+    Generator::Struct.new(:node => (@node / 'class')[3]).to_s.should == <<EOC
+class TestStruct4 < FFI::Struct
+  layout(
+         :s, [TestStruct3, 5]
+  )
+end
+EOC
+
+  end
+end
+
+describe Generator::Union do
+  it_should_behave_like 'All specs'
+  before :all do
+    @node = generate_xml_wrap_from('unions')
+  end
+  it 'should properly generate the layout of a FFI::Union class' do
+    Generator::Union.new(:node => (@node / 'class')[0]).to_s.should == <<EOC
+class UnionT < FFI::Union
+  layout(
+         :c, :char,
+         :f, :float
+  )
+end
+EOC
+  end
+end

data/spec/generator/swig/constants.i

@@ -1,3 +1,8 @@
 %module constant_wrap
 
 #define CONST_1 0x10
+#define CONST_2 1234U
+#define CONST_3 1234L
+#define CONST_4 1234UL
+
+

data/spec/generator/swig/functions.i

@@ -19,6 +19,14 @@ 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));
+const char* func_16();
+const unsigned char * func_17();
+void func_18(...);
+volatile void func_19(volatile int value);
+void func_20(void *p1, void (*callback)(const char* str, void *p2, void *p3 ), void *p4);
+void func_21(void *p1, void (*callback)(const unsigned char uc, void *p2, void *p3 ), void *p4);
+
+
 
 
 

data/spec/generator/swig/testlib.i

@@ -24,18 +24,60 @@ struct test_struct {
   byte b;
 };
 
+struct CamelCaseStruct {
+  int i;
+  char c;
+  byte b;
+};
+
 typedef struct {
   char c;
 } test_struct_3;
 
 typedef void (*cb)(char*, char*);
+typedef void * (*cb_2)(char*, const char *);
+typedef CamelCaseStruct (*cb_3)(char*, CamelCaseStruct);
 
 struct test_struct_2 {
   struct test_struct s;
+  CamelCaseStruct camel_case_struct;
   test_struct_3 s_3;
   enum_t e;
   cb func;
   union_t u;
+  cb callback;
+  void (*inline_callback)();
+};
+
+// struct with getter/setter method for strings and callbacks
+
+struct _test_struct_4 {
+  char* string;
+  void (*inline_callback)();
+};
+
+struct test_struct_5 {
+  int i;
+  union {
+    struct {
+      int a;
+      int b;
+    } nested_struct_field_1;
+    struct {
+      int c;
+      int d;
+    } nested_struct_field_2;
+    struct {
+      int e;
+      int f;
+    } nested_struct_field_3;
+    union {
+      long l;
+      long long ll;
+    } union_field;
+    float f;
+  } big_union_field;
+  char c;
 };
 
 int get_int(struct test_struct* s);

data/spec/generator/swig/typedefs.i

@@ -3,3 +3,4 @@
 typedef unsigned char byte;
 byte b;
 typedef int *(PTF)(char*, char*)
+

data/spec/generator/swig/types.i

@@ -38,6 +38,7 @@ signed long long sll;
 signed long long int slli;
 signed short ss;
 signed short int ssi;
+size_t sizet;
 unsigned char uc;
 unsigned int ui;
 unsigned long ul;

data/spec/generator/type_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+include FFI
+
+describe Generator::Type do
+  it_should_behave_like 'All specs'
+  before :all do
+    @node = generate_xml_wrap_from('types')
+  end
+  it 'should generate string type' do
+    Generator::Type.new(:node => (@node / 'cdecl')[0]).to_s.should == ':string'
+  end
+  it 'should generate pointer type' do
+    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 => (@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 => (@node / 'cdecl')[6]).to_s.should == 'TestStruct'
+  end
+  it 'should generate struct array type' do
+    Generator::Type.new(:node => (@node / 'cdecl')[7]).to_s.should == '[TestStruct, 5]'
+  end
+  it 'should generate enum array type' do
+    Generator::Type.new(:node => (@node / 'cdecl')[8]).to_s.should == '[:int, 5]'
+  end
+  it 'should generate const type' do
+    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 => (@node / 'cdecl')[i + 11]).to_s.should == type[1]
+    end 
+  end
+end

data/spec/spec_helper.rb

@@ -24,4 +24,10 @@ def remove_xml
   FileUtils.rm(Dir.glob('spec/generator/swig/*.xml'))
 end
 
+share_examples_for "All specs" do
+  after :all do
+    remove_xml
+  end
+end
+
 # EOF

data/tasks/cucumber.rake

@@ -0,0 +1,8 @@
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.cucumber_opts = "--format pretty"
+  end
+rescue LoadError
+  nil
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-swig-generator
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 +01:00
+date: 2009-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,17 +32,7 @@ dependencies:
       - !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: 
-description: ffi-swig-generator is a ruby-ffi wrapper code generator based on SWIG interface files.  ffi-swig-generator is able to traverse a XML parse tree file generated by the +swig+ command and to produce a ruby-ffi interface file from it.  ffi-swig-generator is shipped with a command line tool (ffi-gen) and a rake task that automates the code generation process.  ffi-swig-generator XML capabilities are provided by nokogiri.
+description: ffi-swig-generator is a ruby-ffi wrapper code generator that produce ruby-ffi glue code parsing C header files through SWIG.  ffi-swig-generator is able to traverse an XML parse tree generated by the +swig+ command and to produce a ruby-ffi code from it.  ffi-swig-generator is shipped with a command line tool and a rake task that automates the code generation process.  ffi-swig-generator XML capabilities are provided by nokogiri.
 email: andrea.fazzi@alcacoop.it
 executables: 
 - ffi-gen
@@ -55,22 +45,40 @@ extra_rdoc_files:
 files: 
 - .hg/00changelog.i
 - .hg/branch
+- .hg/branch.cache
 - .hg/dirstate
 - .hg/hgrc
 - .hg/requires
 - .hg/store/00changelog.i
 - .hg/store/00manifest.i
+- .hg/store/data/.hgignore.i
+- .hg/store/data/.hgtags.i
 - .hg/store/data/_history.txt.i
 - .hg/store/data/_r_e_a_d_m_e.rdoc.i
 - .hg/store/data/_rakefile.i
 - .hg/store/data/bin/ffi-gen.i
+- .hg/store/data/cucumber.yml.i
 - .hg/store/data/examples/_rakefile.i
 - .hg/store/data/examples/interfaces/libc.i.i
 - .hg/store/data/examples/interfaces/wiiuse.i.i
+- .hg/store/data/features/generate.feature.i
+- .hg/store/data/features/step__definitions/generate.rb.i
+- .hg/store/data/features/support/env.rb.i
+- .hg/store/data/features/support/results.rb.i
+- .hg/store/data/features/support/templates.rb.i
 - .hg/store/data/lib/ffi-swig-generator.rb.i
 - .hg/store/data/lib/generator/application.rb.i
+- .hg/store/data/lib/generator/constant.rb.i
+- .hg/store/data/lib/generator/enum.rb.i
+- .hg/store/data/lib/generator/function.rb.i
 - .hg/store/data/lib/generator/generator.rb.i
 - .hg/store/data/lib/generator/generatortask.rb.i
+- .hg/store/data/lib/generator/logger.rb.i
+- .hg/store/data/lib/generator/node.rb.i
+- .hg/store/data/lib/generator/parser.rb.i
+- .hg/store/data/lib/generator/struct.rb.i
+- .hg/store/data/lib/generator/type.rb.i
+- .hg/store/data/lib/generator/types.rb.i
 - .hg/store/data/pkg/ffi-swig-generator-0.2.1.gem.i
 - .hg/store/data/pkg/ffi-swig-generator-0.2.1.tgz.i
 - .hg/store/data/pkg/ffi-swig-generator-0.2.1/.gitignore.i
@@ -111,7 +119,13 @@ files:
 - .hg/store/data/pkg/ffi-swig-generator-0.2.1/tasks/svn.rake.i
 - .hg/store/data/pkg/ffi-swig-generator-0.2.1/tasks/test.rake.i
 - .hg/store/data/spec/ffi-swig-generator__spec.rb.i
+- .hg/store/data/spec/generator/constant__spec.rb.i
+- .hg/store/data/spec/generator/enum__spec.rb.i
+- .hg/store/data/spec/generator/function__spec.rb.i
 - .hg/store/data/spec/generator/generator__spec.rb.i
+- .hg/store/data/spec/generator/node__spec.rb.i
+- .hg/store/data/spec/generator/parser__spec.rb.i
+- .hg/store/data/spec/generator/struct__spec.rb.i
 - .hg/store/data/spec/generator/swig/constants.i.i
 - .hg/store/data/spec/generator/swig/enums.i.i
 - .hg/store/data/spec/generator/swig/functions.i.i
@@ -120,10 +134,12 @@ files:
 - .hg/store/data/spec/generator/swig/typedefs.i.i
 - .hg/store/data/spec/generator/swig/types.i.i
 - .hg/store/data/spec/generator/swig/unions.i.i
+- .hg/store/data/spec/generator/type__spec.rb.i
 - .hg/store/data/spec/spec.opts.i
 - .hg/store/data/spec/spec__helper.rb.i
 - .hg/store/data/tasks/ann.rake.i
 - .hg/store/data/tasks/bones.rake.i
+- .hg/store/data/tasks/cucumber.rake.i
 - .hg/store/data/tasks/gem.rake.i
 - .hg/store/data/tasks/git.rake.i
 - .hg/store/data/tasks/notes.rake.i
@@ -138,19 +154,41 @@ files:
 - .hg/undo.branch
 - .hg/undo.dirstate
 - .hgignore
+- .hgtags
 - History.txt
 - README.rdoc
 - Rakefile
 - bin/ffi-gen
+- cucumber.yml
 - 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
+- features/generate.feature
+- features/step_definitions/generate.rb
+- features/support/env.rb
+- features/support/templates.rb
 - lib/ffi-swig-generator.rb
 - lib/generator/application.rb
-- lib/generator/generator.rb
+- lib/generator/constant.rb
+- lib/generator/enum.rb
+- lib/generator/function.rb
 - lib/generator/generatortask.rb
+- lib/generator/logger.rb
+- lib/generator/node.rb
+- lib/generator/parser.rb
+- lib/generator/struct.rb
+- lib/generator/type.rb
+- lib/generator/types.rb
 - spec/ffi-swig-generator_spec.rb
-- spec/generator/generator_spec.rb
+- spec/generator/constant_spec.rb
+- spec/generator/enum_spec.rb
+- spec/generator/function_spec.rb
+- spec/generator/parser_spec.rb
+- spec/generator/struct_spec.rb
 - spec/generator/swig/constants.i
 - spec/generator/swig/enums.i
 - spec/generator/swig/functions.i
@@ -159,10 +197,12 @@ files:
 - spec/generator/swig/typedefs.i
 - spec/generator/swig/types.i
 - spec/generator/swig/unions.i
+- spec/generator/type_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/ann.rake
 - tasks/bones.rake
+- tasks/cucumber.rake
 - tasks/gem.rake
 - tasks/git.rake
 - tasks/notes.rake
@@ -174,7 +214,7 @@ files:
 - tasks/svn.rake
 - tasks/test.rake
 has_rdoc: true
-homepage: http://kenai.com/projects/ruby-ffi
+homepage: http://kenai.com/projects/ruby-ffi/sources/swig-generator/show
 post_install_message: 
 rdoc_options: 
 - --main
@@ -196,9 +236,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-swig-gen
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: ffi-swig-generator is a ruby-ffi wrapper code generator based on SWIG interface files
+summary: ffi-swig-generator is a ruby-ffi wrapper code generator that produce ruby-ffi glue code parsing C header files through SWIG
 test_files: []
 

data/lib/generator/generator.rb

@@ -1,344 +0,0 @@
-require 'rubygems'
-require 'nokogiri'
-
-module FFI
-  module Generator
-    @typedefs = {}
-    TYPES = { 
-      'char' => ':char',
-      'double' => ':double',
-      'float' => ':float',
-      'unsigned long' => ':ulong',
-      'unsigned char' => ':uchar',
-      'signed char' => ':char',
-      'unsigned char' => ':uchar',
-      'short' => ':short',
-      'signed short'     => ':short',
-      'signed short int' => ':short',
-      'unsigned short'     => ':ushort',
-      'unsigned short int' => ':ushort',
-      'int' => ':int',
-      'signed int' => ':int',
-      'unsigned int' => ':uint',
-      'long' => ':long',
-      'long int' => ':long',
-      'signed long' => ':long',
-      'signed long int' => ':long',
-      'unsigned long' => ':ulong',
-      'unsigned long int' => ':ulong',
-      'long unsigned int' => ':ulong',
-      'long long'     => ':long_long',
-      'long long int' => ':long_long',
-      'signed long long'     => ':long_long',
-      'signed long long int' => ':long_long',
-      'unsigned long long'     => ':ulong_long',
-      'unsigned long long int' => ':ulong_long',
-      'void' => ':void'
-    }     
-    class << self
-      attr_reader :typedefs
-      def add_type(ctype, rtype)
-        @typedefs[ctype] = rtype
-      end
-    end
-    class Node
-      attr_reader :symname
-      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)
-        if @node
-          attr = (@node / "./attributelist/attribute[@name='#{name}']").first
-          attr['value'] if attr
-        end
-      end
-    end
-    class Type < Node
-      def initialize(params = { })
-        super
-        @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?(@statement)
-      end
-      def is_pointer?
-        @statement[/^p\./] and not is_callback?
-      end
-      def is_enum?
-        @statement[/^enum/]
-      end
-      def is_array?
-        @statement and @statement[/\w+\(\d+\)/]
-      end
-      def is_struct?
-        @statement[/^struct/]
-      end
-      def is_union?
-        @statement[/^union/]
-      end
-      def is_constant?
-        @statement[/^q\(const\)/]
-      end
-      def is_callback?
-        @statement[/^p.f\(/]
-      end
-      def native
-        if is_native?
-          @statement = Generator::TYPES[@statement] 
-          get_type
-        end
-      end
-      def constant
-        if is_constant?
-          @statement = @statement.scan(/^q\(const\)\.(.+)/).flatten[0]
-          get_type 
-        end
-      end
-      def pointer
-        if is_pointer?
-          if @statement[/char/] and @statement.scan(/p\./).size == 1
-            @statement = ':string'
-            # @decl.gsub!(/p\./, '')
-            get_type
-          else
-            return ':pointer'
-          end
-        end        
-      end
-      def array
-        if is_array?
-          num = @statement.scan(/\w+\((\d+)\)/).flatten[0]
-          @statement.gsub!(/\w+\(\d+\)\./, '')
-          "[#{get_type}, #{num}]"
-        end
-      end
-      def struct
-        if is_struct?
-          @statement = Structure.camelcase(@statement.scan(/^struct\s(\w+)/).flatten[0])
-          get_type
-        end
-      end
-      def union
-        if is_union?
-          @statement = Union.camelcase(@statement.scan(/^union\s(\w+)/).flatten[0])
-          get_type
-        end
-      end
-      def enum
-        if is_enum?
-          @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?(@statement)
-          @statement = Generator.typedefs[@statement]
-          get_type
-        end
-      end
-      def get_type
-        constant || pointer || enum || typedef || native || struct || union || array || callback || "#{@statement}"
-      end
-    end
-    class Typedef < Type
-      attr_reader :symname, :statement
-      def initialize(params = { })
-        super
-        @symname = get_attr('name')
-        # @type = is_pointer? ? ':pointer' : get_attr('type')
-        # p @statement
-      end
-    end
-    class Constant < Node
-      def initialize(params = { })
-        super
-        @name, @value = get_attr('sym_name'), get_attr('value')
-      end
-      def to_s
-        @indent_str + "#{@name} = #{@value}"        
-      end
-    end
-    class Enum < Node
-      def initialize(params = { })
-        super
-        eval_items
-      end
-      def to_s
-        @items.sort { |i1, i2| i1[1] <=> i2[1] }.inject("") do |result, item|
-          result << assignment_str(item[0], item[1]) << "\n"
-        end
-      end
-      private
-      def assignment_str(name, value)
-        @indent_str + "#{name} = #{value}"
-      end
-      def eval_expr(expr)
-        if expr.include?('+')
-          (@items[expr[/\w+/]].to_i + 1).to_s
-        else
-          0.to_s
-        end
-      end
-      def eval_items
-        @items = {}
-        get_items.each do |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
-      end
-      def get_items
-        @node / './enumitem'
-      end
-    end
-    class Structure < Node
-      def self.camelcase(name)
-        name.gsub(/^\w|\_\w/).each {|c| c.upcase }.delete('_')
-      end
-      def initialize(params = { })
-        super
-        @name = self.class.camelcase(@symname)
-      end
-      def to_s
-        fields_str = fields.inject("") do |str, f|
-          str << @indent_str + ' ' * 9 << f.join(', ') << ",\n"
-        end
-        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_str + "class #{@name} < FFI::Struct\n"
-      end
-      def fields
-        (@node / 'cdecl').inject([]) do |array, field|
-          array << [":#{Node.new(:node => field).symname}", "#{Type.new(:node => field)}"]
-        end
-      end
-    end
-    class Union < Structure
-      private
-      def klass_string
-        @indent_str + "class #{@name} < FFI::Union\n"
-      end
-    end
-    class Function < Type
-      class Argument < 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 => node).to_s
-        end.collect { |p| "#{p}" }
-        @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
-      class << self
-        def get_verbatim(node)
-          node.xpath("./attributelist/attribute[@name='code']").first['value']
-        end
-        def is_insert_runtime?(node)
-          section = node.xpath("./attributelist/attribute[@name='section']")
-          section.first['value'] == 'runtime' if section.first
-        end
-        def is_constant?(node)
-          node.name == 'constant'
-        end
-        def is_enum?(node)
-          node.name == 'enum'
-        end
-        def is_function_decl?(node)
-          node.name == 'cdecl' and (node / "./attributelist/attribute[@name='kind']").first['value'] == 'function'
-        end
-        def is_struct?(node)
-          node.name == 'class' and (node / "./attributelist/attribute[@name='kind']").first['value'] == 'struct'
-        end
-        def is_union?(node)
-          node.name == 'class' and (node / "./attributelist/attribute[@name='kind']").first['value'] == 'union'
-        end        
-        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 => node, :indent => @indent).to_s << "\n"
-            elsif is_typedef?(node)
-              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 => node, :indent => @indent)
-              Generator.add_type(e.symname, Generator::TYPES['int'])
-              result << e.to_s << "\n"
-            elsif is_struct?(node)
-              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 => node, :indent => @indent)
-              Generator.add_type(s.symname, "union #{s.symname}")
-              result << s.to_s
-            elsif is_function_decl?(node)
-              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       
-          end
-          result
-        end
-      end
-    end
-  end
-end
-