Implementation work for Lite runtime and generator

1 files changed, 13 insertions, 18 deletions

diff --git a/src/ProtocolBuffers/CodedOutputStream.cs b/src/ProtocolBuffers/CodedOutputStream.cs
index b261375c..264ca6ef 100644
--- a/src/ProtocolBuffers/CodedOutputStream.cs
+++ b/src/ProtocolBuffers/CodedOutputStream.cs
@@ -35,9 +35,8 @@
 using System;
 using System.IO;
 using System.Text;
-#if !LITE
 using Google.ProtocolBuffers.Descriptors;
-#endif
+
 namespace Google.ProtocolBuffers {
 
   /// <summary>
@@ -279,7 +278,6 @@ namespace Google.ProtocolBuffers {
       WriteTag(WireFormat.MessageSetField.Item, WireFormat.WireType.EndGroup);
     }
 
-#if !LITE
     public void WriteField(FieldType fieldType, int fieldNumber, object value) {
       switch (fieldType) {
         case FieldType.Double: WriteDouble(fieldNumber, (double)value); break;
@@ -291,15 +289,15 @@ namespace Google.ProtocolBuffers {
         case FieldType.Fixed32: WriteFixed32(fieldNumber, (uint)value); break;
         case FieldType.Bool: WriteBool(fieldNumber, (bool)value); break;
         case FieldType.String: WriteString(fieldNumber, (string)value); break;
-        case FieldType.Group: WriteGroup(fieldNumber, (IMessage)value); break;
-        case FieldType.Message: WriteMessage(fieldNumber, (IMessage)value); break;
+        case FieldType.Group: WriteGroup(fieldNumber, (IMessageLite)value); break;
+        case FieldType.Message: WriteMessage(fieldNumber, (IMessageLite)value); break;
         case FieldType.Bytes: WriteBytes(fieldNumber, (ByteString)value); break;
         case FieldType.UInt32: WriteUInt32(fieldNumber, (uint)value); break;
         case FieldType.SFixed32: WriteSFixed32(fieldNumber, (int)value); break;
         case FieldType.SFixed64: WriteSFixed64(fieldNumber, (long)value); break;
         case FieldType.SInt32: WriteSInt32(fieldNumber, (int)value); break;
         case FieldType.SInt64: WriteSInt64(fieldNumber, (long)value); break;
-        case FieldType.Enum: WriteEnum(fieldNumber, ((EnumValueDescriptor)value).Number);
+        case FieldType.Enum: WriteEnum(fieldNumber, ((IEnumLite)value).Number);
           break;
       }
     }
@@ -315,19 +313,18 @@ namespace Google.ProtocolBuffers {
         case FieldType.Fixed32: WriteFixed32NoTag((uint)value); break;
         case FieldType.Bool: WriteBoolNoTag((bool)value); break;
         case FieldType.String: WriteStringNoTag((string)value); break;
-        case FieldType.Group: WriteGroupNoTag((IMessage)value); break;
-        case FieldType.Message: WriteMessageNoTag((IMessage)value); break;
+        case FieldType.Group: WriteGroupNoTag((IMessageLite)value); break;
+        case FieldType.Message: WriteMessageNoTag((IMessageLite)value); break;
         case FieldType.Bytes: WriteBytesNoTag((ByteString)value); break;
         case FieldType.UInt32: WriteUInt32NoTag((uint)value); break;
         case FieldType.SFixed32: WriteSFixed32NoTag((int)value); break;
         case FieldType.SFixed64: WriteSFixed64NoTag((long)value); break;
         case FieldType.SInt32: WriteSInt32NoTag((int)value); break;
         case FieldType.SInt64: WriteSInt64NoTag((long)value); break;
-        case FieldType.Enum: WriteEnumNoTag(((EnumValueDescriptor)value).Number);
+        case FieldType.Enum: WriteEnumNoTag(((IEnumLite)value).Number);
           break;
       }
     }
-#endif
     #endregion
 
     #region Writing of values without tags
@@ -995,7 +992,6 @@ namespace Google.ProtocolBuffers {
       return 10;
     }
 
-#if !LITE
     /// <summary>
     /// Compute the number of bytes that would be needed to encode a
     /// field of arbitrary type, including the tag, to the stream.
@@ -1011,15 +1007,15 @@ namespace Google.ProtocolBuffers {
         case FieldType.Fixed32: return ComputeFixed32Size(fieldNumber, (uint)value);
         case FieldType.Bool: return ComputeBoolSize(fieldNumber, (bool)value);
         case FieldType.String: return ComputeStringSize(fieldNumber, (string)value);
-        case FieldType.Group: return ComputeGroupSize(fieldNumber, (IMessage)value);
-        case FieldType.Message: return ComputeMessageSize(fieldNumber, (IMessage)value);
+        case FieldType.Group: return ComputeGroupSize(fieldNumber, (IMessageLite)value);
+        case FieldType.Message: return ComputeMessageSize(fieldNumber, (IMessageLite)value);
         case FieldType.Bytes: return ComputeBytesSize(fieldNumber, (ByteString)value);
         case FieldType.UInt32: return ComputeUInt32Size(fieldNumber, (uint)value);
         case FieldType.SFixed32: return ComputeSFixed32Size(fieldNumber, (int)value);
         case FieldType.SFixed64: return ComputeSFixed64Size(fieldNumber, (long)value);
         case FieldType.SInt32: return ComputeSInt32Size(fieldNumber, (int)value);
         case FieldType.SInt64: return ComputeSInt64Size(fieldNumber, (long)value);
-        case FieldType.Enum: return ComputeEnumSize(fieldNumber, ((EnumValueDescriptor)value).Number);
+        case FieldType.Enum: return ComputeEnumSize(fieldNumber, ((IEnumLite)value).Number);
         default:
           throw new ArgumentOutOfRangeException("Invalid field type " + fieldType);
       }
@@ -1040,20 +1036,19 @@ namespace Google.ProtocolBuffers {
         case FieldType.Fixed32: return ComputeFixed32SizeNoTag((uint)value);
         case FieldType.Bool: return ComputeBoolSizeNoTag((bool)value);
         case FieldType.String: return ComputeStringSizeNoTag((string)value);
-        case FieldType.Group: return ComputeGroupSizeNoTag((IMessage)value);
-        case FieldType.Message: return ComputeMessageSizeNoTag((IMessage)value);
+        case FieldType.Group: return ComputeGroupSizeNoTag((IMessageLite)value);
+        case FieldType.Message: return ComputeMessageSizeNoTag((IMessageLite)value);
         case FieldType.Bytes: return ComputeBytesSizeNoTag((ByteString)value);
         case FieldType.UInt32: return ComputeUInt32SizeNoTag((uint)value);
         case FieldType.SFixed32: return ComputeSFixed32SizeNoTag((int)value);
         case FieldType.SFixed64: return ComputeSFixed64SizeNoTag((long)value);
         case FieldType.SInt32: return ComputeSInt32SizeNoTag((int)value);
         case FieldType.SInt64: return ComputeSInt64SizeNoTag((long)value);
-        case FieldType.Enum: return ComputeEnumSizeNoTag(((EnumValueDescriptor)value).Number);
+        case FieldType.Enum: return ComputeEnumSizeNoTag(((IEnumLite)value).Number);
         default:
           throw new ArgumentOutOfRangeException("Invalid field type " + fieldType);
       }
     }
-#endif
 
     /// <summary>
     /// Compute the number of bytes that would be needed to encode a tag.