@@ -115,7 +115,7 @@ module RbPlusPlus up_or_raise = if method.default_return_value reverse = "!" - "return #{method.default_return_value};" + "return #{method.default_return_value}" else if method.purely_virtual? "raisePureVirtual()" @@ -129,14 +129,19 @@ module RbPlusPlus const = method.const? ? "const" : "" + # Write out the virtual method that forwards calls into Ruby declarations << "" - declarations << "#{return_type} #{cpp_name}(#{def_arguments}) #{const} {" - declarations << "if(#{reverse}callIsFromRuby(\"#{ruby_name}\")) {" - declarations << "#{up_or_raise};" - declarations << "} else {" + declarations << "virtual #{return_type} #{cpp_name}(#{def_arguments}) #{const} {" declarations << "#{call_down};" declarations << "}" + + # Write out the wrapper method that gets exposed to Ruby that handles + # going up the inheritance chain + declarations << "" + declarations << "#{return_type} default_#{cpp_name}(#{def_arguments}) #{const} {" + declarations << "#{up_or_raise};" declarations << "}" + end declarations << "};" lib/rbplusplus/builders/director.rb @@ -11,7 +11,7 @@ module RbPlusPlus def code_path cpp_name = self.code.qualified_name.split("::")[-1] - "#{@director.qualified_name}::#{cpp_name}" + "#{@director.qualified_name}::default_#{cpp_name}" end end lib/rbplusplus/builders/director_method.rb d2efd311371f9079bed99104b4be2c40213ac027 Jason Roelofs jameskilton@gmail.com http://github.com/jameskilton/rbplusplus/commit/80b200d2692a9d3b9ac5e78a1df8c37c48fe3152 80b200d2692a9d3b9ac5e78a1df8c37c48fe3152 2009-10-31T10:40:39-07:00 2009-10-31T10:40:39-07:00 Updated to work with the new Director API changes 11df0c5239a1806b12f2b0839bdc684f434bd811 Jason Roelofs jameskilton@gmail.com