@@ -147,6 +147,8 @@ module RbPlusPlus [node.variables.find(:access => :public)].flatten.each do |var| next if var.ignored? || var.moved? + var_name = Inflector.underscore(var.name) + # Setter, only if it isn't const if !var.cpp_type.const? method_name = "wrap_#{node.qualified_name.functionize}_#{var.name}_set" @@ -154,7 +156,7 @@ module RbPlusPlus declarations << "\tself->#{var.name} = val;" declarations << "}" - body << "\t#{self.rice_variable}.define_method(\"#{var.name}=\", &#{method_name});" + body << "\t#{self.rice_variable}.define_method(\"#{var_name}=\", &#{method_name});" end # Getter @@ -163,7 +165,7 @@ module RbPlusPlus declarations << "\treturn self->#{var.name};" declarations << "}" - body << "\t#{self.rice_variable}.define_method(\"#{var.name}\", &#{method_name});" + body << "\t#{self.rice_variable}.define_method(\"#{var_name}\", &#{method_name});" end end lib/rbplusplus/builders/class.rb @@ -163,6 +163,8 @@ module RbPlusPlus [node.variables.find(:access => :public)].flatten.each do |var| next if var.ignored? || var.moved? + var_name = Inflector.underscore(var.name) + # Setter, only if it isn't const if !var.cpp_type.const? method_name = "wrap_#{node.qualified_name.functionize}_#{var.name}_set" @@ -170,7 +172,7 @@ module RbPlusPlus declarations << "\tself->#{var.name} = val;" declarations << "}" - body << "\t#{self.rice_variable}.define_method(\"#{var.name}=\", &#{method_name});" + body << "\t#{self.rice_variable}.define_method(\"#{var_name}=\", &#{method_name});" end # Getter @@ -179,7 +181,7 @@ module RbPlusPlus declarations << "\treturn self->#{var.name};" declarations << "}" - body << "\t#{self.rice_variable}.define_method(\"#{var.name}\", &#{method_name});" + body << "\t#{self.rice_variable}.define_method(\"#{var_name}\", &#{method_name});" end end lib/rbplusplus/builders/director.rb @@ -74,10 +74,13 @@ context "Extension with wrapped classes" do a.value1 = 10 a.value2 = 15.5 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.should_be_transformed.should.equal "TRANSFORM" end specify "const variables are exported as read-only" do test/classes_test.rb @@ -29,6 +29,8 @@ namespace classes { float value2; string value3; + string shouldBeTransformed; + const int const_var; }; test/headers/Adder.h 960585b8c4bc52be79a04d2861ebb35012859c88 Jason Roelofs jameskilton@gmail.com http://github.com/jameskilton/rbplusplus/commit/9aa56d8f011efdd22a4d049251e381035ba79ba4 9aa56d8f011efdd22a4d049251e381035ba79ba4 2009-06-08T06:12:03-07:00 2009-06-08T06:12:03-07:00 public variable wrapping also needs to auto-underscore d1f4d299f39e455abd51f1b4df67c8c9f7152eb7 Jason Roelofs jameskilton@gmail.com