From 123e534914df3dbdcd918ec4f8d79c47a3bf85e5 Mon Sep 17 00:00:00 2001 From: csharptest Date: Fri, 3 Jun 2011 14:15:21 -0500 Subject: Canged CodedInputStream.ReadTag to use boolean result with out params to support reading a field name rather than a field tag. --- src/ProtocolBuffers.Test/CodedInputStreamTest.cs | 28 +- .../TestProtos/UnitTestCSharpOptionsProtoFile.cs | 15 +- .../TestProtos/UnitTestCustomOptionsProtoFile.cs | 255 +++++---- .../UnitTestEmbedOptimizeForProtoFile.cs | 15 +- .../TestProtos/UnitTestGoogleSpeedProtoFile.cs | 75 +-- .../TestProtos/UnitTestImportLiteProtoFile.cs | 9 +- .../TestProtos/UnitTestImportProtoFile.cs | 15 +- .../TestProtos/UnitTestMessageSetProtoFile.cs | 90 ++-- .../UnitTestNoGenericServicesProtoFile.cs | 15 +- .../TestProtos/UnitTestProtoFile.cs | 600 ++++++++++++--------- .../TestProtos/UnitTestRpcInterop.cs | 60 ++- .../UnitTestXmlSerializerTestProtoFile.cs | 75 +-- src/ProtocolBuffers.Test/WireFormatTest.cs | 12 +- 13 files changed, 757 insertions(+), 507 deletions(-) (limited to 'src/ProtocolBuffers.Test') diff --git a/src/ProtocolBuffers.Test/CodedInputStreamTest.cs b/src/ProtocolBuffers.Test/CodedInputStreamTest.cs index 878febee..a49b1ed3 100644 --- a/src/ProtocolBuffers.Test/CodedInputStreamTest.cs +++ b/src/ProtocolBuffers.Test/CodedInputStreamTest.cs @@ -283,16 +283,16 @@ namespace Google.ProtocolBuffers CodedInputStream input2 = CodedInputStream.CreateInstance(rawBytes); UnknownFieldSet.Builder unknownFields = UnknownFieldSet.CreateBuilder(); - while (true) + uint tag; + string name; + while (input1.ReadTag(out tag, out name)) { - uint tag = input1.ReadTag(); - Assert.AreEqual(tag, input2.ReadTag()); - if (tag == 0) - { - break; - } + uint tag2; + Assert.IsTrue(input2.ReadTag(out tag2, out name)); + Assert.AreEqual(tag, tag2); + unknownFields.MergeFieldFrom(tag, input1); - input2.SkipField(tag); + input2.SkipField(); } } @@ -355,7 +355,10 @@ namespace Google.ProtocolBuffers ms.Position = 0; CodedInputStream input = CodedInputStream.CreateInstance(ms); - Assert.AreEqual(tag, input.ReadTag()); + uint testtag; + string ignore; + Assert.IsTrue(input.ReadTag(out testtag, out ignore)); + Assert.AreEqual(tag, testtag); try { @@ -497,7 +500,12 @@ namespace Google.ProtocolBuffers ms.Position = 0; CodedInputStream input = CodedInputStream.CreateInstance(ms); - Assert.AreEqual(tag, input.ReadTag()); + + uint testtag; + string ignored; + + Assert.IsTrue(input.ReadTag(out testtag, out ignored)); + Assert.AreEqual(tag, testtag); string text = input.ReadString(); Assert.AreEqual('\ufffd', text[0]); } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs index 9cc59a22..d769cecc 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs @@ -259,14 +259,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -295,6 +293,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs index 53a076e6..c300e209 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs @@ -576,14 +576,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -604,6 +602,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -779,14 +782,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -803,6 +804,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -959,14 +965,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -983,6 +987,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -1154,14 +1163,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1178,6 +1185,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -1334,14 +1346,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1358,6 +1368,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -1514,14 +1529,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1538,6 +1551,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -1694,14 +1712,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1718,6 +1734,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -1874,14 +1895,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1898,6 +1917,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -2054,14 +2078,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -2078,6 +2100,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -2234,14 +2261,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -2258,6 +2283,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -2476,14 +2506,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -2512,6 +2540,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -2773,14 +2806,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -2801,6 +2832,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -3018,14 +3054,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -3064,6 +3098,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -3359,14 +3398,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -3387,6 +3424,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -3577,14 +3619,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -3614,6 +3654,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -3843,14 +3888,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -3871,6 +3914,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -4045,14 +4093,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -4069,6 +4115,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs index 4d94af25..d6610f45 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs @@ -253,14 +253,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -292,6 +290,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs index 3eb853ce..b3bb9f71 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs @@ -1069,14 +1069,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1262,6 +1260,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -2579,14 +2582,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -2683,6 +2684,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -3570,14 +3576,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -3663,6 +3667,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -4736,14 +4745,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -4882,6 +4889,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -5838,14 +5850,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -5906,6 +5916,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs index 2002d8df..db26d728 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs @@ -207,11 +207,12 @@ namespace Google.ProtocolBuffers.TestProtos { } public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -226,6 +227,8 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs index b00ff2f8..309dfc66 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs @@ -232,14 +232,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -260,6 +258,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index c69ac9f9..89bf4597 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -250,14 +250,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -274,6 +272,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -449,14 +452,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -482,6 +483,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -695,14 +701,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -723,6 +727,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -918,14 +927,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -946,6 +953,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1191,14 +1203,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1223,6 +1233,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1416,14 +1431,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1446,6 +1459,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs index 423c3adc..994d5308 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs @@ -247,14 +247,12 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -275,6 +273,11 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs index a9a69f10..184fb682 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs @@ -1229,14 +1229,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1257,6 +1255,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1450,14 +1453,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1478,6 +1479,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1671,14 +1677,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1699,6 +1703,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -3323,14 +3332,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -3719,6 +3726,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -5482,14 +5494,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -5510,6 +5520,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -5703,14 +5718,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -5731,6 +5744,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -5910,14 +5928,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -5934,6 +5950,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -6109,14 +6130,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -6137,6 +6156,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -6330,14 +6354,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -6358,6 +6380,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -6534,14 +6561,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -6558,6 +6583,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -7348,14 +7378,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -7504,6 +7532,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -8320,14 +8353,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -8363,6 +8394,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -8630,14 +8666,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -8663,6 +8697,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -8855,14 +8894,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -8879,6 +8916,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -9040,14 +9082,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -9064,6 +9104,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -9227,14 +9272,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -9251,6 +9294,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -9445,14 +9493,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -9477,6 +9523,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -9707,14 +9758,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -9744,6 +9793,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -9973,14 +10027,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -10006,6 +10058,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -10236,14 +10293,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -10273,6 +10328,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -10532,14 +10592,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -10560,6 +10618,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -10753,14 +10816,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -10781,6 +10842,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -10990,14 +11056,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -11036,6 +11100,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -11361,14 +11430,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -11395,6 +11462,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -11612,14 +11684,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -11645,6 +11715,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -12110,14 +12185,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -12205,6 +12278,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -12727,14 +12805,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -12763,6 +12839,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -13337,14 +13418,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -13437,6 +13516,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -13960,14 +14044,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -13988,6 +14070,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -14182,14 +14269,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -14210,6 +14295,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -14814,14 +14904,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -14972,6 +15060,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -15886,14 +15979,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -15974,6 +16065,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -16519,14 +16615,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -16543,6 +16637,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -16756,14 +16855,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -16784,6 +16881,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -17090,14 +17192,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -17173,6 +17273,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -17673,14 +17778,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -17721,6 +17824,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -18048,14 +18156,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -18072,6 +18178,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -18228,14 +18339,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -18252,6 +18361,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -18408,14 +18522,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -18432,6 +18544,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -18588,14 +18705,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -18612,6 +18727,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs index 08ac8a68..3e9c35c0 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs @@ -252,14 +252,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -280,6 +278,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -533,14 +536,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -565,6 +566,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -762,14 +768,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -792,6 +796,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1034,14 +1043,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1071,6 +1078,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs index 2c383336..722a5ffa 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs @@ -320,14 +320,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -360,6 +358,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -561,14 +564,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -585,6 +586,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } } @@ -819,14 +825,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -859,6 +863,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1195,14 +1204,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1254,6 +1261,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } @@ -1613,14 +1625,12 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) { pb::UnknownFieldSet.Builder unknownFields = null; - while (true) { - uint tag = input.ReadTag(); + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { switch (tag) { case 0: { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; + throw InvalidProtocolBufferException.InvalidTag(); } default: { if (pb::WireFormat.IsEndGroupTag(tag)) { @@ -1641,6 +1651,11 @@ namespace Google.ProtocolBuffers.TestProtos { } } } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; } diff --git a/src/ProtocolBuffers.Test/WireFormatTest.cs b/src/ProtocolBuffers.Test/WireFormatTest.cs index f7ad864e..e390ce0d 100644 --- a/src/ProtocolBuffers.Test/WireFormatTest.cs +++ b/src/ProtocolBuffers.Test/WireFormatTest.cs @@ -173,17 +173,13 @@ namespace Google.ProtocolBuffers CodedInputStream input = data.CreateCodedInput(); uint previousTag = 0; - while (true) + uint tag; + string name; + while (input.ReadTag(out tag, out name)) { - uint tag = input.ReadTag(); - if (tag == 0) - { - break; - } - Assert.IsTrue(tag > previousTag); previousTag = tag; - input.SkipField(tag); + input.SkipField(); } } -- cgit v1.2.3