From 8729cf46284633bb7c9e7dfff57fea74510b8121 Mon Sep 17 00:00:00 2001
From: Jon Skeet <skeet@pobox.com>
Date: Fri, 5 Jun 2009 22:49:05 +0100
Subject: 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.
---
 src/AddressBook/AddressBookProtos.cs               |  4 +-
 src/ProtoGen/RepeatedEnumFieldGenerator.cs         |  3 +-
 src/ProtoGen/RepeatedMessageFieldGenerator.cs      |  3 +-
 src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs    |  3 +-
 .../Collections/PopsicleListTest.cs                |  1 +
 src/ProtocolBuffers.Test/GeneratedMessageTest.cs   | 17 ++++
 .../UnitTestEmbedOptimizeForProtoFile.cs           |  2 +-
 .../TestProtos/UnitTestMessageSetProtoFile.cs      |  2 +-
 .../TestProtos/UnitTestProtoFile.cs                | 94 +++++++++++-----------
 src/ProtocolBuffers/Collections/IPopsicleList.cs   | 48 +++++++++++
 src/ProtocolBuffers/Collections/PopsicleList.cs    |  9 ++-
 .../DescriptorProtos/DescriptorProtoFile.cs        | 42 +++++-----
 src/ProtocolBuffers/ProtocolBuffers.csproj         |  1 +
 13 files changed, 153 insertions(+), 76 deletions(-)
 create mode 100644 src/ProtocolBuffers/Collections/IPopsicleList.cs

(limited to 'src')

diff --git a/src/AddressBook/AddressBookProtos.cs b/src/AddressBook/AddressBookProtos.cs
index 8caf0f64..5c69ace6 100644
--- a/src/AddressBook/AddressBookProtos.cs
+++ b/src/AddressBook/AddressBookProtos.cs
@@ -668,7 +668,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         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_; }
       }
       public int PhoneCount {
@@ -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_; }
       }
       public int PersonCount {
diff --git a/src/ProtoGen/RepeatedEnumFieldGenerator.cs b/src/ProtoGen/RepeatedEnumFieldGenerator.cs
index 473970f9..9e7f8a70 100644
--- a/src/ProtoGen/RepeatedEnumFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedEnumFieldGenerator.cs
@@ -29,7 +29,8 @@ namespace Google.ProtocolBuffers.ProtoGen {
 
     public void GenerateBuilderMembers(TextGenerator writer) {
       // 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("}");
       writer.WriteLine("public int {0}Count {{", PropertyName);
diff --git a/src/ProtoGen/RepeatedMessageFieldGenerator.cs b/src/ProtoGen/RepeatedMessageFieldGenerator.cs
index 6a9f8e99..af868c89 100644
--- a/src/ProtoGen/RepeatedMessageFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedMessageFieldGenerator.cs
@@ -28,7 +28,8 @@ namespace Google.ProtocolBuffers.ProtoGen {
 
     public void GenerateBuilderMembers(TextGenerator writer) {
       // 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("}");
       writer.WriteLine("public int {0}Count {{", PropertyName);
diff --git a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
index 09e9fa08..dd1675f8 100644
--- a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
@@ -34,8 +34,9 @@ namespace Google.ProtocolBuffers.ProtoGen {
 
     public void GenerateBuilderMembers(TextGenerator writer) {
       // 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);
-      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("}");
       writer.WriteLine("public int {0}Count {{", PropertyName);
diff --git a/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs b/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs
index 2cb25093..94d7fd2f 100644
--- a/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs
+++ b/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs
@@ -16,6 +16,7 @@ namespace Google.ProtocolBuffers.Collections {
       AssertNotSupported(() => list.Insert(0, ""));
       AssertNotSupported(() => list.Remove(""));
       AssertNotSupported(() => list.RemoveAt(0));
+      AssertNotSupported(() => list.Add(new[] {"", ""}));
     }
 
     [Test]
diff --git a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
index 69c5ac37..3e4324ff 100644
--- a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
+++ b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
@@ -34,6 +34,7 @@ using System.Collections.Generic;
 using Google.ProtocolBuffers.Descriptors;
 using Google.ProtocolBuffers.TestProtos;
 using NUnit.Framework;
+using Google.ProtocolBuffers.Collections;
 
 namespace Google.ProtocolBuffers {
   [TestFixture]
@@ -193,6 +194,22 @@ namespace Google.ProtocolBuffers {
       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]
     public void Defaults() {
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
index fdd4acac..5ee90650 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
@@ -321,7 +321,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> RepeatedMessageList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> RepeatedMessageList {
         get { return result.repeatedMessage_; }
       }
       public int RepeatedMessageCount {
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
index d526bdf0..cd1ca898 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
@@ -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_; }
       }
       public int ItemCount {
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
index 8d9b4c49..ff0874b9 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
@@ -4141,7 +4141,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<int> RepeatedInt32List {
+      public pbc::IPopsicleList<int> RepeatedInt32List {
         get { return result.repeatedInt32_; }
       }
       public int RepeatedInt32Count {
@@ -4167,7 +4167,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<long> RepeatedInt64List {
+      public pbc::IPopsicleList<long> RepeatedInt64List {
         get { return result.repeatedInt64_; }
       }
       public int RepeatedInt64Count {
@@ -4194,7 +4194,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<uint> RepeatedUint32List {
+      public pbc::IPopsicleList<uint> RepeatedUint32List {
         get { return result.repeatedUint32_; }
       }
       public int RepeatedUint32Count {
@@ -4225,7 +4225,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<ulong> RepeatedUint64List {
+      public pbc::IPopsicleList<ulong> RepeatedUint64List {
         get { return result.repeatedUint64_; }
       }
       public int RepeatedUint64Count {
@@ -4255,7 +4255,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<int> RepeatedSint32List {
+      public pbc::IPopsicleList<int> RepeatedSint32List {
         get { return result.repeatedSint32_; }
       }
       public int RepeatedSint32Count {
@@ -4281,7 +4281,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<long> RepeatedSint64List {
+      public pbc::IPopsicleList<long> RepeatedSint64List {
         get { return result.repeatedSint64_; }
       }
       public int RepeatedSint64Count {
@@ -4308,7 +4308,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<uint> RepeatedFixed32List {
+      public pbc::IPopsicleList<uint> RepeatedFixed32List {
         get { return result.repeatedFixed32_; }
       }
       public int RepeatedFixed32Count {
@@ -4339,7 +4339,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<ulong> RepeatedFixed64List {
+      public pbc::IPopsicleList<ulong> RepeatedFixed64List {
         get { return result.repeatedFixed64_; }
       }
       public int RepeatedFixed64Count {
@@ -4369,7 +4369,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<int> RepeatedSfixed32List {
+      public pbc::IPopsicleList<int> RepeatedSfixed32List {
         get { return result.repeatedSfixed32_; }
       }
       public int RepeatedSfixed32Count {
@@ -4395,7 +4395,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<long> RepeatedSfixed64List {
+      public pbc::IPopsicleList<long> RepeatedSfixed64List {
         get { return result.repeatedSfixed64_; }
       }
       public int RepeatedSfixed64Count {
@@ -4421,7 +4421,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<float> RepeatedFloatList {
+      public pbc::IPopsicleList<float> RepeatedFloatList {
         get { return result.repeatedFloat_; }
       }
       public int RepeatedFloatCount {
@@ -4447,7 +4447,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<double> RepeatedDoubleList {
+      public pbc::IPopsicleList<double> RepeatedDoubleList {
         get { return result.repeatedDouble_; }
       }
       public int RepeatedDoubleCount {
@@ -4473,7 +4473,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<bool> RepeatedBoolList {
+      public pbc::IPopsicleList<bool> RepeatedBoolList {
         get { return result.repeatedBool_; }
       }
       public int RepeatedBoolCount {
@@ -4499,7 +4499,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<string> RepeatedStringList {
+      public pbc::IPopsicleList<string> RepeatedStringList {
         get { return result.repeatedString_; }
       }
       public int RepeatedStringCount {
@@ -4527,7 +4527,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<pb::ByteString> RepeatedBytesList {
+      public pbc::IPopsicleList<pb::ByteString> RepeatedBytesList {
         get { return result.repeatedBytes_; }
       }
       public int RepeatedBytesCount {
@@ -4555,7 +4555,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         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_; }
       }
       public int RepeatedGroupCount {
@@ -4593,7 +4593,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         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_; }
       }
       public int RepeatedNestedMessageCount {
@@ -4631,7 +4631,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedForeignMessageList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedForeignMessageList {
         get { return result.repeatedForeignMessage_; }
       }
       public int RepeatedForeignMessageCount {
@@ -4669,7 +4669,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> RepeatedImportMessageList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> RepeatedImportMessageList {
         get { return result.repeatedImportMessage_; }
       }
       public int RepeatedImportMessageCount {
@@ -4707,7 +4707,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         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_; }
       }
       public int RepeatedNestedEnumCount {
@@ -4733,7 +4733,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedForeignEnumList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedForeignEnumList {
         get { return result.repeatedForeignEnum_; }
       }
       public int RepeatedForeignEnumCount {
@@ -4759,7 +4759,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> RepeatedImportEnumList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> RepeatedImportEnumList {
         get { return result.repeatedImportEnum_; }
       }
       public int RepeatedImportEnumCount {
@@ -4785,7 +4785,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<string> RepeatedStringPieceList {
+      public pbc::IPopsicleList<string> RepeatedStringPieceList {
         get { return result.repeatedStringPiece_; }
       }
       public int RepeatedStringPieceCount {
@@ -4813,7 +4813,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<string> RepeatedCordList {
+      public pbc::IPopsicleList<string> RepeatedCordList {
         get { return result.repeatedCord_; }
       }
       public int RepeatedCordCount {
@@ -7860,7 +7860,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestRequired> RepeatedMessageList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.TestRequired> RepeatedMessageList {
         get { return result.repeatedMessage_; }
       }
       public int RepeatedMessageCount {
@@ -10585,7 +10585,7 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           
-          public scg::IList<int> NestedmessageRepeatedInt32List {
+          public pbc::IPopsicleList<int> NestedmessageRepeatedInt32List {
             get { return result.nestedmessageRepeatedInt32_; }
           }
           public int NestedmessageRepeatedInt32Count {
@@ -10611,7 +10611,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             return this;
           }
           
-          public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> NestedmessageRepeatedForeignmessageList {
+          public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> NestedmessageRepeatedForeignmessageList {
             get { return result.nestedmessageRepeatedForeignmessage_; }
           }
           public int NestedmessageRepeatedForeignmessageCount {
@@ -11523,7 +11523,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<int> RepeatedPrimitiveFieldList {
+      public pbc::IPopsicleList<int> RepeatedPrimitiveFieldList {
         get { return result.repeatedPrimitiveField_; }
       }
       public int RepeatedPrimitiveFieldCount {
@@ -11549,7 +11549,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<string> RepeatedStringFieldList {
+      public pbc::IPopsicleList<string> RepeatedStringFieldList {
         get { return result.repeatedStringField_; }
       }
       public int RepeatedStringFieldCount {
@@ -11577,7 +11577,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedEnumFieldList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedEnumFieldList {
         get { return result.repeatedEnumField_; }
       }
       public int RepeatedEnumFieldCount {
@@ -11603,7 +11603,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedMessageFieldList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedMessageFieldList {
         get { return result.repeatedMessageField_; }
       }
       public int RepeatedMessageFieldCount {
@@ -11641,7 +11641,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<string> RepeatedStringPieceFieldList {
+      public pbc::IPopsicleList<string> RepeatedStringPieceFieldList {
         get { return result.repeatedStringPieceField_; }
       }
       public int RepeatedStringPieceFieldCount {
@@ -11669,7 +11669,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<string> RepeatedCordFieldList {
+      public pbc::IPopsicleList<string> RepeatedCordFieldList {
         get { return result.repeatedCordField_; }
       }
       public int RepeatedCordFieldCount {
@@ -13206,7 +13206,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       
-      public scg::IList<int> PackedInt32List {
+      public pbc::IPopsicleList<int> PackedInt32List {
         get { return result.packedInt32_; }
       }
       public int PackedInt32Count {
@@ -13232,7 +13232,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<long> PackedInt64List {
+      public pbc::IPopsicleList<long> PackedInt64List {
         get { return result.packedInt64_; }
       }
       public int PackedInt64Count {
@@ -13259,7 +13259,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<uint> PackedUint32List {
+      public pbc::IPopsicleList<uint> PackedUint32List {
         get { return result.packedUint32_; }
       }
       public int PackedUint32Count {
@@ -13290,7 +13290,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<ulong> PackedUint64List {
+      public pbc::IPopsicleList<ulong> PackedUint64List {
         get { return result.packedUint64_; }
       }
       public int PackedUint64Count {
@@ -13320,7 +13320,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<int> PackedSint32List {
+      public pbc::IPopsicleList<int> PackedSint32List {
         get { return result.packedSint32_; }
       }
       public int PackedSint32Count {
@@ -13346,7 +13346,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<long> PackedSint64List {
+      public pbc::IPopsicleList<long> PackedSint64List {
         get { return result.packedSint64_; }
       }
       public int PackedSint64Count {
@@ -13373,7 +13373,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<uint> PackedFixed32List {
+      public pbc::IPopsicleList<uint> PackedFixed32List {
         get { return result.packedFixed32_; }
       }
       public int PackedFixed32Count {
@@ -13404,7 +13404,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       [global::System.CLSCompliant(false)]
-      public scg::IList<ulong> PackedFixed64List {
+      public pbc::IPopsicleList<ulong> PackedFixed64List {
         get { return result.packedFixed64_; }
       }
       public int PackedFixed64Count {
@@ -13434,7 +13434,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<int> PackedSfixed32List {
+      public pbc::IPopsicleList<int> PackedSfixed32List {
         get { return result.packedSfixed32_; }
       }
       public int PackedSfixed32Count {
@@ -13460,7 +13460,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<long> PackedSfixed64List {
+      public pbc::IPopsicleList<long> PackedSfixed64List {
         get { return result.packedSfixed64_; }
       }
       public int PackedSfixed64Count {
@@ -13486,7 +13486,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<float> PackedFloatList {
+      public pbc::IPopsicleList<float> PackedFloatList {
         get { return result.packedFloat_; }
       }
       public int PackedFloatCount {
@@ -13512,7 +13512,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<double> PackedDoubleList {
+      public pbc::IPopsicleList<double> PackedDoubleList {
         get { return result.packedDouble_; }
       }
       public int PackedDoubleCount {
@@ -13538,7 +13538,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<bool> PackedBoolList {
+      public pbc::IPopsicleList<bool> PackedBoolList {
         get { return result.packedBool_; }
       }
       public int PackedBoolCount {
@@ -13564,7 +13564,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> PackedEnumList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> PackedEnumList {
         get { return result.packedEnum_; }
       }
       public int PackedEnumCount {
diff --git a/src/ProtocolBuffers/Collections/IPopsicleList.cs b/src/ProtocolBuffers/Collections/IPopsicleList.cs
new file mode 100644
index 00000000..de59de94
--- /dev/null
+++ b/src/ProtocolBuffers/Collections/IPopsicleList.cs
@@ -0,0 +1,48 @@
+// 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);
+  }
+}
diff --git a/src/ProtocolBuffers/Collections/PopsicleList.cs b/src/ProtocolBuffers/Collections/PopsicleList.cs
index a7d01553..26996d9b 100644
--- a/src/ProtocolBuffers/Collections/PopsicleList.cs
+++ b/src/ProtocolBuffers/Collections/PopsicleList.cs
@@ -39,7 +39,7 @@ namespace Google.ProtocolBuffers.Collections {
   /// to be made read-only (with the <see cref="MakeReadOnly" /> method), 
   /// after which any modifying methods throw <see cref="NotSupportedException" />.
   /// </summary>
-  public sealed class PopsicleList<T> : IList<T> {
+  public sealed class PopsicleList<T> : IPopsicleList<T> {
 
     private readonly List<T> items = new List<T>();
     private bool readOnly = false;
@@ -108,6 +108,13 @@ namespace Google.ProtocolBuffers.Collections {
       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() {
       return items.GetEnumerator();
     }
diff --git a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
index 03c4615c..0839bd0a 100644
--- a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
@@ -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_; }
       }
       public int FileCount {
@@ -902,7 +902,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<string> DependencyList {
+      public pbc::IPopsicleList<string> DependencyList {
         get { return result.dependency_; }
       }
       public int DependencyCount {
@@ -930,7 +930,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> MessageTypeList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> MessageTypeList {
         get { return result.messageType_; }
       }
       public int MessageTypeCount {
@@ -968,7 +968,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
         get { return result.enumType_; }
       }
       public int EnumTypeCount {
@@ -1006,7 +1006,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> ServiceList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> ServiceList {
         get { return result.service_; }
       }
       public int ServiceCount {
@@ -1044,7 +1044,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
         get { return result.extension_; }
       }
       public int ExtensionCount {
@@ -1776,7 +1776,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> FieldList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> FieldList {
         get { return result.field_; }
       }
       public int FieldCount {
@@ -1814,7 +1814,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
         get { return result.extension_; }
       }
       public int ExtensionCount {
@@ -1852,7 +1852,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> NestedTypeList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> NestedTypeList {
         get { return result.nestedType_; }
       }
       public int NestedTypeCount {
@@ -1890,7 +1890,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
         get { return result.enumType_; }
       }
       public int EnumTypeCount {
@@ -1928,7 +1928,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         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_; }
       }
       public int ExtensionRangeCount {
@@ -2858,7 +2858,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> ValueList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> ValueList {
         get { return result.value_; }
       }
       public int ValueCount {
@@ -3532,7 +3532,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> MethodList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> MethodList {
         get { return result.method_; }
       }
       public int MethodCount {
@@ -4365,7 +4365,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
         get { return result.uninterpretedOption_; }
       }
       public int UninterpretedOptionCount {
@@ -4653,7 +4653,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
         get { return result.uninterpretedOption_; }
       }
       public int UninterpretedOptionCount {
@@ -5083,7 +5083,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         return this;
       }
       
-      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
+      public pbc::IPopsicleList<global::Google.ProtocolBuffers.DescriptorProtos.UninterpretedOption> UninterpretedOptionList {
         get { return result.uninterpretedOption_; }
       }
       public int UninterpretedOptionCount {
@@ -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_; }
       }
       public int UninterpretedOptionCount {
@@ -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_; }
       }
       public int UninterpretedOptionCount {
@@ -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_; }
       }
       public int UninterpretedOptionCount {
@@ -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_; }
       }
       public int UninterpretedOptionCount {
@@ -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_; }
       }
       public int NameCount {
diff --git a/src/ProtocolBuffers/ProtocolBuffers.csproj b/src/ProtocolBuffers/ProtocolBuffers.csproj
index 994ceec6..89676915 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -42,6 +42,7 @@
     <Compile Include="AbstractMessage.cs" />
     <Compile Include="ByteString.cs" />
     <Compile Include="Collections\Enumerables.cs" />
+    <Compile Include="Collections\IPopsicleList.cs" />
     <Compile Include="Collections\PopsicleList.cs" />
     <Compile Include="Delegates.cs" />
     <Compile Include="CodedInputStream.cs" />
-- 
cgit v1.2.3