diff options
author | Jon Skeet <skeet@pobox.com> | 2015-06-28 21:53:16 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-06-28 21:53:16 +0100 |
commit | b08b6bf62e5f0398609cc95a34699df500ea110c (patch) | |
tree | 430514e0a7f98dd195d720e2a90a9f3183808fb7 /csharp/protos | |
parent | 6b01539dfc1b4d4cefadc4cfdc79ff17293b84be (diff) | |
parent | fb77cc9d9f066a8ce4f12e8d5f76188d48101444 (diff) | |
download | protobuf-b08b6bf62e5f0398609cc95a34699df500ea110c.tar.gz protobuf-b08b6bf62e5f0398609cc95a34699df500ea110c.tar.bz2 protobuf-b08b6bf62e5f0398609cc95a34699df500ea110c.zip |
Merge pull request #544 from jskeet/csharp-cleanup
Clean up C# code
Diffstat (limited to 'csharp/protos')
-rw-r--r-- | csharp/protos/extest/unittest_extras_full.proto | 71 | ||||
-rw-r--r-- | csharp/protos/extest/unittest_extras_lite.proto | 115 | ||||
-rw-r--r-- | csharp/protos/extest/unittest_extras_xmltest.proto | 53 |
3 files changed, 0 insertions, 239 deletions
diff --git a/csharp/protos/extest/unittest_extras_full.proto b/csharp/protos/extest/unittest_extras_full.proto deleted file mode 100644 index 1b546053..00000000 --- a/csharp/protos/extest/unittest_extras_full.proto +++ /dev/null @@ -1,71 +0,0 @@ -syntax = "proto2"; - -package protobuf_unittest_extra; - -option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; -option optimize_for = CODE_SIZE; -option java_package = "com.google.protobuf"; - -message TestInteropPerson { - required string name = 1; - required int32 id = 2; - optional string email = 3; - repeated int32 codes = 10 [packed=true]; - - enum PhoneType { - MOBILE = 0; - HOME = 1; - WORK = 2; - } - - message PhoneNumber { - required string number = 1; - optional PhoneType type = 2 [default = HOME]; - } - - repeated PhoneNumber phone = 4; - - repeated group Addresses = 5 { - required string address = 1; - optional string address2 = 2; - required string city = 3; - required string state = 4; - required fixed32 zip = 5; - } - - extensions 100 to 199; -} - -message TestInteropEmployeeId { - required string number = 1; -} - -extend TestInteropPerson { - // Note: changed from required to optional, as required fields are not - // permitted in extensions. (The fact that this was allowed in protogen - // before was almost certainly a bug.) - optional TestInteropEmployeeId employee_id = 126; -} - -message TestMissingFieldsA { - required string name = 1; - required int32 id = 2; - optional string email = 3; - - message SubA { - required int32 count = 5; - repeated string values = 6; - } - optional SubA testA = 11; -} - -message TestMissingFieldsB { - required string name = 1; - required int32 id = 2; - optional string website = 4; - - message SubB { - repeated string values = 7; - } - optional SubB testB = 12; -} diff --git a/csharp/protos/extest/unittest_extras_lite.proto b/csharp/protos/extest/unittest_extras_lite.proto deleted file mode 100644 index 0c242d2f..00000000 --- a/csharp/protos/extest/unittest_extras_lite.proto +++ /dev/null @@ -1,115 +0,0 @@ -syntax = "proto2";
-
-package protobuf_unittest_extra;
-
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-option optimize_for = LITE_RUNTIME;
-option java_package = "com.google.protobuf";
-
-message TestRequiredLite {
- required int32 d = 1;
- required ExtraEnum en = 2 [default = DEFAULT];
-}
-
-enum ExtraEnum {
- DEFAULT = 10;
- EXLITE_FOO = 7;
- EXLITE_BAR = 8;
- EXLITE_BAZ = 9;
-}
-
-message TestInteropPersonLite {
- required string name = 1;
- required int32 id = 2;
- optional string email = 3;
- repeated int32 codes = 10 [packed=true];
-
- enum PhoneType {
- MOBILE = 0;
- HOME = 1;
- WORK = 2;
- }
-
- message PhoneNumber {
- required string number = 1;
- optional PhoneType type = 2 [default = HOME];
- }
-
- repeated PhoneNumber phone = 4;
-
- repeated group Addresses = 5 {
- required string address = 1;
- optional string address2 = 2;
- required string city = 3;
- required string state = 4;
- required fixed32 zip = 5;
- }
-
- extensions 100 to 199;
-}
-
-message TestInteropEmployeeIdLite {
- required string number = 1;
-}
-
-extend TestInteropPersonLite {
- // Note: changed from required to optional, as required fields are not
- // permitted in extensions. (The fact that this was allowed in protogen
- // before was almost certainly a bug.)
- optional TestInteropEmployeeIdLite employee_id_lite = 126;
-}
-
-/* Removed from unittest_lite.proto and added back here */
-
-message TestUnpackedExtensionsLite {
- extensions 1 to max;
-}
-
-message TestUnpackedTypesLite {
- repeated int32 unpacked_int32 = 90;
- repeated int64 unpacked_int64 = 91;
- repeated uint32 unpacked_uint32 = 92;
- repeated uint64 unpacked_uint64 = 93;
- repeated sint32 unpacked_sint32 = 94;
- repeated sint64 unpacked_sint64 = 95;
- repeated fixed32 unpacked_fixed32 = 96;
- repeated fixed64 unpacked_fixed64 = 97;
- repeated sfixed32 unpacked_sfixed32 = 98;
- repeated sfixed64 unpacked_sfixed64 = 99;
- repeated float unpacked_float = 100;
- repeated double unpacked_double = 101;
- repeated bool unpacked_bool = 102;
- repeated UnpackedTypesForeignEnumLite unpacked_enum = 103;
-}
-
-extend TestUnpackedExtensionsLite {
- repeated int32 unpacked_int32_extension_lite = 90;
- repeated int64 unpacked_int64_extension_lite = 91;
- repeated uint32 unpacked_uint32_extension_lite = 92;
- repeated uint64 unpacked_uint64_extension_lite = 93;
- repeated sint32 unpacked_sint32_extension_lite = 94;
- repeated sint64 unpacked_sint64_extension_lite = 95;
- repeated fixed32 unpacked_fixed32_extension_lite = 96;
- repeated fixed64 unpacked_fixed64_extension_lite = 97;
- repeated sfixed32 unpacked_sfixed32_extension_lite = 98;
- repeated sfixed64 unpacked_sfixed64_extension_lite = 99;
- repeated float unpacked_float_extension_lite = 100;
- repeated double unpacked_double_extension_lite = 101;
- repeated bool unpacked_bool_extension_lite = 102;
- repeated UnpackedTypesForeignEnumLite unpacked_enum_extension_lite = 103;
-}
-
-enum UnpackedTypesForeignEnumLite {
- FOREIGN_LITE_FOO = 4;
- FOREIGN_LITE_BAR = 5;
- FOREIGN_LITE_BAZ = 6;
-}
-
-message BucketOfBytes {
- optional bytes value = 1;
-
-}
-message BucketOfBytesEx {
- optional bytes value = 1;
- optional bytes value2 = 255;
-}
\ No newline at end of file diff --git a/csharp/protos/extest/unittest_extras_xmltest.proto b/csharp/protos/extest/unittest_extras_xmltest.proto deleted file mode 100644 index fae36165..00000000 --- a/csharp/protos/extest/unittest_extras_xmltest.proto +++ /dev/null @@ -1,53 +0,0 @@ -syntax = "proto2";
-
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
-package protobuf_unittest_extra;
-
-option optimize_for = SPEED;
-
-enum EnumOptions {
- ONE = 0;
- TWO = 1;
- THREE = 2;
-}
-
-message TestXmlChild {
- repeated EnumOptions options = 3;
- optional bytes binary = 4;
-}
-
-message TestXmlNoFields {
-}
-
-message TestXmlRescursive {
- optional TestXmlRescursive child = 1;
-}
-
-message TestXmlMessage {
-
- optional int64 number = 6;
- repeated int32 numbers = 2;
- optional string text = 3;
- repeated string textlines = 700;
- optional bool valid = 5;
-
- optional TestXmlChild child = 1;
- repeated group Children = 401 {
- repeated EnumOptions options = 3;
- optional bytes binary = 4;
- }
-
-extensions 100 to 199;
-}
-
-message TestXmlExtension {
- required int32 number = 1;
-}
-
-extend TestXmlMessage {
- optional EnumOptions extension_enum = 101;
- optional string extension_text = 102;
- repeated int32 extension_number = 103 [packed = true];
- optional TestXmlExtension extension_message = 199;
-}
|