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

Side by Side Diff: third_party/protobuf/js/test.proto

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years 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 // https://developers.google.com/protocol-buffers/ 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.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 optional double optional_double_field = 5; 153 optional double optional_double_field = 5;
154 required double required_double_field = 6; 154 required double required_double_field = 6;
155 repeated double repeated_double_field = 7; 155 repeated double repeated_double_field = 7;
156 optional double default_double_field = 8 [default = 2.0]; 156 optional double default_double_field = 8 [default = 2.0];
157 } 157 }
158 158
159 message TestClone { 159 message TestClone {
160 optional string str = 1; 160 optional string str = 1;
161 optional Simple1 simple1 = 3; 161 optional Simple1 simple1 = 3;
162 repeated Simple1 simple2 = 5; 162 repeated Simple1 simple2 = 5;
163 optional bytes bytes_field = 6;
163 optional string unused = 7; 164 optional string unused = 7;
164 extensions 10 to max; 165 extensions 10 to max;
165 } 166 }
166 167
167 message CloneExtension { 168 message CloneExtension {
168 extend TestClone { 169 extend TestClone {
169 optional CloneExtension ext_field = 100; 170 optional CloneExtension ext_field = 100;
170 } 171 }
171 optional string ext = 2; 172 optional string ext = 2;
172 } 173 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 int32 aone = 10 [default = 1234]; 222 int32 aone = 10 [default = 1234];
222 int32 atwo = 11; 223 int32 atwo = 11;
223 } 224 }
224 225
225 oneof default_oneof_b { 226 oneof default_oneof_b {
226 int32 bone = 12; 227 int32 bone = 12;
227 int32 btwo = 13 [default = 1234]; 228 int32 btwo = 13 [default = 1234];
228 } 229 }
229 } 230 }
230 231
232 message TestEndsWithBytes {
233 optional int32 value = 1;
234 optional bytes data = 2;
235 }
236
237 message TestMapFieldsNoBinary {
238 map<string, string> map_string_string = 1;
239 map<string, int32> map_string_int32 = 2;
240 map<string, int64> map_string_int64 = 3;
241 map<string, bool> map_string_bool = 4;
242 map<string, double> map_string_double = 5;
243 map<string, MapValueEnumNoBinary> map_string_enum = 6;
244 map<string, MapValueMessageNoBinary> map_string_msg = 7;
245
246 map<int32, string> map_int32_string = 8;
247 map<int64, string> map_int64_string = 9;
248 map<bool, string> map_bool_string = 10;
249
250 optional TestMapFieldsNoBinary test_map_fields = 11;
251 map<string, TestMapFieldsNoBinary> map_string_testmapfields = 12;
252 }
253
254 enum MapValueEnumNoBinary {
255 MAP_VALUE_FOO_NOBINARY = 0;
256 MAP_VALUE_BAR_NOBINARY = 1;
257 MAP_VALUE_BAZ_NOBINARY = 2;
258 }
259
260 message MapValueMessageNoBinary {
261 optional int32 foo = 1;
262 }
263
264 message Deeply {
265 message Nested {
266 message Message {
267 optional int32 count = 1;
268 }
269 }
270 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698