diff options
| author | csharptest <roger@csharptest.net> | 2011-07-14 13:06:22 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-07-14 13:06:22 -0500 |
| commit | 74c5e0c3762939fbf5988daf6f97c5d9c97ef4f5 (patch) | |
| tree | 642a1a002907d3291c88e7933cfda87a6704beee /src/ProtocolBuffers/ExtendableBuilderLite.cs | |
| parent | afff2c655c1d39b8f6cd7756c190a559d15134d1 (diff) | |
| download | protobuf-74c5e0c3762939fbf5988daf6f97c5d9c97ef4f5.tar.gz protobuf-74c5e0c3762939fbf5988daf6f97c5d9c97ef4f5.tar.bz2 protobuf-74c5e0c3762939fbf5988daf6f97c5d9c97ef4f5.zip | |
Reformatted to include braces
Diffstat (limited to 'src/ProtocolBuffers/ExtendableBuilderLite.cs')
| -rw-r--r-- | src/ProtocolBuffers/ExtendableBuilderLite.cs | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/src/ProtocolBuffers/ExtendableBuilderLite.cs b/src/ProtocolBuffers/ExtendableBuilderLite.cs index 27cd3e3b..cdec4fa3 100644 --- a/src/ProtocolBuffers/ExtendableBuilderLite.cs +++ b/src/ProtocolBuffers/ExtendableBuilderLite.cs @@ -142,8 +142,10 @@ namespace Google.ProtocolBuffers int fieldNumber = WireFormat.GetTagFieldNumber(tag);
IGeneratedExtensionLite extension = extensionRegistry[DefaultInstanceForType, fieldNumber];
- if (extension == null)//unknown field
+ if (extension == null) //unknown field
+ {
return input.SkipField();
+ }
IFieldDescriptorLite field = extension.Descriptor;
@@ -153,9 +155,9 @@ namespace Google.ProtocolBuffers {
return input.SkipField();
}
- WireFormat.WireType expectedType = field.IsPacked
- ? WireFormat.WireType.LengthDelimited
- : WireFormat.GetWireType(field.FieldType);
+ WireFormat.WireType expectedType = field.IsPacked
+ ? WireFormat.WireType.LengthDelimited
+ : WireFormat.GetWireType(field.FieldType);
if (wireType != expectedType)
{
expectedType = WireFormat.GetWireType(field.FieldType);
@@ -164,15 +166,20 @@ namespace Google.ProtocolBuffers //Allowed as of 2.3, this is unpacked data for a packed array
}
else if (field.IsRepeated && wireType == WireFormat.WireType.LengthDelimited &&
- (expectedType == WireFormat.WireType.Varint || expectedType == WireFormat.WireType.Fixed32 || expectedType == WireFormat.WireType.Fixed64))
+ (expectedType == WireFormat.WireType.Varint || expectedType == WireFormat.WireType.Fixed32 ||
+ expectedType == WireFormat.WireType.Fixed64))
{
//Allowed as of 2.3, this is packed data for an unpacked array
}
else
+ {
return input.SkipField();
+ }
}
if (!field.IsRepeated && wireType != WireFormat.GetWireType(field.FieldType)) //invalid wire type
+ {
return input.SkipField();
+ }
switch (field.FieldType)
{
@@ -185,22 +192,34 @@ namespace Google.ProtocolBuffers IBuilderLite subBuilder = (message ?? extension.MessageDefaultInstance).WeakToBuilder();
if (field.FieldType == FieldType.Group)
+ {
input.ReadGroup(field.FieldNumber, subBuilder, extensionRegistry);
+ }
else
+ {
input.ReadMessage(subBuilder, extensionRegistry);
-
+ }
+
extensions[field] = subBuilder.WeakBuild();
}
else
{
List<IMessageLite> list = new List<IMessageLite>();
if (field.FieldType == FieldType.Group)
- input.ReadGroupArray(tag, fieldName, list, extension.MessageDefaultInstance, extensionRegistry);
+ {
+ input.ReadGroupArray(tag, fieldName, list, extension.MessageDefaultInstance,
+ extensionRegistry);
+ }
else
- input.ReadMessageArray(tag, fieldName, list, extension.MessageDefaultInstance, extensionRegistry);
+ {
+ input.ReadMessageArray(tag, fieldName, list, extension.MessageDefaultInstance,
+ extensionRegistry);
+ }
foreach (IMessageLite m in list)
+ {
extensions.AddRepeatedField(field, m);
+ }
return true;
}
break;
@@ -212,7 +231,9 @@ namespace Google.ProtocolBuffers object unknown;
IEnumLite value = null;
if (input.ReadEnum(ref value, out unknown, field.EnumType))
+ {
extensions[field] = value;
+ }
}
else
{
@@ -221,7 +242,9 @@ namespace Google.ProtocolBuffers input.ReadEnumArray(tag, fieldName, list, out unknown, field.EnumType);
foreach (IEnumLite en in list)
+ {
extensions.AddRepeatedField(field, en);
+ }
}
break;
}
@@ -231,14 +254,18 @@ namespace Google.ProtocolBuffers {
object value = null;
if (input.ReadPrimitiveField(field.FieldType, ref value))
+ {
extensions[field] = value;
+ }
}
else
{
List<object> list = new List<object>();
input.ReadPrimitiveArray(field.FieldType, tag, fieldName, list);
foreach (object oval in list)
+ {
extensions.AddRepeatedField(field, oval);
+ }
}
break;
}
|