diff --git a/Google.Protobuf/FieldCodec.vb b/Google.Protobuf/FieldCodec.vb index de95481..33db43d 100644 --- a/Google.Protobuf/FieldCodec.vb +++ b/Google.Protobuf/FieldCodec.vb @@ -288,132 +288,4 @@ Namespace Google.Protobuf End Function End Class End Module - - ''' - ''' - ''' An encode/decode pair for a single field. This effectively encapsulates - ''' all the information needed to read or write the field value from/to a coded - ''' stream. - ''' - ''' - ''' This class is public and has to be as it is used by generated code, but its public - ''' API is very limited - just what the generated code needs to call directly. - ''' - ''' - ''' - ''' This never writes default values to the stream, and does not address "packedness" - ''' in repeated fields itself, other than to know whether or not the field *should* be packed. - ''' - Public NotInheritable Class FieldCodecType(Of T) - Private Shared ReadOnly DefaultDefault As T - ' Only non-nullable value types support packing. This is the simplest way of detecting that. - Private Shared ReadOnly TypeSupportsPacking As Boolean = Nothing IsNot Nothing - - Shared Sub New() - If GetType(T) Is GetType(String) Then - DefaultDefault = CType(CObj(""), T) - ElseIf GetType(T) Is GetType(ByteString) Then - DefaultDefault = CType(CObj(ByteString.Empty), T) - End If - ' Otherwise it's the default value of the CLR type - End Sub - - Friend Shared Function IsPackedRepeatedField(tag As UInteger) As Boolean - Return TypeSupportsPacking AndAlso GetTagWireType(tag) = WireType.LengthDelimited - End Function - - Friend ReadOnly Property PackedRepeatedField As Boolean - - ''' - ''' Returns a delegate to write a value (unconditionally) to a coded output stream. - ''' - Friend ReadOnly Property ValueWriter As Action(Of CodedOutputStream, T) - - ''' - ''' Returns the size calculator for just a value. - ''' - Friend ReadOnly Property ValueSizeCalculator As Func(Of T, Integer) - - ''' - ''' Returns a delegate to read a value from a coded input stream. It is assumed that - ''' the stream is already positioned on the appropriate tag. - ''' - Friend ReadOnly Property ValueReader As Func(Of CodedInputStream, T) - - ''' - ''' Returns the fixed size for an entry, or 0 if sizes vary. - ''' - Friend ReadOnly Property FixedSize As Integer - - ''' - ''' Gets the tag of the codec. - ''' - ''' - ''' The tag of the codec. - ''' - Friend ReadOnly Property Tag As UInteger - - ''' - ''' Default value for this codec. Usually the same for every instance of the same type, but - ''' for string/ByteString wrapper fields the codec's default value is null, whereas for - ''' other string/ByteString fields it's "" or ByteString.Empty. - ''' - ''' - ''' The default value of the codec's type. - ''' - Friend ReadOnly Property DefaultValue As T - Private ReadOnly tagSize As Integer - - Friend Sub New(reader As Func(Of CodedInputStream, T), writer As Action(Of CodedOutputStream, T), fixedSize As Integer, tag As UInteger) - Me.New(reader, writer, Function(__) fixedSize, tag) - Me.FixedSize = fixedSize - End Sub - - Friend Sub New(reader As Func(Of CodedInputStream, T), writer As Action(Of CodedOutputStream, T), sizeCalculator As Func(Of T, Integer), tag As UInteger) - Me.New(reader, writer, sizeCalculator, tag, DefaultDefault) - End Sub - - Friend Sub New(reader As Func(Of CodedInputStream, T), writer As Action(Of CodedOutputStream, T), sizeCalculator As Func(Of T, Integer), tag As UInteger, defaultValue As T) - ValueReader = reader - ValueWriter = writer - ValueSizeCalculator = sizeCalculator - FixedSize = 0 - Me.Tag = tag - Me.DefaultValue = defaultValue - tagSize = CodedOutputStream.ComputeRawVarint32Size(tag) - ' Detect packed-ness once, so we can check for it within RepeatedField. - PackedRepeatedField = IsPackedRepeatedField(tag) - End Sub - - ''' - ''' Write a tag and the given value, *if* the value is not the default. - ''' - Public Sub WriteTagAndValue(output As CodedOutputStream, value As T) - If Not IsDefault(value) Then - output.WriteTag(Tag) - Me.ValueWriter()(output, value) - End If - End Sub - - ''' - ''' Reads a value of the codec type from the given . - ''' - ''' The input stream to read from. - ''' The value read from the stream. - Public Function Read(input As CodedInputStream) As T - Return ValueReader(input) - End Function - - ''' - ''' Calculates the size required to write the given value, with a tag, - ''' if the value is not the default. - ''' - Public Function CalculateSizeWithTag(value As T) As Integer - Return If(IsDefault(value), 0, ValueSizeCalculator(value) + tagSize) - End Function - - Private Function IsDefault(value As T) As Boolean - Return EqualityComparer(Of T).Default.Equals(value, DefaultValue) - End Function - End Class End Namespace diff --git a/Google.Protobuf/FieldCodecType.vb b/Google.Protobuf/FieldCodecType.vb new file mode 100644 index 0000000..04efbbe --- /dev/null +++ b/Google.Protobuf/FieldCodecType.vb @@ -0,0 +1,130 @@ +Namespace Google.Protobuf + + ''' + ''' + ''' An encode/decode pair for a single field. This effectively encapsulates + ''' all the information needed to read or write the field value from/to a coded + ''' stream. + ''' + ''' + ''' This class is public and has to be as it is used by generated code, but its public + ''' API is very limited - just what the generated code needs to call directly. + ''' + ''' + ''' + ''' This never writes default values to the stream, and does not address "packedness" + ''' in repeated fields itself, other than to know whether or not the field *should* be packed. + ''' + Public NotInheritable Class FieldCodecType(Of T) + Private Shared ReadOnly DefaultDefault As T + ' Only non-nullable value types support packing. This is the simplest way of detecting that. + Private Shared ReadOnly TypeSupportsPacking As Boolean = Nothing IsNot Nothing + + Shared Sub New() + If GetType(T) Is GetType(String) Then + DefaultDefault = CType(CObj(""), T) + ElseIf GetType(T) Is GetType(ByteString) Then + DefaultDefault = CType(CObj(ByteString.Empty), T) + End If + ' Otherwise it's the default value of the CLR type + End Sub + + Friend Shared Function IsPackedRepeatedField(tag As UInteger) As Boolean + Return TypeSupportsPacking AndAlso GetTagWireType(tag) = WireType.LengthDelimited + End Function + + Friend ReadOnly Property PackedRepeatedField As Boolean + + ''' + ''' Returns a delegate to write a value (unconditionally) to a coded output stream. + ''' + Friend ReadOnly Property ValueWriter As Action(Of CodedOutputStream, T) + + ''' + ''' Returns the size calculator for just a value. + ''' + Friend ReadOnly Property ValueSizeCalculator As Func(Of T, Integer) + + ''' + ''' Returns a delegate to read a value from a coded input stream. It is assumed that + ''' the stream is already positioned on the appropriate tag. + ''' + Friend ReadOnly Property ValueReader As Func(Of CodedInputStream, T) + + ''' + ''' Returns the fixed size for an entry, or 0 if sizes vary. + ''' + Friend ReadOnly Property FixedSize As Integer + + ''' + ''' Gets the tag of the codec. + ''' + ''' + ''' The tag of the codec. + ''' + Friend ReadOnly Property Tag As UInteger + + ''' + ''' Default value for this codec. Usually the same for every instance of the same type, but + ''' for string/ByteString wrapper fields the codec's default value is null, whereas for + ''' other string/ByteString fields it's "" or ByteString.Empty. + ''' + ''' + ''' The default value of the codec's type. + ''' + Friend ReadOnly Property DefaultValue As T + Private ReadOnly tagSize As Integer + + Friend Sub New(reader As Func(Of CodedInputStream, T), writer As Action(Of CodedOutputStream, T), fixedSize As Integer, tag As UInteger) + Me.New(reader, writer, Function(__) fixedSize, tag) + Me.FixedSize = fixedSize + End Sub + + Friend Sub New(reader As Func(Of CodedInputStream, T), writer As Action(Of CodedOutputStream, T), sizeCalculator As Func(Of T, Integer), tag As UInteger) + Me.New(reader, writer, sizeCalculator, tag, DefaultDefault) + End Sub + + Friend Sub New(reader As Func(Of CodedInputStream, T), writer As Action(Of CodedOutputStream, T), sizeCalculator As Func(Of T, Integer), tag As UInteger, defaultValue As T) + ValueReader = reader + ValueWriter = writer + ValueSizeCalculator = sizeCalculator + FixedSize = 0 + Me.Tag = tag + Me.DefaultValue = defaultValue + tagSize = CodedOutputStream.ComputeRawVarint32Size(tag) + ' Detect packed-ness once, so we can check for it within RepeatedField. + PackedRepeatedField = IsPackedRepeatedField(tag) + End Sub + + ''' + ''' Write a tag and the given value, *if* the value is not the default. + ''' + Public Sub WriteTagAndValue(output As CodedOutputStream, value As T) + If Not IsDefault(value) Then + output.WriteTag(Tag) + Me.ValueWriter()(output, value) + End If + End Sub + + ''' + ''' Reads a value of the codec type from the given . + ''' + ''' The input stream to read from. + ''' The value read from the stream. + Public Function Read(input As CodedInputStream) As T + Return ValueReader(input) + End Function + + ''' + ''' Calculates the size required to write the given value, with a tag, + ''' if the value is not the default. + ''' + Public Function CalculateSizeWithTag(value As T) As Integer + Return If(IsDefault(value), 0, ValueSizeCalculator(value) + tagSize) + End Function + + Private Function IsDefault(value As T) As Boolean + Return EqualityComparer(Of T).Default.Equals(value, DefaultValue) + End Function + End Class +End Namespace \ No newline at end of file