rbgccxml 1.0 → 1.0.1

data/Rakefile

@@ -5,14 +5,13 @@ require 'rake/gempackagetask'
 require 'rspec/core/rake_task'
 
 PROJECT_NAME = "rbgccxml"
-RBGCCXML_VERSION = "1.0"
+RBGCCXML_VERSION = "1.0.1"
 
 task :default => :spec
 
 desc "Run all specs"
 RSpec::Core::RakeTask.new do |t|
-  t.ruby_opts = ["-Itest"]
-  t.pattern = "test/**/*.rb"
+  t.pattern = "spec/**/*_test.rb"
 end
 
 Rake::RDocTask.new do |rd|
@@ -73,7 +72,7 @@ what you want out of the C++ source code
 
   s.files = patterns.map {|p| Dir.glob(p) }.flatten
 
-  s.test_files = Dir.glob('test/**/*.rb')
+  s.test_files = Dir.glob('spec/**/*.rb')
 
   s.require_paths = ['lib']
 end

data/lib/rbgccxml.rb

@@ -24,6 +24,7 @@ module RbGCCXML
   autoload :File,             "rbgccxml/nodes/file" 
   autoload :FunctionType,     "rbgccxml/nodes/function_type"
   autoload :Function,         "rbgccxml/nodes/function" 
+  autoload :MethodType,       "rbgccxml/nodes/method_type" 
   autoload :Method,           "rbgccxml/nodes/method" 
   autoload :Namespace,        "rbgccxml/nodes/namespace" 
   autoload :Struct,           "rbgccxml/nodes/struct" 

data/lib/rbgccxml/nodes/method_type.rb

@@ -0,0 +1,9 @@
+module RbGCCXML
+
+  # Represents a <MethodType>, also known as a function pointer to a member
+  # function.
+  class MethodType < Function
+  end
+
+end
+

data/lib/rbgccxml/sax_parser.rb

@@ -35,7 +35,7 @@ module RbGCCXML
     NESTED_NODES = %w(Argument Base EnumValue)
 
     def start_element(name, attributes = [])
-      attr_hash = Hash[*attributes]
+      attr_hash = Hash[*attributes.flatten]
 
       # Need to build a node in memory for those
       # that we don't directly support

data/{test → spec}/methods_test.rb

@@ -44,7 +44,7 @@ describe "Querying for class methods" do
 
 end
 
-context "Properties on Methods" do
+describe "Properties on Methods" do
   before(:all) do
     @classes_source = RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
   end

data/spec/pointer_to_member_test.rb

@@ -0,0 +1,35 @@
+require "test_helper"
+
+describe "Pointer to member function or member variable" do
+  before(:all) do
+    @ptm_source = RbGCCXML.parse(
+      full_dir("headers/pointer_to_member.h")).namespaces("pointer_to_member")
+  end
+
+  specify "finds the test struct" do
+    xyz = @ptm_source.structs("xyz_t")
+    xyz.should be_a_kind_of(RbGCCXML::Struct)
+    xyz.methods('do_something').should be_a_kind_of(RbGCCXML::Method)
+    xyz.variables('m_some_member').should be_a_kind_of(RbGCCXML::Field)
+  end
+
+  specify "finds pointer to member variable" do
+    mvar_ptr = @ptm_source.children.find {|c| c.name == 'mvar_ptr_t'}
+    mvar_ptr.should be_a_kind_of(RbGCCXML::Typedef)
+
+    mvar_ptr_type = RbGCCXML::NodeCache.find(mvar_ptr.attributes["type"])
+    mvar_ptr_type.should be_a_kind_of(RbGCCXML::Node) # OffsetType?
+  end
+
+  specify "finds pointer to member function" do
+    mfun_ptr = @ptm_source.children.find {|c| c.name == 'mfun_ptr_t'}
+    mfun_ptr.should be_a_kind_of(RbGCCXML::Typedef)
+
+    mfun_ptr_type = RbGCCXML::NodeCache.find(mfun_ptr.attributes["type"])
+    mfun_ptr_type.should be_a_kind_of(RbGCCXML::PointerType)
+
+    type = RbGCCXML::NodeCache.find(mfun_ptr_type.attributes["type"])
+    type.should be_a_kind_of(RbGCCXML::MethodType)
+  end
+end
+

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbgccxml
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -13,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -04:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -34,9 +38,11 @@ dependencies:
   name: gccxml_gem
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
@@ -73,6 +79,7 @@ files:
 - lib/rbgccxml/nodes/function.rb
 - lib/rbgccxml/nodes/function_type.rb
 - lib/rbgccxml/nodes/method.rb
+- lib/rbgccxml/nodes/method_type.rb
 - lib/rbgccxml/nodes/namespace.rb
 - lib/rbgccxml/nodes/struct.rb
 - lib/rbgccxml/nodes/type.rb
@@ -90,6 +97,21 @@ files:
 - lib/rbgccxml/sax_parser.rb
 - lib/rbgccxml.rb
 - lib/vendor/facets/once.rb
+- spec/arguments_test.rb
+- spec/classes_test.rb
+- spec/enumerations_test.rb
+- spec/function_pointers_test.rb
+- spec/functions_test.rb
+- spec/methods_test.rb
+- spec/namespaces_test.rb
+- spec/node_test.rb
+- spec/parser_test.rb
+- spec/pointer_to_member_test.rb
+- spec/query_results_test.rb
+- spec/structs_test.rb
+- spec/test_helper.rb
+- spec/types_test.rb
+- spec/variables_test.rb
 has_rdoc: true
 homepage: http://rbplusplus.rubyforge.org/rbgccxml
 licenses: []
@@ -100,38 +122,43 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rbplusplus
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby interface to GCCXML
 test_files: 
-- test/arguments_test.rb
-- test/classes_test.rb
-- test/enumerations_test.rb
-- test/function_pointers_test.rb
-- test/functions_test.rb
-- test/methods_test.rb
-- test/namespaces_test.rb
-- test/node_test.rb
-- test/parser_test.rb
-- test/query_results_test.rb
-- test/structs_test.rb
-- test/test_helper.rb
-- test/types_test.rb
-- test/variables_test.rb
+- spec/arguments_test.rb
+- spec/classes_test.rb
+- spec/enumerations_test.rb
+- spec/function_pointers_test.rb
+- spec/functions_test.rb
+- spec/methods_test.rb
+- spec/namespaces_test.rb
+- spec/node_test.rb
+- spec/parser_test.rb
+- spec/pointer_to_member_test.rb
+- spec/query_results_test.rb
+- spec/structs_test.rb
+- spec/test_helper.rb
+- spec/types_test.rb
+- spec/variables_test.rb