rbplusplus 0.9.1 → 1.0

data/lib/rbplusplus/transformers/method.rb

@@ -19,9 +19,9 @@ module RbGCCXML
     # example of this functionality.
     def default_return_value(value = nil)
       if value
-        cache[:default_return_value] = value
+        @default_return_value = value
       else
-        cache[:default_return_value]
+        @default_return_value
       end
     end
   end

data/lib/rbplusplus/transformers/node.rb

@@ -3,44 +3,44 @@ module RbGCCXML
 
     # Specify to Rb++ that this node is not to be wrapped
     def ignore
-      cache[:ignored] = true
+      @ignored = true
     end
 
     # Un-ignore this node, useful if there's a glob ignore and the wrapper
     # just wants a few of the classes
     def unignore
-      cache[:ignored] = false
+      @ignored = false
     end
 
     # Has this node been previously declared to not be wrapped?
     def ignored?
-      !!cache[:ignored]
+      !!@ignored
     end
 
     # Specifies that this node has been included somewhere else
     def moved_to=(val)
-      cache[:moved_to] = val
+      @moved_to = val
     end
 
     # Change what the name of this node will be when wrapped into Ruby
     def wrap_as(name)
-      cache[:wrap_as] = name
+      @wrap_as = name
       self
     end
 
     # Where has this node moved to?
     def moved_to
-      cache[:moved_to]
+      @moved_to
     end
 
     # Has this node been renamed
     def renamed?
-      !!cache[:wrap_as]
+      !!@wrap_as
     end
 
     alias_method :rbgccxml_name, :name
     def name #:nodoc:
-      cache[:wrap_as] || rbgccxml_name
+      @wrap_as || rbgccxml_name
     end
 
     def cpp_name
@@ -53,11 +53,11 @@ module RbGCCXML
     # Flag a given class as ignoring this typedef lookup if this
     # situation happens.
     def disable_typedef_lookup
-      cache[:disable_typedef_lookup] = true
+      @disable_typedef_lookup = true
     end
 
     def _disable_typedef_lookup? #:nodoc:
-      !!cache[:disable_typedef_lookup]
+      !!@disable_typedef_lookup
     end
 
     # Is this node an incomplete node?
@@ -65,12 +65,5 @@ module RbGCCXML
     def incomplete?
       self["incomplete"] ? self["incomplete"] == "1" : false
     end
-
-    protected
-
-    # Get this node's settings cache
-    def cache
-      NodeCache.get(self)
-    end
   end
 end

data/lib/rbplusplus/writers/multiple_files_writer.rb

@@ -253,16 +253,18 @@ module RbPlusPlus
               cpp.puts "#{@register_method}(#{parent_signature}) {"
             end
 
-            if (regs = @registrations.flatten.compact).any?
-              cpp.puts regs.join("\n")
-            end
-
             if @register_methods
-              @register_methods.each do |m|
-                cpp.puts m
+              # Ug, hack. I've seriously got to rethink this whole
+              # code generation system ... again
+              @register_methods.reverse.each do |reg|
+                @registrations.insert(3, reg)
               end
             end
 
+            if (regs = @registrations.flatten.compact).any?
+              cpp.puts regs.join("\n")
+            end
+
             # I really need a better way of handling this
             if @needs_closing
               cpp.puts "} RUBY_CATCH" unless @parent

data/lib/rbplusplus.rb

@@ -33,6 +33,7 @@ module RbPlusPlus
     autoload :ClassNode,              "rbplusplus/builders/class"
     autoload :DirectorNode,           "rbplusplus/builders/director"
     autoload :ConstructorNode,        "rbplusplus/builders/constructor"
+    autoload :ImplicitCasterNode,     "rbplusplus/builders/implicit_caster"
     autoload :InstanceVariableNode,   "rbplusplus/builders/instance_variable"
 
     # Rice type-management nodes
@@ -73,10 +74,10 @@ end
 
 # Transformer classes that reopen RbGCCXML classes to add functionality
 require 'rbplusplus/transformers/rbgccxml'
-require 'rbplusplus/transformers/node_cache'
 require 'rbplusplus/transformers/node'
 require 'rbplusplus/transformers/function'
 require 'rbplusplus/transformers/class'
+require 'rbplusplus/transformers/constructor'
 require 'rbplusplus/transformers/method'
 require 'rbplusplus/transformers/namespace'
 

data/test/allocation_strategies_test.rb

@@ -1,15 +1,11 @@
 require 'test_helper'
 
-context "Allocation Strategies" do
-
-  def setup
-    if !defined?(@@alloc_strat_built)
-      super
-      @@alloc_strat_built = true 
-      Extension.new "alloc_strats" do |e|
-        e.sources full_dir("headers/alloc_strats.h")
-        node = e.namespace "alloc_strats"
-      end
+describe "Allocation Strategies" do
+
+  before(:all) do
+    Extension.new "alloc_strats" do |e|
+      e.sources full_dir("headers/alloc_strats.h")
+      node = e.namespace "alloc_strats"
     end
   end
 
@@ -19,15 +15,26 @@ context "Allocation Strategies" do
   # instantiate an object with a non-public constructor
   # and it all dies.
   specify "properly figures out what allocation to do" do
-    assert_nothing_raised LoadError  do
+    lambda do
       require 'alloc_strats'
-    end 
+    end.should_not raise_error(LoadError)
 
     # Private constructor, public destructor
-    assert defined?(NoConstructor)
+    lambda do
+      NoConstructor
+    end.should_not raise_error(NameError)
 
     # Private constructor and destructor
-    assert defined?(Neither)
+    lambda do
+      Neither
+    end.should_not raise_error(NameError)
+  end
+
+  specify "can get access to Neither object" do
+    n = Neither.get_instance
+    n.should_not be_nil
+
+    n.process(4, 5).should == 20
   end
 
 end

data/test/class_methods_encapsulate_test.rb

@@ -1,28 +1,26 @@
 require 'test_helper'
 
-context "Correct handling of encapsulated methods" do
-  def setup
-    if !defined?(@@encapsulated)
-      super
-      @@encapsulated = true 
-      Extension.new "encapsulation" do |e|
-        e.sources full_dir("headers/class_methods.h")
-        node = e.namespace "encapsulation"
-      end
-
-      require 'encapsulation'
+describe "Correct handling of encapsulated methods" do
+  before(:all) do
+    Extension.new "encapsulation" do |e|
+      e.sources full_dir("headers/class_methods.h")
+      node = e.namespace "encapsulation"
     end
+
+    require 'encapsulation'
   end
 
   specify "should handle private/protected/public" do
     ext = Extended.new
     ext.public_method.should == 1
-    should.raise NoMethodError do
+
+    lambda do
       ext.private_method
-    end
-    should.raise NoMethodError do
+    end.should raise_error(NoMethodError)
+
+    lambda do
       ext.protected_method
-    end
+    end.should raise_error(NoMethodError)
   end
   
   specify "should handle virtual methods" do
@@ -36,24 +34,26 @@ context "Correct handling of encapsulated methods" do
     arg = ArgumentAccess.new
 
     # Single argument methods
-    should.raise NoMethodError do
+    lambda do
       arg.wrap_me_private
-    end
-    should.raise NoMethodError do
+    end.should raise_error(NoMethodError)
+
+    lambda do
       arg.wrap_me_protected
-    end
+    end.should raise_error(NoMethodError)
 
-    should.not.raise NoMethodError do
+    lambda do
       arg.wrap_me_public ArgumentAccess::PublicStruct.new
-    end
+    end.should_not raise_error(NoMethodError)
     
     # Multiple argument methods
-    should.raise NoMethodError do
+    lambda do
       arg.wrap_me_many_no
-    end
-    should.not.raise NoMethodError do
+    end.should raise_error(NoMethodError)
+
+    lambda do
       arg.wrap_me_many_yes(1, 2.0, ArgumentAccess::PublicStruct.new)
-    end
+    end.should_not raise_error(NoMethodError)
   end
 end
 

data/test/class_methods_test.rb

@@ -1,20 +1,15 @@
 require 'test_helper'
 
-context "Correct handling of static methods" do
-  def setup
-    if !defined?(@@complex_static)
-      super
-      @@complex_static = true 
-      Extension.new "complex_test" do |e|
-        e.sources full_dir("headers/complex_static_methods.h")
-        node = e.namespace "complex"
-      end
+describe "Correct handling of static methods" do
 
-      require 'complex_test'
+  specify "should handle complex static methods" do
+    Extension.new "complex_test" do |e|
+      e.sources full_dir("headers/complex_static_methods.h")
+      node = e.namespace "complex"
     end
-  end
 
-  specify "should handle complex static methods" do
+    require 'complex_test'
+
     Multiply.multiply(SmallInteger.new(2),SmallInteger.new(2)).should == 4
   end
   

data/test/classes_test.rb

@@ -1,45 +1,41 @@
 require 'test_helper'
 
-context "Extension with wrapped classes" do
-
-  def setup
-    if !defined?(@@adder_built)
-      super
-      @@adder_built = true 
-      Extension.new "adder" do |e|
-        e.sources full_dir("headers/Adder.h"),
-          :include_source_files => [
-            full_dir("headers/Adder.h"),
-            full_dir("headers/Adder.cpp")
-          ]
-        node = e.namespace "classes"
-        adder = node.classes("Adder")
-        adder.use_constructor(
-          adder.constructors.find(:arguments => [])
-        )
-
-        adder.constants("HideMe").ignore
-        adder.disable_typedef_lookup
-      end
-
-      require 'adder'
+describe "Extension with wrapped classes" do
+
+  before(:all) do
+    Extension.new "adder" do |e|
+      e.sources full_dir("headers/Adder.h"),
+        :include_source_files => [
+          full_dir("headers/Adder.h"),
+          full_dir("headers/Adder.cpp")
+        ]
+      node = e.namespace "classes"
+      adder = node.classes("Adder")
+      adder.use_constructor(
+        adder.constructors.find(:arguments => [])
+      )
+
+      adder.constants("HideMe").ignore
+      adder.disable_typedef_lookup
     end
+
+    require 'adder'
   end
 
   specify "should make classes available as Ruby runtime constants" do
-    assert defined?(Adder), "Adder isn't defined"
+    lambda { Adder }.should_not raise_error
   end
 
   specify "should make wrapped classes constructable" do
     a = Adder.new
-    a.should.not.be.nil
+    a.should_not be_nil
   end
 
   specify "should make functions of the class available" do
     # Wrapped method names default to underscore'd
     adder = Adder.new
     adder.add_integers(1,2).should == 3
-    adder.add_floats(1.0, 2.0).should.be.close(3.0, 0.001)
+    adder.add_floats(1.0, 2.0).should be_close(3.0, 0.001)
     adder.add_strings("Hello", "World").should == "HelloWorld"
     adder.get_class_name.should == "Adder"
   end
@@ -50,15 +46,15 @@ context "Extension with wrapped classes" do
   end
 
   specify "should use typedefs when findable" do
-    assert defined?(IntAdder), "Did not use the typedef for TemplateAdder"
+    lambda { IntAdder }.should_not raise_error
   end
 
   specify "finds and uses multi-nested typedefs" do
-    assert defined?(ShouldFindMe), "Didn't find top level typedef for NestedTemplate"
+    lambda { ShouldFindMe }.should_not raise_error
   end
 
   specify "can turn off typedef lookup for certain classes" do
-    assert !defined?(DontFindMeBro), "Found a typedef we shouldn't have"
+    lambda { DontFindMeBro }.should raise_error
   end
 
   specify "makes class constants available" do
@@ -66,7 +62,7 @@ context "Extension with wrapped classes" do
   end
 
   specify "can ignore constants" do
-    assert !defined?(Adder::HideMe), "Found HideMe when I shouldn't have"
+    lambda { Adder::HideMe }.should raise_error
   end
 
   specify "makes public instance variables accessible" do
@@ -76,21 +72,21 @@ context "Extension with wrapped classes" do
     a.value3 = "This is a value!"
     a.should_be_transformed = "TRANSFORM"
 
-    a.value1.should.equal 10
-    a.value2.should.be.close 15.5, 0.01
-    a.value3.should.equal "This is a value!"
+    a.value1.should == 10
+    a.value2.should be_close(15.5, 0.01)
+    a.value3.should == "This is a value!"
 
-    a.should_be_transformed.should.equal "TRANSFORM"
+    a.should_be_transformed.should == "TRANSFORM"
   end
 
   specify "const variables are exported as read-only" do
     a = Adder.new
 
-    should.raise NoMethodError do
+    lambda do
       a.const_var = "This is a value!"
-    end
+    end.should raise_error
 
-    a.const_var.should.equal 14
+    a.const_var.should == 14
   end
 
   specify "can subclass a wrapped class and go from there" do
@@ -105,12 +101,12 @@ context "Extension with wrapped classes" do
     end
 
     a = MyAdder.new
-    a.add_integers(3, 7).should.equal 21
-    a.add_strings("piz", "owned").should.equal "pizownedwoot"
+    a.add_integers(3, 7).should == 21
+    a.add_strings("piz", "owned").should == "pizownedwoot"
   end
 
   specify "should not wrap incomplete types" do
-    assert !defined?(Forwarder)
+    lambda { Forwarder }.should raise_error
   end
 end
 

data/test/compiling_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
-context "Compiler settings" do
+describe "Compiler settings" do
+
+  before(:each) do
+    test_setup
+  end
 
   specify "should be able to specify include paths" do
     Extension.new "compiler" do |e|
@@ -11,7 +15,7 @@ context "Compiler settings" do
 
     require 'compiler'
 
-    assert defined?(func)
+    func(1, 2).should == 3
   end
 
   specify "should be able to specify library paths" do
@@ -27,7 +31,7 @@ context "Compiler settings" do
 
     contents = File.read(ext_file)
 
-    contents.should.match(%r(-L/usr/lib/testing/123))
+    contents.should =~ %r(-L/usr/lib/testing/123)
 
     # Clean up
     `rm -rf #{full_dir('generated')}/*`
@@ -44,8 +48,8 @@ context "Compiler settings" do
 
     contents = File.read(ext_file)
 
-    contents.should.match(%r(-L/usr/lib/testing/456))
-    contents.should.match(%r(-L/var/lib/stuff))
+    contents.should =~ %r(-L/usr/lib/testing/456)
+    contents.should =~ %r(-L/var/lib/stuff)
   end
 
   specify "should be able to link to external libraries" do
@@ -61,7 +65,7 @@ context "Compiler settings" do
 
     contents = File.read(ext_file)
 
-    contents.should.match(%r(-llib123))
+    contents.should =~ %r(-llib123)
     
     # Clean up
     `rm -rf #{full_dir('generated')}/*`
@@ -78,9 +82,9 @@ context "Compiler settings" do
 
     contents = File.read(ext_file)
 
-    contents.should.match(%r(-lponzor))
-    contents.should.match(%r(-lwonko))
-    contents.should.match(%r(-lprankit))
+    contents.should =~ %r(-lponzor)
+    contents.should =~ %r(-lwonko)
+    contents.should =~ %r(-lprankit)
   end
 
   specify "can add extra cxxflags for gccxml and compiling" do
@@ -95,8 +99,8 @@ context "Compiler settings" do
 
     contents = File.read(ext_file)
 
-    contents.should.match(%r(-I/i/love/scotch))
-    contents.should.match(%r(-D__AND_DEFINE_THAT))
+    contents.should =~ %r(-I/i/love/scotch)
+    contents.should =~ %r(-D__AND_DEFINE_THAT)
   end
 
   specify "can add extra ldflags for gccxml and compiling" do
@@ -111,24 +115,24 @@ context "Compiler settings" do
 
     contents = File.read(ext_file)
 
-    contents.should.match(%r(-R/wootage/to/you))
-    contents.should.match(%r(-lthisandthat))
-    contents.should.match(%r(-nothing_here))
+    contents.should =~ %r(-R/wootage/to/you)
+    contents.should =~ %r(-lthisandthat)
+    contents.should =~ %r(-nothing_here)
   end
 
   specify "should pass cxxflags to rbgccxml" do
-    should.not.raise do
+    lambda do
       e = Extension.new "parsing_test" 
       e.working_dir = full_dir("generated")
       e.sources full_dir("headers/requires_define.h"),
         :cxxflags => "-DMUST_BE_DEFINED"
       e.build
       e.write
-    end
+    end.should_not raise_error
   end
 
   specify "should be able to add additional headers as needed" do
-    should.not.raise do
+    lambda do
       e = Extension.new "external" 
       e.working_dir = full_dir("generated")
       e.sources full_dir("headers/external_mapping.h"), 
@@ -138,8 +142,8 @@ context "Compiler settings" do
 
       file = full_dir("generated/external.rb.cpp")
       contents = File.read(file)
-      contents.should.match(%r(headers/external_mapping_rice.h))
-    end
+      contents.should =~ %r(headers/external_mapping_rice.h)
+    end.should_not raise_error
   end
 
   specify "can specify other source files to be compiled into the extension" do

data/test/constructors_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Extension with constructors out the whazoo" do
+describe "Extension with constructors out the whazoo" do
 
   specify "should make constructors available" do
     Extension.new "constructors" do |e|
@@ -15,17 +15,17 @@ context "Extension with constructors out the whazoo" do
 
     require 'constructors'
 
-    should.not.raise NameError do
+    lambda do
       # Test complex constructors
       d = DoubleStringHolder.new("one", "two")
       one = d.get_one
       d.get_one.should == "one"
       d.get_two.should == "two"
-    end
+    end.should_not raise_error(NameError)
     
-    should.raise TypeError do
+    lambda do
       PrivateConstructor.new
-    end
+    end.should raise_error(TypeError)
   end
 
 end

data/test/custom_code_test.rb

@@ -1,52 +1,45 @@
 require 'test_helper'
 
-context "Extension with wrapped classes" do
-
-  def setup
-    if !defined?(@@adder_built)
-      super
-      @@adder_built = true 
-      Extension.new "adder" do |e|
-        e.sources full_dir("headers/Adder.h"),
-          :include_source_files => [
-            full_dir("headers/Adder.h"),
-            full_dir("headers/Adder.cpp")
-          ]
-        node = e.namespace "classes"
-        adder = node.classes("Adder")
-
-        adder.use_constructor( adder.constructors.find(:arguments => []))
-        adder.disable_typedef_lookup
-
-        decl = <<-END
+describe "Extension with wrapped classes" do
+
+  before(:all) do
+    Extension.new "adder" do |e|
+      e.sources full_dir("headers/Adder.h"),
+        :include_source_files => [
+          full_dir("headers/Adder.h"),
+          full_dir("headers/Adder.cpp")
+        ]
+      node = e.namespace "classes"
+      adder = node.classes("Adder")
+
+      adder.use_constructor( adder.constructors.find(:arguments => []))
+      adder.disable_typedef_lookup
+
+      decl = <<-END
 int subtractIntegers(classes::Adder* self, int a, int b) {
-  return a - b;
+return a - b;
 }
 
 int multiplyIntegers(classes::Adder* self, int a, int b) {
-  return a * b;
+return a * b;
 }
-        END
+      END
 
-        wrapping = <<-END
+      wrapping = <<-END
 <class>.define_method(\"sub_ints\", &subtractIntegers);
 <class>.define_method(\"mult_ints\", &multiplyIntegers);
 END
 
-        adder.add_custom_code( decl, wrapping )
-      end
-
-      require 'adder'
+      adder.add_custom_code( decl, wrapping )
     end
+
+    require 'adder'
   end
 
   specify "Adder has new custom methods" do
     a = Adder.new
-    a.should.respond_to(:sub_ints)
-    a.should.respond_to(:mult_ints)
-
-    a.sub_ints(5, 4).should.equal 1
-    a.mult_ints(5, 4).should.equal 20
+    a.sub_ints(5, 4).should == 1
+    a.mult_ints(5, 4).should == 20
   end
 
 end