@@ -144,68 +144,6 @@ enum FieldBaseType {
144144
145145/// Defines constants and functions for dealing with fieldType bits.
146146class PbFieldType {
147- /// Returns the base field type without any of the required, repeated
148- /// and packed bits.
149- static int _baseType (int fieldType) =>
150- fieldType & ~ (_REQUIRED_BIT | _REPEATED_BIT | _PACKED_BIT | _MAP_BIT );
151-
152- static FieldBaseType toBaseType (int fieldType) {
153- var baseType = fieldType & ~ (_REQUIRED_BIT | _REPEATED_BIT | _PACKED_BIT );
154-
155- // _MAP sets both message and map bits, probably because in some places we
156- // want to handle maps as messages, but in others we treat them specially..
157- // TODO: figure this out
158- if (baseType == _MAP ) {
159- return FieldBaseType .map;
160- }
161-
162- assert (baseType & (baseType - 1 ) == 0 ,
163- 'base type has more than one bit set: $baseType ' );
164-
165- switch (_baseType (fieldType)) {
166- case PbFieldType ._BOOL_BIT :
167- return FieldBaseType .bool ;
168- case PbFieldType ._BYTES_BIT :
169- return FieldBaseType .bytes;
170- case PbFieldType ._STRING_BIT :
171- return FieldBaseType .string;
172- case PbFieldType ._DOUBLE_BIT :
173- return FieldBaseType .double ;
174- case PbFieldType ._FLOAT_BIT :
175- return FieldBaseType .float;
176- case PbFieldType ._ENUM_BIT :
177- return FieldBaseType .enum_;
178- case PbFieldType ._GROUP_BIT :
179- return FieldBaseType .group;
180- case PbFieldType ._INT32_BIT :
181- return FieldBaseType .int32;
182- case PbFieldType ._INT64_BIT :
183- return FieldBaseType .int64;
184- case PbFieldType ._SINT32_BIT :
185- return FieldBaseType .sint32;
186- case PbFieldType ._SINT64_BIT :
187- return FieldBaseType .sint64;
188- case PbFieldType ._UINT32_BIT :
189- return FieldBaseType .uint32;
190- case PbFieldType ._UINT64_BIT :
191- return FieldBaseType .uint64;
192- case PbFieldType ._FIXED32_BIT :
193- return FieldBaseType .fixed32;
194- case PbFieldType ._FIXED64_BIT :
195- return FieldBaseType .fixed64;
196- case PbFieldType ._SFIXED32_BIT :
197- return FieldBaseType .sfixed32;
198- case PbFieldType ._SFIXED64_BIT :
199- return FieldBaseType .sfixed64;
200- case PbFieldType ._MESSAGE_BIT :
201- return FieldBaseType .message;
202- case PbFieldType ._MAP_BIT :
203- return FieldBaseType .map;
204- default :
205- throw ArgumentError ('TODO: write an error message' );
206- }
207- }
208-
209147 static MakeDefaultFunc ? _defaultForType (FieldType type) {
210148 switch (type.baseType) {
211149 case FieldBaseType .bool :
0 commit comments