Author: kclark
Date: Wed Mar 4 21:42:46 2009
New Revision: 750171
URL: http://svn.apache.org/viewvc?rev=750171&view=rev
Log:
THRIFT-352. rb: Implicit enums should be valid values
Author: Gary Tsang
Added:
incubator/thrift/trunk/test/rb/generation/test_enum.rb
Modified:
incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc
Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc?rev=750171&r1=750170&r2=750171&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc Wed Mar
4 21:42:46 2009
@@ -303,10 +303,8 @@
bool first = true;
for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
// Populate the set
- if ((*c_iter)->has_value()){
- first ? first = false: f_types_ << ", ";
- f_types_ << capitalize((*c_iter)->get_name());
- }
+ first ? first = false: f_types_ << ", ";
+ f_types_ << capitalize((*c_iter)->get_name());
}
f_types_ << "]).freeze" << endl;
Added: incubator/thrift/trunk/test/rb/generation/test_enum.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/generation/test_enum.rb?rev=750171&view=auto
==============================================================================
--- incubator/thrift/trunk/test/rb/generation/test_enum.rb (added)
+++ incubator/thrift/trunk/test/rb/generation/test_enum.rb Wed Mar 4 21:42:46
2009
@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), '../test_helper')
+require 'ThriftTest'
+
+class TestEnumGeneration < Test::Unit::TestCase
+ include Thrift::Test
+ def test_enum_valid_values
+ assert_equal(Numberz::VALID_VALUES, Set.new([Numberz::ONE, Numberz::TWO,
Numberz::THREE, Numberz::FIVE, Numberz::SIX, Numberz::EIGHT]))
+ end
+end
\ No newline at end of file