Commit 8729cf46 authored by Jon Skeet's avatar Jon Skeet

Added the ability to use an IEnumerable<T> when adding to a list, so you can do:

new Foo.Builder {
   RepeatedValue = { x.Select(y) }
};

... a bit like LINQ to XML.
parent d6dd0a45
...@@ -668,7 +668,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { ...@@ -668,7 +668,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber> PhoneList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber> PhoneList {
get { return result.phone_; } get { return result.phone_; }
} }
public int PhoneCount { public int PhoneCount {
...@@ -910,7 +910,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { ...@@ -910,7 +910,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
} }
public scg::IList<global::Google.ProtocolBuffers.Examples.AddressBook.Person> PersonList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.Examples.AddressBook.Person> PersonList {
get { return result.person_; } get { return result.person_; }
} }
public int PersonCount { public int PersonCount {
......
...@@ -29,7 +29,8 @@ namespace Google.ProtocolBuffers.ProtoGen { ...@@ -29,7 +29,8 @@ namespace Google.ProtocolBuffers.ProtoGen {
public void GenerateBuilderMembers(TextGenerator writer) { public void GenerateBuilderMembers(TextGenerator writer) {
// Note: We can return the original list here, because we make it unmodifiable when we build // Note: We can return the original list here, because we make it unmodifiable when we build
writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); // We return it via IPopsicleList so that collection initializers work more pleasantly.
writer.WriteLine("public pbc::IPopsicleList<{0}> {1}List {{", TypeName, PropertyName);
writer.WriteLine(" get {{ return result.{0}_; }}", Name); writer.WriteLine(" get {{ return result.{0}_; }}", Name);
writer.WriteLine("}"); writer.WriteLine("}");
writer.WriteLine("public int {0}Count {{", PropertyName); writer.WriteLine("public int {0}Count {{", PropertyName);
......
...@@ -28,7 +28,8 @@ namespace Google.ProtocolBuffers.ProtoGen { ...@@ -28,7 +28,8 @@ namespace Google.ProtocolBuffers.ProtoGen {
public void GenerateBuilderMembers(TextGenerator writer) { public void GenerateBuilderMembers(TextGenerator writer) {
// Note: We can return the original list here, because we make it unmodifiable when we build // Note: We can return the original list here, because we make it unmodifiable when we build
writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); // We return it via IPopsicleList so that collection initializers work more pleasantly.
writer.WriteLine("public pbc::IPopsicleList<{0}> {1}List {{", TypeName, PropertyName);
writer.WriteLine(" get {{ return result.{0}_; }}", Name); writer.WriteLine(" get {{ return result.{0}_; }}", Name);
writer.WriteLine("}"); writer.WriteLine("}");
writer.WriteLine("public int {0}Count {{", PropertyName); writer.WriteLine("public int {0}Count {{", PropertyName);
......
...@@ -34,8 +34,9 @@ namespace Google.ProtocolBuffers.ProtoGen { ...@@ -34,8 +34,9 @@ namespace Google.ProtocolBuffers.ProtoGen {
public void GenerateBuilderMembers(TextGenerator writer) { public void GenerateBuilderMembers(TextGenerator writer) {
// Note: We can return the original list here, because we make it unmodifiable when we build // Note: We can return the original list here, because we make it unmodifiable when we build
// We return it via IPopsicleList so that collection initializers work more pleasantly.
AddClsComplianceCheck(writer); AddClsComplianceCheck(writer);
writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine("public pbc::IPopsicleList<{0}> {1}List {{", TypeName, PropertyName);
writer.WriteLine(" get {{ return result.{0}_; }}", Name); writer.WriteLine(" get {{ return result.{0}_; }}", Name);
writer.WriteLine("}"); writer.WriteLine("}");
writer.WriteLine("public int {0}Count {{", PropertyName); writer.WriteLine("public int {0}Count {{", PropertyName);
......
...@@ -16,6 +16,7 @@ namespace Google.ProtocolBuffers.Collections { ...@@ -16,6 +16,7 @@ namespace Google.ProtocolBuffers.Collections {
AssertNotSupported(() => list.Insert(0, "")); AssertNotSupported(() => list.Insert(0, ""));
AssertNotSupported(() => list.Remove("")); AssertNotSupported(() => list.Remove(""));
AssertNotSupported(() => list.RemoveAt(0)); AssertNotSupported(() => list.RemoveAt(0));
AssertNotSupported(() => list.Add(new[] {"", ""}));
} }
[Test] [Test]
......
...@@ -34,6 +34,7 @@ using System.Collections.Generic; ...@@ -34,6 +34,7 @@ using System.Collections.Generic;
using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.Descriptors;
using Google.ProtocolBuffers.TestProtos; using Google.ProtocolBuffers.TestProtos;
using NUnit.Framework; using NUnit.Framework;
using Google.ProtocolBuffers.Collections;
namespace Google.ProtocolBuffers { namespace Google.ProtocolBuffers {
[TestFixture] [TestFixture]
...@@ -193,6 +194,22 @@ namespace Google.ProtocolBuffers { ...@@ -193,6 +194,22 @@ namespace Google.ProtocolBuffers {
Assert.AreEqual(expectedMessage, message); Assert.AreEqual(expectedMessage, message);
} }
[Test]
public void SettingRepeatedValuesUsingRangeInCollectionInitializer() {
int[] values = { 1, 2, 3 };
TestAllTypes message = new TestAllTypes.Builder {
RepeatedSint32List = { values }
}.Build();
Assert.IsTrue(Lists.Equals(values, message.RepeatedSint32List));
}
[Test]
public void SettingRepeatedValuesUsingIndividualValuesInCollectionInitializer() {
TestAllTypes message = new TestAllTypes.Builder {
RepeatedSint32List = { 6, 7 }
}.Build();
Assert.IsTrue(Lists.Equals(new int[] { 6, 7 }, message.RepeatedSint32List));
}
[Test] [Test]
public void Defaults() { public void Defaults() {
......
...@@ -321,7 +321,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -321,7 +321,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> RepeatedMessageList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> RepeatedMessageList {
get { return result.repeatedMessage_; } get { return result.repeatedMessage_; }
} }
public int RepeatedMessageCount { public int RepeatedMessageCount {
......
...@@ -1401,7 +1401,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -1401,7 +1401,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> ItemList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> ItemList {
get { return result.item_; } get { return result.item_; }
} }
public int ItemCount { public int ItemCount {
......
...@@ -4141,7 +4141,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4141,7 +4141,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<int> RepeatedInt32List { public pbc::IPopsicleList<int> RepeatedInt32List {
get { return result.repeatedInt32_; } get { return result.repeatedInt32_; }
} }
public int RepeatedInt32Count { public int RepeatedInt32Count {
...@@ -4167,7 +4167,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4167,7 +4167,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<long> RepeatedInt64List { public pbc::IPopsicleList<long> RepeatedInt64List {
get { return result.repeatedInt64_; } get { return result.repeatedInt64_; }
} }
public int RepeatedInt64Count { public int RepeatedInt64Count {
...@@ -4194,7 +4194,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4194,7 +4194,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<uint> RepeatedUint32List { public pbc::IPopsicleList<uint> RepeatedUint32List {
get { return result.repeatedUint32_; } get { return result.repeatedUint32_; }
} }
public int RepeatedUint32Count { public int RepeatedUint32Count {
...@@ -4225,7 +4225,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4225,7 +4225,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<ulong> RepeatedUint64List { public pbc::IPopsicleList<ulong> RepeatedUint64List {
get { return result.repeatedUint64_; } get { return result.repeatedUint64_; }
} }
public int RepeatedUint64Count { public int RepeatedUint64Count {
...@@ -4255,7 +4255,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4255,7 +4255,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<int> RepeatedSint32List { public pbc::IPopsicleList<int> RepeatedSint32List {
get { return result.repeatedSint32_; } get { return result.repeatedSint32_; }
} }
public int RepeatedSint32Count { public int RepeatedSint32Count {
...@@ -4281,7 +4281,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4281,7 +4281,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<long> RepeatedSint64List { public pbc::IPopsicleList<long> RepeatedSint64List {
get { return result.repeatedSint64_; } get { return result.repeatedSint64_; }
} }
public int RepeatedSint64Count { public int RepeatedSint64Count {
...@@ -4308,7 +4308,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4308,7 +4308,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<uint> RepeatedFixed32List { public pbc::IPopsicleList<uint> RepeatedFixed32List {
get { return result.repeatedFixed32_; } get { return result.repeatedFixed32_; }
} }
public int RepeatedFixed32Count { public int RepeatedFixed32Count {
...@@ -4339,7 +4339,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4339,7 +4339,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<ulong> RepeatedFixed64List { public pbc::IPopsicleList<ulong> RepeatedFixed64List {
get { return result.repeatedFixed64_; } get { return result.repeatedFixed64_; }
} }
public int RepeatedFixed64Count { public int RepeatedFixed64Count {
...@@ -4369,7 +4369,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4369,7 +4369,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<int> RepeatedSfixed32List { public pbc::IPopsicleList<int> RepeatedSfixed32List {
get { return result.repeatedSfixed32_; } get { return result.repeatedSfixed32_; }
} }
public int RepeatedSfixed32Count { public int RepeatedSfixed32Count {
...@@ -4395,7 +4395,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4395,7 +4395,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<long> RepeatedSfixed64List { public pbc::IPopsicleList<long> RepeatedSfixed64List {
get { return result.repeatedSfixed64_; } get { return result.repeatedSfixed64_; }
} }
public int RepeatedSfixed64Count { public int RepeatedSfixed64Count {
...@@ -4421,7 +4421,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4421,7 +4421,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<float> RepeatedFloatList { public pbc::IPopsicleList<float> RepeatedFloatList {
get { return result.repeatedFloat_; } get { return result.repeatedFloat_; }
} }
public int RepeatedFloatCount { public int RepeatedFloatCount {
...@@ -4447,7 +4447,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4447,7 +4447,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<double> RepeatedDoubleList { public pbc::IPopsicleList<double> RepeatedDoubleList {
get { return result.repeatedDouble_; } get { return result.repeatedDouble_; }
} }
public int RepeatedDoubleCount { public int RepeatedDoubleCount {
...@@ -4473,7 +4473,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4473,7 +4473,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<bool> RepeatedBoolList { public pbc::IPopsicleList<bool> RepeatedBoolList {
get { return result.repeatedBool_; } get { return result.repeatedBool_; }
} }
public int RepeatedBoolCount { public int RepeatedBoolCount {
...@@ -4499,7 +4499,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4499,7 +4499,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<string> RepeatedStringList { public pbc::IPopsicleList<string> RepeatedStringList {
get { return result.repeatedString_; } get { return result.repeatedString_; }
} }
public int RepeatedStringCount { public int RepeatedStringCount {
...@@ -4527,7 +4527,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4527,7 +4527,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<pb::ByteString> RepeatedBytesList { public pbc::IPopsicleList<pb::ByteString> RepeatedBytesList {
get { return result.repeatedBytes_; } get { return result.repeatedBytes_; }
} }
public int RepeatedBytesCount { public int RepeatedBytesCount {
...@@ -4555,7 +4555,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4555,7 +4555,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup> RepeatedGroupList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup> RepeatedGroupList {
get { return result.repeatedGroup_; } get { return result.repeatedGroup_; }
} }
public int RepeatedGroupCount { public int RepeatedGroupCount {
...@@ -4593,7 +4593,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4593,7 +4593,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessageList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessageList {
get { return result.repeatedNestedMessage_; } get { return result.repeatedNestedMessage_; }
} }
public int RepeatedNestedMessageCount { public int RepeatedNestedMessageCount {
...@@ -4631,7 +4631,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4631,7 +4631,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedForeignMessageList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedForeignMessageList {
get { return result.repeatedForeignMessage_; } get { return result.repeatedForeignMessage_; }
} }
public int RepeatedForeignMessageCount { public int RepeatedForeignMessageCount {
...@@ -4669,7 +4669,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4669,7 +4669,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> RepeatedImportMessageList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> RepeatedImportMessageList {
get { return result.repeatedImportMessage_; } get { return result.repeatedImportMessage_; }
} }
public int RepeatedImportMessageCount { public int RepeatedImportMessageCount {
...@@ -4707,7 +4707,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4707,7 +4707,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnumList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnumList {
get { return result.repeatedNestedEnum_; } get { return result.repeatedNestedEnum_; }
} }
public int RepeatedNestedEnumCount { public int RepeatedNestedEnumCount {
...@@ -4733,7 +4733,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4733,7 +4733,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedForeignEnumList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedForeignEnumList {
get { return result.repeatedForeignEnum_; } get { return result.repeatedForeignEnum_; }
} }
public int RepeatedForeignEnumCount { public int RepeatedForeignEnumCount {
...@@ -4759,7 +4759,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4759,7 +4759,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> RepeatedImportEnumList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> RepeatedImportEnumList {
get { return result.repeatedImportEnum_; } get { return result.repeatedImportEnum_; }
} }
public int RepeatedImportEnumCount { public int RepeatedImportEnumCount {
...@@ -4785,7 +4785,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4785,7 +4785,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<string> RepeatedStringPieceList { public pbc::IPopsicleList<string> RepeatedStringPieceList {
get { return result.repeatedStringPiece_; } get { return result.repeatedStringPiece_; }
} }
public int RepeatedStringPieceCount { public int RepeatedStringPieceCount {
...@@ -4813,7 +4813,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -4813,7 +4813,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<string> RepeatedCordList { public pbc::IPopsicleList<string> RepeatedCordList {
get { return result.repeatedCord_; } get { return result.repeatedCord_; }
} }
public int RepeatedCordCount { public int RepeatedCordCount {
...@@ -7860,7 +7860,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -7860,7 +7860,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestRequired> RepeatedMessageList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestRequired> RepeatedMessageList {
get { return result.repeatedMessage_; } get { return result.repeatedMessage_; }
} }
public int RepeatedMessageCount { public int RepeatedMessageCount {
...@@ -10585,7 +10585,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -10585,7 +10585,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
public scg::IList<int> NestedmessageRepeatedInt32List { public pbc::IPopsicleList<int> NestedmessageRepeatedInt32List {
get { return result.nestedmessageRepeatedInt32_; } get { return result.nestedmessageRepeatedInt32_; }
} }
public int NestedmessageRepeatedInt32Count { public int NestedmessageRepeatedInt32Count {
...@@ -10611,7 +10611,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -10611,7 +10611,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> NestedmessageRepeatedForeignmessageList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> NestedmessageRepeatedForeignmessageList {
get { return result.nestedmessageRepeatedForeignmessage_; } get { return result.nestedmessageRepeatedForeignmessage_; }
} }
public int NestedmessageRepeatedForeignmessageCount { public int NestedmessageRepeatedForeignmessageCount {
...@@ -11523,7 +11523,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -11523,7 +11523,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<int> RepeatedPrimitiveFieldList { public pbc::IPopsicleList<int> RepeatedPrimitiveFieldList {
get { return result.repeatedPrimitiveField_; } get { return result.repeatedPrimitiveField_; }
} }
public int RepeatedPrimitiveFieldCount { public int RepeatedPrimitiveFieldCount {
...@@ -11549,7 +11549,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -11549,7 +11549,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<string> RepeatedStringFieldList { public pbc::IPopsicleList<string> RepeatedStringFieldList {
get { return result.repeatedStringField_; } get { return result.repeatedStringField_; }
} }
public int RepeatedStringFieldCount { public int RepeatedStringFieldCount {
...@@ -11577,7 +11577,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -11577,7 +11577,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedEnumFieldList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedEnumFieldList {
get { return result.repeatedEnumField_; } get { return result.repeatedEnumField_; }
} }
public int RepeatedEnumFieldCount { public int RepeatedEnumFieldCount {
...@@ -11603,7 +11603,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -11603,7 +11603,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedMessageFieldList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedMessageFieldList {
get { return result.repeatedMessageField_; } get { return result.repeatedMessageField_; }
} }
public int RepeatedMessageFieldCount { public int RepeatedMessageFieldCount {
...@@ -11641,7 +11641,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -11641,7 +11641,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<string> RepeatedStringPieceFieldList { public pbc::IPopsicleList<string> RepeatedStringPieceFieldList {
get { return result.repeatedStringPieceField_; } get { return result.repeatedStringPieceField_; }
} }
public int RepeatedStringPieceFieldCount { public int RepeatedStringPieceFieldCount {
...@@ -11669,7 +11669,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -11669,7 +11669,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<string> RepeatedCordFieldList { public pbc::IPopsicleList<string> RepeatedCordFieldList {
get { return result.repeatedCordField_; } get { return result.repeatedCordField_; }
} }
public int RepeatedCordFieldCount { public int RepeatedCordFieldCount {
...@@ -13206,7 +13206,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13206,7 +13206,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
public scg::IList<int> PackedInt32List { public pbc::IPopsicleList<int> PackedInt32List {
get { return result.packedInt32_; } get { return result.packedInt32_; }
} }
public int PackedInt32Count { public int PackedInt32Count {
...@@ -13232,7 +13232,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13232,7 +13232,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<long> PackedInt64List { public pbc::IPopsicleList<long> PackedInt64List {
get { return result.packedInt64_; } get { return result.packedInt64_; }
} }
public int PackedInt64Count { public int PackedInt64Count {
...@@ -13259,7 +13259,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13259,7 +13259,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<uint> PackedUint32List { public pbc::IPopsicleList<uint> PackedUint32List {
get { return result.packedUint32_; } get { return result.packedUint32_; }
} }
public int PackedUint32Count { public int PackedUint32Count {
...@@ -13290,7 +13290,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13290,7 +13290,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<ulong> PackedUint64List { public pbc::IPopsicleList<ulong> PackedUint64List {
get { return result.packedUint64_; } get { return result.packedUint64_; }
} }
public int PackedUint64Count { public int PackedUint64Count {
...@@ -13320,7 +13320,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13320,7 +13320,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<int> PackedSint32List { public pbc::IPopsicleList<int> PackedSint32List {
get { return result.packedSint32_; } get { return result.packedSint32_; }
} }
public int PackedSint32Count { public int PackedSint32Count {
...@@ -13346,7 +13346,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13346,7 +13346,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<long> PackedSint64List { public pbc::IPopsicleList<long> PackedSint64List {
get { return result.packedSint64_; } get { return result.packedSint64_; }
} }
public int PackedSint64Count { public int PackedSint64Count {
...@@ -13373,7 +13373,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13373,7 +13373,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<uint> PackedFixed32List { public pbc::IPopsicleList<uint> PackedFixed32List {
get { return result.packedFixed32_; } get { return result.packedFixed32_; }
} }
public int PackedFixed32Count { public int PackedFixed32Count {
...@@ -13404,7 +13404,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13404,7 +13404,7 @@ namespace Google.ProtocolBuffers.TestProtos {
} }
[global::System.CLSCompliant(false)] [global::System.CLSCompliant(false)]
public scg::IList<ulong> PackedFixed64List { public pbc::IPopsicleList<ulong> PackedFixed64List {
get { return result.packedFixed64_; } get { return result.packedFixed64_; }
} }
public int PackedFixed64Count { public int PackedFixed64Count {
...@@ -13434,7 +13434,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13434,7 +13434,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<int> PackedSfixed32List { public pbc::IPopsicleList<int> PackedSfixed32List {
get { return result.packedSfixed32_; } get { return result.packedSfixed32_; }
} }
public int PackedSfixed32Count { public int PackedSfixed32Count {
...@@ -13460,7 +13460,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13460,7 +13460,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<long> PackedSfixed64List { public pbc::IPopsicleList<long> PackedSfixed64List {
get { return result.packedSfixed64_; } get { return result.packedSfixed64_; }
} }
public int PackedSfixed64Count { public int PackedSfixed64Count {
...@@ -13486,7 +13486,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13486,7 +13486,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<float> PackedFloatList { public pbc::IPopsicleList<float> PackedFloatList {
get { return result.packedFloat_; } get { return result.packedFloat_; }
} }
public int PackedFloatCount { public int PackedFloatCount {
...@@ -13512,7 +13512,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13512,7 +13512,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<double> PackedDoubleList { public pbc::IPopsicleList<double> PackedDoubleList {
get { return result.packedDouble_; } get { return result.packedDouble_; }
} }
public int PackedDoubleCount { public int PackedDoubleCount {
...@@ -13538,7 +13538,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13538,7 +13538,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<bool> PackedBoolList { public pbc::IPopsicleList<bool> PackedBoolList {
get { return result.packedBool_; } get { return result.packedBool_; }
} }
public int PackedBoolCount { public int PackedBoolCount {
...@@ -13564,7 +13564,7 @@ namespace Google.ProtocolBuffers.TestProtos { ...@@ -13564,7 +13564,7 @@ namespace Google.ProtocolBuffers.TestProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> PackedEnumList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> PackedEnumList {
get { return result.packedEnum_; } get { return result.packedEnum_; }
} }
public int PackedEnumCount { public int PackedEnumCount {
......
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// http://github.com/jskeet/dotnet-protobufs/
// Original C++/Java/Python code:
// http://code.google.com/p/protobuf/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System.Collections.Generic;
namespace Google.ProtocolBuffers.Collections {
/// <summary>
/// A list which has an Add method which accepts an IEnumerable[T].
/// This allows whole collections to be added easily using collection initializers.
/// It causes a potential overload confusion if T : IEnumerable[T], but in
/// practice that won't happen in protocol buffers.
/// </summary>
/// <remarks>This is only currently implemented by PopsicleList, and it's likely
/// to stay that way - hence the name. More genuinely descriptive names are
/// horribly ugly. (At least, the ones the author could think of...)</remarks>
/// <typeparam name="T">The element type of the list</typeparam>
public interface IPopsicleList<T> : IList<T> {
void Add(IEnumerable<T> collection);
}
}
...@@ -39,7 +39,7 @@ namespace Google.ProtocolBuffers.Collections { ...@@ -39,7 +39,7 @@ namespace Google.ProtocolBuffers.Collections {
/// to be made read-only (with the <see cref="MakeReadOnly" /> method), /// to be made read-only (with the <see cref="MakeReadOnly" /> method),
/// after which any modifying methods throw <see cref="NotSupportedException" />. /// after which any modifying methods throw <see cref="NotSupportedException" />.
/// </summary> /// </summary>
public sealed class PopsicleList<T> : IList<T> { public sealed class PopsicleList<T> : IPopsicleList<T> {
private readonly List<T> items = new List<T>(); private readonly List<T> items = new List<T>();
private bool readOnly = false; private bool readOnly = false;
...@@ -108,6 +108,13 @@ namespace Google.ProtocolBuffers.Collections { ...@@ -108,6 +108,13 @@ namespace Google.ProtocolBuffers.Collections {
return items.Remove(item); return items.Remove(item);
} }
public void Add(IEnumerable<T> collection) {
if (readOnly) {
throw new NotSupportedException("List is read-only");
}
items.AddRange(collection);
}
public IEnumerator<T> GetEnumerator() { public IEnumerator<T> GetEnumerator() {
return items.GetEnumerator(); return items.GetEnumerator();
} }
......
...@@ -419,7 +419,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -419,7 +419,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto> FileList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto> FileList {
get { return result.file_; } get { return result.file_; }
} }
public int FileCount { public int FileCount {
...@@ -902,7 +902,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -902,7 +902,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<string> DependencyList { public pbc::IPopsicleList<string> DependencyList {
get { return result.dependency_; } get { return result.dependency_; }
} }
public int DependencyCount { public int DependencyCount {
...@@ -930,7 +930,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -930,7 +930,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> MessageTypeList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> MessageTypeList {
get { return result.messageType_; } get { return result.messageType_; }
} }
public int MessageTypeCount { public int MessageTypeCount {
...@@ -968,7 +968,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -968,7 +968,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
get { return result.enumType_; } get { return result.enumType_; }
} }
public int EnumTypeCount { public int EnumTypeCount {
...@@ -1006,7 +1006,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1006,7 +1006,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> ServiceList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> ServiceList {
get { return result.service_; } get { return result.service_; }
} }
public int ServiceCount { public int ServiceCount {
...@@ -1044,7 +1044,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1044,7 +1044,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
get { return result.extension_; } get { return result.extension_; }
} }
public int ExtensionCount { public int ExtensionCount {
...@@ -1776,7 +1776,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1776,7 +1776,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> FieldList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> FieldList {
get { return result.field_; } get { return result.field_; }
} }
public int FieldCount { public int FieldCount {
...@@ -1814,7 +1814,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1814,7 +1814,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
get { return result.extension_; } get { return result.extension_; }
} }
public int ExtensionCount { public int ExtensionCount {
...@@ -1852,7 +1852,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1852,7 +1852,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> NestedTypeList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> NestedTypeList {
get { return result.nestedType_; } get { return result.nestedType_; }
} }
public int NestedTypeCount { public int NestedTypeCount {
...@@ -1890,7 +1890,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1890,7 +1890,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
get { return result.enumType_; } get { return result.enumType_; }
} }
public int EnumTypeCount { public int EnumTypeCount {
...@@ -1928,7 +1928,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -1928,7 +1928,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange> ExtensionRangeList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange> ExtensionRangeList {
get { return result.extensionRange_; } get { return result.extensionRange_; }
} }
public int ExtensionRangeCount { public int ExtensionRangeCount {
...@@ -2858,7 +2858,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -2858,7 +2858,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> ValueList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> ValueList {
get { return result.value_; } get { return result.value_; }
} }
public int ValueCount { public int ValueCount {
...@@ -3532,7 +3532,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -3532,7 +3532,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> MethodList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> MethodList {
get { return result.method_; } get { return result.method_; }
} }
public int MethodCount { public int MethodCount {
...@@ -4365,7 +4365,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -4365,7 +4365,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -4653,7 +4653,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -4653,7 +4653,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -5083,7 +5083,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -5083,7 +5083,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
return this; return this;
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -5330,7 +5330,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -5330,7 +5330,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -5577,7 +5577,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -5577,7 +5577,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -5824,7 +5824,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -5824,7 +5824,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -6071,7 +6071,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -6071,7 +6071,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
get { return result.uninterpretedOption_; } get { return result.uninterpretedOption_; }
} }
public int UninterpretedOptionCount { public int UninterpretedOptionCount {
...@@ -6692,7 +6692,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { ...@@ -6692,7 +6692,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
} }
public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption.Types.NamePart> NameList { public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption.Types.NamePart> NameList {
get { return result.name_; } get { return result.name_; }
} }
public int NameCount { public int NameCount {
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<Compile Include="AbstractMessage.cs" /> <Compile Include="AbstractMessage.cs" />
<Compile Include="ByteString.cs" /> <Compile Include="ByteString.cs" />
<Compile Include="Collections\Enumerables.cs" /> <Compile Include="Collections\Enumerables.cs" />
<Compile Include="Collections\IPopsicleList.cs" />
<Compile Include="Collections\PopsicleList.cs" /> <Compile Include="Collections\PopsicleList.cs" />
<Compile Include="Delegates.cs" /> <Compile Include="Delegates.cs" />
<Compile Include="CodedInputStream.cs" /> <Compile Include="CodedInputStream.cs" />
......
...@@ -11,6 +11,5 @@ Current task list (not in order) ...@@ -11,6 +11,5 @@ Current task list (not in order)
- Add RegisterAllExtensions - Add RegisterAllExtensions
- Add ToBuilder changes from Google's r92 (done? Need to check) - Add ToBuilder changes from Google's r92 (done? Need to check)
- Silverlight changes (as per email to Jon) - Silverlight changes (as per email to Jon)
- Extension registration/initialization code?
- Bring service generation into line with Java - Bring service generation into line with Java
- Build protoc as a dll and use directly from protogen - Build protoc as a dll and use directly from protogen
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment