| Index: third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto
|
| diff --git a/third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto b/third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto
|
| similarity index 53%
|
| copy from third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto
|
| copy to third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto
|
| index df98ac4bd1929fda636c9e2fce1a9184ebf5d472..00816b78ec4bf566d045951891d864d5cc7c9d28 100644
|
| --- a/third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto
|
| +++ b/third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto
|
| @@ -1,6 +1,6 @@
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// http://code.google.com/p/protobuf/
|
| +// https://developers.google.com/protocol-buffers/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -28,22 +28,69 @@
|
| // (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: jasonh@google.com (Jason Hsueh)
|
| -//
|
| -// This file is used to test a corner case in the CPP implementation where the
|
| -// generated C++ type is available for the extendee, but the extension is
|
| -// defined in a file whose C++ type is not in the binary.
|
| +syntax = "proto2";
|
| +
|
| +package google.protobuf.python.internal;
|
| +
|
| +
|
| +message DescriptorPoolTest1 {
|
| + extensions 1000 to max;
|
| +
|
| + enum NestedEnum {
|
| + ALPHA = 1;
|
| + BETA = 2;
|
| + }
|
|
|
| + optional NestedEnum nested_enum = 1 [default = BETA];
|
|
|
| -import "google/protobuf/internal/more_extensions.proto";
|
| + message NestedMessage {
|
| + enum NestedEnum {
|
| + EPSILON = 5;
|
| + ZETA = 6;
|
| + }
|
| + optional NestedEnum nested_enum = 1 [default = ZETA];
|
| + optional string nested_field = 2 [default = "beta"];
|
| + optional DeepNestedMessage deep_nested_message = 3;
|
|
|
| -package google.protobuf.internal;
|
| + message DeepNestedMessage {
|
| + enum NestedEnum {
|
| + ETA = 7;
|
| + THETA = 8;
|
| + }
|
| + optional NestedEnum nested_enum = 1 [default = ETA];
|
| + optional string nested_field = 2 [default = "theta"];
|
| + }
|
| + }
|
|
|
| -message DynamicMessageType {
|
| - optional int32 a = 1;
|
| + optional NestedMessage nested_message = 2;
|
| }
|
|
|
| -extend ExtendedMessage {
|
| - optional int32 dynamic_int32_extension = 100;
|
| - optional DynamicMessageType dynamic_message_extension = 101;
|
| +message DescriptorPoolTest2 {
|
| + enum NestedEnum {
|
| + GAMMA = 3;
|
| + DELTA = 4;
|
| + }
|
| +
|
| + optional NestedEnum nested_enum = 1 [default = GAMMA];
|
| +
|
| + message NestedMessage {
|
| + enum NestedEnum {
|
| + IOTA = 9;
|
| + KAPPA = 10;
|
| + }
|
| + optional NestedEnum nested_enum = 1 [default = IOTA];
|
| + optional string nested_field = 2 [default = "delta"];
|
| + optional DeepNestedMessage deep_nested_message = 3;
|
| +
|
| + message DeepNestedMessage {
|
| + enum NestedEnum {
|
| + LAMBDA = 11;
|
| + MU = 12;
|
| + }
|
| + optional NestedEnum nested_enum = 1 [default = MU];
|
| + optional string nested_field = 2 [default = "lambda"];
|
| + }
|
| + }
|
| +
|
| + optional NestedMessage nested_message = 2;
|
| }
|
|
|