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

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

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 6 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
« no previous file with comments | « third_party/protobuf/js/proto3_test.js ('k') | third_party/protobuf/m4/acx_check_suncc.m4 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 message Nested { 93 message Nested {
94 required int32 an_int = 2; 94 required int32 an_int = 2;
95 } 95 }
96 required string a_string = 1; 96 required string a_string = 1;
97 required bool an_out_of_order_bool = 9; 97 required bool an_out_of_order_bool = 9;
98 optional Nested a_nested_message = 4; 98 optional Nested a_nested_message = 4;
99 repeated Nested a_repeated_message = 5; 99 repeated Nested a_repeated_message = 5;
100 repeated string a_repeated_string = 7; 100 repeated string a_repeated_string = 7;
101 } 101 }
102 102
103 message OuterMessage {
104 // Make sure this doesn't conflict with the other Complex message.
105 message Complex {
106 optional int32 inner_complex_field = 1;
107 }
108 }
109
103 message IsExtension { 110 message IsExtension {
104 extend HasExtensions { 111 extend HasExtensions {
105 optional IsExtension ext_field = 100; 112 optional IsExtension ext_field = 100;
106 } 113 }
107 optional string ext1 = 1; 114 optional string ext1 = 1;
108 115
109 // Extensions of proto2 Descriptor messages will be ignored. 116 // Extensions of proto2 Descriptor messages will be ignored.
110 extend google.protobuf.EnumOptions { 117 extend google.protobuf.EnumOptions {
111 optional string simple_option = 42113038; 118 optional string simple_option = 42113038;
112 } 119 }
(...skipping 18 matching lines...) Expand all
131 E2 = 77; 138 E2 = 77;
132 } 139 }
133 optional string string_field = 1 [default="default<>\'\"abc"]; 140 optional string string_field = 1 [default="default<>\'\"abc"];
134 optional bool bool_field = 2 [default=true]; 141 optional bool bool_field = 2 [default=true];
135 optional int64 int_field = 3 [default=11]; 142 optional int64 int_field = 3 [default=11];
136 optional Enum enum_field = 4 [default=E1]; 143 optional Enum enum_field = 4 [default=E1];
137 optional string empty_field = 6 [default=""]; 144 optional string empty_field = 6 [default=""];
138 optional bytes bytes_field = 8 [default="moo"]; // Base64 encoding is "bW9v" 145 optional bytes bytes_field = 8 [default="moo"]; // Base64 encoding is "bW9v"
139 } 146 }
140 147
148 message FloatingPointFields {
149 optional float optional_float_field = 1;
150 required float required_float_field = 2;
151 repeated float repeated_float_field = 3;
152 optional float default_float_field = 4 [default = 2.0];
153 optional double optional_double_field = 5;
154 required double required_double_field = 6;
155 repeated double repeated_double_field = 7;
156 optional double default_double_field = 8 [default = 2.0];
157 }
158
141 message TestClone { 159 message TestClone {
142 optional string str = 1; 160 optional string str = 1;
143 optional Simple1 simple1 = 3; 161 optional Simple1 simple1 = 3;
144 repeated Simple1 simple2 = 5; 162 repeated Simple1 simple2 = 5;
145 optional string unused = 7; 163 optional string unused = 7;
146 extensions 10 to max; 164 extensions 10 to max;
147 } 165 }
148 166
149 message CloneExtension { 167 message CloneExtension {
150 extend TestClone { 168 extend TestClone {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 int32 aone = 10 [default = 1234]; 221 int32 aone = 10 [default = 1234];
204 int32 atwo = 11; 222 int32 atwo = 11;
205 } 223 }
206 224
207 oneof default_oneof_b { 225 oneof default_oneof_b {
208 int32 bone = 12; 226 int32 bone = 12;
209 int32 btwo = 13 [default = 1234]; 227 int32 btwo = 13 [default = 1234];
210 } 228 }
211 } 229 }
212 230
OLDNEW
« no previous file with comments | « third_party/protobuf/js/proto3_test.js ('k') | third_party/protobuf/m4/acx_check_suncc.m4 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698