Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: third_party/protobuf/python/google/protobuf/internal/factory_test2.proto

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update sync unittest and README.chromium Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // http://code.google.com/p/protobuf/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
11 // * Redistributions in binary form must reproduce the above 11 // * Redistributions in binary form must reproduce the above
12 // copyright notice, this list of conditions and the following disclaimer 12 // copyright notice, this list of conditions and the following disclaimer
13 // in the documentation and/or other materials provided with the 13 // in the documentation and/or other materials provided with the
14 // distribution. 14 // distribution.
15 // * Neither the name of Google Inc. nor the names of its 15 // * Neither the name of Google Inc. nor the names of its
16 // contributors may be used to endorse or promote products derived from 16 // contributors may be used to endorse or promote products derived from
17 // this software without specific prior written permission. 17 // this software without specific prior written permission.
18 // 18 //
19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 30
31 // Author: matthewtoia@google.com (Matt Toia) 31 // Author: matthewtoia@google.com (Matt Toia)
32 32
33 syntax = "proto2";
33 34
34 package google.protobuf.python.internal; 35 package google.protobuf.python.internal;
35 36
36 import "google/protobuf/internal/factory_test1.proto"; 37 import "google/protobuf/internal/factory_test1.proto";
37 38
38 39
39 enum Factory2Enum { 40 enum Factory2Enum {
40 FACTORY_2_VALUE_0 = 0; 41 FACTORY_2_VALUE_0 = 0;
41 FACTORY_2_VALUE_1 = 1; 42 FACTORY_2_VALUE_1 = 1;
42 } 43 }
(...skipping 20 matching lines...) Expand all
63 repeated group Grouped = 12 { 64 repeated group Grouped = 12 {
64 optional string part_1 = 13; 65 optional string part_1 = 13;
65 optional string part_2 = 14; 66 optional string part_2 = 14;
66 } 67 }
67 optional LoopMessage loop = 15; 68 optional LoopMessage loop = 15;
68 optional int32 int_with_default = 16 [default = 1776]; 69 optional int32 int_with_default = 16 [default = 1776];
69 optional double double_with_default = 17 [default = 9.99]; 70 optional double double_with_default = 17 [default = 9.99];
70 optional string string_with_default = 18 [default = "hello world"]; 71 optional string string_with_default = 18 [default = "hello world"];
71 optional bool bool_with_default = 19 [default = false]; 72 optional bool bool_with_default = 19 [default = false];
72 optional Factory2Enum enum_with_default = 20 [default = FACTORY_2_VALUE_1]; 73 optional Factory2Enum enum_with_default = 20 [default = FACTORY_2_VALUE_1];
74 optional bytes bytes_with_default = 21 [default = "a\373\000c"];
75
76
77 extend Factory1Message {
78 optional string one_more_field = 1001;
79 }
80
81 oneof oneof_field {
82 int32 oneof_int = 22;
83 string oneof_string = 23;
84 }
73 } 85 }
74 86
75 message LoopMessage { 87 message LoopMessage {
76 optional Factory2Message loop = 1; 88 optional Factory2Message loop = 1;
77 } 89 }
90
91 message MessageWithNestedEnumOnly {
92 enum NestedEnum {
93 NESTED_MESSAGE_ENUM_0 = 0;
94 }
95 }
96
97 extend Factory1Message {
98 optional string another_field = 1002;
99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698