Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Unified Diff: lib/src/protobuf/coded_buffer_writer.dart

Issue 1277863003: cleanup: move fieldType constants and functions to a separate file (Closed) Base URL: git@github.com:dart-lang/dart-protobuf.git@master
Patch Set: _validateMessage should call _baseType, not callers Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/src/protobuf/builder_info.dart ('k') | lib/src/protobuf/field_info.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/protobuf/coded_buffer_writer.dart
diff --git a/lib/src/protobuf/coded_buffer_writer.dart b/lib/src/protobuf/coded_buffer_writer.dart
index 58f9557635787b3b0eea1935fd7d922de8e1dc07..d5037490097fe50d82db1eb2303de3198c0ac039 100644
--- a/lib/src/protobuf/coded_buffer_writer.dart
+++ b/lib/src/protobuf/coded_buffer_writer.dart
@@ -68,20 +68,20 @@ class CodedBufferWriter {
}
return new Map<int, dynamic>()
- ..[GeneratedMessage._BOOL_BIT] = makeWriter(
+ ..[FieldType._BOOL_BIT] = makeWriter(
(value) => _int32ToBytes(value ? 1 : 0))
- ..[GeneratedMessage._BYTES_BIT] = writeBytesNoTag
- ..[GeneratedMessage._STRING_BIT] = (output, value) {
+ ..[FieldType._BYTES_BIT] = writeBytesNoTag
+ ..[FieldType._STRING_BIT] = (output, value) {
writeBytesNoTag(output, _UTF8.encode(value));
}
- ..[GeneratedMessage._DOUBLE_BIT] = makeWriter((double value) {
+ ..[FieldType._DOUBLE_BIT] = makeWriter((double value) {
if (value.isNaN) return new ByteData(8)
..setUint32(0, 0x00000000, Endianness.LITTLE_ENDIAN)
..setUint32(4, 0x7ff80000, Endianness.LITTLE_ENDIAN);
return new ByteData(8)
..setFloat64(0, value, Endianness.LITTLE_ENDIAN);
})
- ..[GeneratedMessage._FLOAT_BIT] = makeWriter((double value) {
+ ..[FieldType._FLOAT_BIT] = makeWriter((double value) {
const double MIN_FLOAT_DENORM = 1.401298464324817E-45;
const double MAX_FLOAT = 3.4028234663852886E38;
// TODO(antonm): reevaluate once semantics of odd values
@@ -96,25 +96,25 @@ class CodedBufferWriter {
return new ByteData(4)
..setFloat32(0, value, Endianness.LITTLE_ENDIAN);
})
- ..[GeneratedMessage._ENUM_BIT] = makeWriter(
+ ..[FieldType._ENUM_BIT] = makeWriter(
(value) => _int32ToBytes(value.value))
- ..[GeneratedMessage._GROUP_BIT] = (output, value) {
+ ..[FieldType._GROUP_BIT] = (output, value) {
value.writeToCodedBufferWriter(output);
}
- ..[GeneratedMessage._INT32_BIT] = makeWriter(_int32ToBytes)
- ..[GeneratedMessage._INT64_BIT] = makeWriter(
+ ..[FieldType._INT32_BIT] = makeWriter(_int32ToBytes)
+ ..[FieldType._INT64_BIT] = makeWriter(
(value) => _toVarint64(value))
- ..[GeneratedMessage._SINT32_BIT] = makeWriter(
+ ..[FieldType._SINT32_BIT] = makeWriter(
(int value) => _int32ToBytes(_encodeZigZag32(value)))
- ..[GeneratedMessage._SINT64_BIT] = makeWriter(
+ ..[FieldType._SINT64_BIT] = makeWriter(
(Int64 value) => _toVarint64(_encodeZigZag64(value)))
- ..[GeneratedMessage._UINT32_BIT] = makeWriter(_toVarint32)
- ..[GeneratedMessage._UINT64_BIT] = makeWriter(_toVarint64)
- ..[GeneratedMessage._FIXED32_BIT] = makeWriter(makeByteData32)
- ..[GeneratedMessage._FIXED64_BIT] = makeWriter(makeByteData64)
- ..[GeneratedMessage._SFIXED32_BIT] = makeWriter(makeByteData32)
- ..[GeneratedMessage._SFIXED64_BIT] = makeWriter(makeByteData64)
- ..[GeneratedMessage._MESSAGE_BIT] = (output, value) {
+ ..[FieldType._UINT32_BIT] = makeWriter(_toVarint32)
+ ..[FieldType._UINT64_BIT] = makeWriter(_toVarint64)
+ ..[FieldType._FIXED32_BIT] = makeWriter(makeByteData32)
+ ..[FieldType._FIXED64_BIT] = makeWriter(makeByteData64)
+ ..[FieldType._SFIXED32_BIT] = makeWriter(makeByteData32)
+ ..[FieldType._SFIXED64_BIT] = makeWriter(makeByteData64)
+ ..[FieldType._MESSAGE_BIT] = (output, value) {
output._withDeferredSizeCalculation(() {
value.writeToCodedBufferWriter(output);
});
@@ -125,24 +125,24 @@ class CodedBufferWriter {
static _makeOpenTagMap() {
return new Map<int, int>()
- ..[GeneratedMessage._BOOL_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._BYTES_BIT] = WIRETYPE_LENGTH_DELIMITED
- ..[GeneratedMessage._STRING_BIT] = WIRETYPE_LENGTH_DELIMITED
- ..[GeneratedMessage._DOUBLE_BIT] = WIRETYPE_FIXED64
- ..[GeneratedMessage._FLOAT_BIT] = WIRETYPE_FIXED32
- ..[GeneratedMessage._ENUM_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._GROUP_BIT] = WIRETYPE_START_GROUP
- ..[GeneratedMessage._INT32_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._INT64_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._SINT32_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._SINT64_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._UINT32_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._UINT64_BIT] = WIRETYPE_VARINT
- ..[GeneratedMessage._FIXED32_BIT] = WIRETYPE_FIXED32
- ..[GeneratedMessage._FIXED64_BIT] = WIRETYPE_FIXED64
- ..[GeneratedMessage._SFIXED32_BIT] = WIRETYPE_FIXED32
- ..[GeneratedMessage._SFIXED64_BIT] = WIRETYPE_FIXED64
- ..[GeneratedMessage._MESSAGE_BIT] = WIRETYPE_LENGTH_DELIMITED;
+ ..[FieldType._BOOL_BIT] = WIRETYPE_VARINT
+ ..[FieldType._BYTES_BIT] = WIRETYPE_LENGTH_DELIMITED
+ ..[FieldType._STRING_BIT] = WIRETYPE_LENGTH_DELIMITED
+ ..[FieldType._DOUBLE_BIT] = WIRETYPE_FIXED64
+ ..[FieldType._FLOAT_BIT] = WIRETYPE_FIXED32
+ ..[FieldType._ENUM_BIT] = WIRETYPE_VARINT
+ ..[FieldType._GROUP_BIT] = WIRETYPE_START_GROUP
+ ..[FieldType._INT32_BIT] = WIRETYPE_VARINT
+ ..[FieldType._INT64_BIT] = WIRETYPE_VARINT
+ ..[FieldType._SINT32_BIT] = WIRETYPE_VARINT
+ ..[FieldType._SINT64_BIT] = WIRETYPE_VARINT
+ ..[FieldType._UINT32_BIT] = WIRETYPE_VARINT
+ ..[FieldType._UINT64_BIT] = WIRETYPE_VARINT
+ ..[FieldType._FIXED32_BIT] = WIRETYPE_FIXED32
+ ..[FieldType._FIXED64_BIT] = WIRETYPE_FIXED64
+ ..[FieldType._SFIXED32_BIT] = WIRETYPE_FIXED32
+ ..[FieldType._SFIXED64_BIT] = WIRETYPE_FIXED64
+ ..[FieldType._MESSAGE_BIT] = WIRETYPE_LENGTH_DELIMITED;
}
void _withDeferredSizeCalculation(continuation) {
@@ -165,7 +165,7 @@ class CodedBufferWriter {
writeInt32NoTag(makeTag(fieldNumber, wireFormat));
}
- if ((fieldType & GeneratedMessage._PACKED_BIT) != 0) {
+ if ((fieldType & FieldType._PACKED_BIT) != 0) {
if (!fieldValue.isEmpty) {
writeTag(WIRETYPE_LENGTH_DELIMITED);
_withDeferredSizeCalculation(() {
@@ -180,12 +180,12 @@ class CodedBufferWriter {
writeValue(value) {
writeTag(_OPEN_TAG_MAP[valueType]);
writeFunction(this, value);
- if (valueType == GeneratedMessage._GROUP_BIT) {
+ if (valueType == FieldType._GROUP_BIT) {
writeTag(WIRETYPE_END_GROUP);
}
}
- if ((fieldType & GeneratedMessage._REPEATED_BIT) != 0) {
+ if ((fieldType & FieldType._REPEATED_BIT) != 0) {
fieldValue.forEach(writeValue);
return;
}
« no previous file with comments | « lib/src/protobuf/builder_info.dart ('k') | lib/src/protobuf/field_info.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698