diff options
author | Brian Duff <bduff@google.com> | 2013-06-05 14:43:32 -0700 |
---|---|---|
committer | Brian Duff <bduff@google.com> | 2013-06-05 15:38:33 -0700 |
commit | 296787577a3ed9a693afb5598015fd1535af1b1c (patch) | |
tree | 665afe2f400ab29aa050f030f273f25ea638d76c /src/google | |
parent | bb9b49029ee9168061adaa08cbe251d35d421e66 (diff) | |
download | protobuf-296787577a3ed9a693afb5598015fd1535af1b1c.tar.gz protobuf-296787577a3ed9a693afb5598015fd1535af1b1c.tar.bz2 protobuf-296787577a3ed9a693afb5598015fd1535af1b1c.zip |
Fix javanano compiler generating uncompileable java code. This happened
for enums when java_multiple_files=true.
Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7
Signed-off-by: Brian Duff <bduff@google.com>
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_enum.cc | 15 | ||||
-rw-r--r-- | src/google/protobuf/unittest_enum_multiplejava_nano.proto | 49 |
2 files changed, 64 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_enum.cc b/src/google/protobuf/compiler/javanano/javanano_enum.cc index 5abd46e9..6ba25ebd 100644 --- a/src/google/protobuf/compiler/javanano/javanano_enum.cc +++ b/src/google/protobuf/compiler/javanano/javanano_enum.cc @@ -69,6 +69,17 @@ EnumGenerator::~EnumGenerator() {} void EnumGenerator::Generate(io::Printer* printer) { printer->Print("// enum $classname$\n", "classname", descriptor_->name()); + bool is_own_file = params_.java_multiple_files() || + ((descriptor_->containing_type() == NULL) && + !params_.has_java_outer_classname(descriptor_->file()->name())); + + if (is_own_file) { + printer->Print("public final class $classname$ {\n", "classname", + descriptor_->name()); + printer->Indent(); + printer->Print("private $classname$() {}\n", "classname", + descriptor_->name()); + } for (int i = 0; i < canonical_values_.size(); i++) { map<string, string> vars; vars["name"] = canonical_values_[i]->name(); @@ -87,6 +98,10 @@ void EnumGenerator::Generate(io::Printer* printer) { "public static final int $name$ = $canonical_name$;\n"); } + if (is_own_file) { + printer->Outdent(); + printer->Print("}"); + } printer->Print("\n"); } diff --git a/src/google/protobuf/unittest_enum_multiplejava_nano.proto b/src/google/protobuf/unittest_enum_multiplejava_nano.proto new file mode 100644 index 00000000..d2da6c6a --- /dev/null +++ b/src/google/protobuf/unittest_enum_multiplejava_nano.proto @@ -0,0 +1,49 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// http://code.google.com/p/protobuf/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Author: bduff@google.com (Brian Duff) +// + +package protobuf_unittest_import; + +option java_package = "com.google.protobuf.nano"; +option java_outer_classname = "NanoEnumsWithMultipleFiles"; +option java_multiple_files = true; + +enum FirstTopLevelEnum { + FIRST_TOP_LEVEL_FIRST = 1; + FIRST_TOP_LEVEL_SECOND = 2; +} + +enum SecondTopLevelEnum { + SECOND_TOP_LEVEL_FIRST = 1; + SECOND_TOP_LEVEL_SECOND = 2; +} + |