rbplusplus 1.0 → 1.0.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/rdoctask'
 require 'rake/contrib/sshpublisher'
 
 PROJECT_NAME = "rb++"
-RBPLUSPLUS_VERSION = "1.0"
+RBPLUSPLUS_VERSION = "1.0.1"
 
 task :default => :test
 

data/lib/rbplusplus/builders/helpers/class.rb

@@ -38,16 +38,18 @@ module RbPlusPlus
         [to_use || real_constructors].flatten.each do |constructor|
           next if do_not_wrap?(constructor)
 
-          if constructor.attributes[:artificial]
-            next if ignore_artificial || constructor.arguments.length == 1
-          end
+          Logger.debug "Wrapping constructor: #{constructor.attributes["demangled"]}"
 
-          if implicit_converter?(constructor)
-            if constructor.implicit_casting?
-              parent.add_child ImplicitCasterNode.new(constructor, self)
+          if constructor.attributes["artificial"]
+            if ignore_artificial && constructor.arguments.length == 1
+              Logger.debug "Not wrapping artificial constructor #{constructor.attributes["demangled"]}"
+              next 
             end
+          end
 
-            # We don't want to expose these constructors to Rice
+          if implicit_casting?(constructor)
+            Logger.debug "Wrapping implicit constructor #{constructor.to_cpp}"
+            parent.add_child ImplicitCasterNode.new(constructor, self)
             next
           end
 
@@ -60,9 +62,10 @@ module RbPlusPlus
       end
 
       # Is this constructor a converter constructor?
-      def implicit_converter?(constructor)
-        # Single argument
-        constructor.arguments.length == 1 &&
+      def implicit_casting?(constructor)
+        constructor.implicit_casting? &&
+          # Only works on single argument constructors
+          constructor.arguments.length == 1 &&
           # We are wrapping the type converting from
           !do_not_wrap?(constructor.arguments[0].cpp_type.base_type)
       end

data/lib/rbplusplus/transformers/constructor.rb

@@ -9,9 +9,9 @@ module RbGCCXML
     # They manage the conversion of one type to another. Rice handles this functionality
     # through a special method, define_implicit_cast<From, To>(). 
     #
-    # Rb++ attempts to find all classes and constructors that fit this pattern
-    # and write out the casting declarations as needed. In the cases where this is
-    # functionality not wanted, use this method to turn off this casting check.
+    # Use this method to specify which constructors are meant to be used in implicit casting.
+    # This will mark the constructor as such and won't wrap it directly, but will build an
+    # appropriate define_implicit_cast<> call for the two types (class and argument)
     #
     # This method can be called per Constructor or per Class.
     def implicit_casting(state)
@@ -20,7 +20,7 @@ module RbGCCXML
 
     def implicit_casting? #:nodoc:
       if @implicit_casting.nil?
-        @implicit_casting = true
+        @implicit_casting = false
       end
 
       @implicit_casting

data/test/director_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Director proxy generation" do
+describe "Director proxy generation" do
 
   before(:all) do
     Extension.new "director" do |e|

data/test/headers/implicit_cast.h

@@ -55,53 +55,6 @@ namespace implicit_cast {
   bool isRight(Degree* degree) {
     return degree->valueDegrees() == 90;
   }
-
-  /**
-   * Classes to show how to turn off the implicit casting
-   */
-  class Explicit
-  {
-    public:
-      Explicit(float v) {
-        value = v;
-      }
-
-      Explicit(const Degree &d) {
-        value = d.valueDegrees();
-      }
-
-      Explicit(const Radian &r) {
-        value = r.valueDegrees();
-      }
-
-      float value;
-  };
-
-  float explicitValue(Explicit e) {
-    return e.value;
-  }
-
-  class NotImplicit
-  {
-    public:
-      NotImplicit(float v, int a) {
-        value = v * a;
-      }
-
-      NotImplicit(const Degree &d) {
-        value = d.valueDegrees();
-      }
-
-      NotImplicit(const Radian &r) {
-        value = r.valueDegrees();
-      }
-
-      float value;
-  };
-
-  float notImplicitValue(NotImplicit i) {
-    return i.value;
-  }
 }
 
 #endif

data/test/implicit_cast_test.rb

@@ -10,11 +10,10 @@ describe "Specify types to allow implicit casting" do
       node = e.namespace "implicit_cast"
 
       # Can flag individual constructors
-      node.classes("Explicit").constructors.
-        find(:arguments => ["const Radian&"]).implicit_casting(false)
+      node.classes("Degree").constructors.find(:arguments => ["const Radian&"]).implicit_casting(true)
 
       # Or flag the class as a whole
-      node.classes("NotImplicit").implicit_casting(false)
+      node.classes("Radian").implicit_casting(true)
     end
 
     require 'implicit_cast'
@@ -37,31 +36,5 @@ describe "Specify types to allow implicit casting" do
     is_right(Degree.new(90)).should be_true
     is_right(Radian.new(2.0)).should be_false
   end
-
-  specify "can turn off implicit cast wrapping for a given constructor" do
-    lambda do
-      explicit_value(Radian.new(60.0))
-    end.should raise_error
-
-    lambda do
-      e = Explicit.new(14.0)
-      explicit_value(e).should be_close(14.0, 0.001)
-    end.should_not raise_error
-  end
-
-  specify "can turn off implicit casting for an entire class" do
-    n = NotImplicit.new(10.0, 3)
-    
-    not_implicit_value(n).should be_close(30.0, 0.001)
-
-    lambda do
-      not_implicit_value(Degree.new(15.0))
-    end.should raise_error
-
-    lambda do
-      not_implicit_value(Radian.new(1.0))
-    end.should raise_error
-  end
-
 end
 

data/test/modules_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Extension with modules" do
+describe "Extension with modules" do
 
   before(:all) do
     Extension.new "modules" do |e|

data/test/nested_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Wrapping Classes within classes" do
+describe "Wrapping Classes within classes" do
   before(:all) do
     Extension.new "nested" do |e|
       e.sources full_dir("headers/nested_classes.h")

data/test/subclass_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Extension with class hierachies" do
+describe "Extension with class hierachies" do
 
   specify "should make super classes methods available" do
     Extension.new "subclass" do |e|

data/test/to_from_ruby_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Properly build known required to_ruby and from_ruby methods" do
+describe "Properly build known required to_ruby and from_ruby methods" do
 
   specify "should build for const & types as needed" do
     Extension.new "to_from_ruby" do |e|

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbplusplus
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jason Roelofs
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency