ADD: added new version of protobuf
This commit is contained in:
@@ -40,8 +40,8 @@
|
||||
GPBUInt64Array *mutableVarintList_;
|
||||
GPBUInt32Array *mutableFixed32List_;
|
||||
GPBUInt64Array *mutableFixed64List_;
|
||||
NSMutableArray<NSData *> *mutableLengthDelimitedList_;
|
||||
NSMutableArray<GPBUnknownFieldSet *> *mutableGroupList_;
|
||||
NSMutableArray<NSData*> *mutableLengthDelimitedList_;
|
||||
NSMutableArray<GPBUnknownFieldSet*> *mutableGroupList_;
|
||||
}
|
||||
|
||||
@synthesize number = number_;
|
||||
@@ -75,14 +75,16 @@
|
||||
#pragma clang diagnostic ignored "-Wdirect-ivar-access"
|
||||
|
||||
- (id)copyWithZone:(NSZone *)zone {
|
||||
GPBUnknownField *result = [[GPBUnknownField allocWithZone:zone] initWithNumber:number_];
|
||||
GPBUnknownField *result =
|
||||
[[GPBUnknownField allocWithZone:zone] initWithNumber:number_];
|
||||
result->mutableFixed32List_ = [mutableFixed32List_ copyWithZone:zone];
|
||||
result->mutableFixed64List_ = [mutableFixed64List_ copyWithZone:zone];
|
||||
result->mutableLengthDelimitedList_ = [mutableLengthDelimitedList_ mutableCopyWithZone:zone];
|
||||
result->mutableLengthDelimitedList_ =
|
||||
[mutableLengthDelimitedList_ mutableCopyWithZone:zone];
|
||||
result->mutableVarintList_ = [mutableVarintList_ copyWithZone:zone];
|
||||
if (mutableGroupList_.count) {
|
||||
result->mutableGroupList_ =
|
||||
[[NSMutableArray allocWithZone:zone] initWithCapacity:mutableGroupList_.count];
|
||||
result->mutableGroupList_ = [[NSMutableArray allocWithZone:zone]
|
||||
initWithCapacity:mutableGroupList_.count];
|
||||
for (GPBUnknownFieldSet *group in mutableGroupList_) {
|
||||
GPBUnknownFieldSet *copied = [group copyWithZone:zone];
|
||||
[result->mutableGroupList_ addObject:copied];
|
||||
@@ -97,21 +99,26 @@
|
||||
if (![object isKindOfClass:[GPBUnknownField class]]) return NO;
|
||||
GPBUnknownField *field = (GPBUnknownField *)object;
|
||||
if (number_ != field->number_) return NO;
|
||||
BOOL equalVarint = (mutableVarintList_.count == 0 && field->mutableVarintList_.count == 0) ||
|
||||
[mutableVarintList_ isEqual:field->mutableVarintList_];
|
||||
BOOL equalVarint =
|
||||
(mutableVarintList_.count == 0 && field->mutableVarintList_.count == 0) ||
|
||||
[mutableVarintList_ isEqual:field->mutableVarintList_];
|
||||
if (!equalVarint) return NO;
|
||||
BOOL equalFixed32 = (mutableFixed32List_.count == 0 && field->mutableFixed32List_.count == 0) ||
|
||||
BOOL equalFixed32 = (mutableFixed32List_.count == 0 &&
|
||||
field->mutableFixed32List_.count == 0) ||
|
||||
[mutableFixed32List_ isEqual:field->mutableFixed32List_];
|
||||
if (!equalFixed32) return NO;
|
||||
BOOL equalFixed64 = (mutableFixed64List_.count == 0 && field->mutableFixed64List_.count == 0) ||
|
||||
BOOL equalFixed64 = (mutableFixed64List_.count == 0 &&
|
||||
field->mutableFixed64List_.count == 0) ||
|
||||
[mutableFixed64List_ isEqual:field->mutableFixed64List_];
|
||||
if (!equalFixed64) return NO;
|
||||
BOOL equalLDList =
|
||||
(mutableLengthDelimitedList_.count == 0 && field->mutableLengthDelimitedList_.count == 0) ||
|
||||
(mutableLengthDelimitedList_.count == 0 &&
|
||||
field->mutableLengthDelimitedList_.count == 0) ||
|
||||
[mutableLengthDelimitedList_ isEqual:field->mutableLengthDelimitedList_];
|
||||
if (!equalLDList) return NO;
|
||||
BOOL equalGroupList = (mutableGroupList_.count == 0 && field->mutableGroupList_.count == 0) ||
|
||||
[mutableGroupList_ isEqual:field->mutableGroupList_];
|
||||
BOOL equalGroupList =
|
||||
(mutableGroupList_.count == 0 && field->mutableGroupList_.count == 0) ||
|
||||
[mutableGroupList_ isEqual:field->mutableGroupList_];
|
||||
if (!equalGroupList) return NO;
|
||||
return YES;
|
||||
}
|
||||
@@ -154,17 +161,20 @@
|
||||
__block size_t result = 0;
|
||||
int32_t number = number_;
|
||||
[mutableVarintList_
|
||||
enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
|
||||
enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
|
||||
#pragma unused(idx, stop)
|
||||
result += GPBComputeUInt64Size(number, value);
|
||||
}];
|
||||
|
||||
[mutableFixed32List_
|
||||
enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
|
||||
enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
|
||||
#pragma unused(idx, stop)
|
||||
result += GPBComputeFixed32Size(number, value);
|
||||
}];
|
||||
|
||||
[mutableFixed64List_
|
||||
enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
|
||||
enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
|
||||
#pragma unused(idx, stop)
|
||||
result += GPBComputeFixed64Size(number, value);
|
||||
}];
|
||||
|
||||
@@ -195,19 +205,23 @@
|
||||
|
||||
- (NSString *)description {
|
||||
NSMutableString *description =
|
||||
[NSMutableString stringWithFormat:@"<%@ %p>: Field: %d {\n", [self class], self, number_];
|
||||
[NSMutableString stringWithFormat:@"<%@ %p>: Field: %d {\n",
|
||||
[self class], self, number_];
|
||||
[mutableVarintList_
|
||||
enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
|
||||
enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
|
||||
#pragma unused(idx, stop)
|
||||
[description appendFormat:@"\t%llu\n", value];
|
||||
}];
|
||||
|
||||
[mutableFixed32List_
|
||||
enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
|
||||
enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
|
||||
#pragma unused(idx, stop)
|
||||
[description appendFormat:@"\t%u\n", value];
|
||||
}];
|
||||
|
||||
[mutableFixed64List_
|
||||
enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
|
||||
enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
|
||||
#pragma unused(idx, stop)
|
||||
[description appendFormat:@"\t%llu\n", value];
|
||||
}];
|
||||
|
||||
@@ -255,14 +269,16 @@
|
||||
if (mutableLengthDelimitedList_ == nil) {
|
||||
mutableLengthDelimitedList_ = [otherLengthDelimitedList mutableCopy];
|
||||
} else {
|
||||
[mutableLengthDelimitedList_ addObjectsFromArray:otherLengthDelimitedList];
|
||||
[mutableLengthDelimitedList_
|
||||
addObjectsFromArray:otherLengthDelimitedList];
|
||||
}
|
||||
}
|
||||
|
||||
NSArray *otherGroupList = other.groupList;
|
||||
if (otherGroupList.count > 0) {
|
||||
if (mutableGroupList_ == nil) {
|
||||
mutableGroupList_ = [[NSMutableArray alloc] initWithCapacity:otherGroupList.count];
|
||||
mutableGroupList_ =
|
||||
[[NSMutableArray alloc] initWithCapacity:otherGroupList.count];
|
||||
}
|
||||
// Make our own mutable copies.
|
||||
for (GPBUnknownFieldSet *group in otherGroupList) {
|
||||
@@ -283,7 +299,8 @@
|
||||
|
||||
- (void)addFixed32:(uint32_t)value {
|
||||
if (mutableFixed32List_ == nil) {
|
||||
mutableFixed32List_ = [[GPBUInt32Array alloc] initWithValues:&value count:1];
|
||||
mutableFixed32List_ =
|
||||
[[GPBUInt32Array alloc] initWithValues:&value count:1];
|
||||
} else {
|
||||
[mutableFixed32List_ addValue:value];
|
||||
}
|
||||
@@ -291,7 +308,8 @@
|
||||
|
||||
- (void)addFixed64:(uint64_t)value {
|
||||
if (mutableFixed64List_ == nil) {
|
||||
mutableFixed64List_ = [[GPBUInt64Array alloc] initWithValues:&value count:1];
|
||||
mutableFixed64List_ =
|
||||
[[GPBUInt64Array alloc] initWithValues:&value count:1];
|
||||
} else {
|
||||
[mutableFixed64List_ addValue:value];
|
||||
}
|
||||
@@ -299,7 +317,8 @@
|
||||
|
||||
- (void)addLengthDelimited:(NSData *)value {
|
||||
if (mutableLengthDelimitedList_ == nil) {
|
||||
mutableLengthDelimitedList_ = [[NSMutableArray alloc] initWithObjects:&value count:1];
|
||||
mutableLengthDelimitedList_ =
|
||||
[[NSMutableArray alloc] initWithObjects:&value count:1];
|
||||
} else {
|
||||
[mutableLengthDelimitedList_ addObject:value];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user