AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Ruby nested msg caps (#5564)

Browse Source 
* Ruby nested msg caps

* nested types tests added

* test cases added for RubifyConstant

* extracted NestedMessage to TestNestedMessage

* removed nested tests with leading underscore

* extracted testLowercase to toplevel testLowercaseNested
This commit is contained in:
toc007 2019-01-15 20:01:41 -08:00 committed by Paul Yang
parent 0c95791509
commit dda7ab0363
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruby/tests/generated_code.proto
View File

@ -69,6 +69,11 @@ enum TestEnum {
C = 3;
}
message testLowercaseNested {
message lowercase{}
}
message TestUnknown {
TestUnknown optional_unknown = 11;
repeated TestUnknown repeated_unknown = 31;

2
ruby/tests/generated_code_test.rb
View File

@ -15,6 +15,8 @@ class GeneratedCodeTest < Test::Unit::TestCase
# successfully creates message definitions and classes, not to test every
# aspect of the extension (basic.rb is for that).
A::B::C::TestMessage.new
A::B::C::TestMessage::NestedMessage.new
A::B::C::TestLowercaseNested::Lowercase.new
FooBar::TestImportedMessage.new
A::B::TestRubyPackageMessage.new
end

2
src/google/protobuf/compiler/ruby/ruby_generator.cc
View File

@ -389,7 +389,7 @@ void GenerateMessageAssignment(
"lookup(\"$full_name$\").msgclass\n",
"full_name", message->full_name());
std::string nested_prefix = prefix + message->name() + "::";
std::string nested_prefix = prefix + RubifyConstant(message->name()) + "::";
for (int i = 0; i < message->nested_type_count(); i++) {
GenerateMessageAssignment(nested_prefix, message->nested_type(i), printer);
}