From 8aae88b2006d7bcdcb173a7ee5c1f6824644768c Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Sat, 19 Apr 2014 19:02:52 +0400 Subject: [PATCH 01/18] arm64 fixes --- Example/Person.pb.m | 18 +- Example/iOS/Proto/ViewController.m | 8 +- Example/person.pb.rb | 45 + Example/person.proto | 2 +- src/compiler/objc_enum_field.cc | 12 +- src/compiler/objc_helpers.cc | 12 +- src/compiler/objc_message.cc | 6 +- src/compiler/objc_primitive_field.cc | 8 +- src/runtime/Classes/AbstractMessage.m | 2 +- src/runtime/Classes/CodedInputStream.h | 54 +- src/runtime/Classes/CodedInputStream.m | 98 +- src/runtime/Classes/CodedOutputStream.h | 74 +- src/runtime/Classes/CodedOutputStream.m | 92 +- src/runtime/Classes/ConcreteExtensionField.h | 4 +- src/runtime/Classes/ConcreteExtensionField.m | 40 +- src/runtime/Classes/Descriptor.pb.h | 158 +-- src/runtime/Classes/Descriptor.pb.m | 268 ++--- src/runtime/Classes/ExtendableMessage.h | 18 +- src/runtime/Classes/ExtendableMessage.m | 34 +- .../Classes/ExtendableMessage_Builder.h | 2 +- .../Classes/ExtendableMessage_Builder.m | 16 +- src/runtime/Classes/ExtensionField.h | 6 +- src/runtime/Classes/Field.h | 10 +- src/runtime/Classes/Field.m | 28 +- src/runtime/Classes/GeneratedMessage.h | 2 +- .../Classes/GeneratedMessage_Builder.h | 2 +- .../Classes/GeneratedMessage_Builder.m | 2 +- src/runtime/Classes/Message.h | 2 +- src/runtime/Classes/MutableField.h | 2 +- src/runtime/Classes/MutableField.m | 2 +- src/runtime/Classes/PBArray.h | 8 +- src/runtime/Classes/PBArray.m | 24 +- src/runtime/Classes/RingBuffer.m | 6 +- src/runtime/Classes/TextFormat.h | 4 +- src/runtime/Classes/TextFormat.m | 18 +- src/runtime/Classes/UnknownFieldSet.h | 8 +- src/runtime/Classes/UnknownFieldSet.m | 16 +- src/runtime/Classes/UnknownFieldSet_Builder.h | 10 +- src/runtime/Classes/UnknownFieldSet_Builder.m | 24 +- src/runtime/Classes/Utilities.h | 102 +- src/runtime/Classes/Utilities.m | 116 +- src/runtime/Classes/WireFormat.h | 6 +- src/runtime/Classes/WireFormat.m | 6 +- src/runtime/Tests/ArrayTests.m | 24 +- src/runtime/Tests/CodedInputStreamTests.m | 36 +- src/runtime/Tests/CodedOuputStreamTests.m | 18 +- src/runtime/Tests/CoreTests.m | 2 +- src/runtime/Tests/SmallBlockInputStream.h | 4 +- src/runtime/Tests/SmallBlockInputStream.m | 4 +- src/runtime/Tests/Unittest.pb.h | 694 +++++------ src/runtime/Tests/Unittest.pb.m | 1066 ++++++++--------- src/runtime/Tests/UnittestCustomOptions.pb.h | 80 +- src/runtime/Tests/UnittestCustomOptions.pb.m | 186 +-- .../Tests/UnittestEmbedOptimizeFor.pb.m | 6 +- .../Tests/UnittestEnormousDescriptor.pb.m | 6 +- src/runtime/Tests/UnittestImport.pb.h | 8 +- src/runtime/Tests/UnittestImport.pb.m | 12 +- src/runtime/Tests/UnittestImportLite.pb.h | 8 +- src/runtime/Tests/UnittestImportLite.pb.m | 12 +- src/runtime/Tests/UnittestLite.pb.h | 244 ++-- src/runtime/Tests/UnittestLite.pb.m | 430 +++---- .../Tests/UnittestLiteImportsNonlite.pb.m | 6 +- src/runtime/Tests/UnittestMset.pb.h | 16 +- src/runtime/Tests/UnittestMset.pb.m | 48 +- .../Tests/UnittestNoGenericServices.pb.h | 8 +- .../Tests/UnittestNoGenericServices.pb.m | 12 +- src/runtime/Tests/UnittestOptimizeFor.pb.h | 16 +- src/runtime/Tests/UnittestOptimizeFor.pb.m | 30 +- src/runtime/Tests/UnknownFieldSetTest.m | 2 +- src/runtime/Tests/WireFormatTests.m | 4 +- 70 files changed, 2202 insertions(+), 2155 deletions(-) create mode 100644 Example/person.pb.rb diff --git a/Example/Person.pb.m b/Example/Person.pb.m index 9d5bdbf..0932413 100644 --- a/Example/Person.pb.m +++ b/Example/Person.pb.m @@ -112,8 +112,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size_ = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size_ = memoizedSerializedSize; if (size_ != -1) { return size_; } @@ -170,7 +170,7 @@ - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) ind [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; } if (self.hasPersonId) { - [output appendFormat:@"%@%@: %@\n", indent, @"personId", [NSNumber numberWithInt:self.personId]]; + [output appendFormat:@"%@%@: %@\n", indent, @"personId", [NSNumber numberWithInteger:self.personId]]; } if (self.hasEmail) { [output appendFormat:@"%@%@: %@\n", indent, @"email", self.email]; @@ -207,7 +207,7 @@ - (NSUInteger) hash { hashCode = hashCode * 31 + [self.name hash]; } if (self.hasPersonId) { - hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.personId] hash]; + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.personId] hash]; } if (self.hasEmail) { hashCode = hashCode * 31 + [self.email hash]; @@ -288,8 +288,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size_ = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size_ = memoizedSerializedSize; if (size_ != -1) { return size_; } @@ -428,7 +428,7 @@ - (PersonPhoneNumberBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (PersonPhoneNumberBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -445,7 +445,7 @@ - (PersonPhoneNumberBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 16: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (PersonPhoneTypeIsValidValue(value)) { [self setType:value]; } else { @@ -556,7 +556,7 @@ - (PersonBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (PersonBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/Example/iOS/Proto/ViewController.m b/Example/iOS/Proto/ViewController.m index f944855..aecc7c1 100644 --- a/Example/iOS/Proto/ViewController.m +++ b/Example/iOS/Proto/ViewController.m @@ -23,14 +23,14 @@ - (void)viewDidLoad [super viewDidLoad]; [self proto]; - [self json]; +// [self json]; } -(void) proto { // Proto Part - NSData* raw_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://0.0.0.0:4567/1/getGroups"]]; + NSData* raw_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://192.168.2.1:4567/1/getGroups"]]; if (!raw_data) { NSLog(@"Please turn on the server"); @@ -39,15 +39,17 @@ -(void) proto __block Person* person; NSLog(@"proto content size %@",[NSByteCountFormatter stringFromByteCount:raw_data.length countStyle:NSByteCountFormatterCountStyleMemory]); + [NSObject logTime:^{ person = [Person parseFromData:raw_data]; + NSLog(@"%ld",(long)person.personId); } withPrefix:@"builing proto objects"]; } -(void) json { // JSON Part - NSData *raw_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://0.0.0.0:4567/1/getGroupsJson"]]; + NSData *raw_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://192.168.2.1:4567/1/getGroupsJson"]]; if (!raw_data) { diff --git a/Example/person.pb.rb b/Example/person.pb.rb new file mode 100644 index 0000000..1180b0f --- /dev/null +++ b/Example/person.pb.rb @@ -0,0 +1,45 @@ +### Generated by rprotoc. DO NOT EDIT! +### +# +# message Person { +# required string name = 1; +# required int32 personId = 2; +# optional string email = 3; +# +# enum PhoneType { +# MOBILE = 0; +# HOME = 1; +# WORK = 2; +# } +# +# message PhoneNumber { +# required string number = 1; +# optional PhoneType type = 2 [default = HOME]; +# } +# +# repeated PhoneNumber phones = 4; +# } + +require 'protobuf/message/message' +require 'protobuf/message/enum' +require 'protobuf/message/service' +require 'protobuf/message/extend' + +class Person < ::Protobuf::Message + defined_in __FILE__ + required :string, :name, 1 + required :int32, :personId, 2 + optional :string, :email, 3 + class PhoneType < ::Protobuf::Enum + defined_in __FILE__ + MOBILE = value(:MOBILE, 0) + HOME = value(:HOME, 1) + WORK = value(:WORK, 2) + end + class PhoneNumber < ::Protobuf::Message + defined_in __FILE__ + required :string, :number, 1 + optional :PhoneType, :type, 2, :default => :HOME + end + repeated :PhoneNumber, :phones, 4 +end \ No newline at end of file diff --git a/Example/person.proto b/Example/person.proto index 1b38fd6..e141d45 100644 --- a/Example/person.proto +++ b/Example/person.proto @@ -1,7 +1,7 @@ message Person { required string name = 1; - required int32 personId = 2; + required int64 personId = 2; optional string email = 3; enum PhoneType { diff --git a/src/compiler/objc_enum_field.cc b/src/compiler/objc_enum_field.cc index c0cfe00..69c6333 100644 --- a/src/compiler/objc_enum_field.cc +++ b/src/compiler/objc_enum_field.cc @@ -171,7 +171,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void EnumFieldGenerator::GenerateParsingCodeSource(io::Printer* printer) const { printer->Print(variables_, - "int32_t value = [input readEnum];\n" + "NSInteger value = [input readEnum];\n" "if ($type$IsValidValue(value)) {\n" " [self set$capitalized_name$:value];\n" "} else {\n" @@ -250,7 +250,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective printer->Print(variables_, "PBAppendableArray * $list_name$;\n"); if (descriptor_->options().packed()) { printer->Print(variables_, - "int32_t $name$MemoizedSerializedSize;\n"); + "NSInteger $name$MemoizedSerializedSize;\n"); } } @@ -378,14 +378,14 @@ namespace google { namespace protobuf { namespace compiler { namespace objective // If packed, set up the while loop if (descriptor_->options().packed()) { printer->Print(variables_, - "int32_t length = [input readRawVarint32];\n" - "int32_t oldLimit = [input pushLimit:length];\n" + "NSInteger length = [input readRawVarint32];\n" + "NSInteger oldLimit = [input pushLimit:length];\n" "while (input.bytesUntilLimit > 0) {\n"); printer->Indent(); } printer->Print(variables_, - "int32_t value = [input readEnum];\n" + "NSInteger value = [input readEnum];\n" "if ($type$IsValidValue(value)) {\n" " [self add$capitalized_name$:value];\n" "} else {\n" @@ -426,7 +426,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void RepeatedEnumFieldGenerator::GenerateSerializedSizeCodeSource(io::Printer* printer) const { printer->Print(variables_, "{\n" - " int32_t dataSize = 0;\n" + " NSInteger dataSize = 0;\n" " const NSUInteger count = self.$list_name$.count;\n"); printer->Indent(); diff --git a/src/compiler/objc_helpers.cc b/src/compiler/objc_helpers.cc index 0c43891..1df8f86 100644 --- a/src/compiler/objc_helpers.cc +++ b/src/compiler/objc_helpers.cc @@ -423,17 +423,17 @@ namespace google { namespace protobuf { namespace compiler { namespace objective string BoxValue(const FieldDescriptor* field, const string& value) { switch (GetObjectiveCType(field)) { case OBJECTIVECTYPE_INT: - return "@(" + value + ")"; + return "[NSNumber numberWithInteger:" + value + "]"; case OBJECTIVECTYPE_LONG: - return "@(" + value + ")"; + return "[NSNumber numberWithLongLong:" + value + "]"; case OBJECTIVECTYPE_FLOAT: - return "@(" + value + ")"; + return "[NSNumber numberWithFloat:" + value + "]"; case OBJECTIVECTYPE_DOUBLE: - return "@(" + value + ")"; + return "[NSNumber numberWithDouble:" + value + "]"; case OBJECTIVECTYPE_BOOLEAN: - return "@(" + value + ")"; + return "[NSNumber numberWithBool:" + value + "]"; case OBJECTIVECTYPE_ENUM: - return "@(" + value + ")"; + return "[NSNumber numberWithInteger:" + value + "]"; default: return value; } diff --git a/src/compiler/objc_message.cc b/src/compiler/objc_message.cc index f18bfa8..8971856 100644 --- a/src/compiler/objc_message.cc +++ b/src/compiler/objc_message.cc @@ -581,8 +581,8 @@ namespace google { namespace protobuf { namespace compiler { namespace objective printer->Outdent(); printer->Print( "}\n" - "- (int32_t) serializedSize {\n" - " int32_t size_ = memoizedSerializedSize;\n" + "- (NSInteger) serializedSize {\n" + " NSInteger size_ = memoizedSerializedSize;\n" " if (size_ != -1) {\n" " return size_;\n" " }\n" @@ -959,7 +959,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective printer->Indent(); printer->Print( - "int32_t tag = [input readTag];\n" + "NSInteger tag = [input readTag];\n" "switch (tag) {\n"); printer->Indent(); diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc index e2f9d53..fe43d02 100644 --- a/src/compiler/objc_primitive_field.cc +++ b/src/compiler/objc_primitive_field.cc @@ -436,7 +436,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void RepeatedPrimitiveFieldGenerator::GenerateFieldHeader(io::Printer* printer) const { printer->Print(variables_, "PBAppendableArray * $list_name$;\n"); if (descriptor_->options().packed()) { - printer->Print(variables_,"int32_t $name$MemoizedSerializedSize;\n"); + printer->Print(variables_,"NSInteger $name$MemoizedSerializedSize;\n"); } } @@ -566,8 +566,8 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void RepeatedPrimitiveFieldGenerator::GenerateParsingCodeSource(io::Printer* printer) const { if (descriptor_->options().packed()) { printer->Print(variables_, - "int32_t length = [input readRawVarint32];\n" - "int32_t limit = [input pushLimit:length];\n" + "NSInteger length = [input readRawVarint32];\n" + "NSInteger limit = [input pushLimit:length];\n" "if (result.$list_name$ == nil) {\n" " result.$list_name$ = [PBAppendableArray arrayWithValueType:$array_value_type$];\n" "}\n" @@ -621,7 +621,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective printer->Indent(); printer->Print(variables_, - "int32_t dataSize = 0;\n" + "NSInteger dataSize = 0;\n" "const NSUInteger count = self.$list_name$.count;\n"); if (FixedSize(descriptor_->type()) == -1) { diff --git a/src/runtime/Classes/AbstractMessage.m b/src/runtime/Classes/AbstractMessage.m index a38600a..d152a50 100644 --- a/src/runtime/Classes/AbstractMessage.m +++ b/src/runtime/Classes/AbstractMessage.m @@ -42,7 +42,7 @@ - (BOOL) isInitialized { } -- (int32_t) serializedSize { +- (NSInteger) serializedSize { @throw [NSException exceptionWithName:@"ImproperSubclassing" reason:@"" userInfo:nil]; } diff --git a/src/runtime/Classes/CodedInputStream.h b/src/runtime/Classes/CodedInputStream.h index 5b092e3..c2a02e1 100644 --- a/src/runtime/Classes/CodedInputStream.h +++ b/src/runtime/Classes/CodedInputStream.h @@ -34,28 +34,28 @@ @interface PBCodedInputStream : NSObject { @private NSMutableData* buffer; - int32_t bufferSize; - int32_t bufferSizeAfterLimit; - int32_t bufferPos; + NSInteger bufferSize; + NSInteger bufferSizeAfterLimit; + NSInteger bufferPos; NSInputStream* input; - int32_t lastTag; + NSInteger lastTag; /** * The total number of bytes read before the current buffer. The total * bytes read up to the current position can be computed as * {@code totalBytesRetired + bufferPos}. */ - int32_t totalBytesRetired; + NSInteger totalBytesRetired; /** The absolute position of the end of the current message. */ - int32_t currentLimit; + NSInteger currentLimit; /** See setRecursionLimit() */ - int32_t recursionDepth; - int32_t recursionLimit; + NSInteger recursionDepth; + NSInteger recursionLimit; /** See setSizeLimit() */ - int32_t sizeLimit; + NSInteger sizeLimit; } + (PBCodedInputStream*) streamWithData:(NSData*) data; @@ -66,21 +66,21 @@ * Protocol message parsers use this to read tags, since a protocol message * may legally end wherever a tag occurs, and zero is not a valid tag number. */ -- (int32_t) readTag; +- (NSInteger) readTag; - (BOOL) refillBuffer:(BOOL) mustSucceed; - (Float64) readDouble; - (Float32) readFloat; - (int64_t) readUInt64; -- (int32_t) readUInt32; +- (NSInteger) readUInt32; - (int64_t) readInt64; -- (int32_t) readInt32; +- (NSInteger) readInt32; - (int64_t) readFixed64; -- (int32_t) readFixed32; -- (int32_t) readEnum; -- (int32_t) readSFixed32; +- (NSInteger) readFixed32; +- (NSInteger) readEnum; +- (NSInteger) readSFixed32; - (int64_t) readSFixed64; -- (int32_t) readSInt32; +- (NSInteger) readSInt32; - (int64_t) readSInt64; /** @@ -95,9 +95,9 @@ * Read a raw Varint from the stream. If larger than 32 bits, discard the * upper bits. */ -- (int32_t) readRawVarint32; +- (NSInteger) readRawVarint32; - (int64_t) readRawVarint64; -- (int32_t) readRawLittleEndian32; +- (NSInteger) readRawLittleEndian32; - (int64_t) readRawLittleEndian64; /** @@ -106,7 +106,7 @@ * @throws InvalidProtocolBuffer The end of the stream or the current * limit was reached. */ -- (NSData*) readRawData:(int32_t) size; +- (NSData*) readRawData:(NSInteger) size; /** * Reads and discards a single field, given its tag value. @@ -114,7 +114,7 @@ * @return {@code false} if the tag is an endgroup tag, in which case * nothing is skipped. Otherwise, returns {@code true}. */ -- (BOOL) skipField:(int32_t) tag; +- (BOOL) skipField:(NSInteger) tag; /** @@ -123,7 +123,7 @@ * @throws InvalidProtocolBuffer The end of the stream or the current * limit was reached. */ -- (void) skipRawData:(int32_t) size; +- (void) skipRawData:(NSInteger) size; /** * Reads and discards an entire message. This will read either until EOF @@ -132,10 +132,10 @@ - (void) skipMessage; - (BOOL) isAtEnd; -- (int32_t) pushLimit:(int32_t) byteLimit; +- (NSInteger) pushLimit:(NSInteger) byteLimit; - (void) recomputeBufferSizeAfterLimit; -- (void) popLimit:(int32_t) oldLimit; -- (int32_t) bytesUntilLimit; +- (void) popLimit:(NSInteger) oldLimit; +- (NSInteger) bytesUntilLimit; /** Read an embedded message field value from the stream. */ @@ -145,13 +145,13 @@ - (NSString*) readString; - (NSData*) readData; -- (void) readGroup:(int32_t) fieldNumber builder:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (void) readGroup:(NSInteger) fieldNumber builder:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry; /** * Reads a {@code group} field value from the stream and merges it into the * given {@link UnknownFieldSet}. */ -- (void) readUnknownGroup:(int32_t) fieldNumber builder:(PBUnknownFieldSet_Builder*) builder; +- (void) readUnknownGroup:(NSInteger) fieldNumber builder:(PBUnknownFieldSet_Builder*) builder; /** * Verifies that the last call to readTag() returned the given tag value. @@ -161,6 +161,6 @@ * @throws InvalidProtocolBuffer {@code value} does not match the * last tag. */ -- (void) checkLastTagWas:(int32_t) value; +- (void) checkLastTagWas:(NSInteger) value; @end diff --git a/src/runtime/Classes/CodedInputStream.m b/src/runtime/Classes/CodedInputStream.m index 5de831b..fc7219e 100644 --- a/src/runtime/Classes/CodedInputStream.m +++ b/src/runtime/Classes/CodedInputStream.m @@ -30,9 +30,9 @@ @interface PBCodedInputStream () @implementation PBCodedInputStream -const int32_t DEFAULT_RECURSION_LIMIT = 64; -const int32_t DEFAULT_SIZE_LIMIT = 64 << 20; // 64MB -const int32_t BUFFER_SIZE = 4096; +const NSInteger DEFAULT_RECURSION_LIMIT = 64; +const NSInteger DEFAULT_SIZE_LIMIT = 64 << 20; // 64MB +const NSInteger BUFFER_SIZE = 4096; @synthesize buffer; @synthesize input; @@ -93,7 +93,7 @@ + (PBCodedInputStream*) streamWithInputStream:(NSInputStream*) input { * Protocol message parsers use this to read tags, since a protocol message * may legally end wherever a tag occurs, and zero is not a valid tag number. */ -- (int32_t) readTag { +- (NSInteger) readTag { if (self.isAtEnd) { lastTag = 0; return 0; @@ -115,7 +115,7 @@ - (int32_t) readTag { * @throws InvalidProtocolBufferException {@code value} does not match the * last tag. */ -- (void) checkLastTagWas:(int32_t) value { +- (void) checkLastTagWas:(NSInteger) value { if (lastTag != value) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"Invalid End Tag" userInfo:nil]; } @@ -127,7 +127,7 @@ - (void) checkLastTagWas:(int32_t) value { * @return {@code NO} if the tag is an endgroup tag, in which case * nothing is skipped. Otherwise, returns {@code YES}. */ -- (BOOL) skipField:(int32_t) tag { +- (BOOL) skipField:(NSInteger) tag { switch (PBWireFormatGetTagWireType(tag)) { case PBWireFormatVarint: [self readInt32]; @@ -161,7 +161,7 @@ - (BOOL) skipField:(int32_t) tag { */ - (void) skipMessage { while (YES) { - int32_t tag = [self readTag]; + NSInteger tag = [self readTag]; if (tag == 0 || ![self skipField:tag]) { return; } @@ -194,7 +194,7 @@ - (int64_t) readInt64 { /** Read an {@code int32} field value from the stream. */ -- (int32_t) readInt32 { +- (NSInteger) readInt32 { return [self readRawVarint32]; } @@ -206,7 +206,7 @@ - (int64_t) readFixed64 { /** Read a {@code fixed32} field value from the stream. */ -- (int32_t) readFixed32 { +- (NSInteger) readFixed32 { return [self readRawLittleEndian32]; } @@ -219,7 +219,7 @@ - (BOOL) readBool { /** Read a {@code string} field value from the stream. */ - (NSString*) readString { - int32_t size = [self readRawVarint32]; + NSInteger size = [self readRawVarint32]; if (size <= (bufferSize - bufferPos) && size > 0) { // Fast path: We already have the bytes in a contiguous buffer, so // just copy directly from it. @@ -238,7 +238,7 @@ - (NSString*) readString { /** Read a {@code group} field value from the stream. */ -- (void) readGroup:(int32_t) fieldNumber +- (void) readGroup:(NSInteger) fieldNumber builder:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry { if (recursionDepth >= recursionLimit) { @@ -255,7 +255,7 @@ - (void) readGroup:(int32_t) fieldNumber * Reads a {@code group} field value from the stream and merges it into the * given {@link PBUnknownFieldSet}. */ -- (void) readUnknownGroup:(int32_t) fieldNumber +- (void) readUnknownGroup:(NSInteger) fieldNumber builder:(PBUnknownFieldSet_Builder*) builder { if (recursionDepth >= recursionLimit) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"Recursion Limit Exceeded" userInfo:nil]; @@ -270,11 +270,11 @@ - (void) readUnknownGroup:(int32_t) fieldNumber /** Read an embedded message field value from the stream. */ - (void) readMessage:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - int32_t length = [self readRawVarint32]; + NSInteger length = [self readRawVarint32]; if (recursionDepth >= recursionLimit) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"Recursion Limit Exceeded" userInfo:nil]; } - int32_t oldLimit = [self pushLimit:length]; + NSInteger oldLimit = [self pushLimit:length]; ++recursionDepth; [builder mergeFromCodedInputStream:self extensionRegistry:extensionRegistry]; [self checkLastTagWas:0]; @@ -285,7 +285,7 @@ - (void) readMessage:(id) builder /** Read a {@code bytes} field value from the stream. */ - (NSData*) readData { - int32_t size = [self readRawVarint32]; + NSInteger size = [self readRawVarint32]; if (size < bufferSize - bufferPos && size > 0) { // Fast path: We already have the bytes in a contiguous buffer, so // just copy directly from it. @@ -300,7 +300,7 @@ - (NSData*) readData { /** Read a {@code uint32} field value from the stream. */ -- (int32_t) readUInt32 { +- (NSInteger) readUInt32 { return [self readRawVarint32]; } @@ -309,13 +309,13 @@ - (int32_t) readUInt32 { * Read an enum field value from the stream. Caller is responsible * for converting the numeric value to an actual enum. */ -- (int32_t) readEnum { +- (NSInteger) readEnum { return [self readRawVarint32]; } /** Read an {@code sfixed32} field value from the stream. */ -- (int32_t) readSFixed32 { +- (NSInteger) readSFixed32 { return [self readRawLittleEndian32]; } @@ -327,7 +327,7 @@ - (int64_t) readSFixed64 { /** Read an {@code sint32} field value from the stream. */ -- (int32_t) readSInt32 { +- (NSInteger) readSInt32 { return decodeZigZag32([self readRawVarint32]); } @@ -344,12 +344,12 @@ - (int64_t) readSInt64 { * Read a raw Varint from the stream. If larger than 32 bits, discard the * upper bits. */ -- (int32_t) readRawVarint32 { +- (NSInteger) readRawVarint32 { int8_t tmp = [self readRawByte]; if (tmp >= 0) { return tmp; } - int32_t result = tmp & 0x7f; + NSInteger result = tmp & 0x7f; if ((tmp = [self readRawByte]) >= 0) { result |= tmp << 7; } else { @@ -381,7 +381,7 @@ - (int32_t) readRawVarint32 { /** Read a raw Varint from the stream. */ - (int64_t) readRawVarint64 { - int32_t shift = 0; + NSInteger shift = 0; int64_t result = 0; while (shift < 64) { int8_t b = [self readRawByte]; @@ -396,16 +396,16 @@ - (int64_t) readRawVarint64 { /** Read a 32-bit little-endian integer from the stream. */ -- (int32_t) readRawLittleEndian32 { +- (NSInteger) readRawLittleEndian32 { int8_t b1 = [self readRawByte]; int8_t b2 = [self readRawByte]; int8_t b3 = [self readRawByte]; int8_t b4 = [self readRawByte]; return - (((int32_t)b1 & 0xff) ) | - (((int32_t)b2 & 0xff) << 8) | - (((int32_t)b3 & 0xff) << 16) | - (((int32_t)b4 & 0xff) << 24); + (((NSInteger)b1 & 0xff) ) | + (((NSInteger)b2 & 0xff) << 8) | + (((NSInteger)b3 & 0xff) << 16) | + (((NSInteger)b4 & 0xff) << 24); } @@ -438,11 +438,11 @@ - (int64_t) readRawLittleEndian64 { * * @return the old limit. */ -- (int32_t) setRecursionLimit:(int32_t) limit { +- (NSInteger) setRecursionLimit:(NSInteger) limit { if (limit < 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"Recursion limit cannot be negative" userInfo:nil]; } - int32_t oldLimit = recursionLimit; + NSInteger oldLimit = recursionLimit; recursionLimit = limit; return oldLimit; } @@ -459,11 +459,11 @@ - (int32_t) setRecursionLimit:(int32_t) limit { * * @return the old limit. */ -- (int32_t) setSizeLimit:(int32_t) limit { +- (NSInteger) setSizeLimit:(NSInteger) limit { if (limit < 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"Size limit cannot be negative:" userInfo:nil]; } - int32_t oldLimit = sizeLimit; + NSInteger oldLimit = sizeLimit; sizeLimit = limit; return oldLimit; } @@ -483,12 +483,12 @@ - (void) resetSizeCounter { * * @return the old limit. */ -- (int32_t) pushLimit:(int32_t) byteLimit { +- (NSInteger) pushLimit:(NSInteger) byteLimit { if (byteLimit < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"negativeSize" userInfo:nil]; } byteLimit += totalBytesRetired + bufferPos; - int32_t oldLimit = currentLimit; + NSInteger oldLimit = currentLimit; if (byteLimit > oldLimit) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"truncatedMessage" userInfo:nil]; } @@ -502,7 +502,7 @@ - (int32_t) pushLimit:(int32_t) byteLimit { - (void) recomputeBufferSizeAfterLimit { bufferSize += bufferSizeAfterLimit; - int32_t bufferEnd = totalBytesRetired + bufferSize; + NSInteger bufferEnd = totalBytesRetired + bufferSize; if (bufferEnd > currentLimit) { // Limit is in current buffer. bufferSizeAfterLimit = bufferEnd - currentLimit; @@ -518,7 +518,7 @@ - (void) recomputeBufferSizeAfterLimit { * * @param oldLimit The old limit, as returned by {@code pushLimit}. */ -- (void) popLimit:(int32_t) oldLimit { +- (void) popLimit:(NSInteger) oldLimit { currentLimit = oldLimit; [self recomputeBufferSizeAfterLimit]; } @@ -528,12 +528,12 @@ - (void) popLimit:(int32_t) oldLimit { * Returns the number of bytes to be read before the current limit. * If no limit is set, returns -1. */ -- (int32_t) bytesUntilLimit { +- (NSInteger) bytesUntilLimit { if (currentLimit == INT_MAX) { return -1; } - int32_t currentAbsolutePosition = totalBytesRetired + bufferPos; + NSInteger currentAbsolutePosition = totalBytesRetired + bufferPos; return currentLimit - currentAbsolutePosition; } @@ -587,7 +587,7 @@ - (BOOL) refillBuffer:(BOOL) mustSucceed { } } else { [self recomputeBufferSizeAfterLimit]; - int32_t totalBytesRead = totalBytesRetired + bufferSize + bufferSizeAfterLimit; + NSInteger totalBytesRead = totalBytesRetired + bufferSize + bufferSizeAfterLimit; if (totalBytesRead > sizeLimit || totalBytesRead < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"sizeLimitExceeded" userInfo:nil]; } @@ -617,7 +617,7 @@ - (int8_t) readRawByte { * @throws InvalidProtocolBufferException The end of the stream or the current * limit was reached. */ -- (NSData*) readRawData:(int32_t) size { +- (NSData*) readRawData:(NSInteger) size { if (size < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"negativeSize" userInfo:nil]; } @@ -640,7 +640,7 @@ - (NSData*) readRawData:(int32_t) size { // First copy what we have. NSMutableData* bytes = [NSMutableData dataWithLength:size]; - int32_t pos = bufferSize - bufferPos; + NSInteger pos = bufferSize - bufferPos; memcpy(bytes.mutableBytes, ((int8_t*)buffer.bytes) + bufferPos, pos); bufferPos = bufferSize; @@ -671,8 +671,8 @@ - (NSData*) readRawData:(int32_t) size { // Remember the buffer markers since we'll have to copy the bytes out of // it later. - int32_t originalBufferPos = bufferPos; - int32_t originalBufferSize = bufferSize; + NSInteger originalBufferPos = bufferPos; + NSInteger originalBufferSize = bufferSize; // Mark the current buffer consumed. totalBytesRetired += bufferSize; @@ -680,15 +680,15 @@ - (NSData*) readRawData:(int32_t) size { bufferSize = 0; // Read all the rest of the bytes we need. - int32_t sizeLeft = size - (originalBufferSize - originalBufferPos); + NSInteger sizeLeft = size - (originalBufferSize - originalBufferPos); NSMutableArray* chunks = [NSMutableArray array]; while (sizeLeft > 0) { NSMutableData* chunk = [NSMutableData dataWithLength:MIN(sizeLeft, BUFFER_SIZE)]; - int32_t pos = 0; + NSInteger pos = 0; while (pos < chunk.length) { - int32_t n = 0; + NSInteger n = 0; if (input != nil) { n = [input read:(((uint8_t*) chunk.mutableBytes) + pos) maxLength:chunk.length - pos]; } @@ -706,7 +706,7 @@ - (NSData*) readRawData:(int32_t) size { NSMutableData* bytes = [NSMutableData dataWithLength:size]; // Start by copying the leftover bytes from this.buffer. - int32_t pos = originalBufferSize - originalBufferPos; + NSInteger pos = originalBufferSize - originalBufferPos; memcpy(bytes.mutableBytes, ((int8_t*)buffer.bytes) + originalBufferPos, pos); // And now all the chunks. @@ -727,7 +727,7 @@ - (NSData*) readRawData:(int32_t) size { * @throws InvalidProtocolBufferException The end of the stream or the current * limit was reached. */ -- (void) skipRawData:(int32_t) size { +- (void) skipRawData:(NSInteger) size { if (size < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"negativeSize" userInfo:nil]; } @@ -744,7 +744,7 @@ - (void) skipRawData:(int32_t) size { bufferPos += size; } else { // Skipping more bytes than are in the buffer. First skip what we have. - int32_t pos = bufferSize - bufferPos; + NSInteger pos = bufferSize - bufferPos; totalBytesRetired += pos; bufferPos = 0; bufferSize = 0; @@ -752,7 +752,7 @@ - (void) skipRawData:(int32_t) size { // Then skip directly from the InputStream for the rest. while (pos < size) { NSMutableData* data = [NSMutableData dataWithLength:(size - pos)]; - int32_t n = (input == nil) ? -1 : (int32_t)[input read:data.mutableBytes maxLength:(size - pos)]; + NSInteger n = (input == nil) ? -1 : (NSInteger)[input read:data.mutableBytes maxLength:(size - pos)]; if (n <= 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"truncatedMessage" userInfo:nil]; } diff --git a/src/runtime/Classes/CodedOutputStream.h b/src/runtime/Classes/CodedOutputStream.h index 6328100..88c45ba 100644 --- a/src/runtime/Classes/CodedOutputStream.h +++ b/src/runtime/Classes/CodedOutputStream.h @@ -41,7 +41,7 @@ + (PBCodedOutputStream*) streamWithData:(NSMutableData*) data; + (PBCodedOutputStream*) streamWithOutputStream:(NSOutputStream*) output; -+ (PBCodedOutputStream*) streamWithOutputStream:(NSOutputStream*) output bufferSize:(int32_t) bufferSize; ++ (PBCodedOutputStream*) streamWithOutputStream:(NSOutputStream*) output bufferSize:(NSInteger) bufferSize; /** * Flushes the stream and forces any buffered bytes to be written. This @@ -53,10 +53,10 @@ - (void) writeRawByte:(uint8_t) value; /** Encode and write a tag. */ -- (void) writeTag:(int32_t) fieldNumber format:(int32_t) format; +- (void) writeTag:(NSInteger) fieldNumber format:(NSInteger) format; /** Write a little-endian 32-bit integer. */ -- (void) writeRawLittleEndian32:(int32_t) value; +- (void) writeRawLittleEndian32:(NSInteger) value; /** Write a little-endian 64-bit integer. */ - (void) writeRawLittleEndian64:(int64_t) value; @@ -64,55 +64,55 @@ * Encode and write a varint. {@code value} is treated as * unsigned, so it won't be sign-extended if negative. */ -- (void) writeRawVarint32:(int32_t) value; +- (void) writeRawVarint32:(NSInteger) value; /** Encode and write a varint. */ - (void) writeRawVarint64:(int64_t) value; -//- (void) writeRawLittleEndian32:(int32_t) value; +//- (void) writeRawLittleEndian32:(NSInteger) value; //- (void) writeRawLittleEndian64:(int64_t) value; /** Write an array of bytes. */ - (void) writeRawData:(const NSData*) data; -- (void) writeRawData:(const NSData*) data offset:(int32_t) offset length:(int32_t) length; - -- (void) writeData:(int32_t) fieldNumber value:(const NSData*) value; - -- (void) writeDouble:(int32_t) fieldNumber value:(Float64) value; -- (void) writeFloat:(int32_t) fieldNumber value:(Float32) value; -- (void) writeUInt64:(int32_t) fieldNumber value:(int64_t) value; -- (void) writeInt64:(int32_t) fieldNumber value:(int64_t) value; -- (void) writeInt32:(int32_t) fieldNumber value:(int32_t) value; -- (void) writeFixed64:(int32_t) fieldNumber value:(int64_t) value; -- (void) writeFixed32:(int32_t) fieldNumber value:(int32_t) value; -- (void) writeBool:(int32_t) fieldNumber value:(BOOL) value; -- (void) writeString:(int32_t) fieldNumber value:(const NSString*) value; -- (void) writeGroup:(int32_t) fieldNumber value:(const id) value; -- (void) writeUnknownGroup:(int32_t) fieldNumber value:(const PBUnknownFieldSet*) value; -- (void) writeMessage:(int32_t) fieldNumber value:(const id) value; -- (void) writeUInt32:(int32_t) fieldNumber value:(int32_t) value; -- (void) writeSFixed32:(int32_t) fieldNumber value:(int32_t) value; -- (void) writeSFixed64:(int32_t) fieldNumber value:(int64_t) value; -- (void) writeSInt32:(int32_t) fieldNumber value:(int32_t) value; -- (void) writeSInt64:(int32_t) fieldNumber value:(int64_t) value; +- (void) writeRawData:(const NSData*) data offset:(NSInteger) offset length:(NSInteger) length; + +- (void) writeData:(NSInteger) fieldNumber value:(const NSData*) value; + +- (void) writeDouble:(NSInteger) fieldNumber value:(Float64) value; +- (void) writeFloat:(NSInteger) fieldNumber value:(Float32) value; +- (void) writeUInt64:(NSInteger) fieldNumber value:(int64_t) value; +- (void) writeInt64:(NSInteger) fieldNumber value:(int64_t) value; +- (void) writeInt32:(NSInteger) fieldNumber value:(NSInteger) value; +- (void) writeFixed64:(NSInteger) fieldNumber value:(int64_t) value; +- (void) writeFixed32:(NSInteger) fieldNumber value:(NSInteger) value; +- (void) writeBool:(NSInteger) fieldNumber value:(BOOL) value; +- (void) writeString:(NSInteger) fieldNumber value:(const NSString*) value; +- (void) writeGroup:(NSInteger) fieldNumber value:(const id) value; +- (void) writeUnknownGroup:(NSInteger) fieldNumber value:(const PBUnknownFieldSet*) value; +- (void) writeMessage:(NSInteger) fieldNumber value:(const id) value; +- (void) writeUInt32:(NSInteger) fieldNumber value:(NSInteger) value; +- (void) writeSFixed32:(NSInteger) fieldNumber value:(NSInteger) value; +- (void) writeSFixed64:(NSInteger) fieldNumber value:(int64_t) value; +- (void) writeSInt32:(NSInteger) fieldNumber value:(NSInteger) value; +- (void) writeSInt64:(NSInteger) fieldNumber value:(int64_t) value; - (void) writeDoubleNoTag:(Float64) value; - (void) writeFloatNoTag:(Float32) value; - (void) writeUInt64NoTag:(int64_t) value; - (void) writeInt64NoTag:(int64_t) value; -- (void) writeInt32NoTag:(int32_t) value; +- (void) writeInt32NoTag:(NSInteger) value; - (void) writeFixed64NoTag:(int64_t) value; -- (void) writeFixed32NoTag:(int32_t) value; +- (void) writeFixed32NoTag:(NSInteger) value; - (void) writeBoolNoTag:(BOOL) value; - (void) writeStringNoTag:(const NSString*) value; -- (void) writeGroupNoTag:(int32_t) fieldNumber value:(const id) value; -- (void) writeUnknownGroupNoTag:(int32_t) fieldNumber value:(const PBUnknownFieldSet*) value; +- (void) writeGroupNoTag:(NSInteger) fieldNumber value:(const id) value; +- (void) writeUnknownGroupNoTag:(NSInteger) fieldNumber value:(const PBUnknownFieldSet*) value; - (void) writeMessageNoTag:(const id) value; - (void) writeDataNoTag:(const NSData*) value; -- (void) writeUInt32NoTag:(int32_t) value; -- (void) writeEnumNoTag:(int32_t) value; -- (void) writeSFixed32NoTag:(int32_t) value; +- (void) writeUInt32NoTag:(NSInteger) value; +- (void) writeEnumNoTag:(NSInteger) value; +- (void) writeSFixed32NoTag:(NSInteger) value; - (void) writeSFixed64NoTag:(int64_t) value; -- (void) writeSInt32NoTag:(int32_t) value; +- (void) writeSInt32NoTag:(NSInteger) value; - (void) writeSInt64NoTag:(int64_t) value; @@ -120,18 +120,18 @@ * Write a MessageSet extension field to the stream. For historical reasons, * the wire format differs from normal fields. */ -- (void) writeMessageSetExtension:(int32_t) fieldNumber value:(const id) value; +- (void) writeMessageSetExtension:(NSInteger) fieldNumber value:(const id) value; /** * Write an unparsed MessageSet extension field to the stream. For * historical reasons, the wire format differs from normal fields. */ -- (void) writeRawMessageSetExtension:(int32_t) fieldNumber value:(const NSData*) value; +- (void) writeRawMessageSetExtension:(NSInteger) fieldNumber value:(const NSData*) value; /** * Write an enum field, including tag, to the stream. Caller is responsible * for converting the enum value to its numeric value. */ -- (void) writeEnum:(int32_t) fieldNumber value:(int32_t) value; +- (void) writeEnum:(NSInteger) fieldNumber value:(NSInteger) value; @end diff --git a/src/runtime/Classes/CodedOutputStream.m b/src/runtime/Classes/CodedOutputStream.m index 4a3f739..9cc7110 100644 --- a/src/runtime/Classes/CodedOutputStream.m +++ b/src/runtime/Classes/CodedOutputStream.m @@ -24,7 +24,7 @@ @implementation PBCodedOutputStream -const int32_t DEFAULT_BUFFER_SIZE = 4 * 1024; +const NSInteger DEFAULT_BUFFER_SIZE = 4 * 1024; - (id)initWithOutputStream:(NSOutputStream*)_output data:(NSMutableData*)data { @@ -43,7 +43,7 @@ - (void)dealloc { } -+ (PBCodedOutputStream*)streamWithOutputStream:(NSOutputStream*)output bufferSize:(int32_t)bufferSize { ++ (PBCodedOutputStream*)streamWithOutputStream:(NSOutputStream*)output bufferSize:(NSInteger)bufferSize { NSMutableData *data = [NSMutableData dataWithLength:bufferSize]; return [[[PBCodedOutputStream alloc] initWithOutputStream:output data:data] autorelease]; } @@ -81,9 +81,9 @@ - (void)writeRawData:(const NSData*)data { } -- (void)writeRawData:(const NSData*)value offset:(int32_t)offset length:(int32_t)length { +- (void)writeRawData:(const NSData*)value offset:(NSInteger)offset length:(NSInteger)length { while (length > 0) { - int32_t written = [buffer appendData:value offset:offset length:length]; + NSInteger written = [buffer appendData:value offset:offset length:length]; offset += written; length -= written; if (!written || length > 0) { @@ -99,7 +99,7 @@ - (void)writeDoubleNoTag:(Float64)value { /** Write a {@code double} field, including tag, to the stream. */ -- (void)writeDouble:(int32_t)fieldNumber value:(Float64)value { +- (void)writeDouble:(NSInteger)fieldNumber value:(Float64)value { [self writeTag:fieldNumber format:PBWireFormatFixed64]; [self writeDoubleNoTag:value]; } @@ -111,7 +111,7 @@ - (void)writeFloatNoTag:(Float32)value { /** Write a {@code float} field, including tag, to the stream. */ -- (void)writeFloat:(int32_t)fieldNumber value:(Float32)value { +- (void)writeFloat:(NSInteger)fieldNumber value:(Float32)value { [self writeTag:fieldNumber format:PBWireFormatFixed32]; [self writeFloatNoTag:value]; } @@ -123,7 +123,7 @@ - (void)writeUInt64NoTag:(int64_t)value { /** Write a {@code uint64} field, including tag, to the stream. */ -- (void)writeUInt64:(int32_t)fieldNumber value:(int64_t)value { +- (void)writeUInt64:(NSInteger)fieldNumber value:(int64_t)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeUInt64NoTag:value]; } @@ -135,13 +135,13 @@ - (void)writeInt64NoTag:(int64_t)value { /** Write an {@code int64} field, including tag, to the stream. */ -- (void)writeInt64:(int32_t)fieldNumber value:(int64_t)value { +- (void)writeInt64:(NSInteger)fieldNumber value:(int64_t)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeInt64NoTag:value]; } -- (void)writeInt32NoTag:(int32_t)value { +- (void)writeInt32NoTag:(NSInteger)value { if (value >= 0) { [self writeRawVarint32:value]; } else { @@ -152,7 +152,7 @@ - (void)writeInt32NoTag:(int32_t)value { /** Write an {@code int32} field, including tag, to the stream. */ -- (void)writeInt32:(int32_t)fieldNumber value:(int32_t)value { +- (void)writeInt32:(NSInteger)fieldNumber value:(NSInteger)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeInt32NoTag:value]; } @@ -164,19 +164,19 @@ - (void)writeFixed64NoTag:(int64_t)value { /** Write a {@code fixed64} field, including tag, to the stream. */ -- (void)writeFixed64:(int32_t)fieldNumber value:(int64_t)value { +- (void)writeFixed64:(NSInteger)fieldNumber value:(int64_t)value { [self writeTag:fieldNumber format:PBWireFormatFixed64]; [self writeFixed64NoTag:value]; } -- (void)writeFixed32NoTag:(int32_t)value { +- (void)writeFixed32NoTag:(NSInteger)value { [self writeRawLittleEndian32:value]; } /** Write a {@code fixed32} field, including tag, to the stream. */ -- (void)writeFixed32:(int32_t)fieldNumber value:(int32_t)value { +- (void)writeFixed32:(NSInteger)fieldNumber value:(NSInteger)value { [self writeTag:fieldNumber format:PBWireFormatFixed32]; [self writeFixed32NoTag:value]; } @@ -188,7 +188,7 @@ - (void)writeBoolNoTag:(BOOL)value { /** Write a {@code bool} field, including tag, to the stream. */ -- (void)writeBool:(int32_t)fieldNumber value:(BOOL)value { +- (void)writeBool:(NSInteger)fieldNumber value:(BOOL)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeBoolNoTag:value]; } @@ -202,33 +202,33 @@ - (void)writeStringNoTag:(const NSString*)value { /** Write a {@code string} field, including tag, to the stream. */ -- (void)writeString:(int32_t)fieldNumber value:(const NSString*)value { +- (void)writeString:(NSInteger)fieldNumber value:(const NSString*)value { [self writeTag:fieldNumber format:PBWireFormatLengthDelimited]; [self writeStringNoTag:value]; } -- (void)writeGroupNoTag:(int32_t)fieldNumber value:(const id)value { +- (void)writeGroupNoTag:(NSInteger)fieldNumber value:(const id)value { [value writeToCodedOutputStream:self]; [self writeTag:fieldNumber format:PBWireFormatEndGroup]; } /** Write a {@code group} field, including tag, to the stream. */ -- (void)writeGroup:(int32_t)fieldNumber value:(const id)value { +- (void)writeGroup:(NSInteger)fieldNumber value:(const id)value { [self writeTag:fieldNumber format:PBWireFormatStartGroup]; [self writeGroupNoTag:fieldNumber value:value]; } -- (void)writeUnknownGroupNoTag:(int32_t)fieldNumber value:(const PBUnknownFieldSet*)value { +- (void)writeUnknownGroupNoTag:(NSInteger)fieldNumber value:(const PBUnknownFieldSet*)value { [value writeToCodedOutputStream:self]; [self writeTag:fieldNumber format:PBWireFormatEndGroup]; } /** Write a group represented by an {@link PBUnknownFieldSet}. */ -- (void)writeUnknownGroup:(int32_t)fieldNumber value:(const PBUnknownFieldSet*)value { +- (void)writeUnknownGroup:(NSInteger)fieldNumber value:(const PBUnknownFieldSet*)value { [self writeTag:fieldNumber format:PBWireFormatStartGroup]; [self writeUnknownGroupNoTag:fieldNumber value:value]; } @@ -241,7 +241,7 @@ - (void)writeMessageNoTag:(const id)value { /** Write an embedded message field, including tag, to the stream. */ -- (void)writeMessage:(int32_t)fieldNumber value:(const id)value { +- (void)writeMessage:(NSInteger)fieldNumber value:(const id)value { [self writeTag:fieldNumber format:PBWireFormatLengthDelimited]; [self writeMessageNoTag:value]; } @@ -254,42 +254,42 @@ - (void)writeDataNoTag:(const NSData*)value { /** Write a {@code bytes} field, including tag, to the stream. */ -- (void)writeData:(int32_t)fieldNumber value:(const NSData*)value { +- (void)writeData:(NSInteger)fieldNumber value:(const NSData*)value { [self writeTag:fieldNumber format:PBWireFormatLengthDelimited]; [self writeDataNoTag:value]; } -- (void)writeUInt32NoTag:(int32_t)value { +- (void)writeUInt32NoTag:(NSInteger)value { [self writeRawVarint32:value]; } /** Write a {@code uint32} field, including tag, to the stream. */ -- (void)writeUInt32:(int32_t)fieldNumber value:(int32_t)value { +- (void)writeUInt32:(NSInteger)fieldNumber value:(NSInteger)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeUInt32NoTag:value]; } -- (void)writeEnumNoTag:(int32_t)value { +- (void)writeEnumNoTag:(NSInteger)value { [self writeRawVarint32:value]; } -- (void)writeEnum:(int32_t)fieldNumber value:(int32_t)value { +- (void)writeEnum:(NSInteger)fieldNumber value:(NSInteger)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeEnumNoTag:value]; } -- (void)writeSFixed32NoTag:(int32_t)value { +- (void)writeSFixed32NoTag:(NSInteger)value { [self writeRawLittleEndian32:value]; } /** Write an {@code sfixed32} field, including tag, to the stream. */ -- (void)writeSFixed32:(int32_t)fieldNumber value:(int32_t)value { +- (void)writeSFixed32:(NSInteger)fieldNumber value:(NSInteger)value { [self writeTag:fieldNumber format:PBWireFormatFixed32]; [self writeSFixed32NoTag:value]; } @@ -301,19 +301,19 @@ - (void)writeSFixed64NoTag:(int64_t)value { /** Write an {@code sfixed64} field, including tag, to the stream. */ -- (void)writeSFixed64:(int32_t)fieldNumber value:(int64_t)value { +- (void)writeSFixed64:(NSInteger)fieldNumber value:(int64_t)value { [self writeTag:fieldNumber format:PBWireFormatFixed64]; [self writeSFixed64NoTag:value]; } -- (void)writeSInt32NoTag:(int32_t)value { +- (void)writeSInt32NoTag:(NSInteger)value { [self writeRawVarint32:encodeZigZag32(value)]; } /** Write an {@code sint32} field, including tag, to the stream. */ -- (void)writeSInt32:(int32_t)fieldNumber value:(int32_t)value { +- (void)writeSInt32:(NSInteger)fieldNumber value:(NSInteger)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeSInt32NoTag:value]; } @@ -325,7 +325,7 @@ - (void)writeSInt64NoTag:(int64_t)value { /** Write an {@code sint64} field, including tag, to the stream. */ -- (void)writeSInt64:(int32_t)fieldNumber value:(int64_t)value { +- (void)writeSInt64:(NSInteger)fieldNumber value:(int64_t)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeSInt64NoTag:value]; } @@ -335,7 +335,7 @@ - (void)writeSInt64:(int32_t)fieldNumber value:(int64_t)value { * Write a MessageSet extension field to the stream. For historical reasons, * the wire format differs from normal fields. */ -- (void)writeMessageSetExtension:(int32_t)fieldNumber value:(const id)value { +- (void)writeMessageSetExtension:(NSInteger)fieldNumber value:(const id)value { [self writeTag:PBWireFormatMessageSetItem format:PBWireFormatStartGroup]; [self writeUInt32:PBWireFormatMessageSetTypeId value:fieldNumber]; [self writeMessage:PBWireFormatMessageSetMessage value:value]; @@ -347,7 +347,7 @@ - (void)writeMessageSetExtension:(int32_t)fieldNumber value:(const id * Write an unparsed MessageSet extension field to the stream. For * historical reasons, the wire format differs from normal fields. */ -- (void)writeRawMessageSetExtension:(int32_t)fieldNumber value:(const NSData*)value { +- (void)writeRawMessageSetExtension:(NSInteger)fieldNumber value:(const NSData*)value { [self writeTag:PBWireFormatMessageSetItem format:PBWireFormatStartGroup]; [self writeUInt32:PBWireFormatMessageSetTypeId value:fieldNumber]; [self writeData:PBWireFormatMessageSetMessage value:value]; @@ -355,12 +355,12 @@ - (void)writeRawMessageSetExtension:(int32_t)fieldNumber value:(const NSData*)va } -- (void)writeTag:(int32_t)fieldNumber format:(int32_t)format { +- (void)writeTag:(NSInteger)fieldNumber format:(NSInteger)format { [self writeRawVarint32:PBWireFormatMakeTag(fieldNumber, format)]; } -- (void)writeRawVarint32:(int32_t)value { +- (void)writeRawVarint32:(NSInteger)value { while (YES) { if ((value & ~0x7F) == 0) { [self writeRawByte:value]; @@ -376,17 +376,17 @@ - (void)writeRawVarint32:(int32_t)value { - (void)writeRawVarint64:(int64_t)value { while (YES) { if ((value & ~0x7FL) == 0) { - [self writeRawByte:((int32_t)value)]; + [self writeRawByte:((NSInteger)value)]; return; } else { - [self writeRawByte:(((int32_t)value & 0x7F) | 0x80)]; + [self writeRawByte:(((NSInteger)value & 0x7F) | 0x80)]; value = logicalRightShift64(value, 7); } } } -- (void)writeRawLittleEndian32:(int32_t)value { +- (void)writeRawLittleEndian32:(NSInteger)value { [self writeRawByte:((value ) & 0xFF)]; [self writeRawByte:((value >> 8) & 0xFF)]; [self writeRawByte:((value >> 16) & 0xFF)]; @@ -395,14 +395,14 @@ - (void)writeRawLittleEndian32:(int32_t)value { - (void)writeRawLittleEndian64:(int64_t)value { - [self writeRawByte:((int32_t)(value ) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 8) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 16) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 24) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 32) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 40) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 48) & 0xFF)]; - [self writeRawByte:((int32_t)(value >> 56) & 0xFF)]; + [self writeRawByte:((NSInteger)(value ) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 8) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 16) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 24) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 32) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 40) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 48) & 0xFF)]; + [self writeRawByte:((NSInteger)(value >> 56) & 0xFF)]; } @end diff --git a/src/runtime/Classes/ConcreteExtensionField.h b/src/runtime/Classes/ConcreteExtensionField.h index 51d5136..f22975e 100644 --- a/src/runtime/Classes/ConcreteExtensionField.h +++ b/src/runtime/Classes/ConcreteExtensionField.h @@ -43,7 +43,7 @@ typedef enum { PBExtensionType type; Class extendedClass; - int32_t fieldNumber; + NSInteger fieldNumber; id defaultValue; Class messageOrGroupClass; @@ -55,7 +55,7 @@ typedef enum { + (PBConcreteExtensionField*) extensionWithType:(PBExtensionType) type extendedClass:(Class) extendedClass - fieldNumber:(int32_t) fieldNumber + fieldNumber:(NSInteger) fieldNumber defaultValue:(id) defaultValue messageOrGroupClass:(Class) messageOrGroupClass isRepeated:(BOOL) isRepeated diff --git a/src/runtime/Classes/ConcreteExtensionField.m b/src/runtime/Classes/ConcreteExtensionField.m index e1f66c1..fe23af6 100644 --- a/src/runtime/Classes/ConcreteExtensionField.m +++ b/src/runtime/Classes/ConcreteExtensionField.m @@ -28,7 +28,7 @@ @interface PBConcreteExtensionField() @property PBExtensionType type; @property (assign) Class extendedClass; -@property int32_t fieldNumber; +@property NSInteger fieldNumber; @property (retain) id defaultValue; @property (assign) Class messageOrGroupClass; @property BOOL isRepeated; @@ -62,7 +62,7 @@ - (void) dealloc { - (id) initWithType:(PBExtensionType) type_ extendedClass:(Class) extendedClass_ - fieldNumber:(int32_t) fieldNumber_ + fieldNumber:(NSInteger) fieldNumber_ defaultValue:(id) defaultValue_ messageOrGroupClass:(Class) messageOrGroupClass_ isRepeated:(BOOL) isRepeated_ @@ -85,7 +85,7 @@ - (id) initWithType:(PBExtensionType) type_ + (PBConcreteExtensionField*) extensionWithType:(PBExtensionType) type extendedClass:(Class) extendedClass - fieldNumber:(int32_t) fieldNumber + fieldNumber:(NSInteger) fieldNumber defaultValue:(id) defaultValue messageOrGroupClass:(Class) messageOrGroupClass isRepeated:(BOOL) isRepeated @@ -148,7 +148,7 @@ BOOL typeIsFixedSize(PBExtensionType type) { } -int32_t typeSize(PBExtensionType type) { +NSInteger typeSize(PBExtensionType type) { switch (type) { case PBExtensionTypeBool: return 1; @@ -298,7 +298,7 @@ - (void) writeSingleValue:(id) value } -- (int32_t) computeSingleSerializedSizeNoTag:(id) value { +- (NSInteger) computeSingleSerializedSizeNoTag:(id) value { switch (type) { case PBExtensionTypeBool: return computeBoolSizeNoTag([value boolValue]); case PBExtensionTypeFixed32: return computeFixed32SizeNoTag([value intValue]); @@ -324,7 +324,7 @@ - (int32_t) computeSingleSerializedSizeNoTag:(id) value { } -- (int32_t) computeSingleSerializedSizeIncludingTag:(id) value { +- (NSInteger) computeSingleSerializedSizeIncludingTag:(id) value { switch (type) { case PBExtensionTypeBool: return computeBoolSize(fieldNumber, [value boolValue]); case PBExtensionTypeFixed32: return computeFixed32Size(fieldNumber, [value intValue]); @@ -390,7 +390,7 @@ - (void) writeRepeatedValues:(NSArray*) values includingTagsToCodedOutputStream:(PBCodedOutputStream*) output { if (isPacked) { [output writeTag:fieldNumber format:PBWireFormatLengthDelimited]; - int32_t dataSize = 0; + NSInteger dataSize = 0; if (typeIsFixedSize(type)) { dataSize = values.count * typeSize(type); } else { @@ -419,9 +419,9 @@ - (void) writeValue:(id) value includingTagToCodedOutputStream:(PBCodedOutputStr } -- (int32_t) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { +- (NSInteger) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { if (isPacked) { - int32_t size = 0; + NSInteger size = 0; if (typeIsFixedSize(type)) { size = values.count * typeSize(type); } else { @@ -431,7 +431,7 @@ - (int32_t) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { } return size + computeTagSize(fieldNumber) + computeRawVarint32Size(size); } else { - int32_t size = 0; + NSInteger size = 0; for (id value in values) { size += [self computeSingleSerializedSizeIncludingTag:value]; } @@ -440,7 +440,7 @@ - (int32_t) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { } -- (int32_t) computeSerializedSizeIncludingTag:(id) value { +- (NSInteger) computeSerializedSizeIncludingTag:(id) value { if (isRepeated) { return [self computeRepeatedSerializedSizeIncludingTags:value]; } else { @@ -530,21 +530,21 @@ - (id) readSingleValueFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { switch (type) { case PBExtensionTypeBool: return [NSNumber numberWithBool:[input readBool]]; - case PBExtensionTypeFixed32: return [NSNumber numberWithInt:[input readFixed32]]; - case PBExtensionTypeSFixed32: return [NSNumber numberWithInt:[input readSFixed32]]; + case PBExtensionTypeFixed32: return @([input readFixed32]); + case PBExtensionTypeSFixed32: return @([input readSFixed32]); case PBExtensionTypeFloat: return [NSNumber numberWithFloat:[input readFloat]]; case PBExtensionTypeFixed64: return [NSNumber numberWithLongLong:[input readFixed64]]; case PBExtensionTypeSFixed64: return [NSNumber numberWithLongLong:[input readSFixed64]]; case PBExtensionTypeDouble: return [NSNumber numberWithDouble:[input readDouble]]; - case PBExtensionTypeInt32: return [NSNumber numberWithInt:[input readInt32]]; + case PBExtensionTypeInt32: return @([input readInt32]); case PBExtensionTypeInt64: return [NSNumber numberWithLongLong:[input readInt64]]; - case PBExtensionTypeSInt32: return [NSNumber numberWithInt:[input readSInt32]]; + case PBExtensionTypeSInt32: return @([input readSInt32]); case PBExtensionTypeSInt64: return [NSNumber numberWithLongLong:[input readSInt64]]; - case PBExtensionTypeUInt32: return [NSNumber numberWithInt:[input readUInt32]]; + case PBExtensionTypeUInt32: return @([input readUInt32]); case PBExtensionTypeUInt64: return [NSNumber numberWithLongLong:[input readUInt64]]; case PBExtensionTypeBytes: return [input readData]; case PBExtensionTypeString: return [input readString]; - case PBExtensionTypeEnum: return [NSNumber numberWithInt:[input readEnum]]; + case PBExtensionTypeEnum: return @([input readEnum]); case PBExtensionTypeGroup: { id builder = [messageOrGroupClass builder]; @@ -568,10 +568,10 @@ - (void) mergeFromCodedInputStream:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry builder:(PBExtendableMessage_Builder*) builder - tag:(int32_t) tag { + tag:(NSInteger) tag { if (isPacked) { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; while ([input bytesUntilLimit] > 0) { id value = [self readSingleValueFromCodedInputStream:input extensionRegistry:extensionRegistry]; [builder addExtension:self value:value]; diff --git a/src/runtime/Classes/Descriptor.pb.h b/src/runtime/Classes/Descriptor.pb.h index 19dc017..0d98753 100644 --- a/src/runtime/Classes/Descriptor.pb.h +++ b/src/runtime/Classes/Descriptor.pb.h @@ -96,7 +96,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableFileList; } - (NSArray*) fileList; -- (PBFileDescriptorProto*) fileAtIndex:(int32_t) index; +- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index; + (PBFileDescriptorSet*) defaultInstance; - (PBFileDescriptorSet*) defaultInstance; @@ -133,8 +133,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) fileList; -- (PBFileDescriptorProto*) fileAtIndex:(int32_t) index; -- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(int32_t) index with:(PBFileDescriptorProto*) value; +- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index; +- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(NSInteger) index with:(PBFileDescriptorProto*) value; - (PBFileDescriptorSet_Builder*) addFile:(PBFileDescriptorProto*) value; - (PBFileDescriptorSet_Builder*) addAllFile:(NSArray*) values; - (PBFileDescriptorSet_Builder*) clearFileList; @@ -161,15 +161,15 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* package; @property (readonly, retain) PBFileOptions* options; - (NSArray*) dependencyList; -- (NSString*) dependencyAtIndex:(int32_t) index; +- (NSString*) dependencyAtIndex:(NSInteger) index; - (NSArray*) messageTypeList; -- (PBDescriptorProto*) messageTypeAtIndex:(int32_t) index; +- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; - (NSArray*) serviceList; -- (PBServiceDescriptorProto*) serviceAtIndex:(int32_t) index; +- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index; +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; + (PBFileDescriptorProto*) defaultInstance; - (PBFileDescriptorProto*) defaultInstance; @@ -216,36 +216,36 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFileDescriptorProto_Builder*) clearPackage; - (NSArray*) dependencyList; -- (NSString*) dependencyAtIndex:(int32_t) index; -- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(int32_t) index with:(NSString*) value; +- (NSString*) dependencyAtIndex:(NSInteger) index; +- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(NSInteger) index with:(NSString*) value; - (PBFileDescriptorProto_Builder*) addDependency:(NSString*) value; - (PBFileDescriptorProto_Builder*) addAllDependency:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearDependencyList; - (NSArray*) messageTypeList; -- (PBDescriptorProto*) messageTypeAtIndex:(int32_t) index; -- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(int32_t) index with:(PBDescriptorProto*) value; +- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index; +- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addMessageType:(PBDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllMessageType:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearMessageTypeList; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index; -- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(int32_t) index with:(PBEnumDescriptorProto*) value; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; +- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllEnumType:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearEnumTypeList; - (NSArray*) serviceList; -- (PBServiceDescriptorProto*) serviceAtIndex:(int32_t) index; -- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(int32_t) index with:(PBServiceDescriptorProto*) value; +- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index; +- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(NSInteger) index with:(PBServiceDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addService:(PBServiceDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllService:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearServiceList; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index; -- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(int32_t) index with:(PBFieldDescriptorProto*) value; +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; +- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllExtension:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearExtensionList; @@ -275,15 +275,15 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* name; @property (readonly, retain) PBMessageOptions* options; - (NSArray*) fieldList; -- (PBFieldDescriptorProto*) fieldAtIndex:(int32_t) index; +- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index; +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; - (NSArray*) nestedTypeList; -- (PBDescriptorProto*) nestedTypeAtIndex:(int32_t) index; +- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; - (NSArray*) extensionRangeList; -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(int32_t) index; +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index; + (PBDescriptorProto*) defaultInstance; - (PBDescriptorProto*) defaultInstance; @@ -306,13 +306,13 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @private BOOL hasStart_:1; BOOL hasEnd_:1; - int32_t start; - int32_t end; + NSInteger start; + NSInteger end; } - (BOOL) hasStart; - (BOOL) hasEnd; -@property (readonly) int32_t start; -@property (readonly) int32_t end; +@property (readonly) NSInteger start; +@property (readonly) NSInteger end; + (PBDescriptorProto_ExtensionRange*) defaultInstance; - (PBDescriptorProto_ExtensionRange*) defaultInstance; @@ -349,13 +349,13 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasStart; -- (int32_t) start; -- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(int32_t) value; +- (NSInteger) start; +- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(NSInteger) value; - (PBDescriptorProto_ExtensionRange_Builder*) clearStart; - (BOOL) hasEnd; -- (int32_t) end; -- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(int32_t) value; +- (NSInteger) end; +- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(NSInteger) value; - (PBDescriptorProto_ExtensionRange_Builder*) clearEnd; @end @@ -382,36 +382,36 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBDescriptorProto_Builder*) clearName; - (NSArray*) fieldList; -- (PBFieldDescriptorProto*) fieldAtIndex:(int32_t) index; -- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(int32_t) index with:(PBFieldDescriptorProto*) value; +- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index; +- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addField:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllField:(NSArray*) values; - (PBDescriptorProto_Builder*) clearFieldList; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index; -- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(int32_t) index with:(PBFieldDescriptorProto*) value; +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; +- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllExtension:(NSArray*) values; - (PBDescriptorProto_Builder*) clearExtensionList; - (NSArray*) nestedTypeList; -- (PBDescriptorProto*) nestedTypeAtIndex:(int32_t) index; -- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(int32_t) index with:(PBDescriptorProto*) value; +- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index; +- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value; - (PBDescriptorProto_Builder*) addNestedType:(PBDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllNestedType:(NSArray*) values; - (PBDescriptorProto_Builder*) clearNestedTypeList; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index; -- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(int32_t) index with:(PBEnumDescriptorProto*) value; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; +- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value; - (PBDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllEnumType:(NSArray*) values; - (PBDescriptorProto_Builder*) clearEnumTypeList; - (NSArray*) extensionRangeList; -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(int32_t) index; -- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(int32_t) index with:(PBDescriptorProto_ExtensionRange*) value; +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index; +- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(NSInteger) index with:(PBDescriptorProto_ExtensionRange*) value; - (PBDescriptorProto_Builder*) addExtensionRange:(PBDescriptorProto_ExtensionRange*) value; - (PBDescriptorProto_Builder*) addAllExtensionRange:(NSArray*) values; - (PBDescriptorProto_Builder*) clearExtensionRangeList; @@ -434,7 +434,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasOptions_:1; BOOL hasLabel_:1; BOOL hasType_:1; - int32_t number; + NSInteger number; NSString* name; NSString* typeName; NSString* extendee; @@ -452,7 +452,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasDefaultValue; - (BOOL) hasOptions; @property (readonly, retain) NSString* name; -@property (readonly) int32_t number; +@property (readonly) NSInteger number; @property (readonly) PBFieldDescriptorProto_Label label; @property (readonly) PBFieldDescriptorProto_Type type; @property (readonly, retain) NSString* typeName; @@ -500,8 +500,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFieldDescriptorProto_Builder*) clearName; - (BOOL) hasNumber; -- (int32_t) number; -- (PBFieldDescriptorProto_Builder*) setNumber:(int32_t) value; +- (NSInteger) number; +- (PBFieldDescriptorProto_Builder*) setNumber:(NSInteger) value; - (PBFieldDescriptorProto_Builder*) clearNumber; - (BOOL) hasLabel; @@ -550,7 +550,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* name; @property (readonly, retain) PBEnumOptions* options; - (NSArray*) valueList; -- (PBEnumValueDescriptorProto*) valueAtIndex:(int32_t) index; +- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index; + (PBEnumDescriptorProto*) defaultInstance; - (PBEnumDescriptorProto*) defaultInstance; @@ -592,8 +592,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumDescriptorProto_Builder*) clearName; - (NSArray*) valueList; -- (PBEnumValueDescriptorProto*) valueAtIndex:(int32_t) index; -- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(int32_t) index with:(PBEnumValueDescriptorProto*) value; +- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index; +- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(NSInteger) index with:(PBEnumValueDescriptorProto*) value; - (PBEnumDescriptorProto_Builder*) addValue:(PBEnumValueDescriptorProto*) value; - (PBEnumDescriptorProto_Builder*) addAllValue:(NSArray*) values; - (PBEnumDescriptorProto_Builder*) clearValueList; @@ -611,7 +611,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasNumber_:1; BOOL hasName_:1; BOOL hasOptions_:1; - int32_t number; + NSInteger number; NSString* name; PBEnumValueOptions* options; } @@ -619,7 +619,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasNumber; - (BOOL) hasOptions; @property (readonly, retain) NSString* name; -@property (readonly) int32_t number; +@property (readonly) NSInteger number; @property (readonly, retain) PBEnumValueOptions* options; + (PBEnumValueDescriptorProto*) defaultInstance; @@ -662,8 +662,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumValueDescriptorProto_Builder*) clearName; - (BOOL) hasNumber; -- (int32_t) number; -- (PBEnumValueDescriptorProto_Builder*) setNumber:(int32_t) value; +- (NSInteger) number; +- (PBEnumValueDescriptorProto_Builder*) setNumber:(NSInteger) value; - (PBEnumValueDescriptorProto_Builder*) clearNumber; - (BOOL) hasOptions; @@ -687,7 +687,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* name; @property (readonly, retain) PBServiceOptions* options; - (NSArray*) methodList; -- (PBMethodDescriptorProto*) methodAtIndex:(int32_t) index; +- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index; + (PBServiceDescriptorProto*) defaultInstance; - (PBServiceDescriptorProto*) defaultInstance; @@ -729,8 +729,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBServiceDescriptorProto_Builder*) clearName; - (NSArray*) methodList; -- (PBMethodDescriptorProto*) methodAtIndex:(int32_t) index; -- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(int32_t) index with:(PBMethodDescriptorProto*) value; +- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index; +- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(NSInteger) index with:(PBMethodDescriptorProto*) value; - (PBServiceDescriptorProto_Builder*) addMethod:(PBMethodDescriptorProto*) value; - (PBServiceDescriptorProto_Builder*) addAllMethod:(NSArray*) values; - (PBServiceDescriptorProto_Builder*) clearMethodList; @@ -841,7 +841,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) javaMultipleFiles; @property (readonly) PBFileOptions_OptimizeMode optimizeFor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBFileOptions*) defaultInstance; - (PBFileOptions*) defaultInstance; @@ -898,8 +898,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFileOptions_Builder*) clearOptimizeFor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBFileOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBFileOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBFileOptions_Builder*) clearUninterpretedOptionList; @@ -918,7 +918,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) messageSetWireFormat; - (BOOL) noStandardDescriptorAccessor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBMessageOptions*) defaultInstance; - (PBMessageOptions*) defaultInstance; @@ -965,8 +965,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBMessageOptions_Builder*) clearNoStandardDescriptorAccessor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBMessageOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBMessageOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBMessageOptions_Builder*) clearUninterpretedOptionList; @@ -993,7 +993,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) deprecated; @property (readonly, retain) NSString* experimentalMapKey; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBFieldOptions*) defaultInstance; - (PBFieldOptions*) defaultInstance; @@ -1050,8 +1050,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFieldOptions_Builder*) clearExperimentalMapKey; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBFieldOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBFieldOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBFieldOptions_Builder*) clearUninterpretedOptionList; @@ -1062,7 +1062,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBEnumOptions*) defaultInstance; - (PBEnumOptions*) defaultInstance; @@ -1099,8 +1099,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBEnumOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBEnumOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBEnumOptions_Builder*) clearUninterpretedOptionList; @@ -1111,7 +1111,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBEnumValueOptions*) defaultInstance; - (PBEnumValueOptions*) defaultInstance; @@ -1148,8 +1148,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBEnumValueOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBEnumValueOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBEnumValueOptions_Builder*) clearUninterpretedOptionList; @@ -1160,7 +1160,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBServiceOptions*) defaultInstance; - (PBServiceOptions*) defaultInstance; @@ -1197,8 +1197,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBServiceOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBServiceOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBServiceOptions_Builder*) clearUninterpretedOptionList; @@ -1209,7 +1209,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; + (PBMethodOptions*) defaultInstance; - (PBMethodOptions*) defaultInstance; @@ -1246,8 +1246,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index; -- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; - (PBMethodOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBMethodOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBMethodOptions_Builder*) clearUninterpretedOptionList; @@ -1278,7 +1278,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly) Float64 doubleValue; @property (readonly, retain) NSData* stringValue; - (NSArray*) nameList; -- (PBUninterpretedOption_NamePart*) nameAtIndex:(int32_t) index; +- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index; + (PBUninterpretedOption*) defaultInstance; - (PBUninterpretedOption*) defaultInstance; @@ -1372,8 +1372,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) nameList; -- (PBUninterpretedOption_NamePart*) nameAtIndex:(int32_t) index; -- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(int32_t) index with:(PBUninterpretedOption_NamePart*) value; +- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index; +- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(NSInteger) index with:(PBUninterpretedOption_NamePart*) value; - (PBUninterpretedOption_Builder*) addName:(PBUninterpretedOption_NamePart*) value; - (PBUninterpretedOption_Builder*) addAllName:(NSArray*) values; - (PBUninterpretedOption_Builder*) clearNameList; diff --git a/src/runtime/Classes/Descriptor.pb.m b/src/runtime/Classes/Descriptor.pb.m index 9f29e6a..8b84e5f 100644 --- a/src/runtime/Classes/Descriptor.pb.m +++ b/src/runtime/Classes/Descriptor.pb.m @@ -50,7 +50,7 @@ - (PBFileDescriptorSet*) defaultInstance { - (NSArray*) fileList { return mutableFileList; } -- (PBFileDescriptorProto*) fileAtIndex:(int32_t) index { +- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index { id value = [mutableFileList objectAtIndex:index]; return value; } @@ -68,8 +68,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -168,7 +168,7 @@ - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -193,10 +193,10 @@ - (NSArray*) fileList { if (result.mutableFileList == nil) { return [NSArray array]; } return result.mutableFileList; } -- (PBFileDescriptorProto*) fileAtIndex:(int32_t) index { +- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index { return [result fileAtIndex:index]; } -- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(int32_t) index with:(PBFileDescriptorProto*) value { +- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(NSInteger) index with:(PBFileDescriptorProto*) value { [result.mutableFileList replaceObjectAtIndex:index withObject:value]; return self; } @@ -293,35 +293,35 @@ - (PBFileDescriptorProto*) defaultInstance { - (NSArray*) dependencyList { return mutableDependencyList; } -- (NSString*) dependencyAtIndex:(int32_t) index { +- (NSString*) dependencyAtIndex:(NSInteger) index { id value = [mutableDependencyList objectAtIndex:index]; return value; } - (NSArray*) messageTypeList { return mutableMessageTypeList; } -- (PBDescriptorProto*) messageTypeAtIndex:(int32_t) index { +- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index { id value = [mutableMessageTypeList objectAtIndex:index]; return value; } - (NSArray*) enumTypeList { return mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { id value = [mutableEnumTypeList objectAtIndex:index]; return value; } - (NSArray*) serviceList { return mutableServiceList; } -- (PBServiceDescriptorProto*) serviceAtIndex:(int32_t) index { +- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index { id value = [mutableServiceList objectAtIndex:index]; return value; } - (NSArray*) extensionList { return mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { id value = [mutableExtensionList objectAtIndex:index]; return value; } @@ -380,8 +380,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -394,7 +394,7 @@ - (int32_t) serializedSize { size += computeStringSize(2, self.package); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; for (NSString* element in self.mutableDependencyList) { dataSize += computeStringSizeNoTag(element); } @@ -539,7 +539,7 @@ - (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -637,10 +637,10 @@ - (NSArray*) dependencyList { } return result.mutableDependencyList; } -- (NSString*) dependencyAtIndex:(int32_t) index { +- (NSString*) dependencyAtIndex:(NSInteger) index { return [result dependencyAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(int32_t) index with:(NSString*) value { +- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(NSInteger) index with:(NSString*) value { [result.mutableDependencyList replaceObjectAtIndex:index withObject:value]; return self; } @@ -666,10 +666,10 @@ - (NSArray*) messageTypeList { if (result.mutableMessageTypeList == nil) { return [NSArray array]; } return result.mutableMessageTypeList; } -- (PBDescriptorProto*) messageTypeAtIndex:(int32_t) index { +- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index { return [result messageTypeAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(int32_t) index with:(PBDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value { [result.mutableMessageTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -695,10 +695,10 @@ - (NSArray*) enumTypeList { if (result.mutableEnumTypeList == nil) { return [NSArray array]; } return result.mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { return [result enumTypeAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(int32_t) index with:(PBEnumDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value { [result.mutableEnumTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -724,10 +724,10 @@ - (NSArray*) serviceList { if (result.mutableServiceList == nil) { return [NSArray array]; } return result.mutableServiceList; } -- (PBServiceDescriptorProto*) serviceAtIndex:(int32_t) index { +- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index { return [result serviceAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(int32_t) index with:(PBServiceDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(NSInteger) index with:(PBServiceDescriptorProto*) value { [result.mutableServiceList replaceObjectAtIndex:index withObject:value]; return self; } @@ -753,10 +753,10 @@ - (NSArray*) extensionList { if (result.mutableExtensionList == nil) { return [NSArray array]; } return result.mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { return [result extensionAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(int32_t) index with:(PBFieldDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value { [result.mutableExtensionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -873,35 +873,35 @@ - (PBDescriptorProto*) defaultInstance { - (NSArray*) fieldList { return mutableFieldList; } -- (PBFieldDescriptorProto*) fieldAtIndex:(int32_t) index { +- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index { id value = [mutableFieldList objectAtIndex:index]; return value; } - (NSArray*) extensionList { return mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { id value = [mutableExtensionList objectAtIndex:index]; return value; } - (NSArray*) nestedTypeList { return mutableNestedTypeList; } -- (PBDescriptorProto*) nestedTypeAtIndex:(int32_t) index { +- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index { id value = [mutableNestedTypeList objectAtIndex:index]; return value; } - (NSArray*) enumTypeList { return mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { id value = [mutableEnumTypeList objectAtIndex:index]; return value; } - (NSArray*) extensionRangeList { return mutableExtensionRangeList; } -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(int32_t) index { +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index { id value = [mutableExtensionRangeList objectAtIndex:index]; return value; } @@ -957,8 +957,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1019,8 +1019,8 @@ - (PBDescriptorProto_Builder*) builder { @end @interface PBDescriptorProto_ExtensionRange () -@property int32_t start; -@property int32_t end; +@property NSInteger start; +@property NSInteger end; @end @implementation PBDescriptorProto_ExtensionRange @@ -1073,8 +1073,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1176,7 +1176,7 @@ - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCoded - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1202,10 +1202,10 @@ - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCoded - (BOOL) hasStart { return result.hasStart; } -- (int32_t) start { +- (NSInteger) start { return result.start; } -- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(int32_t) value { +- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(NSInteger) value { result.hasStart = YES; result.start = value; return self; @@ -1218,10 +1218,10 @@ - (PBDescriptorProto_ExtensionRange_Builder*) clearStart { - (BOOL) hasEnd { return result.hasEnd; } -- (int32_t) end { +- (NSInteger) end { return result.end; } -- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(int32_t) value { +- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(NSInteger) value { result.hasEnd = YES; result.end = value; return self; @@ -1320,7 +1320,7 @@ - (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1398,10 +1398,10 @@ - (NSArray*) fieldList { if (result.mutableFieldList == nil) { return [NSArray array]; } return result.mutableFieldList; } -- (PBFieldDescriptorProto*) fieldAtIndex:(int32_t) index { +- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index { return [result fieldAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(int32_t) index with:(PBFieldDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value { [result.mutableFieldList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1427,10 +1427,10 @@ - (NSArray*) extensionList { if (result.mutableExtensionList == nil) { return [NSArray array]; } return result.mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(int32_t) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { return [result extensionAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(int32_t) index with:(PBFieldDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value { [result.mutableExtensionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1456,10 +1456,10 @@ - (NSArray*) nestedTypeList { if (result.mutableNestedTypeList == nil) { return [NSArray array]; } return result.mutableNestedTypeList; } -- (PBDescriptorProto*) nestedTypeAtIndex:(int32_t) index { +- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index { return [result nestedTypeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(int32_t) index with:(PBDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value { [result.mutableNestedTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1485,10 +1485,10 @@ - (NSArray*) enumTypeList { if (result.mutableEnumTypeList == nil) { return [NSArray array]; } return result.mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(int32_t) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { return [result enumTypeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(int32_t) index with:(PBEnumDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value { [result.mutableEnumTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1514,10 +1514,10 @@ - (NSArray*) extensionRangeList { if (result.mutableExtensionRangeList == nil) { return [NSArray array]; } return result.mutableExtensionRangeList; } -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(int32_t) index { +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index { return [result extensionRangeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(int32_t) index with:(PBDescriptorProto_ExtensionRange*) value { +- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(NSInteger) index with:(PBDescriptorProto_ExtensionRange*) value { [result.mutableExtensionRangeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1573,7 +1573,7 @@ - (PBDescriptorProto_Builder*) clearOptions { @interface PBFieldDescriptorProto () @property (retain) NSString* name; -@property int32_t number; +@property NSInteger number; @property PBFieldDescriptorProto_Label label; @property PBFieldDescriptorProto_Type type; @property (retain) NSString* typeName; @@ -1708,8 +1708,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1882,7 +1882,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1907,7 +1907,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 32: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (PBFieldDescriptorProto_LabelIsValidValue(value)) { [self setLabel:value]; } else { @@ -1916,7 +1916,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 40: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (PBFieldDescriptorProto_TypeIsValidValue(value)) { [self setType:value]; } else { @@ -1963,10 +1963,10 @@ - (PBFieldDescriptorProto_Builder*) clearName { - (BOOL) hasNumber { return result.hasNumber; } -- (int32_t) number { +- (NSInteger) number { return result.number; } -- (PBFieldDescriptorProto_Builder*) setNumber:(int32_t) value { +- (PBFieldDescriptorProto_Builder*) setNumber:(NSInteger) value { result.hasNumber = YES; result.number = value; return self; @@ -2139,7 +2139,7 @@ - (PBEnumDescriptorProto*) defaultInstance { - (NSArray*) valueList { return mutableValueList; } -- (PBEnumValueDescriptorProto*) valueAtIndex:(int32_t) index { +- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index { id value = [mutableValueList objectAtIndex:index]; return value; } @@ -2168,8 +2168,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2280,7 +2280,7 @@ - (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2334,10 +2334,10 @@ - (NSArray*) valueList { if (result.mutableValueList == nil) { return [NSArray array]; } return result.mutableValueList; } -- (PBEnumValueDescriptorProto*) valueAtIndex:(int32_t) index { +- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index { return [result valueAtIndex:index]; } -- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(int32_t) index with:(PBEnumValueDescriptorProto*) value { +- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(NSInteger) index with:(PBEnumValueDescriptorProto*) value { [result.mutableValueList replaceObjectAtIndex:index withObject:value]; return self; } @@ -2393,7 +2393,7 @@ - (PBEnumDescriptorProto_Builder*) clearOptions { @interface PBEnumValueDescriptorProto () @property (retain) NSString* name; -@property int32_t number; +@property NSInteger number; @property (retain) PBEnumValueOptions* options; @end @@ -2465,8 +2465,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2574,7 +2574,7 @@ - (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2625,10 +2625,10 @@ - (PBEnumValueDescriptorProto_Builder*) clearName { - (BOOL) hasNumber { return result.hasNumber; } -- (int32_t) number { +- (NSInteger) number { return result.number; } -- (PBEnumValueDescriptorProto_Builder*) setNumber:(int32_t) value { +- (PBEnumValueDescriptorProto_Builder*) setNumber:(NSInteger) value { result.hasNumber = YES; result.number = value; return self; @@ -2721,7 +2721,7 @@ - (PBServiceDescriptorProto*) defaultInstance { - (NSArray*) methodList { return mutableMethodList; } -- (PBMethodDescriptorProto*) methodAtIndex:(int32_t) index { +- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index { id value = [mutableMethodList objectAtIndex:index]; return value; } @@ -2750,8 +2750,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2862,7 +2862,7 @@ - (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2916,10 +2916,10 @@ - (NSArray*) methodList { if (result.mutableMethodList == nil) { return [NSArray array]; } return result.mutableMethodList; } -- (PBMethodDescriptorProto*) methodAtIndex:(int32_t) index { +- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index { return [result methodAtIndex:index]; } -- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(int32_t) index with:(PBMethodDescriptorProto*) value { +- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(NSInteger) index with:(PBMethodDescriptorProto*) value { [result.mutableMethodList replaceObjectAtIndex:index withObject:value]; return self; } @@ -3061,8 +3061,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3176,7 +3176,7 @@ - (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3366,7 +3366,7 @@ - (PBFileOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -3402,8 +3402,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3538,7 +3538,7 @@ - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3559,7 +3559,7 @@ - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 72: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (PBFileOptions_OptimizeModeIsValidValue(value)) { [self setOptimizeFor:value]; } else { @@ -3648,10 +3648,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -3734,7 +3734,7 @@ - (PBMessageOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -3764,8 +3764,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3878,7 +3878,7 @@ - (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3943,10 +3943,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4048,7 +4048,7 @@ - (PBFieldOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4084,8 +4084,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4219,7 +4219,7 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4232,7 +4232,7 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu break; } case 8: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (PBFieldOptions_CTypeIsValidValue(value)) { [self setCtype:value]; } else { @@ -4329,10 +4329,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4387,7 +4387,7 @@ - (PBEnumOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4411,8 +4411,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4513,7 +4513,7 @@ - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4538,10 +4538,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4596,7 +4596,7 @@ - (PBEnumValueOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4620,8 +4620,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4722,7 +4722,7 @@ - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4747,10 +4747,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4805,7 +4805,7 @@ - (PBServiceOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4829,8 +4829,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4931,7 +4931,7 @@ - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4956,10 +4956,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -5014,7 +5014,7 @@ - (PBMethodOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -5038,8 +5038,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5140,7 +5140,7 @@ - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5165,10 +5165,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(int32_t) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(int32_t) index with:(PBUninterpretedOption*) value { +- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -5270,7 +5270,7 @@ - (PBUninterpretedOption*) defaultInstance { - (NSArray*) nameList { return mutableNameList; } -- (PBUninterpretedOption_NamePart*) nameAtIndex:(int32_t) index { +- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index { id value = [mutableNameList objectAtIndex:index]; return value; } @@ -5303,8 +5303,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5428,8 +5428,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5531,7 +5531,7 @@ - (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedIn - (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5660,7 +5660,7 @@ - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5705,10 +5705,10 @@ - (NSArray*) nameList { if (result.mutableNameList == nil) { return [NSArray array]; } return result.mutableNameList; } -- (PBUninterpretedOption_NamePart*) nameAtIndex:(int32_t) index { +- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index { return [result nameAtIndex:index]; } -- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(int32_t) index with:(PBUninterpretedOption_NamePart*) value { +- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(NSInteger) index with:(PBUninterpretedOption_NamePart*) value { [result.mutableNameList replaceObjectAtIndex:index withObject:value]; return self; } diff --git a/src/runtime/Classes/ExtendableMessage.h b/src/runtime/Classes/ExtendableMessage.h index b051497..eb7ee78 100644 --- a/src/runtime/Classes/ExtendableMessage.h +++ b/src/runtime/Classes/ExtendableMessage.h @@ -68,19 +68,19 @@ //@protected - (BOOL) extensionsAreInitialized; -- (int32_t) extensionsSerializedSize; +- (NSInteger) extensionsSerializedSize; - (void) writeExtensionsToCodedOutputStream:(PBCodedOutputStream*) output - from:(int32_t) startInclusive - to:(int32_t) endExclusive; + from:(NSInteger) startInclusive + to:(NSInteger) endExclusive; - (void) writeExtensionDescriptionToMutableString:(NSMutableString*) output - from:(int32_t) startInclusive - to:(int32_t) endExclusive + from:(NSInteger) startInclusive + to:(NSInteger) endExclusive withIndent:(NSString*) indent; - (BOOL) isEqualExtensionsInOther:(PBExtendableMessage*)otherMessage - from:(int32_t) startInclusive - to:(int32_t) endExclusive; -- (NSUInteger) hashExtensionsFrom:(int32_t) startInclusive - to:(int32_t) endExclusive; + from:(NSInteger) startInclusive + to:(NSInteger) endExclusive; +- (NSUInteger) hashExtensionsFrom:(NSInteger) startInclusive + to:(NSInteger) endExclusive; diff --git a/src/runtime/Classes/ExtendableMessage.m b/src/runtime/Classes/ExtendableMessage.m index 9d485c7..efa5f30 100644 --- a/src/runtime/Classes/ExtendableMessage.m +++ b/src/runtime/Classes/ExtendableMessage.m @@ -53,7 +53,7 @@ - (BOOL) extensionsAreInitialized { - (id) getExtension:(id) extension { [self ensureExtensionIsRegistered:extension]; - id value = [extensionMap objectForKey:[NSNumber numberWithInt:[extension fieldNumber]]]; + id value = [extensionMap objectForKey:@([extension fieldNumber])]; if (value != nil) { return value; } @@ -71,22 +71,22 @@ - (void) ensureExtensionIsRegistered:(id) extension { self.extensionRegistry = [NSMutableDictionary dictionary]; } [extensionRegistry setObject:extension - forKey:[NSNumber numberWithInt:[extension fieldNumber]]]; + forKey:@([extension fieldNumber])]; } - (BOOL) hasExtension:(id) extension { - return nil != [extensionMap objectForKey:[NSNumber numberWithInt:[extension fieldNumber]]]; + return nil != [extensionMap objectForKey:@([extension fieldNumber])]; } - (void) writeExtensionsToCodedOutputStream:(PBCodedOutputStream*) output - from:(int32_t) startInclusive - to:(int32_t) endExclusive { + from:(NSInteger) startInclusive + to:(NSInteger) endExclusive { // man, i really wish Cocoa had a Sorted/TreeMap NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - int32_t fieldNumber = [number intValue]; + NSInteger fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id extension = [extensionRegistry objectForKey:number]; id value = [extensionMap objectForKey:number]; @@ -97,12 +97,12 @@ - (void) writeExtensionsToCodedOutputStream:(PBCodedOutputStream*) output - (void) writeExtensionDescriptionToMutableString:(NSMutableString*) output - from:(int32_t) startInclusive - to:(int32_t) endExclusive + from:(NSInteger) startInclusive + to:(NSInteger) endExclusive withIndent:(NSString*) indent { NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - int32_t fieldNumber = [number intValue]; + NSInteger fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id extension = [extensionRegistry objectForKey:number]; id value = [extensionMap objectForKey:number]; @@ -113,11 +113,11 @@ - (void) writeExtensionDescriptionToMutableString:(NSMutableString*) output - (BOOL) isEqualExtensionsInOther:(PBExtendableMessage*)otherMessage - from:(int32_t) startInclusive - to:(int32_t) endExclusive { + from:(NSInteger) startInclusive + to:(NSInteger) endExclusive { NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - int32_t fieldNumber = [number intValue]; + NSInteger fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id value = [extensionMap objectForKey:number]; id otherValue = [otherMessage.extensionMap objectForKey:number]; @@ -130,12 +130,12 @@ - (BOOL) isEqualExtensionsInOther:(PBExtendableMessage*)otherMessage } -- (NSUInteger) hashExtensionsFrom:(int32_t) startInclusive - to:(int32_t) endExclusive { +- (NSUInteger) hashExtensionsFrom:(NSInteger) startInclusive + to:(NSInteger) endExclusive { NSUInteger hashCode = 0; NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - int32_t fieldNumber = [number intValue]; + NSInteger fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id value = [extensionMap objectForKey:number]; hashCode = hashCode * 31 + [value hash]; @@ -145,8 +145,8 @@ - (NSUInteger) hashExtensionsFrom:(int32_t) startInclusive } -- (int32_t) extensionsSerializedSize { - int32_t size = 0; +- (NSInteger) extensionsSerializedSize { + NSInteger size = 0; for (NSNumber* number in extensionMap) { id extension = [extensionRegistry objectForKey:number]; id value = [extensionMap objectForKey:number]; diff --git a/src/runtime/Classes/ExtendableMessage_Builder.h b/src/runtime/Classes/ExtendableMessage_Builder.h index e7bbd2a..c063381 100644 --- a/src/runtime/Classes/ExtendableMessage_Builder.h +++ b/src/runtime/Classes/ExtendableMessage_Builder.h @@ -68,7 +68,7 @@ - (PBExtendableMessage_Builder*) addExtension:(id) extension value:(id) value; - (PBExtendableMessage_Builder*) setExtension:(id) extension - index:(int32_t) index + index:(NSInteger) index value:(id) value; - (PBExtendableMessage_Builder*) clearExtension:(id) extension; diff --git a/src/runtime/Classes/ExtendableMessage_Builder.m b/src/runtime/Classes/ExtendableMessage_Builder.m index a8caeb4..fb18acf 100644 --- a/src/runtime/Classes/ExtendableMessage_Builder.m +++ b/src/runtime/Classes/ExtendableMessage_Builder.m @@ -35,10 +35,10 @@ - (PBExtendableMessage*) internalGetResult { - (BOOL) parseUnknownField:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry - tag:(int32_t) tag { + tag:(NSInteger) tag { PBExtendableMessage* message = [self internalGetResult]; - int32_t wireType = PBWireFormatGetTagWireType(tag); - int32_t fieldNumber = PBWireFormatGetTagFieldNumber(tag); + NSInteger wireType = PBWireFormatGetTagWireType(tag); + NSInteger fieldNumber = PBWireFormatGetTagFieldNumber(tag); id extension = [extensionRegistry getExtension:[message class] fieldNumber:fieldNumber]; @@ -80,7 +80,7 @@ - (PBExtendableMessage_Builder*) setExtension:(id) extension if (message.extensionMap == nil) { message.extensionMap = [NSMutableDictionary dictionary]; } - [message.extensionMap setObject:value forKey:[NSNumber numberWithInt:[extension fieldNumber]]]; + [message.extensionMap setObject:value forKey:@([extension fieldNumber])]; return self; } @@ -97,7 +97,7 @@ - (PBExtendableMessage_Builder*) addExtension:(id) extension if (message.extensionMap == nil) { message.extensionMap = [NSMutableDictionary dictionary]; } - NSNumber* fieldNumber = [NSNumber numberWithInt:[extension fieldNumber]]; + NSNumber* fieldNumber = ([extension fieldNumber]); NSMutableArray* list = [message.extensionMap objectForKey:fieldNumber]; if (list == nil) { list = [NSMutableArray array]; @@ -110,7 +110,7 @@ - (PBExtendableMessage_Builder*) addExtension:(id) extension - (PBExtendableMessage_Builder*) setExtension:(id) extension - index:(int32_t) index + index:(NSInteger) index value:(id) value { PBExtendableMessage* message = [self internalGetResult]; [message ensureExtensionIsRegistered:extension]; @@ -123,7 +123,7 @@ - (PBExtendableMessage_Builder*) setExtension:(id) extension message.extensionMap = [NSMutableDictionary dictionary]; } - NSNumber* fieldNumber = [NSNumber numberWithInt:[extension fieldNumber]]; + NSNumber* fieldNumber = @([extension fieldNumber]); NSMutableArray* list = [message.extensionMap objectForKey:fieldNumber]; [list replaceObjectAtIndex:index withObject:value]; @@ -135,7 +135,7 @@ - (PBExtendableMessage_Builder*) setExtension:(id) extension - (PBExtendableMessage_Builder*) clearExtension:(id) extension { PBExtendableMessage* message = [self internalGetResult]; [message ensureExtensionIsRegistered:extension]; - [message.extensionMap removeObjectForKey:[NSNumber numberWithInt:[extension fieldNumber]]]; + [message.extensionMap removeObjectForKey:@([extension fieldNumber])]; return self; } diff --git a/src/runtime/Classes/ExtensionField.h b/src/runtime/Classes/ExtensionField.h index d30165d..fe13d2c 100644 --- a/src/runtime/Classes/ExtensionField.h +++ b/src/runtime/Classes/ExtensionField.h @@ -24,7 +24,7 @@ @class PBUnknownFieldSet_Builder; @protocol PBExtensionField -- (int32_t) fieldNumber; +- (NSInteger) fieldNumber; - (PBWireFormat) wireType; - (BOOL) isRepeated; - (Class) extendedClass; @@ -34,9 +34,9 @@ unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry builder:(PBExtendableMessage_Builder*) builder - tag:(int32_t) tag; + tag:(NSInteger) tag; - (void) writeValue:(id) value includingTagToCodedOutputStream:(PBCodedOutputStream*) output; -- (int32_t) computeSerializedSizeIncludingTag:(id) value; +- (NSInteger) computeSerializedSizeIncludingTag:(id) value; - (void) writeDescriptionOf:(id) value to:(NSMutableString*) output withIndent:(NSString*) indent; diff --git a/src/runtime/Classes/Field.h b/src/runtime/Classes/Field.h index c8b19a2..f881312 100644 --- a/src/runtime/Classes/Field.h +++ b/src/runtime/Classes/Field.h @@ -39,12 +39,12 @@ + (PBField *)defaultInstance; -- (int32_t)getSerializedSize:(int32_t)fieldNumber; -- (int32_t)getSerializedSizeAsMessageSetExtension:(int32_t)fieldNumber; +- (NSInteger)getSerializedSize:(NSInteger)fieldNumber; +- (NSInteger)getSerializedSizeAsMessageSetExtension:(NSInteger)fieldNumber; -- (void)writeTo:(int32_t) fieldNumber output:(PBCodedOutputStream *)output; -- (void)writeAsMessageSetExtensionTo:(int32_t)fieldNumber output:(PBCodedOutputStream *)output; -- (void)writeDescriptionFor:(int32_t) fieldNumber +- (void)writeTo:(NSInteger) fieldNumber output:(PBCodedOutputStream *)output; +- (void)writeAsMessageSetExtensionTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *)output; +- (void)writeDescriptionFor:(NSInteger) fieldNumber to:(NSMutableString*) output withIndent:(NSString*) indent; @end diff --git a/src/runtime/Classes/Field.m b/src/runtime/Classes/Field.m index 6124a46..a3e3e14 100644 --- a/src/runtime/Classes/Field.m +++ b/src/runtime/Classes/Field.m @@ -51,8 +51,8 @@ + (PBField *)defaultInstance { return sDefaultInstance; } -- (int32_t)getSerializedSize:(int32_t)fieldNumber { - int32_t result = 0; +- (NSInteger)getSerializedSize:(NSInteger)fieldNumber { + NSInteger result = 0; const int64_t *varintValues = (const int64_t *)_varintArray.data; if (varintValues) { @@ -62,7 +62,7 @@ - (int32_t)getSerializedSize:(int32_t)fieldNumber { } } - const int32_t *fixed32Values = (const int32_t *)_fixed32Array.data; + const NSInteger *fixed32Values = (const NSInteger *)_fixed32Array.data; if (fixed32Values) { const NSUInteger count = _fixed32Array.count; for (NSUInteger i = 0; i < count; ++i) { @@ -89,8 +89,8 @@ - (int32_t)getSerializedSize:(int32_t)fieldNumber { return result; } -- (int32_t)getSerializedSizeAsMessageSetExtension:(int32_t)fieldNumber { - int32_t result = 0; +- (NSInteger)getSerializedSizeAsMessageSetExtension:(NSInteger)fieldNumber { + NSInteger result = 0; for (NSData *value in _lengthDelimitedArray) { result += computeRawMessageSetExtensionSize(fieldNumber, value); @@ -99,7 +99,7 @@ - (int32_t)getSerializedSizeAsMessageSetExtension:(int32_t)fieldNumber { return result; } -- (void)writeTo:(int32_t)fieldNumber output:(PBCodedOutputStream *) output { +- (void)writeTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *) output { const int64_t *varintValues = (const int64_t *)_varintArray.data; if (varintValues) { const NSUInteger count = _varintArray.count; @@ -108,7 +108,7 @@ - (void)writeTo:(int32_t)fieldNumber output:(PBCodedOutputStream *) output { } } - const int32_t *fixed32Values = (const int32_t *)_fixed32Array.data; + const NSInteger *fixed32Values = (const NSInteger *)_fixed32Array.data; if (fixed32Values) { const NSUInteger count = _fixed32Array.count; for (NSUInteger i = 0; i < count; ++i) { @@ -133,29 +133,29 @@ - (void)writeTo:(int32_t)fieldNumber output:(PBCodedOutputStream *) output { } } -- (void)writeDescriptionFor:(int32_t) fieldNumber +- (void)writeDescriptionFor:(NSInteger) fieldNumber to:(NSMutableString*) output withIndent:(NSString*) indent { for (NSNumber* value in self.varintArray) { - [output appendFormat:@"%@%d: %qi\n", indent, fieldNumber, value.longLongValue]; + [output appendFormat:@"%@%ld: %qi\n", indent, (long)fieldNumber, value.longLongValue]; } for (NSNumber* value in self.fixed32Array) { - [output appendFormat:@"%@%d: %d\n", indent, fieldNumber, value.intValue]; + [output appendFormat:@"%@%ld: %d\n", indent, (long)fieldNumber, value.intValue]; } for (NSNumber* value in self.fixed64Array) { - [output appendFormat:@"%@%d: %qi\n", indent, fieldNumber, value.longLongValue]; + [output appendFormat:@"%@%ld: %qi\n", indent, (long)fieldNumber, value.longLongValue]; } for (NSData* value in self.lengthDelimitedArray) { - [output appendFormat:@"%@%d: %@\n", indent, fieldNumber, value]; + [output appendFormat:@"%@%ld: %@\n", indent, (long)fieldNumber, value]; } for (PBUnknownFieldSet* value in self.groupArray) { - [output appendFormat:@"%@%d: [\n", indent, fieldNumber]; + [output appendFormat:@"%@%ld: [\n", indent, (long)fieldNumber]; [value writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@]", indent]; } } -- (void)writeAsMessageSetExtensionTo:(int32_t)fieldNumber output:(PBCodedOutputStream *) output { +- (void)writeAsMessageSetExtensionTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *) output { for (NSData *value in _lengthDelimitedArray) { [output writeRawMessageSetExtension:fieldNumber value:value]; } diff --git a/src/runtime/Classes/GeneratedMessage.h b/src/runtime/Classes/GeneratedMessage.h index bbc5f0d..0ac1c98 100644 --- a/src/runtime/Classes/GeneratedMessage.h +++ b/src/runtime/Classes/GeneratedMessage.h @@ -30,7 +30,7 @@ PBUnknownFieldSet* unknownFields; @protected - int32_t memoizedSerializedSize; + NSInteger memoizedSerializedSize; } @end diff --git a/src/runtime/Classes/GeneratedMessage_Builder.h b/src/runtime/Classes/GeneratedMessage_Builder.h index 23563c5..1bc3a7c 100644 --- a/src/runtime/Classes/GeneratedMessage_Builder.h +++ b/src/runtime/Classes/GeneratedMessage_Builder.h @@ -26,7 +26,7 @@ - (BOOL) parseUnknownField:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry - tag:(int32_t) tag; + tag:(NSInteger) tag; - (void) checkInitialized; diff --git a/src/runtime/Classes/GeneratedMessage_Builder.m b/src/runtime/Classes/GeneratedMessage_Builder.m index 78bf22f..a3233fe 100644 --- a/src/runtime/Classes/GeneratedMessage_Builder.m +++ b/src/runtime/Classes/GeneratedMessage_Builder.m @@ -80,7 +80,7 @@ - (BOOL) isInitialized { - (BOOL) parseUnknownField:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry - tag:(int32_t) tag { + tag:(NSInteger) tag { return [unknownFields mergeFieldFrom:tag input:input]; } diff --git a/src/runtime/Classes/Message.h b/src/runtime/Classes/Message.h index cd188cc..614b7ef 100644 --- a/src/runtime/Classes/Message.h +++ b/src/runtime/Classes/Message.h @@ -44,7 +44,7 @@ * Get the number of bytes required to encode this message. The result * is only computed on the first call and memoized after that. */ -- (int32_t) serializedSize; +- (NSInteger) serializedSize; /** * Returns true if all required fields in the message and all embedded diff --git a/src/runtime/Classes/MutableField.h b/src/runtime/Classes/MutableField.h index b6181d3..d357173 100644 --- a/src/runtime/Classes/MutableField.h +++ b/src/runtime/Classes/MutableField.h @@ -27,7 +27,7 @@ - (PBMutableField *)clear; - (PBMutableField *)addVarint:(int64_t)value; -- (PBMutableField *)addFixed32:(int32_t)value; +- (PBMutableField *)addFixed32:(NSInteger)value; - (PBMutableField *)addFixed64:(int64_t)value; - (PBMutableField *)addLengthDelimited:(NSData *)value; - (PBMutableField *)addGroup:(PBUnknownFieldSet *)value; diff --git a/src/runtime/Classes/MutableField.m b/src/runtime/Classes/MutableField.m index dbba925..d6600c1 100644 --- a/src/runtime/Classes/MutableField.m +++ b/src/runtime/Classes/MutableField.m @@ -93,7 +93,7 @@ - (PBMutableField *)addVarint:(int64_t)value { return self; } -- (PBMutableField *)addFixed32:(int32_t)value { +- (PBMutableField *)addFixed32:(NSInteger)value { if (_fixed32Array == nil) { _fixed32Array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; } diff --git a/src/runtime/Classes/PBArray.h b/src/runtime/Classes/PBArray.h index 97a2751..8f3466c 100644 --- a/src/runtime/Classes/PBArray.h +++ b/src/runtime/Classes/PBArray.h @@ -49,8 +49,8 @@ typedef enum _PBArrayValueType - (NSUInteger)count; - (id)objectAtIndex:(NSUInteger)index; - (BOOL)boolAtIndex:(NSUInteger)index; -- (int32_t)int32AtIndex:(NSUInteger)index; -- (uint32_t)uint32AtIndex:(NSUInteger)index; +- (NSInteger)int32AtIndex:(NSUInteger)index; +- (NSUInteger)uint32AtIndex:(NSUInteger)index; - (int64_t)int64AtIndex:(NSUInteger)index; - (uint64_t)uint64AtIndex:(NSUInteger)index; - (Float32)floatAtIndex:(NSUInteger)index; @@ -90,8 +90,8 @@ typedef enum _PBArrayValueType - (void)addObject:(id)value; - (void)addBool:(BOOL)value; -- (void)addInt32:(int32_t)value; -- (void)addUint32:(uint32_t)value; +- (void)addInt32:(NSInteger)value; +- (void)addUint32:(NSUInteger)value; - (void)addInt64:(int64_t)value; - (void)addUint64:(uint64_t)value; - (void)addFloat:(Float32)value; diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 7def7de..9717cbe 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -33,12 +33,12 @@ static void PBArraySetBoolValue(NSNumber *number, void *value) static void PBArraySetInt32Value(NSNumber *number, void *value) { - *((int32_t *)value) = [number intValue]; + *((NSInteger *)value) = [number intValue]; } static void PBArraySetUInt32Value(NSNumber *number, void *value) { - *((uint32_t *)value) = [number unsignedIntValue]; + *((NSUInteger *)value) = [number unsignedIntValue]; } static void PBArraySetInt64Value(NSNumber *number, void *value) @@ -73,8 +73,8 @@ static void PBArraySetDoubleValue(NSNumber *number, void *value) { { sizeof(id), NULL }, { sizeof(BOOL), PBArraySetBoolValue }, - { sizeof(int32_t), PBArraySetInt32Value }, - { sizeof(uint32_t), PBArraySetUInt32Value }, + { sizeof(NSInteger), PBArraySetInt32Value }, + { sizeof(NSUInteger), PBArraySetUInt32Value }, { sizeof(int64_t), PBArraySetInt64Value }, { sizeof(uint64_t), PBArraySetUInt64Value }, { sizeof(Float32), PBArraySetFloatValue }, @@ -211,18 +211,18 @@ - (BOOL)boolAtIndex:(NSUInteger)index return ((BOOL *)_data)[index]; } -- (int32_t)int32AtIndex:(NSUInteger)index +- (NSInteger)int32AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt32); - return ((int32_t *)_data)[index]; + return ((NSInteger *)_data)[index]; } -- (uint32_t)uint32AtIndex:(NSUInteger)index +- (NSUInteger)uint32AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt32); - return ((uint32_t *)_data)[index]; + return ((NSUInteger *)_data)[index]; } - (int64_t)int64AtIndex:(NSUInteger)index @@ -454,19 +454,19 @@ - (void)addBool:(BOOL)value _count++; } -- (void)addInt32:(int32_t)value +- (void)addInt32:(NSInteger)value { PBArrayValueTypeAssert(PBArrayValueTypeInt32); [self ensureAdditionalCapacity:1]; - *(int32_t *)PBArraySlot(_count) = value; + *(NSInteger *)PBArraySlot(_count) = value; _count++; } -- (void)addUint32:(uint32_t)value +- (void)addUint32:(NSUInteger)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt32); [self ensureAdditionalCapacity:1]; - *(uint32_t *)PBArraySlot(_count) = value; + *(NSUInteger *)PBArraySlot(_count) = value; _count++; } diff --git a/src/runtime/Classes/RingBuffer.m b/src/runtime/Classes/RingBuffer.m index 6c4d4b4..1a71219 100644 --- a/src/runtime/Classes/RingBuffer.m +++ b/src/runtime/Classes/RingBuffer.m @@ -44,7 +44,7 @@ - (NSInteger)appendData:(const NSData*)value offset:(NSInteger)offset length:(NS } // position < tail - int32_t written = MIN(freeSpace, length); + NSInteger written = MIN(freeSpace, length); memcpy(data + position, input + offset, written); position += written; totalWritten += written; @@ -58,7 +58,7 @@ - (NSInteger)flushToOutputStream:(NSOutputStream*)stream { const uint8_t *data = buffer.bytes; if (tail > position) { - int32_t written = [stream write:data + tail maxLength:buffer.length - tail]; + NSInteger written = [stream write:data + tail maxLength:buffer.length - tail]; if (written <= 0) return totalWritten; totalWritten += written; tail += written; @@ -68,7 +68,7 @@ - (NSInteger)flushToOutputStream:(NSOutputStream*)stream { } if (tail < position) { - int32_t written = [stream write:data + tail maxLength:position - tail]; + NSInteger written = [stream write:data + tail maxLength:position - tail]; if (written <= 0) return totalWritten; totalWritten += written; tail += written; diff --git a/src/runtime/Classes/TextFormat.h b/src/runtime/Classes/TextFormat.h index 7cf8a55..8f39f6a 100644 --- a/src/runtime/Classes/TextFormat.h +++ b/src/runtime/Classes/TextFormat.h @@ -19,8 +19,8 @@ } -+ (int32_t) parseInt32:(NSString*) text; -+ (int32_t) parseUInt32:(NSString*) text; ++ (NSInteger) parseInt32:(NSString*) text; ++ (NSInteger) parseUInt32:(NSString*) text; + (int64_t) parseInt64:(NSString*) text; + (int64_t) parseUInt64:(NSString*) text; diff --git a/src/runtime/Classes/TextFormat.m b/src/runtime/Classes/TextFormat.m index 466ff03..0caeabd 100644 --- a/src/runtime/Classes/TextFormat.m +++ b/src/runtime/Classes/TextFormat.m @@ -109,8 +109,8 @@ + (int64_t) parseInteger:(NSString*) text * the prefixes "0x" and "0" to signify hexidecimal and octal numbers, * respectively. */ -+ (int32_t) parseInt32:(NSString*) text { - return (int32_t)[self parseInteger:text isSigned:YES isLong:NO]; ++ (NSInteger) parseInt32:(NSString*) text { + return (NSInteger)[self parseInteger:text isSigned:YES isLong:NO]; } @@ -119,8 +119,8 @@ + (int32_t) parseInt32:(NSString*) text { * the prefixes "0x" and "0" to signify hexidecimal and octal numbers, * respectively. The result is coerced to a (signed) {@code int} when returned. */ -+ (int32_t) parseUInt32:(NSString*) text { - return (int32_t)[self parseInteger:text isSigned:NO isLong:NO]; ++ (NSInteger) parseUInt32:(NSString*) text { + return (NSInteger)[self parseInteger:text isSigned:NO isLong:NO]; } @@ -149,7 +149,7 @@ + (int64_t) parseUInt64:(NSString*) text { * numeric value. This is like {@code Character.digit()} but we don't accept * non-ASCII digits. */ -int32_t digitValue(unichar c) { +NSInteger digitValue(unichar c) { if ('0' <= c && c <= '9') { return c - '0'; } else if ('a' <= c && c <= 'z') { @@ -168,8 +168,8 @@ int32_t digitValue(unichar c) { + (NSData*) unescapeBytes:(NSString*) input { NSMutableData* result = [NSMutableData dataWithLength:input.length]; - int32_t pos = 0; - for (int32_t i = 0; i < input.length; i++) { + NSInteger pos = 0; + for (NSInteger i = 0; i < input.length; i++) { unichar c = [input characterAtIndex:i]; if (c == '\\') { if (i + 1 < input.length) { @@ -177,7 +177,7 @@ + (NSData*) unescapeBytes:(NSString*) input { c = [input characterAtIndex:i]; if (isOctal(c)) { // Octal escape. - int32_t code = digitValue(c); + NSInteger code = digitValue(c); if (i + 1 < input.length && isOctal([input characterAtIndex:(i + 1)])) { ++i; code = code * 8 + digitValue([input characterAtIndex:i]); @@ -202,7 +202,7 @@ + (NSData*) unescapeBytes:(NSString*) input { case 'x': // hex escape { - int32_t code = 0; + NSInteger code = 0; if (i + 1 < input.length && isHex([input characterAtIndex:(i + 1)])) { ++i; code = digitValue([input characterAtIndex:i]); diff --git a/src/runtime/Classes/UnknownFieldSet.h b/src/runtime/Classes/UnknownFieldSet.h index 4e8faf2..760b9ca 100644 --- a/src/runtime/Classes/UnknownFieldSet.h +++ b/src/runtime/Classes/UnknownFieldSet.h @@ -38,11 +38,11 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; - (NSData*) data; -- (int32_t) serializedSize; -- (int32_t) serializedSizeAsMessageSet; +- (NSInteger) serializedSize; +- (NSInteger) serializedSizeAsMessageSet; -- (BOOL) hasField:(int32_t) number; -- (PBField*) getField:(int32_t) number; +- (BOOL) hasField:(NSInteger) number; +- (PBField*) getField:(NSInteger) number; - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent; diff --git a/src/runtime/Classes/UnknownFieldSet.m b/src/runtime/Classes/UnknownFieldSet.m index b336a3f..1df7688 100644 --- a/src/runtime/Classes/UnknownFieldSet.m +++ b/src/runtime/Classes/UnknownFieldSet.m @@ -66,13 +66,13 @@ + (PBUnknownFieldSet*) setWithFields:(NSMutableDictionary*) fields { } -- (BOOL) hasField:(int32_t) number { - return [fields objectForKey:[NSNumber numberWithInt:number]] != nil; +- (BOOL) hasField:(NSInteger) number { + return [fields objectForKey:@(number)] != nil; } -- (PBField*) getField:(int32_t) number { - PBField* result = [fields objectForKey:[NSNumber numberWithInt:number]]; +- (PBField*) getField:(NSInteger) number { + PBField* result = [fields objectForKey:@(number)]; return (result == nil) ? [PBField defaultInstance] : result; } @@ -129,8 +129,8 @@ + (PBUnknownFieldSet_Builder*) builderWithUnknownFields:(PBUnknownFieldSet*) cop /** Get the number of bytes required to encode this set. */ -- (int32_t) serializedSize { - int32_t result = 0; +- (NSInteger) serializedSize { + NSInteger result = 0; for (NSNumber* number in fields) { result += [[fields objectForKey:number] getSerializedSize:number.intValue]; } @@ -152,8 +152,8 @@ - (void) writeAsMessageSetTo:(PBCodedOutputStream*) output { * Get the number of bytes required to encode this set using * {@code MessageSet} wire format. */ -- (int32_t) serializedSizeAsMessageSet { - int32_t result = 0; +- (NSInteger) serializedSizeAsMessageSet { + NSInteger result = 0; for (NSNumber* number in fields) { result += [[fields objectForKey:number] getSerializedSizeAsMessageSetExtension:number.intValue]; } diff --git a/src/runtime/Classes/UnknownFieldSet_Builder.h b/src/runtime/Classes/UnknownFieldSet_Builder.h index 436d444..f88bd04 100644 --- a/src/runtime/Classes/UnknownFieldSet_Builder.h +++ b/src/runtime/Classes/UnknownFieldSet_Builder.h @@ -27,7 +27,7 @@ // Optimization: We keep around a builder for the last field that was // modified so that we can efficiently add to it multiple times in a // row (important when parsing an unknown repeated field). - int32_t lastFieldNumber; + NSInteger lastFieldNumber; PBMutableField* lastField; } @@ -41,13 +41,13 @@ - (PBUnknownFieldSet_Builder*) mergeFromData:(NSData*) data; - (PBUnknownFieldSet_Builder*) mergeFromInputStream:(NSInputStream*) input; -- (PBUnknownFieldSet_Builder*) mergeVarintField:(int32_t) number value:(int32_t) value; +- (PBUnknownFieldSet_Builder*) mergeVarintField:(NSInteger) number value:(NSInteger) value; -- (BOOL) mergeFieldFrom:(int32_t) tag input:(PBCodedInputStream*) input; +- (BOOL) mergeFieldFrom:(NSInteger) tag input:(PBCodedInputStream*) input; -- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(int32_t) number; +- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(NSInteger) number; - (PBUnknownFieldSet_Builder*) clear; -- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(int32_t) number; +- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(NSInteger) number; @end diff --git a/src/runtime/Classes/UnknownFieldSet_Builder.m b/src/runtime/Classes/UnknownFieldSet_Builder.m index 4fdd178..14cd149 100644 --- a/src/runtime/Classes/UnknownFieldSet_Builder.m +++ b/src/runtime/Classes/UnknownFieldSet_Builder.m @@ -25,7 +25,7 @@ @interface PBUnknownFieldSet_Builder () @property (retain) NSMutableDictionary* fields; -@property int32_t lastFieldNumber; +@property NSInteger lastFieldNumber; @property (retain) PBMutableField* lastField; @end @@ -65,7 +65,7 @@ + (PBUnknownFieldSet_Builder*) createBuilder:(PBUnknownFieldSet*) unknownFields * Add a field to the {@code PBUnknownFieldSet}. If a field with the same * number already exists, it is removed. */ -- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(int32_t) number { +- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(NSInteger) number { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"" userInfo:nil]; } @@ -74,7 +74,7 @@ - (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(int32_t) num self.lastField = nil; lastFieldNumber = 0; } - [fields setObject:field forKey:[NSNumber numberWithInt:number]]; + [fields setObject:field forKey:@(number)]; return self; } @@ -83,7 +83,7 @@ - (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(int32_t) num * Get a field builder for the given field number which includes any * values that already exist. */ -- (PBMutableField*) getFieldBuilder:(int32_t) number { +- (PBMutableField*) getFieldBuilder:(NSInteger) number { if (lastField != nil) { if (number == lastFieldNumber) { return lastField; @@ -94,7 +94,7 @@ - (PBMutableField*) getFieldBuilder:(int32_t) number { if (number == 0) { return nil; } else { - PBField* existing = [fields objectForKey:[NSNumber numberWithInt:number]]; + PBField* existing = [fields objectForKey:@(number)]; lastFieldNumber = number; self.lastField = [PBMutableField field]; if (existing != nil) { @@ -142,12 +142,12 @@ - (PBUnknownFieldSet*) unknownFields { } /** Check if the given field number is present in the set. */ -- (BOOL) hasField:(int32_t) number { +- (BOOL) hasField:(NSInteger) number { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"" userInfo:nil]; } - return number == lastFieldNumber || ([fields objectForKey:[NSNumber numberWithInt:number]] != nil); + return number == lastFieldNumber || ([fields objectForKey:@(number)] != nil); } @@ -155,7 +155,7 @@ - (BOOL) hasField:(int32_t) number { * Add a field to the {@code PBUnknownFieldSet}. If a field with the same * number already exists, the two are merged. */ -- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(int32_t) number { +- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(NSInteger) number { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"" userInfo:nil]; } @@ -207,7 +207,7 @@ - (PBUnknownFieldSet_Builder*) mergeFromInputStream:(NSInputStream*) input exten @throw [NSException exceptionWithName:@"UnsupportedMethod" reason:@"" userInfo:nil]; } -- (PBUnknownFieldSet_Builder*) mergeVarintField:(int32_t) number value:(int32_t) value { +- (PBUnknownFieldSet_Builder*) mergeVarintField:(NSInteger) number value:(NSInteger) value { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"Zero is not a valid field number." userInfo:nil]; } @@ -222,8 +222,8 @@ - (PBUnknownFieldSet_Builder*) mergeVarintField:(int32_t) number value:(int32_t) * @param tag The field's tag number, which was already parsed. * @return {@code NO} if the tag is an engroup tag. */ -- (BOOL) mergeFieldFrom:(int32_t) tag input:(PBCodedInputStream*) input { - int32_t number = PBWireFormatGetTagFieldNumber(tag); +- (BOOL) mergeFieldFrom:(NSInteger) tag input:(PBCodedInputStream*) input { + NSInteger number = PBWireFormatGetTagFieldNumber(tag); switch (PBWireFormatGetTagWireType(tag)) { case PBWireFormatVarint: [[self getFieldBuilder:number] addVarint:[input readInt64]]; @@ -257,7 +257,7 @@ - (BOOL) mergeFieldFrom:(int32_t) tag input:(PBCodedInputStream*) input { */ - (PBUnknownFieldSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; if (tag == 0 || ![self mergeFieldFrom:tag input:input]) { break; } diff --git a/src/runtime/Classes/Utilities.h b/src/runtime/Classes/Utilities.h index aa9adf4..a703478 100644 --- a/src/runtime/Classes/Utilities.h +++ b/src/runtime/Classes/Utilities.h @@ -18,17 +18,17 @@ #import "Message.h" int64_t convertFloat64ToInt64(Float64 f); -int32_t convertFloat32ToInt32(Float32 f); +NSInteger convertFloat32ToInt32(Float32 f); Float64 convertInt64ToFloat64(int64_t f); -Float32 convertInt32ToFloat32(int32_t f); +Float32 convertInt32ToFloat32(NSInteger f); uint64_t convertInt64ToUInt64(int64_t i); int64_t convertUInt64ToInt64(uint64_t u); -uint32_t convertInt32ToUInt32(int32_t i); -int64_t convertUInt32ToInt32(uint32_t u); +NSUInteger convertInt32ToUInt32(NSInteger i); +int64_t convertUInt32ToInt32(NSUInteger u); -int32_t logicalRightShift32(int32_t value, int32_t spaces); -int64_t logicalRightShift64(int64_t value, int32_t spaces); +NSInteger logicalRightShift32(NSInteger value, NSInteger spaces); +int64_t logicalRightShift64(int64_t value, NSInteger spaces); /** @@ -40,7 +40,7 @@ int64_t logicalRightShift64(int64_t value, int32_t spaces); * @param n An unsigned 32-bit integer, stored in a signed int. * @return A signed 32-bit integer. */ -int32_t decodeZigZag32(int32_t n); +NSInteger decodeZigZag32(NSInteger n); /** * Decode a ZigZag-encoded 64-bit value. ZigZag encodes signed integers @@ -63,7 +63,7 @@ int64_t decodeZigZag64(int64_t n); * @param n A signed 32-bit integer. * @return An unsigned 32-bit integer, stored in a signed int. */ -int32_t encodeZigZag32(int32_t n); +NSInteger encodeZigZag32(NSInteger n); /** * Encode a ZigZag-encoded 64-bit value. ZigZag encodes signed integers @@ -80,256 +80,256 @@ int64_t encodeZigZag64(int64_t n); * Compute the number of bytes that would be needed to encode a * {@code double} field, including tag. */ -int32_t computeDoubleSize(int32_t fieldNumber, Float64 value); +NSInteger computeDoubleSize(NSInteger fieldNumber, Float64 value); /** * Compute the number of bytes that would be needed to encode a * {@code float} field, including tag. */ -int32_t computeFloatSize(int32_t fieldNumber, Float32 value); +NSInteger computeFloatSize(NSInteger fieldNumber, Float32 value); /** * Compute the number of bytes that would be needed to encode a * {@code uint64} field, including tag. */ -int32_t computeUInt64Size(int32_t fieldNumber, int64_t value); +NSInteger computeUInt64Size(NSInteger fieldNumber, int64_t value); /** * Compute the number of bytes that would be needed to encode an * {@code int64} field, including tag. */ -int32_t computeInt64Size(int32_t fieldNumber, int64_t value); +NSInteger computeInt64Size(NSInteger fieldNumber, int64_t value); /** * Compute the number of bytes that would be needed to encode an * {@code int32} field, including tag. */ -int32_t computeInt32Size(int32_t fieldNumber, int32_t value); +NSInteger computeInt32Size(NSInteger fieldNumber, NSInteger value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed64} field, including tag. */ -int32_t computeFixed64Size(int32_t fieldNumber, int64_t value); +NSInteger computeFixed64Size(NSInteger fieldNumber, int64_t value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed32} field, including tag. */ -int32_t computeFixed32Size(int32_t fieldNumber, int32_t value); +NSInteger computeFixed32Size(NSInteger fieldNumber, NSInteger value); /** * Compute the number of bytes that would be needed to encode a * {@code bool} field, including tag. */ -int32_t computeBoolSize(int32_t fieldNumber, BOOL value); +NSInteger computeBoolSize(NSInteger fieldNumber, BOOL value); /** * Compute the number of bytes that would be needed to encode a * {@code string} field, including tag. */ -int32_t computeStringSize(int32_t fieldNumber, const NSString* value); +NSInteger computeStringSize(NSInteger fieldNumber, const NSString* value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field, including tag. */ -int32_t computeGroupSize(int32_t fieldNumber, const id value); +NSInteger computeGroupSize(NSInteger fieldNumber, const id value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field represented by an {@code PBUnknownFieldSet}, including * tag. */ -int32_t computeUnknownGroupSize(int32_t fieldNumber, const PBUnknownFieldSet* value); +NSInteger computeUnknownGroupSize(NSInteger fieldNumber, const PBUnknownFieldSet* value); /** * Compute the number of bytes that would be needed to encode an * embedded message field, including tag. */ -int32_t computeMessageSize(int32_t fieldNumber, const id value); +NSInteger computeMessageSize(NSInteger fieldNumber, const id value); /** * Compute the number of bytes that would be needed to encode a * {@code bytes} field, including tag. */ -int32_t computeDataSize(int32_t fieldNumber, const NSData* value); +NSInteger computeDataSize(NSInteger fieldNumber, const NSData* value); /** * Compute the number of bytes that would be needed to encode a * {@code uint32} field, including tag. */ -int32_t computeUInt32Size(int32_t fieldNumber, int32_t value); +NSInteger computeUInt32Size(NSInteger fieldNumber, NSInteger value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed32} field, including tag. */ -int32_t computeSFixed32Size(int32_t fieldNumber, int32_t value); +NSInteger computeSFixed32Size(NSInteger fieldNumber, NSInteger value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed64} field, including tag. */ -int32_t computeSFixed64Size(int32_t fieldNumber, int64_t value); +NSInteger computeSFixed64Size(NSInteger fieldNumber, int64_t value); /** * Compute the number of bytes that would be needed to encode an * {@code sint32} field, including tag. */ -int32_t computeSInt32Size(int32_t fieldNumber, int32_t value); +NSInteger computeSInt32Size(NSInteger fieldNumber, NSInteger value); /** * Compute the number of bytes that would be needed to encode an * {@code sint64} field, including tag. */ -int32_t computeSInt64Size(int32_t fieldNumber, int64_t value); +NSInteger computeSInt64Size(NSInteger fieldNumber, int64_t value); /** Compute the number of bytes that would be needed to encode a tag. */ -int32_t computeTagSize(int32_t fieldNumber); +NSInteger computeTagSize(NSInteger fieldNumber); /** * Compute the number of bytes that would be needed to encode a * {@code double} field, including tag. */ -int32_t computeDoubleSizeNoTag(Float64 value); +NSInteger computeDoubleSizeNoTag(Float64 value); /** * Compute the number of bytes that would be needed to encode a * {@code float} field, including tag. */ -int32_t computeFloatSizeNoTag(Float32 value); +NSInteger computeFloatSizeNoTag(Float32 value); /** * Compute the number of bytes that would be needed to encode a * {@code uint64} field, including tag. */ -int32_t computeUInt64SizeNoTag(int64_t value); +NSInteger computeUInt64SizeNoTag(int64_t value); /** * Compute the number of bytes that would be needed to encode an * {@code int64} field, including tag. */ -int32_t computeInt64SizeNoTag(int64_t value); +NSInteger computeInt64SizeNoTag(int64_t value); /** * Compute the number of bytes that would be needed to encode an * {@code int32} field, including tag. */ -int32_t computeInt32SizeNoTag(int32_t value); +NSInteger computeInt32SizeNoTag(NSInteger value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed64} field, including tag. */ -int32_t computeFixed64SizeNoTag(int64_t value); +NSInteger computeFixed64SizeNoTag(int64_t value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed32} field, including tag. */ -int32_t computeFixed32SizeNoTag(int32_t value); +NSInteger computeFixed32SizeNoTag(NSInteger value); /** * Compute the number of bytes that would be needed to encode a * {@code bool} field, including tag. */ -int32_t computeBoolSizeNoTag(BOOL value); +NSInteger computeBoolSizeNoTag(BOOL value); /** * Compute the number of bytes that would be needed to encode a * {@code string} field, including tag. */ -int32_t computeStringSizeNoTag(const NSString* value); +NSInteger computeStringSizeNoTag(const NSString* value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field, including tag. */ -int32_t computeGroupSizeNoTag(const id value); +NSInteger computeGroupSizeNoTag(const id value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field represented by an {@code PBUnknownFieldSet}, including * tag. */ -int32_t computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value); +NSInteger computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value); /** * Compute the number of bytes that would be needed to encode an * embedded message field, including tag. */ -int32_t computeMessageSizeNoTag(const id value); +NSInteger computeMessageSizeNoTag(const id value); /** * Compute the number of bytes that would be needed to encode a * {@code bytes} field, including tag. */ -int32_t computeDataSizeNoTag(const NSData* value); +NSInteger computeDataSizeNoTag(const NSData* value); /** * Compute the number of bytes that would be needed to encode a * {@code uint32} field, including tag. */ -int32_t computeUInt32SizeNoTag(int32_t value); +NSInteger computeUInt32SizeNoTag(NSInteger value); /** * Compute the number of bytes that would be needed to encode an * enum field, including tag. Caller is responsible for converting the * enum value to its numeric value. */ -int32_t computeEnumSizeNoTag(int32_t value); +NSInteger computeEnumSizeNoTag(NSInteger value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed32} field, including tag. */ -int32_t computeSFixed32SizeNoTag(int32_t value); +NSInteger computeSFixed32SizeNoTag(NSInteger value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed64} field, including tag. */ -int32_t computeSFixed64SizeNoTag(int64_t value); +NSInteger computeSFixed64SizeNoTag(int64_t value); /** * Compute the number of bytes that would be needed to encode an * {@code sint32} field, including tag. */ -int32_t computeSInt32SizeNoTag(int32_t value); +NSInteger computeSInt32SizeNoTag(NSInteger value); /** * Compute the number of bytes that would be needed to encode an * {@code sint64} field, including tag. */ -int32_t computeSInt64SizeNoTag(int64_t value); +NSInteger computeSInt64SizeNoTag(int64_t value); /** * Compute the number of bytes that would be needed to encode a varint. * {@code value} is treated as unsigned, so it won't be sign-extended if * negative. */ -int32_t computeRawVarint32Size(int32_t value); +NSInteger computeRawVarint32Size(NSInteger value); /** Compute the number of bytes that would be needed to encode a varint. */ -int32_t computeRawVarint64Size(int64_t value); +NSInteger computeRawVarint64Size(int64_t value); /** * Compute the number of bytes that would be needed to encode a * MessageSet extension to the stream. For historical reasons, * the wire format differs from normal fields. */ -int32_t computeMessageSetExtensionSize(int32_t fieldNumber, const id value); +NSInteger computeMessageSetExtensionSize(NSInteger fieldNumber, const id value); /** * Compute the number of bytes that would be needed to encode an * unparsed MessageSet extension field to the stream. For * historical reasons, the wire format differs from normal fields. */ -int32_t computeRawMessageSetExtensionSize(int32_t fieldNumber, const NSData* value); +NSInteger computeRawMessageSetExtensionSize(NSInteger fieldNumber, const NSData* value); /** * Compute the number of bytes that would be needed to encode an * enum field, including tag. Caller is responsible for converting the * enum value to its numeric value. */ -int32_t computeEnumSize(int32_t fieldNumber, int32_t value); +NSInteger computeEnumSize(NSInteger fieldNumber, NSInteger value); diff --git a/src/runtime/Classes/Utilities.m b/src/runtime/Classes/Utilities.m index fe91c1c..5a4f8f4 100644 --- a/src/runtime/Classes/Utilities.m +++ b/src/runtime/Classes/Utilities.m @@ -20,8 +20,8 @@ #import "UnknownFieldSet.h" #import "WireFormat.h" -const int32_t LITTLE_ENDIAN_32_SIZE = 4; -const int32_t LITTLE_ENDIAN_64_SIZE = 8; +const NSInteger LITTLE_ENDIAN_32_SIZE = 4; +const NSInteger LITTLE_ENDIAN_64_SIZE = 8; int64_t convertFloat64ToInt64(Float64 v) { @@ -31,8 +31,8 @@ int64_t convertFloat64ToInt64(Float64 v) { } -int32_t convertFloat32ToInt32(Float32 v) { - union { Float32 f; int32_t i; } u; +NSInteger convertFloat32ToInt32(Float32 v) { + union { Float32 f; NSInteger i; } u; u.f = v; return u.i; } @@ -45,8 +45,8 @@ Float64 convertInt64ToFloat64(int64_t v) { } -Float32 convertInt32ToFloat32(int32_t v) { - union { Float32 f; int32_t i; } u; +Float32 convertInt32ToFloat32(NSInteger v) { + union { Float32 f; NSInteger i; } u; u.i = v; return u.f; } @@ -65,31 +65,31 @@ int64_t convertUInt64ToInt64(uint64_t v) { return u.i; } -uint32_t convertInt32ToUInt32(int32_t v) { - union { int32_t i; uint32_t u; } u; +NSUInteger convertInt32ToUInt32(NSInteger v) { + union { NSInteger i; NSUInteger u; } u; u.i = v; return u.u; } -int64_t convertUInt32ToInt32(uint32_t v) { - union { int32_t i; uint32_t u; } u; +int64_t convertUInt32ToInt32(NSUInteger v) { + union { NSInteger i; NSUInteger u; } u; u.u = v; return u.i; } -int32_t logicalRightShift32(int32_t value, int32_t spaces) { +NSInteger logicalRightShift32(NSInteger value, NSInteger spaces) { return convertUInt32ToInt32((convertInt32ToUInt32(value) >> spaces)); } -int64_t logicalRightShift64(int64_t value, int32_t spaces) { +int64_t logicalRightShift64(int64_t value, NSInteger spaces) { return convertUInt64ToInt64((convertInt64ToUInt64(value) >> spaces)); } -int32_t decodeZigZag32(int32_t n) { +NSInteger decodeZigZag32(NSInteger n) { return logicalRightShift32(n, 1) ^ -(n & 1); } @@ -99,7 +99,7 @@ int64_t decodeZigZag64(int64_t n) { } -int32_t encodeZigZag32(int32_t n) { +NSInteger encodeZigZag32(NSInteger n) { // Note: the right-shift must be arithmetic return (n << 1) ^ (n >> 31); } @@ -111,27 +111,27 @@ int64_t encodeZigZag64(int64_t n) { } -int32_t computeDoubleSizeNoTag(Float64 value) { +NSInteger computeDoubleSizeNoTag(Float64 value) { return LITTLE_ENDIAN_64_SIZE; } -int32_t computeFloatSizeNoTag(Float32 value) { +NSInteger computeFloatSizeNoTag(Float32 value) { return LITTLE_ENDIAN_32_SIZE; } -int32_t computeUInt64SizeNoTag(int64_t value) { +NSInteger computeUInt64SizeNoTag(int64_t value) { return computeRawVarint64Size(value); } -int32_t computeInt64SizeNoTag(int64_t value) { +NSInteger computeInt64SizeNoTag(int64_t value) { return computeRawVarint64Size(value); } -int32_t computeInt32SizeNoTag(int32_t value) { +NSInteger computeInt32SizeNoTag(NSInteger value) { if (value >= 0) { return computeRawVarint32Size(value); } else { @@ -141,180 +141,180 @@ int32_t computeInt32SizeNoTag(int32_t value) { } -int32_t computeFixed64SizeNoTag(int64_t value) { +NSInteger computeFixed64SizeNoTag(int64_t value) { return LITTLE_ENDIAN_64_SIZE; } -int32_t computeFixed32SizeNoTag(int32_t value) { +NSInteger computeFixed32SizeNoTag(NSInteger value) { return LITTLE_ENDIAN_32_SIZE; } -int32_t computeBoolSizeNoTag(BOOL value) { +NSInteger computeBoolSizeNoTag(BOOL value) { return 1; } -int32_t computeStringSizeNoTag(const NSString* value) { +NSInteger computeStringSizeNoTag(const NSString* value) { const NSUInteger length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; return computeRawVarint32Size(length) + length; } -int32_t computeGroupSizeNoTag(const id value) { +NSInteger computeGroupSizeNoTag(const id value) { return [value serializedSize]; } -int32_t computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value) { +NSInteger computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value) { return value.serializedSize; } -int32_t computeMessageSizeNoTag(const id value) { - int32_t size = [value serializedSize]; +NSInteger computeMessageSizeNoTag(const id value) { + NSInteger size = [value serializedSize]; return computeRawVarint32Size(size) + size; } -int32_t computeDataSizeNoTag(const NSData* value) { +NSInteger computeDataSizeNoTag(const NSData* value) { return computeRawVarint32Size(value.length) + value.length; } -int32_t computeUInt32SizeNoTag(int32_t value) { +NSInteger computeUInt32SizeNoTag(NSInteger value) { return computeRawVarint32Size(value); } -int32_t computeEnumSizeNoTag(int32_t value) { +NSInteger computeEnumSizeNoTag(NSInteger value) { return computeRawVarint32Size(value); } -int32_t computeSFixed32SizeNoTag(int32_t value) { +NSInteger computeSFixed32SizeNoTag(NSInteger value) { return LITTLE_ENDIAN_32_SIZE; } -int32_t computeSFixed64SizeNoTag(int64_t value) { +NSInteger computeSFixed64SizeNoTag(int64_t value) { return LITTLE_ENDIAN_64_SIZE; } -int32_t computeSInt32SizeNoTag(int32_t value) { +NSInteger computeSInt32SizeNoTag(NSInteger value) { return computeRawVarint32Size(encodeZigZag32(value)); } -int32_t computeSInt64SizeNoTag(int64_t value) { +NSInteger computeSInt64SizeNoTag(int64_t value) { return computeRawVarint64Size(encodeZigZag64(value)); } -int32_t computeDoubleSize(int32_t fieldNumber, Float64 value) { +NSInteger computeDoubleSize(NSInteger fieldNumber, Float64 value) { return computeTagSize(fieldNumber) + computeDoubleSizeNoTag(value); } -int32_t computeFloatSize(int32_t fieldNumber, Float32 value) { +NSInteger computeFloatSize(NSInteger fieldNumber, Float32 value) { return computeTagSize(fieldNumber) + computeFloatSizeNoTag(value); } -int32_t computeUInt64Size(int32_t fieldNumber, int64_t value) { +NSInteger computeUInt64Size(NSInteger fieldNumber, int64_t value) { return computeTagSize(fieldNumber) + computeUInt64SizeNoTag(value); } -int32_t computeInt64Size(int32_t fieldNumber, int64_t value) { +NSInteger computeInt64Size(NSInteger fieldNumber, int64_t value) { return computeTagSize(fieldNumber) + computeInt64SizeNoTag(value); } -int32_t computeInt32Size(int32_t fieldNumber, int32_t value) { +NSInteger computeInt32Size(NSInteger fieldNumber, NSInteger value) { return computeTagSize(fieldNumber) + computeInt32SizeNoTag(value); } -int32_t computeFixed64Size(int32_t fieldNumber, int64_t value) { +NSInteger computeFixed64Size(NSInteger fieldNumber, int64_t value) { return computeTagSize(fieldNumber) + computeFixed64SizeNoTag(value); } -int32_t computeFixed32Size(int32_t fieldNumber, int32_t value) { +NSInteger computeFixed32Size(NSInteger fieldNumber, NSInteger value) { return computeTagSize(fieldNumber) + computeFixed32SizeNoTag(value); } -int32_t computeBoolSize(int32_t fieldNumber, BOOL value) { +NSInteger computeBoolSize(NSInteger fieldNumber, BOOL value) { return computeTagSize(fieldNumber) + computeBoolSizeNoTag(value); } -int32_t computeStringSize(int32_t fieldNumber, const NSString* value) { +NSInteger computeStringSize(NSInteger fieldNumber, const NSString* value) { return computeTagSize(fieldNumber) + computeStringSizeNoTag(value); } -int32_t computeGroupSize(int32_t fieldNumber, const id value) { +NSInteger computeGroupSize(NSInteger fieldNumber, const id value) { return computeTagSize(fieldNumber) * 2 + computeGroupSizeNoTag(value); } -int32_t computeUnknownGroupSize(int32_t fieldNumber, const PBUnknownFieldSet* value) { +NSInteger computeUnknownGroupSize(NSInteger fieldNumber, const PBUnknownFieldSet* value) { return computeTagSize(fieldNumber) * 2 + computeUnknownGroupSizeNoTag(value); } -int32_t computeMessageSize(int32_t fieldNumber, const id value) { +NSInteger computeMessageSize(NSInteger fieldNumber, const id value) { return computeTagSize(fieldNumber) + computeMessageSizeNoTag(value); } -int32_t computeDataSize(int32_t fieldNumber, const NSData* value) { +NSInteger computeDataSize(NSInteger fieldNumber, const NSData* value) { return computeTagSize(fieldNumber) + computeDataSizeNoTag(value); } -int32_t computeUInt32Size(int32_t fieldNumber, int32_t value) { +NSInteger computeUInt32Size(NSInteger fieldNumber, NSInteger value) { return computeTagSize(fieldNumber) + computeUInt32SizeNoTag(value); } -int32_t computeEnumSize(int32_t fieldNumber, int32_t value) { +NSInteger computeEnumSize(NSInteger fieldNumber, NSInteger value) { return computeTagSize(fieldNumber) + computeEnumSizeNoTag(value); } -int32_t computeSFixed32Size(int32_t fieldNumber, int32_t value) { +NSInteger computeSFixed32Size(NSInteger fieldNumber, NSInteger value) { return computeTagSize(fieldNumber) + computeSFixed32SizeNoTag(value); } -int32_t computeSFixed64Size(int32_t fieldNumber, int64_t value) { +NSInteger computeSFixed64Size(NSInteger fieldNumber, int64_t value) { return computeTagSize(fieldNumber) + computeSFixed64SizeNoTag(value); } -int32_t computeSInt32Size(int32_t fieldNumber, int32_t value) { +NSInteger computeSInt32Size(NSInteger fieldNumber, NSInteger value) { return computeTagSize(fieldNumber) + computeSInt32SizeNoTag(value); } -int32_t computeTagSize(int32_t fieldNumber) { +NSInteger computeTagSize(NSInteger fieldNumber) { return computeRawVarint32Size(PBWireFormatMakeTag(fieldNumber, 0)); } -int32_t computeSInt64Size(int32_t fieldNumber, int64_t value) { +NSInteger computeSInt64Size(NSInteger fieldNumber, int64_t value) { return computeTagSize(fieldNumber) + computeRawVarint64Size(encodeZigZag64(value)); } -int32_t computeRawVarint32Size(int32_t value) { +NSInteger computeRawVarint32Size(NSInteger value) { if ((value & (0xffffffff << 7)) == 0) return 1; if ((value & (0xffffffff << 14)) == 0) return 2; if ((value & (0xffffffff << 21)) == 0) return 3; @@ -323,7 +323,7 @@ int32_t computeRawVarint32Size(int32_t value) { } -int32_t computeRawVarint64Size(int64_t value) { +NSInteger computeRawVarint64Size(int64_t value) { if ((value & (0xffffffffffffffffL << 7)) == 0) return 1; if ((value & (0xffffffffffffffffL << 14)) == 0) return 2; if ((value & (0xffffffffffffffffL << 21)) == 0) return 3; @@ -337,14 +337,14 @@ int32_t computeRawVarint64Size(int64_t value) { } -int32_t computeMessageSetExtensionSize(int32_t fieldNumber, const id value) { +NSInteger computeMessageSetExtensionSize(NSInteger fieldNumber, const id value) { return computeTagSize(PBWireFormatMessageSetItem) * 2 + computeUInt32Size(PBWireFormatMessageSetTypeId, fieldNumber) + computeMessageSize(PBWireFormatMessageSetMessage, value); } -int32_t computeRawMessageSetExtensionSize(int32_t fieldNumber, const NSData* value) { +NSInteger computeRawMessageSetExtensionSize(NSInteger fieldNumber, const NSData* value) { return computeTagSize(PBWireFormatMessageSetItem) * 2 + computeUInt32Size(PBWireFormatMessageSetTypeId, fieldNumber) + computeDataSize(PBWireFormatMessageSetMessage, value); diff --git a/src/runtime/Classes/WireFormat.h b/src/runtime/Classes/WireFormat.h index 9ce3e4a..4bd4230 100644 --- a/src/runtime/Classes/WireFormat.h +++ b/src/runtime/Classes/WireFormat.h @@ -31,9 +31,9 @@ typedef enum { PBWireFormatMessageSetMessage = 3 } PBWireFormat; -int32_t PBWireFormatMakeTag(int32_t fieldNumber, int32_t wireType); -int32_t PBWireFormatGetTagWireType(int32_t tag); -int32_t PBWireFormatGetTagFieldNumber(int32_t tag); +NSInteger PBWireFormatMakeTag(NSInteger fieldNumber, NSInteger wireType); +NSInteger PBWireFormatGetTagWireType(NSInteger tag); +NSInteger PBWireFormatGetTagFieldNumber(NSInteger tag); #define PBWireFormatMessageSetItemTag (PBWireFormatMakeTag(PBWireFormatMessageSetItem, PBWireFormatStartGroup)) #define PBWireFormatMessageSetItemEndTag (PBWireFormatMakeTag(PBWireFormatMessageSetItem, PBWireFormatEndGroup)) diff --git a/src/runtime/Classes/WireFormat.m b/src/runtime/Classes/WireFormat.m index 632deb4..c9665ec 100644 --- a/src/runtime/Classes/WireFormat.m +++ b/src/runtime/Classes/WireFormat.m @@ -19,16 +19,16 @@ #import "Utilities.h" -int32_t PBWireFormatMakeTag(int32_t fieldNumber, int32_t wireType) { +NSInteger PBWireFormatMakeTag(NSInteger fieldNumber, NSInteger wireType) { return (fieldNumber << PBWireFormatTagTypeBits) | wireType; } -int32_t PBWireFormatGetTagWireType(int32_t tag) { +NSInteger PBWireFormatGetTagWireType(NSInteger tag) { return tag & PBWireFormatTagTypeMask; } -int32_t PBWireFormatGetTagFieldNumber(int32_t tag) { +NSInteger PBWireFormatGetTagFieldNumber(NSInteger tag) { return logicalRightShift32(tag, PBWireFormatTagTypeBits); } diff --git a/src/runtime/Tests/ArrayTests.m b/src/runtime/Tests/ArrayTests.m index fa2bd37..1a932a0 100644 --- a/src/runtime/Tests/ArrayTests.m +++ b/src/runtime/Tests/ArrayTests.m @@ -24,7 +24,7 @@ @implementation ArrayTests - (void)testCount { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertEquals([array count], (NSUInteger)3, nil); STAssertEquals(array.count, (NSUInteger)3, nil); @@ -33,7 +33,7 @@ - (void)testCount - (void)testValueType { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertEquals(array.valueType, PBArrayValueTypeInt32, nil); [array release]; @@ -41,7 +41,7 @@ - (void)testValueType - (void)testPrimitiveAccess { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertEquals([array int32AtIndex:1], 2, nil); [array release]; @@ -67,7 +67,7 @@ - (void)testEmpty - (void)testCopy { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *original = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; PBArray *copy = [original copy]; STAssertEquals(original.valueType, copy.valueType, nil); @@ -106,7 +106,7 @@ - (void)testFastEnumeration - (void)testArrayAppendingArray { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *a = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; PBArray *b = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; @@ -136,7 +136,7 @@ - (void)testArrayAppendingArrayObjects - (void)testAppendArrayTypeException { - const int32_t kValuesA[3] = { 1, 2, 3 }; + const NSInteger kValuesA[3] = { 1, 2, 3 }; const int64_t kValuesB[3] = { 1, 2, 3 }; PBArray *a = [[PBArray alloc] initWithValues:kValuesA count:3 valueType:PBArrayValueTypeInt32]; PBArray *b = [[PBArray alloc] initWithValues:kValuesB count:3 valueType:PBArrayValueTypeInt64]; @@ -147,7 +147,7 @@ - (void)testAppendArrayTypeException - (void)testRangeException { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertThrowsSpecificNamed([array objectAtIndex:10], NSException, NSRangeException, nil); [array release]; @@ -155,7 +155,7 @@ - (void)testRangeException - (void)testTypeMismatchException { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertThrowsSpecificNamed([array objectAtIndex:0], NSException, PBArrayTypeMismatchException, nil); [array release]; @@ -193,7 +193,7 @@ - (void)testAddObject - (void)testAppendArray { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *source = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; PBAppendableArray *array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; [array appendArray:source]; @@ -205,7 +205,7 @@ - (void)testAppendArray - (void)testAppendValues { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBAppendableArray *array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; [array appendValues:kValues count:3]; STAssertEquals(array.count, (NSUInteger)3, nil); @@ -215,7 +215,7 @@ - (void)testAppendValues - (void)testEqualValues { - const int32_t kValues[3] = { 1, 2, 3 }; + const NSInteger kValues[3] = { 1, 2, 3 }; PBArray *array1 = [[PBArray alloc] initWithValues:kValues count:2 valueType:PBArrayValueTypeInt32]; // Test self equality. @@ -236,7 +236,7 @@ - (void)testEqualValues STAssertFalse([array1 isEqual:array3], nil); // Test non equality of arrays of same sizes with different contents. - const int32_t kValues2[2] = { 2, 1 }; + const NSInteger kValues2[2] = { 2, 1 }; PBArray *array4 = [[PBArray alloc] initWithValues:kValues2 count:2 valueType:PBArrayValueTypeInt32]; STAssertFalse([array1 isEqual:array4], nil); diff --git a/src/runtime/Tests/CodedInputStreamTests.m b/src/runtime/Tests/CodedInputStreamTests.m index 6292f82..cb4b048 100644 --- a/src/runtime/Tests/CodedInputStreamTests.m +++ b/src/runtime/Tests/CodedInputStreamTests.m @@ -23,14 +23,14 @@ @implementation CodedInputStreamTests -- (NSData*) bytes_with_sentinel:(int32_t) unused, ... { +- (NSData*) bytes_with_sentinel:(NSInteger) unused, ... { va_list list; va_start(list, unused); NSMutableData* values = [NSMutableData dataWithCapacity:0]; - int32_t i; + NSInteger i; - while ((i = va_arg(list, int32_t)) != 256) { + while ((i = va_arg(list, NSInteger)) != 256) { NSAssert(i >= 0 && i < 256, @""); uint8_t u = (uint8_t)i; [values appendBytes:&u length:1]; @@ -48,10 +48,10 @@ - (void) testDecodeZigZag { STAssertEquals(-1, decodeZigZag32(1), nil); STAssertEquals( 1, decodeZigZag32(2), nil); STAssertEquals(-2, decodeZigZag32(3), nil); - STAssertEquals((int32_t)0x3FFFFFFF, decodeZigZag32(0x7FFFFFFE), nil); - STAssertEquals((int32_t)0xC0000000, decodeZigZag32(0x7FFFFFFF), nil); - STAssertEquals((int32_t)0x7FFFFFFF, decodeZigZag32(0xFFFFFFFE), nil); - STAssertEquals((int32_t)0x80000000, decodeZigZag32(0xFFFFFFFF), nil); + STAssertEquals((NSInteger)0x3FFFFFFF, decodeZigZag32(0x7FFFFFFE), nil); + STAssertEquals((NSInteger)0xC0000000, decodeZigZag32(0x7FFFFFFF), nil); + STAssertEquals((NSInteger)0x7FFFFFFF, decodeZigZag32(0xFFFFFFFE), nil); + STAssertEquals((NSInteger)0x80000000, decodeZigZag32(0xFFFFFFFF), nil); STAssertEquals((int64_t) 0, decodeZigZag64(0), nil); STAssertEquals((int64_t)-1, decodeZigZag64(1), nil); @@ -73,7 +73,7 @@ - (void) testDecodeZigZag { - (void) assertReadVarint:(NSData*) data value:(int64_t) value { { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; - STAssertTrue((int32_t)value == [input readRawVarint32], @""); + STAssertTrue((NSInteger)value == [input readRawVarint32], @""); } { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; @@ -82,7 +82,7 @@ - (void) assertReadVarint:(NSData*) data value:(int64_t) value { { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[NSInputStream inputStreamWithData:data]]; - STAssertTrue((int32_t)value == [input readRawVarint32], @""); + STAssertTrue((NSInteger)value == [input readRawVarint32], @""); } { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[NSInputStream inputStreamWithData:data]]; @@ -90,10 +90,10 @@ - (void) assertReadVarint:(NSData*) data value:(int64_t) value { } // Try different block sizes. - for (int32_t blockSize = 1; blockSize <= 16; blockSize *= 2) { + for (NSInteger blockSize = 1; blockSize <= 16; blockSize *= 2) { { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[SmallBlockInputStream streamWithData:data blockSize:blockSize]]; - STAssertTrue((int32_t)value == [input readRawVarint32], @""); + STAssertTrue((NSInteger)value == [input readRawVarint32], @""); } { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[SmallBlockInputStream streamWithData:data blockSize:blockSize]]; @@ -107,12 +107,12 @@ - (void) assertReadVarint:(NSData*) data value:(int64_t) value { * Parses the given bytes using readRawLittleEndian32() and checks * that the result matches the given value. */ -- (void) assertReadLittleEndian32:(NSData*) data value:(int32_t) value { +- (void) assertReadLittleEndian32:(NSData*) data value:(NSInteger) value { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; STAssertTrue(value == [input readRawLittleEndian32], @""); // Try different block sizes. - for (int32_t blockSize = 1; blockSize <= 16; blockSize *= 2) { + for (NSInteger blockSize = 1; blockSize <= 16; blockSize *= 2) { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream: [SmallBlockInputStream streamWithData:data blockSize:blockSize]]; @@ -130,7 +130,7 @@ - (void) assertReadLittleEndian64:(NSData*) data value:(int64_t) value { STAssertTrue(value == [input readRawLittleEndian64], @""); // Try different block sizes. - for (int32_t blockSize = 1; blockSize <= 16; blockSize *= 2) { + for (NSInteger blockSize = 1; blockSize <= 16; blockSize *= 2) { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream: [SmallBlockInputStream streamWithData:data blockSize:blockSize]]; @@ -223,7 +223,7 @@ - (void) testReadWholeMessage { [TestUtilities assertAllFieldsSet:message2]; // Try different block sizes. - for (int32_t blockSize = 1; blockSize < 256; blockSize *= 2) { + for (NSInteger blockSize = 1; blockSize < 256; blockSize *= 2) { message2 = [TestAllTypes parseFromInputStream: [SmallBlockInputStream streamWithData:rawBytes blockSize:blockSize]]; [TestUtilities assertAllFieldsSet:message2]; @@ -243,7 +243,7 @@ - (void) testSkipWholeMessage { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builder]; while (YES) { - int32_t tag = [input1 readTag]; + NSInteger tag = [input1 readTag]; STAssertTrue(tag == [input2 readTag], @""); if (tag == 0) { break; @@ -257,7 +257,7 @@ - (void) testSkipWholeMessage { - (void) testReadHugeBlob { // Allocate and initialize a 1MB blob. NSMutableData* blob = [NSMutableData dataWithLength:1 << 20]; - for (int32_t i = 0; i < blob.length; i++) { + for (NSInteger i = 0; i < blob.length; i++) { ((uint8_t*)blob.mutableBytes)[i] = (uint8_t)i; } @@ -288,7 +288,7 @@ - (void) testReadMaliciouslyLargeBlob { [rawOutput open]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; - int32_t tag = PBWireFormatMakeTag(1, PBWireFormatLengthDelimited); + NSInteger tag = PBWireFormatMakeTag(1, PBWireFormatLengthDelimited); [output writeRawVarint32:tag]; [output writeRawVarint32:0x7FFFFFFF]; uint8_t bytes[32] = { 0 }; diff --git a/src/runtime/Tests/CodedOuputStreamTests.m b/src/runtime/Tests/CodedOuputStreamTests.m index 93bcac1..f339ca3 100644 --- a/src/runtime/Tests/CodedOuputStreamTests.m +++ b/src/runtime/Tests/CodedOuputStreamTests.m @@ -22,14 +22,14 @@ @implementation CodedOutputStreamTests -- (NSData*) bytes_with_sentinel:(int32_t) unused, ... { +- (NSData*) bytes_with_sentinel:(NSInteger) unused, ... { va_list list; va_start(list, unused); NSMutableData* values = [NSMutableData dataWithCapacity:0]; - int32_t i; + NSInteger i; - while ((i = va_arg(list, int32_t)) != 256) { + while ((i = va_arg(list, NSInteger)) != 256) { NSAssert(i >= 0 && i < 256, @""); uint8_t u = (uint8_t)i; [values appendBytes:&u length:1]; @@ -58,10 +58,10 @@ - (NSOutputStream*)openMemoryStream { * Parses the given bytes using writeRawLittleEndian32() and checks * that the result matches the given value. */ -- (void) assertWriteLittleEndian32:(NSData*) data value:(int32_t) value { +- (void) assertWriteLittleEndian32:(NSData*) data value:(NSInteger) value { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; - [output writeRawLittleEndian32:(int32_t)value]; + [output writeRawLittleEndian32:(NSInteger)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; @@ -71,7 +71,7 @@ - (void) assertWriteLittleEndian32:(NSData*) data value:(int32_t) value { for (int blockSize = 1; blockSize <= 16; blockSize *= 2) { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput bufferSize:blockSize]; - [output writeRawLittleEndian32:(int32_t)value]; + [output writeRawLittleEndian32:(NSInteger)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; @@ -116,14 +116,14 @@ - (void) assertWriteVarint:(NSData*) data value:(int64_t) value { if (logicalRightShift64(value, 32) == 0) { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; - [output writeRawVarint32:(int32_t)value]; + [output writeRawVarint32:(NSInteger)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; STAssertEqualObjects(data, actual, @""); // Also try computing size. - STAssertTrue(data.length == computeRawVarint32Size((int32_t)value), @""); + STAssertTrue(data.length == computeRawVarint32Size((NSInteger)value), @""); } { @@ -147,7 +147,7 @@ - (void) assertWriteVarint:(NSData*) data value:(int64_t) value { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput bufferSize:blockSize]; - [output writeRawVarint32:(int32_t)value]; + [output writeRawVarint32:(NSInteger)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; diff --git a/src/runtime/Tests/CoreTests.m b/src/runtime/Tests/CoreTests.m index c9f9572..e3b0bd7 100644 --- a/src/runtime/Tests/CoreTests.m +++ b/src/runtime/Tests/CoreTests.m @@ -26,7 +26,7 @@ - (void) testTypeSizes { STAssertEquals(4, (int)sizeof(long), nil); #endif STAssertEquals(8, (int)sizeof(long long), nil); - STAssertEquals(4, (int)sizeof(int32_t), nil); + STAssertEquals(4, (int)sizeof(NSInteger), nil); STAssertEquals(8, (int)sizeof(int64_t), nil); STAssertEquals(4, (int)sizeof(Float32), nil); STAssertEquals(8, (int)sizeof(Float64), nil); diff --git a/src/runtime/Tests/SmallBlockInputStream.h b/src/runtime/Tests/SmallBlockInputStream.h index 2b6fadd..98a566d 100644 --- a/src/runtime/Tests/SmallBlockInputStream.h +++ b/src/runtime/Tests/SmallBlockInputStream.h @@ -17,11 +17,11 @@ @interface SmallBlockInputStream : NSInputStream { NSInputStream* underlyingStream; - int32_t blockSize; + NSInteger blockSize; } @property (retain) NSInputStream* underlyingStream; -+ (SmallBlockInputStream*) streamWithData:(NSData*) data blockSize:(int32_t) blockSize; ++ (SmallBlockInputStream*) streamWithData:(NSData*) data blockSize:(NSInteger) blockSize; @end diff --git a/src/runtime/Tests/SmallBlockInputStream.m b/src/runtime/Tests/SmallBlockInputStream.m index d26c4dd..4752e32 100644 --- a/src/runtime/Tests/SmallBlockInputStream.m +++ b/src/runtime/Tests/SmallBlockInputStream.m @@ -29,7 +29,7 @@ - (void) dealloc { - (id) initWithData:(NSData*) data_ - blockSize:(int32_t) blockSize_ { + blockSize:(NSInteger) blockSize_ { if ((self = [super init])) { self.underlyingStream = [NSInputStream inputStreamWithData:data_]; blockSize = blockSize_; @@ -40,7 +40,7 @@ - (id) initWithData:(NSData*) data_ + (SmallBlockInputStream*) streamWithData:(NSData*) data - blockSize:(int32_t) blockSize { + blockSize:(NSInteger) blockSize { return [[[SmallBlockInputStream alloc] initWithData:data blockSize:blockSize] autorelease]; } diff --git a/src/runtime/Tests/Unittest.pb.h b/src/runtime/Tests/Unittest.pb.h index 5530c60..ac2c70d 100644 --- a/src/runtime/Tests/Unittest.pb.h +++ b/src/runtime/Tests/Unittest.pb.h @@ -291,12 +291,12 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn int64_t defaultInt64; uint64_t optionalUint64; uint64_t defaultUint64; - int32_t defaultInt32; - int32_t optionalInt32; + NSInteger defaultInt32; + NSInteger optionalInt32; uint64_t optionalFixed64; uint64_t defaultFixed64; - uint32_t optionalFixed32; - uint32_t defaultFixed32; + uNSInteger optionalFixed32; + uNSInteger defaultFixed32; NSString* defaultString; NSString* defaultStringPiece; NSString* defaultCord; @@ -309,20 +309,20 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn ImportMessage* optionalImportMessage; NSData* defaultBytes; NSData* optionalBytes; - uint32_t optionalUint32; - uint32_t defaultUint32; + uNSInteger optionalUint32; + uNSInteger defaultUint32; ImportEnum defaultImportEnum; ForeignEnum defaultForeignEnum; TestAllTypes_NestedEnum defaultNestedEnum; ImportEnum optionalImportEnum; ForeignEnum optionalForeignEnum; TestAllTypes_NestedEnum optionalNestedEnum; - int32_t defaultSfixed32; - int32_t optionalSfixed32; + NSInteger defaultSfixed32; + NSInteger optionalSfixed32; int64_t defaultSfixed64; int64_t optionalSfixed64; - int32_t defaultSint32; - int32_t optionalSint32; + NSInteger defaultSint32; + NSInteger optionalSint32; int64_t optionalSint64; int64_t defaultSint64; PBAppendableArray * repeatedBoolArray; @@ -394,15 +394,15 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasDefaultImportEnum; - (BOOL) hasDefaultStringPiece; - (BOOL) hasDefaultCord; -@property (readonly) int32_t optionalInt32; +@property (readonly) NSInteger optionalInt32; @property (readonly) int64_t optionalInt64; -@property (readonly) uint32_t optionalUint32; +@property (readonly) uNSInteger optionalUint32; @property (readonly) uint64_t optionalUint64; -@property (readonly) int32_t optionalSint32; +@property (readonly) NSInteger optionalSint32; @property (readonly) int64_t optionalSint64; -@property (readonly) uint32_t optionalFixed32; +@property (readonly) uNSInteger optionalFixed32; @property (readonly) uint64_t optionalFixed64; -@property (readonly) int32_t optionalSfixed32; +@property (readonly) NSInteger optionalSfixed32; @property (readonly) int64_t optionalSfixed64; @property (readonly) Float32 optionalFloat; @property (readonly) Float64 optionalDouble; @@ -442,15 +442,15 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedImportEnum; @property (readonly, retain) PBArray * repeatedStringPiece; @property (readonly, retain) PBArray * repeatedCord; -@property (readonly) int32_t defaultInt32; +@property (readonly) NSInteger defaultInt32; @property (readonly) int64_t defaultInt64; -@property (readonly) uint32_t defaultUint32; +@property (readonly) uNSInteger defaultUint32; @property (readonly) uint64_t defaultUint64; -@property (readonly) int32_t defaultSint32; +@property (readonly) NSInteger defaultSint32; @property (readonly) int64_t defaultSint64; -@property (readonly) uint32_t defaultFixed32; +@property (readonly) uNSInteger defaultFixed32; @property (readonly) uint64_t defaultFixed64; -@property (readonly) int32_t defaultSfixed32; +@property (readonly) NSInteger defaultSfixed32; @property (readonly) int64_t defaultSfixed64; @property (readonly) Float32 defaultFloat; @property (readonly) Float64 defaultDouble; @@ -462,15 +462,15 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly) ImportEnum defaultImportEnum; @property (readonly, retain) NSString* defaultStringPiece; @property (readonly, retain) NSString* defaultCord; -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; - (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index; +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; - (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; - (int64_t)repeatedSint64AtIndex:(NSUInteger)index; -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index; +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; - (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; - (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index; - (Float32)repeatedFloatAtIndex:(NSUInteger)index; - (Float64)repeatedDoubleAtIndex:(NSUInteger)index; @@ -508,10 +508,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestAllTypes_NestedMessage : PBGeneratedMessage { @private BOOL hasBb_:1; - int32_t bb; + NSInteger bb; } - (BOOL) hasBb; -@property (readonly) int32_t bb; +@property (readonly) NSInteger bb; + (TestAllTypes_NestedMessage*) defaultInstance; - (TestAllTypes_NestedMessage*) defaultInstance; @@ -549,18 +549,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBb; -- (int32_t) bb; -- (TestAllTypes_NestedMessage_Builder*) setBb:(int32_t) value; +- (NSInteger) bb; +- (TestAllTypes_NestedMessage_Builder*) setBb:(NSInteger) value; - (TestAllTypes_NestedMessage_Builder*) clearBb; @end @interface TestAllTypes_OptionalGroup : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestAllTypes_OptionalGroup*) defaultInstance; - (TestAllTypes_OptionalGroup*) defaultInstance; @@ -598,18 +598,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestAllTypes_OptionalGroup_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestAllTypes_OptionalGroup_Builder*) setA:(NSInteger) value; - (TestAllTypes_OptionalGroup_Builder*) clearA; @end @interface TestAllTypes_RepeatedGroup : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestAllTypes_RepeatedGroup*) defaultInstance; - (TestAllTypes_RepeatedGroup*) defaultInstance; @@ -647,8 +647,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestAllTypes_RepeatedGroup_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestAllTypes_RepeatedGroup_Builder*) setA:(NSInteger) value; - (TestAllTypes_RepeatedGroup_Builder*) clearA; @end @@ -670,8 +670,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasOptionalInt32; -- (int32_t) optionalInt32; -- (TestAllTypes_Builder*) setOptionalInt32:(int32_t) value; +- (NSInteger) optionalInt32; +- (TestAllTypes_Builder*) setOptionalInt32:(NSInteger) value; - (TestAllTypes_Builder*) clearOptionalInt32; - (BOOL) hasOptionalInt64; @@ -680,8 +680,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearOptionalInt64; - (BOOL) hasOptionalUint32; -- (uint32_t) optionalUint32; -- (TestAllTypes_Builder*) setOptionalUint32:(uint32_t) value; +- (uNSInteger) optionalUint32; +- (TestAllTypes_Builder*) setOptionalUint32:(uNSInteger) value; - (TestAllTypes_Builder*) clearOptionalUint32; - (BOOL) hasOptionalUint64; @@ -690,8 +690,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearOptionalUint64; - (BOOL) hasOptionalSint32; -- (int32_t) optionalSint32; -- (TestAllTypes_Builder*) setOptionalSint32:(int32_t) value; +- (NSInteger) optionalSint32; +- (TestAllTypes_Builder*) setOptionalSint32:(NSInteger) value; - (TestAllTypes_Builder*) clearOptionalSint32; - (BOOL) hasOptionalSint64; @@ -700,8 +700,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearOptionalSint64; - (BOOL) hasOptionalFixed32; -- (uint32_t) optionalFixed32; -- (TestAllTypes_Builder*) setOptionalFixed32:(uint32_t) value; +- (uNSInteger) optionalFixed32; +- (TestAllTypes_Builder*) setOptionalFixed32:(uNSInteger) value; - (TestAllTypes_Builder*) clearOptionalFixed32; - (BOOL) hasOptionalFixed64; @@ -710,8 +710,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearOptionalFixed64; - (BOOL) hasOptionalSfixed32; -- (int32_t) optionalSfixed32; -- (TestAllTypes_Builder*) setOptionalSfixed32:(int32_t) value; +- (NSInteger) optionalSfixed32; +- (TestAllTypes_Builder*) setOptionalSfixed32:(NSInteger) value; - (TestAllTypes_Builder*) clearOptionalSfixed32; - (BOOL) hasOptionalSfixed64; @@ -798,10 +798,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearOptionalCord; - (PBAppendableArray *)repeatedInt32; -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedInt32:(int32_t)value; +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; +- (TestAllTypes_Builder *)addRepeatedInt32:(NSInteger)value; - (TestAllTypes_Builder *)setRepeatedInt32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestAllTypes_Builder *)clearRepeatedInt32; - (PBAppendableArray *)repeatedInt64; @@ -812,10 +812,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder *)clearRepeatedInt64; - (PBAppendableArray *)repeatedUint32; -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedUint32:(uint32_t)value; +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; +- (TestAllTypes_Builder *)addRepeatedUint32:(uNSInteger)value; - (TestAllTypes_Builder *)setRepeatedUint32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedUint32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestAllTypes_Builder *)clearRepeatedUint32; - (PBAppendableArray *)repeatedUint64; @@ -826,10 +826,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder *)clearRepeatedUint64; - (PBAppendableArray *)repeatedSint32; -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedSint32:(int32_t)value; +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; +- (TestAllTypes_Builder *)addRepeatedSint32:(NSInteger)value; - (TestAllTypes_Builder *)setRepeatedSint32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedSint32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestAllTypes_Builder *)clearRepeatedSint32; - (PBAppendableArray *)repeatedSint64; @@ -840,10 +840,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder *)clearRepeatedSint64; - (PBAppendableArray *)repeatedFixed32; -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedFixed32:(uint32_t)value; +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; +- (TestAllTypes_Builder *)addRepeatedFixed32:(uNSInteger)value; - (TestAllTypes_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestAllTypes_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedFixed64; @@ -854,10 +854,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder *)clearRepeatedFixed64; - (PBAppendableArray *)repeatedSfixed32; -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedSfixed32:(int32_t)value; +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; +- (TestAllTypes_Builder *)addRepeatedSfixed32:(NSInteger)value; - (TestAllTypes_Builder *)setRepeatedSfixed32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestAllTypes_Builder *)clearRepeatedSfixed32; - (PBAppendableArray *)repeatedSfixed64; @@ -966,8 +966,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder *)clearRepeatedCord; - (BOOL) hasDefaultInt32; -- (int32_t) defaultInt32; -- (TestAllTypes_Builder*) setDefaultInt32:(int32_t) value; +- (NSInteger) defaultInt32; +- (TestAllTypes_Builder*) setDefaultInt32:(NSInteger) value; - (TestAllTypes_Builder*) clearDefaultInt32; - (BOOL) hasDefaultInt64; @@ -976,8 +976,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearDefaultInt64; - (BOOL) hasDefaultUint32; -- (uint32_t) defaultUint32; -- (TestAllTypes_Builder*) setDefaultUint32:(uint32_t) value; +- (uNSInteger) defaultUint32; +- (TestAllTypes_Builder*) setDefaultUint32:(uNSInteger) value; - (TestAllTypes_Builder*) clearDefaultUint32; - (BOOL) hasDefaultUint64; @@ -986,8 +986,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearDefaultUint64; - (BOOL) hasDefaultSint32; -- (int32_t) defaultSint32; -- (TestAllTypes_Builder*) setDefaultSint32:(int32_t) value; +- (NSInteger) defaultSint32; +- (TestAllTypes_Builder*) setDefaultSint32:(NSInteger) value; - (TestAllTypes_Builder*) clearDefaultSint32; - (BOOL) hasDefaultSint64; @@ -996,8 +996,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearDefaultSint64; - (BOOL) hasDefaultFixed32; -- (uint32_t) defaultFixed32; -- (TestAllTypes_Builder*) setDefaultFixed32:(uint32_t) value; +- (uNSInteger) defaultFixed32; +- (TestAllTypes_Builder*) setDefaultFixed32:(uNSInteger) value; - (TestAllTypes_Builder*) clearDefaultFixed32; - (BOOL) hasDefaultFixed64; @@ -1006,8 +1006,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearDefaultFixed64; - (BOOL) hasDefaultSfixed32; -- (int32_t) defaultSfixed32; -- (TestAllTypes_Builder*) setDefaultSfixed32:(int32_t) value; +- (NSInteger) defaultSfixed32; +- (TestAllTypes_Builder*) setDefaultSfixed32:(NSInteger) value; - (TestAllTypes_Builder*) clearDefaultSfixed32; - (BOOL) hasDefaultSfixed64; @@ -1069,10 +1069,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestDeprecatedFields : PBGeneratedMessage { @private BOOL hasDeprecatedInt32_:1; - int32_t deprecatedInt32; + NSInteger deprecatedInt32; } - (BOOL) hasDeprecatedInt32; -@property (readonly) int32_t deprecatedInt32; +@property (readonly) NSInteger deprecatedInt32; + (TestDeprecatedFields*) defaultInstance; - (TestDeprecatedFields*) defaultInstance; @@ -1110,18 +1110,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDeprecatedInt32; -- (int32_t) deprecatedInt32; -- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(int32_t) value; +- (NSInteger) deprecatedInt32; +- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(NSInteger) value; - (TestDeprecatedFields_Builder*) clearDeprecatedInt32; @end @interface ForeignMessage : PBGeneratedMessage { @private BOOL hasC_:1; - int32_t c; + NSInteger c; } - (BOOL) hasC; -@property (readonly) int32_t c; +@property (readonly) NSInteger c; + (ForeignMessage*) defaultInstance; - (ForeignMessage*) defaultInstance; @@ -1159,8 +1159,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasC; -- (int32_t) c; -- (ForeignMessage_Builder*) setC:(int32_t) value; +- (NSInteger) c; +- (ForeignMessage_Builder*) setC:(NSInteger) value; - (ForeignMessage_Builder*) clearC; @end @@ -1207,10 +1207,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface OptionalGroup_extension : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (OptionalGroup_extension*) defaultInstance; - (OptionalGroup_extension*) defaultInstance; @@ -1248,18 +1248,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (OptionalGroup_extension_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (OptionalGroup_extension_Builder*) setA:(NSInteger) value; - (OptionalGroup_extension_Builder*) clearA; @end @interface RepeatedGroup_extension : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (RepeatedGroup_extension*) defaultInstance; - (RepeatedGroup_extension*) defaultInstance; @@ -1297,8 +1297,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (RepeatedGroup_extension_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (RepeatedGroup_extension_Builder*) setA:(NSInteger) value; - (RepeatedGroup_extension_Builder*) clearA; @end @@ -1378,39 +1378,39 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasDummy15_:1; BOOL hasDummy16_:1; BOOL hasDummy17_:1; - int32_t c; - int32_t dummy32; - int32_t dummy31; - int32_t dummy30; - int32_t dummy29; - int32_t dummy28; - int32_t dummy27; - int32_t dummy26; - int32_t dummy25; - int32_t dummy24; - int32_t dummy23; - int32_t dummy22; - int32_t dummy21; - int32_t dummy20; - int32_t dummy19; - int32_t dummy18; - int32_t a; - int32_t dummy2; - int32_t b; - int32_t dummy4; - int32_t dummy5; - int32_t dummy6; - int32_t dummy7; - int32_t dummy8; - int32_t dummy9; - int32_t dummy10; - int32_t dummy11; - int32_t dummy12; - int32_t dummy13; - int32_t dummy14; - int32_t dummy15; - int32_t dummy16; - int32_t dummy17; + NSInteger c; + NSInteger dummy32; + NSInteger dummy31; + NSInteger dummy30; + NSInteger dummy29; + NSInteger dummy28; + NSInteger dummy27; + NSInteger dummy26; + NSInteger dummy25; + NSInteger dummy24; + NSInteger dummy23; + NSInteger dummy22; + NSInteger dummy21; + NSInteger dummy20; + NSInteger dummy19; + NSInteger dummy18; + NSInteger a; + NSInteger dummy2; + NSInteger b; + NSInteger dummy4; + NSInteger dummy5; + NSInteger dummy6; + NSInteger dummy7; + NSInteger dummy8; + NSInteger dummy9; + NSInteger dummy10; + NSInteger dummy11; + NSInteger dummy12; + NSInteger dummy13; + NSInteger dummy14; + NSInteger dummy15; + NSInteger dummy16; + NSInteger dummy17; } - (BOOL) hasA; - (BOOL) hasDummy2; @@ -1445,39 +1445,39 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasDummy31; - (BOOL) hasDummy32; - (BOOL) hasC; -@property (readonly) int32_t a; -@property (readonly) int32_t dummy2; -@property (readonly) int32_t b; -@property (readonly) int32_t dummy4; -@property (readonly) int32_t dummy5; -@property (readonly) int32_t dummy6; -@property (readonly) int32_t dummy7; -@property (readonly) int32_t dummy8; -@property (readonly) int32_t dummy9; -@property (readonly) int32_t dummy10; -@property (readonly) int32_t dummy11; -@property (readonly) int32_t dummy12; -@property (readonly) int32_t dummy13; -@property (readonly) int32_t dummy14; -@property (readonly) int32_t dummy15; -@property (readonly) int32_t dummy16; -@property (readonly) int32_t dummy17; -@property (readonly) int32_t dummy18; -@property (readonly) int32_t dummy19; -@property (readonly) int32_t dummy20; -@property (readonly) int32_t dummy21; -@property (readonly) int32_t dummy22; -@property (readonly) int32_t dummy23; -@property (readonly) int32_t dummy24; -@property (readonly) int32_t dummy25; -@property (readonly) int32_t dummy26; -@property (readonly) int32_t dummy27; -@property (readonly) int32_t dummy28; -@property (readonly) int32_t dummy29; -@property (readonly) int32_t dummy30; -@property (readonly) int32_t dummy31; -@property (readonly) int32_t dummy32; -@property (readonly) int32_t c; +@property (readonly) NSInteger a; +@property (readonly) NSInteger dummy2; +@property (readonly) NSInteger b; +@property (readonly) NSInteger dummy4; +@property (readonly) NSInteger dummy5; +@property (readonly) NSInteger dummy6; +@property (readonly) NSInteger dummy7; +@property (readonly) NSInteger dummy8; +@property (readonly) NSInteger dummy9; +@property (readonly) NSInteger dummy10; +@property (readonly) NSInteger dummy11; +@property (readonly) NSInteger dummy12; +@property (readonly) NSInteger dummy13; +@property (readonly) NSInteger dummy14; +@property (readonly) NSInteger dummy15; +@property (readonly) NSInteger dummy16; +@property (readonly) NSInteger dummy17; +@property (readonly) NSInteger dummy18; +@property (readonly) NSInteger dummy19; +@property (readonly) NSInteger dummy20; +@property (readonly) NSInteger dummy21; +@property (readonly) NSInteger dummy22; +@property (readonly) NSInteger dummy23; +@property (readonly) NSInteger dummy24; +@property (readonly) NSInteger dummy25; +@property (readonly) NSInteger dummy26; +@property (readonly) NSInteger dummy27; +@property (readonly) NSInteger dummy28; +@property (readonly) NSInteger dummy29; +@property (readonly) NSInteger dummy30; +@property (readonly) NSInteger dummy31; +@property (readonly) NSInteger dummy32; +@property (readonly) NSInteger c; + (TestRequired*) defaultInstance; - (TestRequired*) defaultInstance; @@ -1517,168 +1517,168 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestRequired_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestRequired_Builder*) setA:(NSInteger) value; - (TestRequired_Builder*) clearA; - (BOOL) hasDummy2; -- (int32_t) dummy2; -- (TestRequired_Builder*) setDummy2:(int32_t) value; +- (NSInteger) dummy2; +- (TestRequired_Builder*) setDummy2:(NSInteger) value; - (TestRequired_Builder*) clearDummy2; - (BOOL) hasB; -- (int32_t) b; -- (TestRequired_Builder*) setB:(int32_t) value; +- (NSInteger) b; +- (TestRequired_Builder*) setB:(NSInteger) value; - (TestRequired_Builder*) clearB; - (BOOL) hasDummy4; -- (int32_t) dummy4; -- (TestRequired_Builder*) setDummy4:(int32_t) value; +- (NSInteger) dummy4; +- (TestRequired_Builder*) setDummy4:(NSInteger) value; - (TestRequired_Builder*) clearDummy4; - (BOOL) hasDummy5; -- (int32_t) dummy5; -- (TestRequired_Builder*) setDummy5:(int32_t) value; +- (NSInteger) dummy5; +- (TestRequired_Builder*) setDummy5:(NSInteger) value; - (TestRequired_Builder*) clearDummy5; - (BOOL) hasDummy6; -- (int32_t) dummy6; -- (TestRequired_Builder*) setDummy6:(int32_t) value; +- (NSInteger) dummy6; +- (TestRequired_Builder*) setDummy6:(NSInteger) value; - (TestRequired_Builder*) clearDummy6; - (BOOL) hasDummy7; -- (int32_t) dummy7; -- (TestRequired_Builder*) setDummy7:(int32_t) value; +- (NSInteger) dummy7; +- (TestRequired_Builder*) setDummy7:(NSInteger) value; - (TestRequired_Builder*) clearDummy7; - (BOOL) hasDummy8; -- (int32_t) dummy8; -- (TestRequired_Builder*) setDummy8:(int32_t) value; +- (NSInteger) dummy8; +- (TestRequired_Builder*) setDummy8:(NSInteger) value; - (TestRequired_Builder*) clearDummy8; - (BOOL) hasDummy9; -- (int32_t) dummy9; -- (TestRequired_Builder*) setDummy9:(int32_t) value; +- (NSInteger) dummy9; +- (TestRequired_Builder*) setDummy9:(NSInteger) value; - (TestRequired_Builder*) clearDummy9; - (BOOL) hasDummy10; -- (int32_t) dummy10; -- (TestRequired_Builder*) setDummy10:(int32_t) value; +- (NSInteger) dummy10; +- (TestRequired_Builder*) setDummy10:(NSInteger) value; - (TestRequired_Builder*) clearDummy10; - (BOOL) hasDummy11; -- (int32_t) dummy11; -- (TestRequired_Builder*) setDummy11:(int32_t) value; +- (NSInteger) dummy11; +- (TestRequired_Builder*) setDummy11:(NSInteger) value; - (TestRequired_Builder*) clearDummy11; - (BOOL) hasDummy12; -- (int32_t) dummy12; -- (TestRequired_Builder*) setDummy12:(int32_t) value; +- (NSInteger) dummy12; +- (TestRequired_Builder*) setDummy12:(NSInteger) value; - (TestRequired_Builder*) clearDummy12; - (BOOL) hasDummy13; -- (int32_t) dummy13; -- (TestRequired_Builder*) setDummy13:(int32_t) value; +- (NSInteger) dummy13; +- (TestRequired_Builder*) setDummy13:(NSInteger) value; - (TestRequired_Builder*) clearDummy13; - (BOOL) hasDummy14; -- (int32_t) dummy14; -- (TestRequired_Builder*) setDummy14:(int32_t) value; +- (NSInteger) dummy14; +- (TestRequired_Builder*) setDummy14:(NSInteger) value; - (TestRequired_Builder*) clearDummy14; - (BOOL) hasDummy15; -- (int32_t) dummy15; -- (TestRequired_Builder*) setDummy15:(int32_t) value; +- (NSInteger) dummy15; +- (TestRequired_Builder*) setDummy15:(NSInteger) value; - (TestRequired_Builder*) clearDummy15; - (BOOL) hasDummy16; -- (int32_t) dummy16; -- (TestRequired_Builder*) setDummy16:(int32_t) value; +- (NSInteger) dummy16; +- (TestRequired_Builder*) setDummy16:(NSInteger) value; - (TestRequired_Builder*) clearDummy16; - (BOOL) hasDummy17; -- (int32_t) dummy17; -- (TestRequired_Builder*) setDummy17:(int32_t) value; +- (NSInteger) dummy17; +- (TestRequired_Builder*) setDummy17:(NSInteger) value; - (TestRequired_Builder*) clearDummy17; - (BOOL) hasDummy18; -- (int32_t) dummy18; -- (TestRequired_Builder*) setDummy18:(int32_t) value; +- (NSInteger) dummy18; +- (TestRequired_Builder*) setDummy18:(NSInteger) value; - (TestRequired_Builder*) clearDummy18; - (BOOL) hasDummy19; -- (int32_t) dummy19; -- (TestRequired_Builder*) setDummy19:(int32_t) value; +- (NSInteger) dummy19; +- (TestRequired_Builder*) setDummy19:(NSInteger) value; - (TestRequired_Builder*) clearDummy19; - (BOOL) hasDummy20; -- (int32_t) dummy20; -- (TestRequired_Builder*) setDummy20:(int32_t) value; +- (NSInteger) dummy20; +- (TestRequired_Builder*) setDummy20:(NSInteger) value; - (TestRequired_Builder*) clearDummy20; - (BOOL) hasDummy21; -- (int32_t) dummy21; -- (TestRequired_Builder*) setDummy21:(int32_t) value; +- (NSInteger) dummy21; +- (TestRequired_Builder*) setDummy21:(NSInteger) value; - (TestRequired_Builder*) clearDummy21; - (BOOL) hasDummy22; -- (int32_t) dummy22; -- (TestRequired_Builder*) setDummy22:(int32_t) value; +- (NSInteger) dummy22; +- (TestRequired_Builder*) setDummy22:(NSInteger) value; - (TestRequired_Builder*) clearDummy22; - (BOOL) hasDummy23; -- (int32_t) dummy23; -- (TestRequired_Builder*) setDummy23:(int32_t) value; +- (NSInteger) dummy23; +- (TestRequired_Builder*) setDummy23:(NSInteger) value; - (TestRequired_Builder*) clearDummy23; - (BOOL) hasDummy24; -- (int32_t) dummy24; -- (TestRequired_Builder*) setDummy24:(int32_t) value; +- (NSInteger) dummy24; +- (TestRequired_Builder*) setDummy24:(NSInteger) value; - (TestRequired_Builder*) clearDummy24; - (BOOL) hasDummy25; -- (int32_t) dummy25; -- (TestRequired_Builder*) setDummy25:(int32_t) value; +- (NSInteger) dummy25; +- (TestRequired_Builder*) setDummy25:(NSInteger) value; - (TestRequired_Builder*) clearDummy25; - (BOOL) hasDummy26; -- (int32_t) dummy26; -- (TestRequired_Builder*) setDummy26:(int32_t) value; +- (NSInteger) dummy26; +- (TestRequired_Builder*) setDummy26:(NSInteger) value; - (TestRequired_Builder*) clearDummy26; - (BOOL) hasDummy27; -- (int32_t) dummy27; -- (TestRequired_Builder*) setDummy27:(int32_t) value; +- (NSInteger) dummy27; +- (TestRequired_Builder*) setDummy27:(NSInteger) value; - (TestRequired_Builder*) clearDummy27; - (BOOL) hasDummy28; -- (int32_t) dummy28; -- (TestRequired_Builder*) setDummy28:(int32_t) value; +- (NSInteger) dummy28; +- (TestRequired_Builder*) setDummy28:(NSInteger) value; - (TestRequired_Builder*) clearDummy28; - (BOOL) hasDummy29; -- (int32_t) dummy29; -- (TestRequired_Builder*) setDummy29:(int32_t) value; +- (NSInteger) dummy29; +- (TestRequired_Builder*) setDummy29:(NSInteger) value; - (TestRequired_Builder*) clearDummy29; - (BOOL) hasDummy30; -- (int32_t) dummy30; -- (TestRequired_Builder*) setDummy30:(int32_t) value; +- (NSInteger) dummy30; +- (TestRequired_Builder*) setDummy30:(NSInteger) value; - (TestRequired_Builder*) clearDummy30; - (BOOL) hasDummy31; -- (int32_t) dummy31; -- (TestRequired_Builder*) setDummy31:(int32_t) value; +- (NSInteger) dummy31; +- (TestRequired_Builder*) setDummy31:(NSInteger) value; - (TestRequired_Builder*) clearDummy31; - (BOOL) hasDummy32; -- (int32_t) dummy32; -- (TestRequired_Builder*) setDummy32:(int32_t) value; +- (NSInteger) dummy32; +- (TestRequired_Builder*) setDummy32:(NSInteger) value; - (TestRequired_Builder*) clearDummy32; - (BOOL) hasC; -- (int32_t) c; -- (TestRequired_Builder*) setC:(int32_t) value; +- (NSInteger) c; +- (TestRequired_Builder*) setC:(NSInteger) value; - (TestRequired_Builder*) clearC; @end @@ -1686,7 +1686,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasDummy_:1; BOOL hasOptionalMessage_:1; - int32_t dummy; + NSInteger dummy; TestRequired* optionalMessage; PBAppendableArray * repeatedMessageArray; } @@ -1694,7 +1694,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasDummy; @property (readonly, retain) TestRequired* optionalMessage; @property (readonly, retain) PBArray * repeatedMessage; -@property (readonly) int32_t dummy; +@property (readonly) NSInteger dummy; - (TestRequired*)repeatedMessageAtIndex:(NSUInteger)index; + (TestRequiredForeign*) defaultInstance; @@ -1747,8 +1747,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRequiredForeign_Builder *)clearRepeatedMessage; - (BOOL) hasDummy; -- (int32_t) dummy; -- (TestRequiredForeign_Builder*) setDummy:(int32_t) value; +- (NSInteger) dummy; +- (TestRequiredForeign_Builder*) setDummy:(NSInteger) value; - (TestRequiredForeign_Builder*) clearDummy; @end @@ -1927,13 +1927,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasA_:1; BOOL hasBb_:1; - int32_t a; - int32_t bb; + NSInteger a; + NSInteger bb; } - (BOOL) hasA; - (BOOL) hasBb; -@property (readonly) int32_t a; -@property (readonly) int32_t bb; +@property (readonly) NSInteger a; +@property (readonly) NSInteger bb; + (TestReallyLargeTagNumber*) defaultInstance; - (TestReallyLargeTagNumber*) defaultInstance; @@ -1971,13 +1971,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestReallyLargeTagNumber_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestReallyLargeTagNumber_Builder*) setA:(NSInteger) value; - (TestReallyLargeTagNumber_Builder*) clearA; - (BOOL) hasBb; -- (int32_t) bb; -- (TestReallyLargeTagNumber_Builder*) setBb:(int32_t) value; +- (NSInteger) bb; +- (TestReallyLargeTagNumber_Builder*) setBb:(NSInteger) value; - (TestReallyLargeTagNumber_Builder*) clearBb; @end @@ -1985,13 +1985,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasI_:1; BOOL hasA_:1; - int32_t i; + NSInteger i; TestRecursiveMessage* a; } - (BOOL) hasA; - (BOOL) hasI; @property (readonly, retain) TestRecursiveMessage* a; -@property (readonly) int32_t i; +@property (readonly) NSInteger i; + (TestRecursiveMessage*) defaultInstance; - (TestRecursiveMessage*) defaultInstance; @@ -2036,8 +2036,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRecursiveMessage_Builder*) clearA; - (BOOL) hasI; -- (int32_t) i; -- (TestRecursiveMessage_Builder*) setI:(int32_t) value; +- (NSInteger) i; +- (TestRecursiveMessage_Builder*) setI:(NSInteger) value; - (TestRecursiveMessage_Builder*) clearI; @end @@ -2096,13 +2096,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasOptionalInt32_:1; BOOL hasA_:1; - int32_t optionalInt32; + NSInteger optionalInt32; TestMutualRecursionA* a; } - (BOOL) hasA; - (BOOL) hasOptionalInt32; @property (readonly, retain) TestMutualRecursionA* a; -@property (readonly) int32_t optionalInt32; +@property (readonly) NSInteger optionalInt32; + (TestMutualRecursionB*) defaultInstance; - (TestMutualRecursionB*) defaultInstance; @@ -2147,8 +2147,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestMutualRecursionB_Builder*) clearA; - (BOOL) hasOptionalInt32; -- (int32_t) optionalInt32; -- (TestMutualRecursionB_Builder*) setOptionalInt32:(int32_t) value; +- (NSInteger) optionalInt32; +- (TestMutualRecursionB_Builder*) setOptionalInt32:(NSInteger) value; - (TestMutualRecursionB_Builder*) clearOptionalInt32; @end @@ -2157,14 +2157,14 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasA_:1; BOOL hasFoo_:1; BOOL hasBar_:1; - int32_t a; + NSInteger a; TestDupFieldNumber_Foo* foo; TestDupFieldNumber_Bar* bar; } - (BOOL) hasA; - (BOOL) hasFoo; - (BOOL) hasBar; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; @property (readonly, retain) TestDupFieldNumber_Foo* foo; @property (readonly, retain) TestDupFieldNumber_Bar* bar; @@ -2189,10 +2189,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestDupFieldNumber_Foo : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestDupFieldNumber_Foo*) defaultInstance; - (TestDupFieldNumber_Foo*) defaultInstance; @@ -2230,18 +2230,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestDupFieldNumber_Foo_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestDupFieldNumber_Foo_Builder*) setA:(NSInteger) value; - (TestDupFieldNumber_Foo_Builder*) clearA; @end @interface TestDupFieldNumber_Bar : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestDupFieldNumber_Bar*) defaultInstance; - (TestDupFieldNumber_Bar*) defaultInstance; @@ -2279,8 +2279,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestDupFieldNumber_Bar_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestDupFieldNumber_Bar_Builder*) setA:(NSInteger) value; - (TestDupFieldNumber_Bar_Builder*) clearA; @end @@ -2302,8 +2302,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestDupFieldNumber_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestDupFieldNumber_Builder*) setA:(NSInteger) value; - (TestDupFieldNumber_Builder*) clearA; - (BOOL) hasFoo; @@ -2354,7 +2354,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn } @property (readonly, retain) PBArray * nestedmessageRepeatedInt32; @property (readonly, retain) PBArray * nestedmessageRepeatedForeignmessage; -- (int32_t)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index; +- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index; - (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(NSUInteger)index; + (TestNestedMessageHasBits_NestedMessage*) defaultInstance; @@ -2393,10 +2393,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)nestedmessageRepeatedInt32; -- (int32_t)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index; -- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(int32_t)value; +- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index; +- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(NSInteger)value; - (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Array:(NSArray *)array; -- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestNestedMessageHasBits_NestedMessage_Builder *)clearNestedmessageRepeatedInt32; - (PBAppendableArray *)nestedmessageRepeatedForeignmessage; @@ -2440,7 +2440,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasCordField_:1; BOOL hasMessageField_:1; BOOL hasEnumField_:1; - int32_t primitiveField; + NSInteger primitiveField; NSString* stringField; NSString* stringPieceField; NSString* cordField; @@ -2459,7 +2459,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasMessageField; - (BOOL) hasStringPieceField; - (BOOL) hasCordField; -@property (readonly) int32_t primitiveField; +@property (readonly) NSInteger primitiveField; @property (readonly, retain) NSString* stringField; @property (readonly) ForeignEnum enumField; @property (readonly, retain) ForeignMessage* messageField; @@ -2471,7 +2471,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedMessageField; @property (readonly, retain) PBArray * repeatedStringPieceField; @property (readonly, retain) PBArray * repeatedCordField; -- (int32_t)repeatedPrimitiveFieldAtIndex:(NSUInteger)index; +- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index; - (NSString*)repeatedStringFieldAtIndex:(NSUInteger)index; - (ForeignEnum)repeatedEnumFieldAtIndex:(NSUInteger)index; - (ForeignMessage*)repeatedMessageFieldAtIndex:(NSUInteger)index; @@ -2514,8 +2514,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasPrimitiveField; -- (int32_t) primitiveField; -- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(int32_t) value; +- (NSInteger) primitiveField; +- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(NSInteger) value; - (TestCamelCaseFieldNames_Builder*) clearPrimitiveField; - (BOOL) hasStringField; @@ -2546,10 +2546,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestCamelCaseFieldNames_Builder*) clearCordField; - (PBAppendableArray *)repeatedPrimitiveField; -- (int32_t)repeatedPrimitiveFieldAtIndex:(NSUInteger)index; -- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(int32_t)value; +- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index; +- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(NSInteger)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const int32_t *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const NSInteger *)values count:(NSUInteger)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedPrimitiveField; - (PBAppendableArray *)repeatedStringField; @@ -2692,11 +2692,11 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn Float32 nanFloat; int64_t smallInt64; uint64_t largeUint64; - int32_t smallInt32; + NSInteger smallInt32; NSString* cppTrigraph; NSString* utf8String; NSData* escapedBytes; - uint32_t largeUint32; + uNSInteger largeUint32; } - (BOOL) hasEscapedBytes; - (BOOL) hasLargeUint32; @@ -2719,9 +2719,9 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasNanFloat; - (BOOL) hasCppTrigraph; @property (readonly, retain) NSData* escapedBytes; -@property (readonly) uint32_t largeUint32; +@property (readonly) uNSInteger largeUint32; @property (readonly) uint64_t largeUint64; -@property (readonly) int32_t smallInt32; +@property (readonly) NSInteger smallInt32; @property (readonly) int64_t smallInt64; @property (readonly, retain) NSString* utf8String; @property (readonly) Float32 zeroFloat; @@ -2780,8 +2780,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestExtremeDefaultValues_Builder*) clearEscapedBytes; - (BOOL) hasLargeUint32; -- (uint32_t) largeUint32; -- (TestExtremeDefaultValues_Builder*) setLargeUint32:(uint32_t) value; +- (uNSInteger) largeUint32; +- (TestExtremeDefaultValues_Builder*) setLargeUint32:(uNSInteger) value; - (TestExtremeDefaultValues_Builder*) clearLargeUint32; - (BOOL) hasLargeUint64; @@ -2790,8 +2790,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestExtremeDefaultValues_Builder*) clearLargeUint64; - (BOOL) hasSmallInt32; -- (int32_t) smallInt32; -- (TestExtremeDefaultValues_Builder*) setSmallInt32:(int32_t) value; +- (NSInteger) smallInt32; +- (TestExtremeDefaultValues_Builder*) setSmallInt32:(NSInteger) value; - (TestExtremeDefaultValues_Builder*) clearSmallInt32; - (BOOL) hasSmallInt64; @@ -3025,33 +3025,33 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestPackedTypes : PBGeneratedMessage { @private PBAppendableArray * packedBoolArray; - int32_t packedBoolMemoizedSerializedSize; + NSInteger packedBoolMemoizedSerializedSize; PBAppendableArray * packedDoubleArray; - int32_t packedDoubleMemoizedSerializedSize; + NSInteger packedDoubleMemoizedSerializedSize; PBAppendableArray * packedFloatArray; - int32_t packedFloatMemoizedSerializedSize; + NSInteger packedFloatMemoizedSerializedSize; PBAppendableArray * packedInt64Array; - int32_t packedInt64MemoizedSerializedSize; + NSInteger packedInt64MemoizedSerializedSize; PBAppendableArray * packedUint64Array; - int32_t packedUint64MemoizedSerializedSize; + NSInteger packedUint64MemoizedSerializedSize; PBAppendableArray * packedInt32Array; - int32_t packedInt32MemoizedSerializedSize; + NSInteger packedInt32MemoizedSerializedSize; PBAppendableArray * packedFixed64Array; - int32_t packedFixed64MemoizedSerializedSize; + NSInteger packedFixed64MemoizedSerializedSize; PBAppendableArray * packedFixed32Array; - int32_t packedFixed32MemoizedSerializedSize; + NSInteger packedFixed32MemoizedSerializedSize; PBAppendableArray * packedUint32Array; - int32_t packedUint32MemoizedSerializedSize; + NSInteger packedUint32MemoizedSerializedSize; PBAppendableArray * packedEnumArray; - int32_t packedEnumMemoizedSerializedSize; + NSInteger packedEnumMemoizedSerializedSize; PBAppendableArray * packedSfixed32Array; - int32_t packedSfixed32MemoizedSerializedSize; + NSInteger packedSfixed32MemoizedSerializedSize; PBAppendableArray * packedSfixed64Array; - int32_t packedSfixed64MemoizedSerializedSize; + NSInteger packedSfixed64MemoizedSerializedSize; PBAppendableArray * packedSint32Array; - int32_t packedSint32MemoizedSerializedSize; + NSInteger packedSint32MemoizedSerializedSize; PBAppendableArray * packedSint64Array; - int32_t packedSint64MemoizedSerializedSize; + NSInteger packedSint64MemoizedSerializedSize; } @property (readonly, retain) PBArray * packedInt32; @property (readonly, retain) PBArray * packedInt64; @@ -3067,15 +3067,15 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * packedDouble; @property (readonly, retain) PBArray * packedBool; @property (readonly, retain) PBArray * packedEnum; -- (int32_t)packedInt32AtIndex:(NSUInteger)index; +- (NSInteger)packedInt32AtIndex:(NSUInteger)index; - (int64_t)packedInt64AtIndex:(NSUInteger)index; -- (uint32_t)packedUint32AtIndex:(NSUInteger)index; +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; - (uint64_t)packedUint64AtIndex:(NSUInteger)index; -- (int32_t)packedSint32AtIndex:(NSUInteger)index; +- (NSInteger)packedSint32AtIndex:(NSUInteger)index; - (int64_t)packedSint64AtIndex:(NSUInteger)index; -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index; +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; - (uint64_t)packedFixed64AtIndex:(NSUInteger)index; -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index; +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; - (int64_t)packedSfixed64AtIndex:(NSUInteger)index; - (Float32)packedFloatAtIndex:(NSUInteger)index; - (Float64)packedDoubleAtIndex:(NSUInteger)index; @@ -3118,10 +3118,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)packedInt32; -- (int32_t)packedInt32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedInt32:(int32_t)value; +- (NSInteger)packedInt32AtIndex:(NSUInteger)index; +- (TestPackedTypes_Builder *)addPackedInt32:(NSInteger)value; - (TestPackedTypes_Builder *)setPackedInt32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestPackedTypes_Builder *)clearPackedInt32; - (PBAppendableArray *)packedInt64; @@ -3132,10 +3132,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestPackedTypes_Builder *)clearPackedInt64; - (PBAppendableArray *)packedUint32; -- (uint32_t)packedUint32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedUint32:(uint32_t)value; +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; +- (TestPackedTypes_Builder *)addPackedUint32:(uNSInteger)value; - (TestPackedTypes_Builder *)setPackedUint32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedUint32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestPackedTypes_Builder *)clearPackedUint32; - (PBAppendableArray *)packedUint64; @@ -3146,10 +3146,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestPackedTypes_Builder *)clearPackedUint64; - (PBAppendableArray *)packedSint32; -- (int32_t)packedSint32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedSint32:(int32_t)value; +- (NSInteger)packedSint32AtIndex:(NSUInteger)index; +- (TestPackedTypes_Builder *)addPackedSint32:(NSInteger)value; - (TestPackedTypes_Builder *)setPackedSint32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedSint32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestPackedTypes_Builder *)clearPackedSint32; - (PBAppendableArray *)packedSint64; @@ -3160,10 +3160,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestPackedTypes_Builder *)clearPackedSint64; - (PBAppendableArray *)packedFixed32; -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedFixed32:(uint32_t)value; +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; +- (TestPackedTypes_Builder *)addPackedFixed32:(uNSInteger)value; - (TestPackedTypes_Builder *)setPackedFixed32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedFixed32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestPackedTypes_Builder *)clearPackedFixed32; - (PBAppendableArray *)packedFixed64; @@ -3174,10 +3174,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestPackedTypes_Builder *)clearPackedFixed64; - (PBAppendableArray *)packedSfixed32; -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedSfixed32:(int32_t)value; +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; +- (TestPackedTypes_Builder *)addPackedSfixed32:(NSInteger)value; - (TestPackedTypes_Builder *)setPackedSfixed32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestPackedTypes_Builder *)clearPackedSfixed32; - (PBAppendableArray *)packedSfixed64; @@ -3247,15 +3247,15 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * unpackedDouble; @property (readonly, retain) PBArray * unpackedBool; @property (readonly, retain) PBArray * unpackedEnum; -- (int32_t)unpackedInt32AtIndex:(NSUInteger)index; +- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index; - (int64_t)unpackedInt64AtIndex:(NSUInteger)index; -- (uint32_t)unpackedUint32AtIndex:(NSUInteger)index; +- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index; - (uint64_t)unpackedUint64AtIndex:(NSUInteger)index; -- (int32_t)unpackedSint32AtIndex:(NSUInteger)index; +- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index; - (int64_t)unpackedSint64AtIndex:(NSUInteger)index; -- (uint32_t)unpackedFixed32AtIndex:(NSUInteger)index; +- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index; - (uint64_t)unpackedFixed64AtIndex:(NSUInteger)index; -- (int32_t)unpackedSfixed32AtIndex:(NSUInteger)index; +- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index; - (int64_t)unpackedSfixed64AtIndex:(NSUInteger)index; - (Float32)unpackedFloatAtIndex:(NSUInteger)index; - (Float64)unpackedDoubleAtIndex:(NSUInteger)index; @@ -3298,10 +3298,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)unpackedInt32; -- (int32_t)unpackedInt32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedInt32:(int32_t)value; +- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index; +- (TestUnpackedTypes_Builder *)addUnpackedInt32:(NSInteger)value; - (TestUnpackedTypes_Builder *)setUnpackedInt32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestUnpackedTypes_Builder *)clearUnpackedInt32; - (PBAppendableArray *)unpackedInt64; @@ -3312,10 +3312,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestUnpackedTypes_Builder *)clearUnpackedInt64; - (PBAppendableArray *)unpackedUint32; -- (uint32_t)unpackedUint32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedUint32:(uint32_t)value; +- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index; +- (TestUnpackedTypes_Builder *)addUnpackedUint32:(uNSInteger)value; - (TestUnpackedTypes_Builder *)setUnpackedUint32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestUnpackedTypes_Builder *)clearUnpackedUint32; - (PBAppendableArray *)unpackedUint64; @@ -3326,10 +3326,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestUnpackedTypes_Builder *)clearUnpackedUint64; - (PBAppendableArray *)unpackedSint32; -- (int32_t)unpackedSint32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedSint32:(int32_t)value; +- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index; +- (TestUnpackedTypes_Builder *)addUnpackedSint32:(NSInteger)value; - (TestUnpackedTypes_Builder *)setUnpackedSint32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestUnpackedTypes_Builder *)clearUnpackedSint32; - (PBAppendableArray *)unpackedSint64; @@ -3340,10 +3340,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestUnpackedTypes_Builder *)clearUnpackedSint64; - (PBAppendableArray *)unpackedFixed32; -- (uint32_t)unpackedFixed32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(uint32_t)value; +- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index; +- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(uNSInteger)value; - (TestUnpackedTypes_Builder *)setUnpackedFixed32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestUnpackedTypes_Builder *)clearUnpackedFixed32; - (PBAppendableArray *)unpackedFixed64; @@ -3354,10 +3354,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestUnpackedTypes_Builder *)clearUnpackedFixed64; - (PBAppendableArray *)unpackedSfixed32; -- (int32_t)unpackedSfixed32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(int32_t)value; +- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index; +- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(NSInteger)value; - (TestUnpackedTypes_Builder *)setUnpackedSfixed32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestUnpackedTypes_Builder *)clearUnpackedSfixed32; - (PBAppendableArray *)unpackedSfixed64; @@ -3443,21 +3443,21 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasDynamicMessageExtension_:1; BOOL hasEnumExtension_:1; BOOL hasDynamicEnumExtension_:1; - uint32_t scalarExtension; + uNSInteger scalarExtension; ForeignMessage* messageExtension; TestDynamicExtensions_DynamicMessageType* dynamicMessageExtension; ForeignEnum enumExtension; TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; PBAppendableArray * repeatedExtensionArray; PBAppendableArray * packedExtensionArray; - int32_t packedExtensionMemoizedSerializedSize; + NSInteger packedExtensionMemoizedSerializedSize; } - (BOOL) hasScalarExtension; - (BOOL) hasEnumExtension; - (BOOL) hasDynamicEnumExtension; - (BOOL) hasMessageExtension; - (BOOL) hasDynamicMessageExtension; -@property (readonly) uint32_t scalarExtension; +@property (readonly) uNSInteger scalarExtension; @property (readonly) ForeignEnum enumExtension; @property (readonly) TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; @property (readonly, retain) ForeignMessage* messageExtension; @@ -3465,7 +3465,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedExtension; @property (readonly, retain) PBArray * packedExtension; - (NSString*)repeatedExtensionAtIndex:(NSUInteger)index; -- (int32_t)packedExtensionAtIndex:(NSUInteger)index; +- (NSInteger)packedExtensionAtIndex:(NSUInteger)index; + (TestDynamicExtensions*) defaultInstance; - (TestDynamicExtensions*) defaultInstance; @@ -3488,10 +3488,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestDynamicExtensions_DynamicMessageType : PBGeneratedMessage { @private BOOL hasDynamicField_:1; - int32_t dynamicField; + NSInteger dynamicField; } - (BOOL) hasDynamicField; -@property (readonly) int32_t dynamicField; +@property (readonly) NSInteger dynamicField; + (TestDynamicExtensions_DynamicMessageType*) defaultInstance; - (TestDynamicExtensions_DynamicMessageType*) defaultInstance; @@ -3529,8 +3529,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDynamicField; -- (int32_t) dynamicField; -- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(int32_t) value; +- (NSInteger) dynamicField; +- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(NSInteger) value; - (TestDynamicExtensions_DynamicMessageType_Builder*) clearDynamicField; @end @@ -3552,8 +3552,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasScalarExtension; -- (uint32_t) scalarExtension; -- (TestDynamicExtensions_Builder*) setScalarExtension:(uint32_t) value; +- (uNSInteger) scalarExtension; +- (TestDynamicExtensions_Builder*) setScalarExtension:(uNSInteger) value; - (TestDynamicExtensions_Builder*) clearScalarExtension; - (BOOL) hasEnumExtension; @@ -3588,10 +3588,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDynamicExtensions_Builder *)clearRepeatedExtension; - (PBAppendableArray *)packedExtension; -- (int32_t)packedExtensionAtIndex:(NSUInteger)index; -- (TestDynamicExtensions_Builder *)addPackedExtension:(int32_t)value; +- (NSInteger)packedExtensionAtIndex:(NSUInteger)index; +- (TestDynamicExtensions_Builder *)addPackedExtension:(NSInteger)value; - (TestDynamicExtensions_Builder *)setPackedExtensionArray:(NSArray *)array; -- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const int32_t *)values count:(NSUInteger)count; +- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const NSInteger *)values count:(NSUInteger)count; - (TestDynamicExtensions_Builder *)clearPackedExtension; @end @@ -3610,8 +3610,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedInt64; @property (readonly, retain) PBArray * repeatedFloat; @property (readonly, retain) PBArray * repeatedUint64; -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index; -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index; +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; - (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; - (int64_t)repeatedInt64AtIndex:(NSUInteger)index; - (Float32)repeatedFloatAtIndex:(NSUInteger)index; @@ -3653,17 +3653,17 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)repeatedFixed32; -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(uint32_t)value; +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(uNSInteger)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedInt32; -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(int32_t)value; +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(NSInteger)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedInt32; - (PBAppendableArray *)repeatedFixed64; diff --git a/src/runtime/Tests/Unittest.pb.m b/src/runtime/Tests/Unittest.pb.m index aba9c59..599e033 100644 --- a/src/runtime/Tests/Unittest.pb.m +++ b/src/runtime/Tests/Unittest.pb.m @@ -1264,15 +1264,15 @@ BOOL TestSparseEnumIsValidValue(TestSparseEnum value) { } } @interface TestAllTypes () -@property int32_t optionalInt32; +@property NSInteger optionalInt32; @property int64_t optionalInt64; -@property uint32_t optionalUint32; +@property uNSInteger optionalUint32; @property uint64_t optionalUint64; -@property int32_t optionalSint32; +@property NSInteger optionalSint32; @property int64_t optionalSint64; -@property uint32_t optionalFixed32; +@property uNSInteger optionalFixed32; @property uint64_t optionalFixed64; -@property int32_t optionalSfixed32; +@property NSInteger optionalSfixed32; @property int64_t optionalSfixed64; @property Float32 optionalFloat; @property Float64 optionalDouble; @@ -1312,15 +1312,15 @@ @interface TestAllTypes () @property (retain) PBAppendableArray * repeatedImportEnumArray; @property (retain) PBAppendableArray * repeatedStringPieceArray; @property (retain) PBAppendableArray * repeatedCordArray; -@property int32_t defaultInt32; +@property NSInteger defaultInt32; @property int64_t defaultInt64; -@property uint32_t defaultUint32; +@property uNSInteger defaultUint32; @property uint64_t defaultUint64; -@property int32_t defaultSint32; +@property NSInteger defaultSint32; @property int64_t defaultSint64; -@property uint32_t defaultFixed32; +@property uNSInteger defaultFixed32; @property uint64_t defaultFixed64; -@property int32_t defaultSfixed32; +@property NSInteger defaultSfixed32; @property int64_t defaultSfixed64; @property Float32 defaultFloat; @property Float64 defaultDouble; @@ -1805,7 +1805,7 @@ - (TestAllTypes*) defaultInstance { - (PBArray *)repeatedInt32 { return repeatedInt32Array; } -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { return [repeatedInt32Array int32AtIndex:index]; } - (PBArray *)repeatedInt64 { @@ -1817,7 +1817,7 @@ - (int64_t)repeatedInt64AtIndex:(NSUInteger)index { - (PBArray *)repeatedUint32 { return repeatedUint32Array; } -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { return [repeatedUint32Array uint32AtIndex:index]; } - (PBArray *)repeatedUint64 { @@ -1829,7 +1829,7 @@ - (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { - (PBArray *)repeatedSint32 { return repeatedSint32Array; } -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { return [repeatedSint32Array int32AtIndex:index]; } - (PBArray *)repeatedSint64 { @@ -1841,7 +1841,7 @@ - (int64_t)repeatedSint64AtIndex:(NSUInteger)index { - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedFixed64 { @@ -1853,7 +1853,7 @@ - (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { - (PBArray *)repeatedSfixed32 { return repeatedSfixed32Array; } -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { return [repeatedSfixed32Array int32AtIndex:index]; } - (PBArray *)repeatedSfixed64 { @@ -2024,7 +2024,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedInt32ArrayCount = self.repeatedInt32Array.count; if (repeatedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; for (NSUInteger i = 0; i < repeatedInt32ArrayCount; ++i) { [output writeInt32:31 value:values[i]]; } @@ -2038,7 +2038,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedUint32ArrayCount = self.repeatedUint32Array.count; if (repeatedUint32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.repeatedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; for (NSUInteger i = 0; i < repeatedUint32ArrayCount; ++i) { [output writeUInt32:33 value:values[i]]; } @@ -2052,7 +2052,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedSint32ArrayCount = self.repeatedSint32Array.count; if (repeatedSint32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; for (NSUInteger i = 0; i < repeatedSint32ArrayCount; ++i) { [output writeSInt32:35 value:values[i]]; } @@ -2066,7 +2066,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.repeatedFixed32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedFixed32Array.data; for (NSUInteger i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:37 value:values[i]]; } @@ -2080,7 +2080,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedSfixed32ArrayCount = self.repeatedSfixed32Array.count; if (repeatedSfixed32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedSfixed32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedSfixed32Array.data; for (NSUInteger i = 0; i < repeatedSfixed32ArrayCount; ++i) { [output writeSFixed32:39 value:values[i]]; } @@ -2230,8 +2230,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2310,9 +2310,9 @@ - (int32_t) serializedSize { size += computeStringSize(25, self.optionalCord); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedInt32Array.count; - const int32_t *values = (const int32_t *)self.repeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -2320,7 +2320,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedInt64Array.count; const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2330,9 +2330,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedUint32Array.count; - const uint32_t *values = (const uint32_t *)self.repeatedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -2340,7 +2340,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedUint64Array.count; const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2350,9 +2350,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSint32Array.count; - const int32_t *values = (const int32_t *)self.repeatedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } @@ -2360,7 +2360,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSint64Array.count; const int64_t *values = (const int64_t *)self.repeatedSint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2370,56 +2370,56 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSfixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSfixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedDoubleArray.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedBoolArray.count; dataSize = 1 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedStringArray.count; const NSString* *values = (const NSString* *)self.repeatedStringArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2429,7 +2429,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedBytesArray.count; const NSData* *values = (const NSData* *)self.repeatedBytesArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2451,7 +2451,7 @@ - (int32_t) serializedSize { size += computeMessageSize(50, element); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedNestedEnumArray.count; const TestAllTypes_NestedEnum *values = (const TestAllTypes_NestedEnum *)self.repeatedNestedEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2461,7 +2461,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedForeignEnumArray.count; const ForeignEnum *values = (const ForeignEnum *)self.repeatedForeignEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2471,7 +2471,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedImportEnumArray.count; const ImportEnum *values = (const ImportEnum *)self.repeatedImportEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2481,7 +2481,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedStringPieceArray.count; const NSString* *values = (const NSString* *)self.repeatedStringPieceArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2491,7 +2491,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedCordArray.count; const NSString* *values = (const NSString* *)self.repeatedCordArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -3238,7 +3238,7 @@ BOOL TestAllTypes_NestedEnumIsValidValue(TestAllTypes_NestedEnum value) { } } @interface TestAllTypes_NestedMessage () -@property int32_t bb; +@property NSInteger bb; @end @implementation TestAllTypes_NestedMessage @@ -3280,8 +3280,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3408,7 +3408,7 @@ - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3430,10 +3430,10 @@ - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (BOOL) hasBb { return result.hasBb; } -- (int32_t) bb { +- (NSInteger) bb { return result.bb; } -- (TestAllTypes_NestedMessage_Builder*) setBb:(int32_t) value { +- (TestAllTypes_NestedMessage_Builder*) setBb:(NSInteger) value { result.hasBb = YES; result.bb = value; return self; @@ -3446,7 +3446,7 @@ - (TestAllTypes_NestedMessage_Builder*) clearBb { @end @interface TestAllTypes_OptionalGroup () -@property int32_t a; +@property NSInteger a; @end @implementation TestAllTypes_OptionalGroup @@ -3488,8 +3488,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3616,7 +3616,7 @@ - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3638,10 +3638,10 @@ - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestAllTypes_OptionalGroup_Builder*) setA:(int32_t) value { +- (TestAllTypes_OptionalGroup_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -3654,7 +3654,7 @@ - (TestAllTypes_OptionalGroup_Builder*) clearA { @end @interface TestAllTypes_RepeatedGroup () -@property int32_t a; +@property NSInteger a; @end @implementation TestAllTypes_RepeatedGroup @@ -3696,8 +3696,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3824,7 +3824,7 @@ - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3846,10 +3846,10 @@ - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestAllTypes_RepeatedGroup_Builder*) setA:(int32_t) value { +- (TestAllTypes_RepeatedGroup_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -4212,7 +4212,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4321,7 +4321,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 168: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestAllTypes_NestedEnumIsValidValue(value)) { [self setOptionalNestedEnum:value]; } else { @@ -4330,7 +4330,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 176: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setOptionalForeignEnum:value]; } else { @@ -4339,7 +4339,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 184: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ImportEnumIsValidValue(value)) { [self setOptionalImportEnum:value]; } else { @@ -4440,7 +4440,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 408: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestAllTypes_NestedEnumIsValidValue(value)) { [self addRepeatedNestedEnum:value]; } else { @@ -4449,7 +4449,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 416: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addRepeatedForeignEnum:value]; } else { @@ -4458,7 +4458,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 424: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ImportEnumIsValidValue(value)) { [self addRepeatedImportEnum:value]; } else { @@ -4535,7 +4535,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 648: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestAllTypes_NestedEnumIsValidValue(value)) { [self setDefaultNestedEnum:value]; } else { @@ -4544,7 +4544,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 656: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setDefaultForeignEnum:value]; } else { @@ -4553,7 +4553,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 664: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ImportEnumIsValidValue(value)) { [self setDefaultImportEnum:value]; } else { @@ -4575,10 +4575,10 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (BOOL) hasOptionalInt32 { return result.hasOptionalInt32; } -- (int32_t) optionalInt32 { +- (NSInteger) optionalInt32 { return result.optionalInt32; } -- (TestAllTypes_Builder*) setOptionalInt32:(int32_t) value { +- (TestAllTypes_Builder*) setOptionalInt32:(NSInteger) value { result.hasOptionalInt32 = YES; result.optionalInt32 = value; return self; @@ -4607,10 +4607,10 @@ - (TestAllTypes_Builder*) clearOptionalInt64 { - (BOOL) hasOptionalUint32 { return result.hasOptionalUint32; } -- (uint32_t) optionalUint32 { +- (uNSInteger) optionalUint32 { return result.optionalUint32; } -- (TestAllTypes_Builder*) setOptionalUint32:(uint32_t) value { +- (TestAllTypes_Builder*) setOptionalUint32:(uNSInteger) value { result.hasOptionalUint32 = YES; result.optionalUint32 = value; return self; @@ -4639,10 +4639,10 @@ - (TestAllTypes_Builder*) clearOptionalUint64 { - (BOOL) hasOptionalSint32 { return result.hasOptionalSint32; } -- (int32_t) optionalSint32 { +- (NSInteger) optionalSint32 { return result.optionalSint32; } -- (TestAllTypes_Builder*) setOptionalSint32:(int32_t) value { +- (TestAllTypes_Builder*) setOptionalSint32:(NSInteger) value { result.hasOptionalSint32 = YES; result.optionalSint32 = value; return self; @@ -4671,10 +4671,10 @@ - (TestAllTypes_Builder*) clearOptionalSint64 { - (BOOL) hasOptionalFixed32 { return result.hasOptionalFixed32; } -- (uint32_t) optionalFixed32 { +- (uNSInteger) optionalFixed32 { return result.optionalFixed32; } -- (TestAllTypes_Builder*) setOptionalFixed32:(uint32_t) value { +- (TestAllTypes_Builder*) setOptionalFixed32:(uNSInteger) value { result.hasOptionalFixed32 = YES; result.optionalFixed32 = value; return self; @@ -4703,10 +4703,10 @@ - (TestAllTypes_Builder*) clearOptionalFixed64 { - (BOOL) hasOptionalSfixed32 { return result.hasOptionalSfixed32; } -- (int32_t) optionalSfixed32 { +- (NSInteger) optionalSfixed32 { return result.optionalSfixed32; } -- (TestAllTypes_Builder*) setOptionalSfixed32:(int32_t) value { +- (TestAllTypes_Builder*) setOptionalSfixed32:(NSInteger) value { result.hasOptionalSfixed32 = YES; result.optionalSfixed32 = value; return self; @@ -5015,10 +5015,10 @@ - (TestAllTypes_Builder*) clearOptionalCord { - (PBAppendableArray *)repeatedInt32 { return result.repeatedInt32Array; } -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { return [result repeatedInt32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedInt32:(int32_t)value { +- (TestAllTypes_Builder *)addRepeatedInt32:(NSInteger)value { if (result.repeatedInt32Array == nil) { result.repeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5029,7 +5029,7 @@ - (TestAllTypes_Builder *)setRepeatedInt32Array:(NSArray *)array { result.repeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5065,10 +5065,10 @@ - (TestAllTypes_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedUint32 { return result.repeatedUint32Array; } -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { return [result repeatedUint32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedUint32:(uint32_t)value { +- (TestAllTypes_Builder *)addRepeatedUint32:(uNSInteger)value { if (result.repeatedUint32Array == nil) { result.repeatedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5079,7 +5079,7 @@ - (TestAllTypes_Builder *)setRepeatedUint32Array:(NSArray *)array { result.repeatedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedUint32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { result.repeatedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5115,10 +5115,10 @@ - (TestAllTypes_Builder *)clearRepeatedUint64 { - (PBAppendableArray *)repeatedSint32 { return result.repeatedSint32Array; } -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { return [result repeatedSint32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedSint32:(int32_t)value { +- (TestAllTypes_Builder *)addRepeatedSint32:(NSInteger)value { if (result.repeatedSint32Array == nil) { result.repeatedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5129,7 +5129,7 @@ - (TestAllTypes_Builder *)setRepeatedSint32Array:(NSArray *)array { result.repeatedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedSint32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5165,10 +5165,10 @@ - (TestAllTypes_Builder *)clearRepeatedSint64 { - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { return [result repeatedFixed32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedFixed32:(uint32_t)value { +- (TestAllTypes_Builder *)addRepeatedFixed32:(uNSInteger)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5179,7 +5179,7 @@ - (TestAllTypes_Builder *)setRepeatedFixed32Array:(NSArray *)array { result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5215,10 +5215,10 @@ - (TestAllTypes_Builder *)clearRepeatedFixed64 { - (PBAppendableArray *)repeatedSfixed32 { return result.repeatedSfixed32Array; } -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { return [result repeatedSfixed32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedSfixed32:(int32_t)value { +- (TestAllTypes_Builder *)addRepeatedSfixed32:(NSInteger)value { if (result.repeatedSfixed32Array == nil) { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5229,7 +5229,7 @@ - (TestAllTypes_Builder *)setRepeatedSfixed32Array:(NSArray *)array { result.repeatedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5615,10 +5615,10 @@ - (TestAllTypes_Builder *)clearRepeatedCord { - (BOOL) hasDefaultInt32 { return result.hasDefaultInt32; } -- (int32_t) defaultInt32 { +- (NSInteger) defaultInt32 { return result.defaultInt32; } -- (TestAllTypes_Builder*) setDefaultInt32:(int32_t) value { +- (TestAllTypes_Builder*) setDefaultInt32:(NSInteger) value { result.hasDefaultInt32 = YES; result.defaultInt32 = value; return self; @@ -5647,10 +5647,10 @@ - (TestAllTypes_Builder*) clearDefaultInt64 { - (BOOL) hasDefaultUint32 { return result.hasDefaultUint32; } -- (uint32_t) defaultUint32 { +- (uNSInteger) defaultUint32 { return result.defaultUint32; } -- (TestAllTypes_Builder*) setDefaultUint32:(uint32_t) value { +- (TestAllTypes_Builder*) setDefaultUint32:(uNSInteger) value { result.hasDefaultUint32 = YES; result.defaultUint32 = value; return self; @@ -5679,10 +5679,10 @@ - (TestAllTypes_Builder*) clearDefaultUint64 { - (BOOL) hasDefaultSint32 { return result.hasDefaultSint32; } -- (int32_t) defaultSint32 { +- (NSInteger) defaultSint32 { return result.defaultSint32; } -- (TestAllTypes_Builder*) setDefaultSint32:(int32_t) value { +- (TestAllTypes_Builder*) setDefaultSint32:(NSInteger) value { result.hasDefaultSint32 = YES; result.defaultSint32 = value; return self; @@ -5711,10 +5711,10 @@ - (TestAllTypes_Builder*) clearDefaultSint64 { - (BOOL) hasDefaultFixed32 { return result.hasDefaultFixed32; } -- (uint32_t) defaultFixed32 { +- (uNSInteger) defaultFixed32 { return result.defaultFixed32; } -- (TestAllTypes_Builder*) setDefaultFixed32:(uint32_t) value { +- (TestAllTypes_Builder*) setDefaultFixed32:(uNSInteger) value { result.hasDefaultFixed32 = YES; result.defaultFixed32 = value; return self; @@ -5743,10 +5743,10 @@ - (TestAllTypes_Builder*) clearDefaultFixed64 { - (BOOL) hasDefaultSfixed32 { return result.hasDefaultSfixed32; } -- (int32_t) defaultSfixed32 { +- (NSInteger) defaultSfixed32 { return result.defaultSfixed32; } -- (TestAllTypes_Builder*) setDefaultSfixed32:(int32_t) value { +- (TestAllTypes_Builder*) setDefaultSfixed32:(NSInteger) value { result.hasDefaultSfixed32 = YES; result.defaultSfixed32 = value; return self; @@ -5935,7 +5935,7 @@ - (TestAllTypes_Builder*) clearDefaultCord { @end @interface TestDeprecatedFields () -@property int32_t deprecatedInt32; +@property NSInteger deprecatedInt32; @end @implementation TestDeprecatedFields @@ -5977,8 +5977,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6105,7 +6105,7 @@ - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6127,10 +6127,10 @@ - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (BOOL) hasDeprecatedInt32 { return result.hasDeprecatedInt32; } -- (int32_t) deprecatedInt32 { +- (NSInteger) deprecatedInt32 { return result.deprecatedInt32; } -- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(int32_t) value { +- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(NSInteger) value { result.hasDeprecatedInt32 = YES; result.deprecatedInt32 = value; return self; @@ -6143,7 +6143,7 @@ - (TestDeprecatedFields_Builder*) clearDeprecatedInt32 { @end @interface ForeignMessage () -@property int32_t c; +@property NSInteger c; @end @implementation ForeignMessage @@ -6185,8 +6185,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6313,7 +6313,7 @@ - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6335,10 +6335,10 @@ - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (BOOL) hasC { return result.hasC; } -- (int32_t) c { +- (NSInteger) c { return result.c; } -- (ForeignMessage_Builder*) setC:(int32_t) value { +- (ForeignMessage_Builder*) setC:(NSInteger) value { result.hasC = YES; result.c = value; return self; @@ -6387,8 +6387,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6509,7 +6509,7 @@ - (TestAllExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (TestAllExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6527,7 +6527,7 @@ - (TestAllExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i @end @interface OptionalGroup_extension () -@property int32_t a; +@property NSInteger a; @end @implementation OptionalGroup_extension @@ -6569,8 +6569,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6697,7 +6697,7 @@ - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6719,10 +6719,10 @@ - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (OptionalGroup_extension_Builder*) setA:(int32_t) value { +- (OptionalGroup_extension_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -6735,7 +6735,7 @@ - (OptionalGroup_extension_Builder*) clearA { @end @interface RepeatedGroup_extension () -@property int32_t a; +@property NSInteger a; @end @implementation RepeatedGroup_extension @@ -6777,8 +6777,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6905,7 +6905,7 @@ - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6927,10 +6927,10 @@ - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (RepeatedGroup_extension_Builder*) setA:(int32_t) value { +- (RepeatedGroup_extension_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -6976,8 +6976,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7089,7 +7089,7 @@ - (TestNestedExtension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestNestedExtension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7107,39 +7107,39 @@ - (TestNestedExtension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) @end @interface TestRequired () -@property int32_t a; -@property int32_t dummy2; -@property int32_t b; -@property int32_t dummy4; -@property int32_t dummy5; -@property int32_t dummy6; -@property int32_t dummy7; -@property int32_t dummy8; -@property int32_t dummy9; -@property int32_t dummy10; -@property int32_t dummy11; -@property int32_t dummy12; -@property int32_t dummy13; -@property int32_t dummy14; -@property int32_t dummy15; -@property int32_t dummy16; -@property int32_t dummy17; -@property int32_t dummy18; -@property int32_t dummy19; -@property int32_t dummy20; -@property int32_t dummy21; -@property int32_t dummy22; -@property int32_t dummy23; -@property int32_t dummy24; -@property int32_t dummy25; -@property int32_t dummy26; -@property int32_t dummy27; -@property int32_t dummy28; -@property int32_t dummy29; -@property int32_t dummy30; -@property int32_t dummy31; -@property int32_t dummy32; -@property int32_t c; +@property NSInteger a; +@property NSInteger dummy2; +@property NSInteger b; +@property NSInteger dummy4; +@property NSInteger dummy5; +@property NSInteger dummy6; +@property NSInteger dummy7; +@property NSInteger dummy8; +@property NSInteger dummy9; +@property NSInteger dummy10; +@property NSInteger dummy11; +@property NSInteger dummy12; +@property NSInteger dummy13; +@property NSInteger dummy14; +@property NSInteger dummy15; +@property NSInteger dummy16; +@property NSInteger dummy17; +@property NSInteger dummy18; +@property NSInteger dummy19; +@property NSInteger dummy20; +@property NSInteger dummy21; +@property NSInteger dummy22; +@property NSInteger dummy23; +@property NSInteger dummy24; +@property NSInteger dummy25; +@property NSInteger dummy26; +@property NSInteger dummy27; +@property NSInteger dummy28; +@property NSInteger dummy29; +@property NSInteger dummy30; +@property NSInteger dummy31; +@property NSInteger dummy32; +@property NSInteger c; @end @implementation TestRequired @@ -7548,8 +7548,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8156,7 +8156,7 @@ - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8306,10 +8306,10 @@ - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestRequired_Builder*) setA:(int32_t) value { +- (TestRequired_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -8322,10 +8322,10 @@ - (TestRequired_Builder*) clearA { - (BOOL) hasDummy2 { return result.hasDummy2; } -- (int32_t) dummy2 { +- (NSInteger) dummy2 { return result.dummy2; } -- (TestRequired_Builder*) setDummy2:(int32_t) value { +- (TestRequired_Builder*) setDummy2:(NSInteger) value { result.hasDummy2 = YES; result.dummy2 = value; return self; @@ -8338,10 +8338,10 @@ - (TestRequired_Builder*) clearDummy2 { - (BOOL) hasB { return result.hasB; } -- (int32_t) b { +- (NSInteger) b { return result.b; } -- (TestRequired_Builder*) setB:(int32_t) value { +- (TestRequired_Builder*) setB:(NSInteger) value { result.hasB = YES; result.b = value; return self; @@ -8354,10 +8354,10 @@ - (TestRequired_Builder*) clearB { - (BOOL) hasDummy4 { return result.hasDummy4; } -- (int32_t) dummy4 { +- (NSInteger) dummy4 { return result.dummy4; } -- (TestRequired_Builder*) setDummy4:(int32_t) value { +- (TestRequired_Builder*) setDummy4:(NSInteger) value { result.hasDummy4 = YES; result.dummy4 = value; return self; @@ -8370,10 +8370,10 @@ - (TestRequired_Builder*) clearDummy4 { - (BOOL) hasDummy5 { return result.hasDummy5; } -- (int32_t) dummy5 { +- (NSInteger) dummy5 { return result.dummy5; } -- (TestRequired_Builder*) setDummy5:(int32_t) value { +- (TestRequired_Builder*) setDummy5:(NSInteger) value { result.hasDummy5 = YES; result.dummy5 = value; return self; @@ -8386,10 +8386,10 @@ - (TestRequired_Builder*) clearDummy5 { - (BOOL) hasDummy6 { return result.hasDummy6; } -- (int32_t) dummy6 { +- (NSInteger) dummy6 { return result.dummy6; } -- (TestRequired_Builder*) setDummy6:(int32_t) value { +- (TestRequired_Builder*) setDummy6:(NSInteger) value { result.hasDummy6 = YES; result.dummy6 = value; return self; @@ -8402,10 +8402,10 @@ - (TestRequired_Builder*) clearDummy6 { - (BOOL) hasDummy7 { return result.hasDummy7; } -- (int32_t) dummy7 { +- (NSInteger) dummy7 { return result.dummy7; } -- (TestRequired_Builder*) setDummy7:(int32_t) value { +- (TestRequired_Builder*) setDummy7:(NSInteger) value { result.hasDummy7 = YES; result.dummy7 = value; return self; @@ -8418,10 +8418,10 @@ - (TestRequired_Builder*) clearDummy7 { - (BOOL) hasDummy8 { return result.hasDummy8; } -- (int32_t) dummy8 { +- (NSInteger) dummy8 { return result.dummy8; } -- (TestRequired_Builder*) setDummy8:(int32_t) value { +- (TestRequired_Builder*) setDummy8:(NSInteger) value { result.hasDummy8 = YES; result.dummy8 = value; return self; @@ -8434,10 +8434,10 @@ - (TestRequired_Builder*) clearDummy8 { - (BOOL) hasDummy9 { return result.hasDummy9; } -- (int32_t) dummy9 { +- (NSInteger) dummy9 { return result.dummy9; } -- (TestRequired_Builder*) setDummy9:(int32_t) value { +- (TestRequired_Builder*) setDummy9:(NSInteger) value { result.hasDummy9 = YES; result.dummy9 = value; return self; @@ -8450,10 +8450,10 @@ - (TestRequired_Builder*) clearDummy9 { - (BOOL) hasDummy10 { return result.hasDummy10; } -- (int32_t) dummy10 { +- (NSInteger) dummy10 { return result.dummy10; } -- (TestRequired_Builder*) setDummy10:(int32_t) value { +- (TestRequired_Builder*) setDummy10:(NSInteger) value { result.hasDummy10 = YES; result.dummy10 = value; return self; @@ -8466,10 +8466,10 @@ - (TestRequired_Builder*) clearDummy10 { - (BOOL) hasDummy11 { return result.hasDummy11; } -- (int32_t) dummy11 { +- (NSInteger) dummy11 { return result.dummy11; } -- (TestRequired_Builder*) setDummy11:(int32_t) value { +- (TestRequired_Builder*) setDummy11:(NSInteger) value { result.hasDummy11 = YES; result.dummy11 = value; return self; @@ -8482,10 +8482,10 @@ - (TestRequired_Builder*) clearDummy11 { - (BOOL) hasDummy12 { return result.hasDummy12; } -- (int32_t) dummy12 { +- (NSInteger) dummy12 { return result.dummy12; } -- (TestRequired_Builder*) setDummy12:(int32_t) value { +- (TestRequired_Builder*) setDummy12:(NSInteger) value { result.hasDummy12 = YES; result.dummy12 = value; return self; @@ -8498,10 +8498,10 @@ - (TestRequired_Builder*) clearDummy12 { - (BOOL) hasDummy13 { return result.hasDummy13; } -- (int32_t) dummy13 { +- (NSInteger) dummy13 { return result.dummy13; } -- (TestRequired_Builder*) setDummy13:(int32_t) value { +- (TestRequired_Builder*) setDummy13:(NSInteger) value { result.hasDummy13 = YES; result.dummy13 = value; return self; @@ -8514,10 +8514,10 @@ - (TestRequired_Builder*) clearDummy13 { - (BOOL) hasDummy14 { return result.hasDummy14; } -- (int32_t) dummy14 { +- (NSInteger) dummy14 { return result.dummy14; } -- (TestRequired_Builder*) setDummy14:(int32_t) value { +- (TestRequired_Builder*) setDummy14:(NSInteger) value { result.hasDummy14 = YES; result.dummy14 = value; return self; @@ -8530,10 +8530,10 @@ - (TestRequired_Builder*) clearDummy14 { - (BOOL) hasDummy15 { return result.hasDummy15; } -- (int32_t) dummy15 { +- (NSInteger) dummy15 { return result.dummy15; } -- (TestRequired_Builder*) setDummy15:(int32_t) value { +- (TestRequired_Builder*) setDummy15:(NSInteger) value { result.hasDummy15 = YES; result.dummy15 = value; return self; @@ -8546,10 +8546,10 @@ - (TestRequired_Builder*) clearDummy15 { - (BOOL) hasDummy16 { return result.hasDummy16; } -- (int32_t) dummy16 { +- (NSInteger) dummy16 { return result.dummy16; } -- (TestRequired_Builder*) setDummy16:(int32_t) value { +- (TestRequired_Builder*) setDummy16:(NSInteger) value { result.hasDummy16 = YES; result.dummy16 = value; return self; @@ -8562,10 +8562,10 @@ - (TestRequired_Builder*) clearDummy16 { - (BOOL) hasDummy17 { return result.hasDummy17; } -- (int32_t) dummy17 { +- (NSInteger) dummy17 { return result.dummy17; } -- (TestRequired_Builder*) setDummy17:(int32_t) value { +- (TestRequired_Builder*) setDummy17:(NSInteger) value { result.hasDummy17 = YES; result.dummy17 = value; return self; @@ -8578,10 +8578,10 @@ - (TestRequired_Builder*) clearDummy17 { - (BOOL) hasDummy18 { return result.hasDummy18; } -- (int32_t) dummy18 { +- (NSInteger) dummy18 { return result.dummy18; } -- (TestRequired_Builder*) setDummy18:(int32_t) value { +- (TestRequired_Builder*) setDummy18:(NSInteger) value { result.hasDummy18 = YES; result.dummy18 = value; return self; @@ -8594,10 +8594,10 @@ - (TestRequired_Builder*) clearDummy18 { - (BOOL) hasDummy19 { return result.hasDummy19; } -- (int32_t) dummy19 { +- (NSInteger) dummy19 { return result.dummy19; } -- (TestRequired_Builder*) setDummy19:(int32_t) value { +- (TestRequired_Builder*) setDummy19:(NSInteger) value { result.hasDummy19 = YES; result.dummy19 = value; return self; @@ -8610,10 +8610,10 @@ - (TestRequired_Builder*) clearDummy19 { - (BOOL) hasDummy20 { return result.hasDummy20; } -- (int32_t) dummy20 { +- (NSInteger) dummy20 { return result.dummy20; } -- (TestRequired_Builder*) setDummy20:(int32_t) value { +- (TestRequired_Builder*) setDummy20:(NSInteger) value { result.hasDummy20 = YES; result.dummy20 = value; return self; @@ -8626,10 +8626,10 @@ - (TestRequired_Builder*) clearDummy20 { - (BOOL) hasDummy21 { return result.hasDummy21; } -- (int32_t) dummy21 { +- (NSInteger) dummy21 { return result.dummy21; } -- (TestRequired_Builder*) setDummy21:(int32_t) value { +- (TestRequired_Builder*) setDummy21:(NSInteger) value { result.hasDummy21 = YES; result.dummy21 = value; return self; @@ -8642,10 +8642,10 @@ - (TestRequired_Builder*) clearDummy21 { - (BOOL) hasDummy22 { return result.hasDummy22; } -- (int32_t) dummy22 { +- (NSInteger) dummy22 { return result.dummy22; } -- (TestRequired_Builder*) setDummy22:(int32_t) value { +- (TestRequired_Builder*) setDummy22:(NSInteger) value { result.hasDummy22 = YES; result.dummy22 = value; return self; @@ -8658,10 +8658,10 @@ - (TestRequired_Builder*) clearDummy22 { - (BOOL) hasDummy23 { return result.hasDummy23; } -- (int32_t) dummy23 { +- (NSInteger) dummy23 { return result.dummy23; } -- (TestRequired_Builder*) setDummy23:(int32_t) value { +- (TestRequired_Builder*) setDummy23:(NSInteger) value { result.hasDummy23 = YES; result.dummy23 = value; return self; @@ -8674,10 +8674,10 @@ - (TestRequired_Builder*) clearDummy23 { - (BOOL) hasDummy24 { return result.hasDummy24; } -- (int32_t) dummy24 { +- (NSInteger) dummy24 { return result.dummy24; } -- (TestRequired_Builder*) setDummy24:(int32_t) value { +- (TestRequired_Builder*) setDummy24:(NSInteger) value { result.hasDummy24 = YES; result.dummy24 = value; return self; @@ -8690,10 +8690,10 @@ - (TestRequired_Builder*) clearDummy24 { - (BOOL) hasDummy25 { return result.hasDummy25; } -- (int32_t) dummy25 { +- (NSInteger) dummy25 { return result.dummy25; } -- (TestRequired_Builder*) setDummy25:(int32_t) value { +- (TestRequired_Builder*) setDummy25:(NSInteger) value { result.hasDummy25 = YES; result.dummy25 = value; return self; @@ -8706,10 +8706,10 @@ - (TestRequired_Builder*) clearDummy25 { - (BOOL) hasDummy26 { return result.hasDummy26; } -- (int32_t) dummy26 { +- (NSInteger) dummy26 { return result.dummy26; } -- (TestRequired_Builder*) setDummy26:(int32_t) value { +- (TestRequired_Builder*) setDummy26:(NSInteger) value { result.hasDummy26 = YES; result.dummy26 = value; return self; @@ -8722,10 +8722,10 @@ - (TestRequired_Builder*) clearDummy26 { - (BOOL) hasDummy27 { return result.hasDummy27; } -- (int32_t) dummy27 { +- (NSInteger) dummy27 { return result.dummy27; } -- (TestRequired_Builder*) setDummy27:(int32_t) value { +- (TestRequired_Builder*) setDummy27:(NSInteger) value { result.hasDummy27 = YES; result.dummy27 = value; return self; @@ -8738,10 +8738,10 @@ - (TestRequired_Builder*) clearDummy27 { - (BOOL) hasDummy28 { return result.hasDummy28; } -- (int32_t) dummy28 { +- (NSInteger) dummy28 { return result.dummy28; } -- (TestRequired_Builder*) setDummy28:(int32_t) value { +- (TestRequired_Builder*) setDummy28:(NSInteger) value { result.hasDummy28 = YES; result.dummy28 = value; return self; @@ -8754,10 +8754,10 @@ - (TestRequired_Builder*) clearDummy28 { - (BOOL) hasDummy29 { return result.hasDummy29; } -- (int32_t) dummy29 { +- (NSInteger) dummy29 { return result.dummy29; } -- (TestRequired_Builder*) setDummy29:(int32_t) value { +- (TestRequired_Builder*) setDummy29:(NSInteger) value { result.hasDummy29 = YES; result.dummy29 = value; return self; @@ -8770,10 +8770,10 @@ - (TestRequired_Builder*) clearDummy29 { - (BOOL) hasDummy30 { return result.hasDummy30; } -- (int32_t) dummy30 { +- (NSInteger) dummy30 { return result.dummy30; } -- (TestRequired_Builder*) setDummy30:(int32_t) value { +- (TestRequired_Builder*) setDummy30:(NSInteger) value { result.hasDummy30 = YES; result.dummy30 = value; return self; @@ -8786,10 +8786,10 @@ - (TestRequired_Builder*) clearDummy30 { - (BOOL) hasDummy31 { return result.hasDummy31; } -- (int32_t) dummy31 { +- (NSInteger) dummy31 { return result.dummy31; } -- (TestRequired_Builder*) setDummy31:(int32_t) value { +- (TestRequired_Builder*) setDummy31:(NSInteger) value { result.hasDummy31 = YES; result.dummy31 = value; return self; @@ -8802,10 +8802,10 @@ - (TestRequired_Builder*) clearDummy31 { - (BOOL) hasDummy32 { return result.hasDummy32; } -- (int32_t) dummy32 { +- (NSInteger) dummy32 { return result.dummy32; } -- (TestRequired_Builder*) setDummy32:(int32_t) value { +- (TestRequired_Builder*) setDummy32:(NSInteger) value { result.hasDummy32 = YES; result.dummy32 = value; return self; @@ -8818,10 +8818,10 @@ - (TestRequired_Builder*) clearDummy32 { - (BOOL) hasC { return result.hasC; } -- (int32_t) c { +- (NSInteger) c { return result.c; } -- (TestRequired_Builder*) setC:(int32_t) value { +- (TestRequired_Builder*) setC:(NSInteger) value { result.hasC = YES; result.c = value; return self; @@ -8836,7 +8836,7 @@ - (TestRequired_Builder*) clearC { @interface TestRequiredForeign () @property (retain) TestRequired* optionalMessage; @property (retain) PBAppendableArray * repeatedMessageArray; -@property int32_t dummy; +@property NSInteger dummy; @end @implementation TestRequiredForeign @@ -8912,8 +8912,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9079,7 +9079,7 @@ - (TestRequiredForeign_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestRequiredForeign_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9171,10 +9171,10 @@ - (TestRequiredForeign_Builder *)clearRepeatedMessage { - (BOOL) hasDummy { return result.hasDummy; } -- (int32_t) dummy { +- (NSInteger) dummy { return result.dummy; } -- (TestRequiredForeign_Builder*) setDummy:(int32_t) value { +- (TestRequiredForeign_Builder*) setDummy:(NSInteger) value { result.hasDummy = YES; result.dummy = value; return self; @@ -9230,8 +9230,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9361,7 +9361,7 @@ - (TestForeignNested_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (TestForeignNested_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9448,8 +9448,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9561,7 +9561,7 @@ - (TestEmptyMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (TestEmptyMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9615,8 +9615,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9737,7 +9737,7 @@ - (TestEmptyMessageWithExtensions_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestEmptyMessageWithExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9797,8 +9797,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9933,7 +9933,7 @@ - (TestMultipleExtensionRanges_Builder*) mergeFromCodedInputStream:(PBCodedInput - (TestMultipleExtensionRanges_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9951,8 +9951,8 @@ - (TestMultipleExtensionRanges_Builder*) mergeFromCodedInputStream:(PBCodedInput @end @interface TestReallyLargeTagNumber () -@property int32_t a; -@property int32_t bb; +@property NSInteger a; +@property NSInteger bb; @end @implementation TestReallyLargeTagNumber @@ -10005,8 +10005,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10148,7 +10148,7 @@ - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10174,10 +10174,10 @@ - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestReallyLargeTagNumber_Builder*) setA:(int32_t) value { +- (TestReallyLargeTagNumber_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -10190,10 +10190,10 @@ - (TestReallyLargeTagNumber_Builder*) clearA { - (BOOL) hasBb { return result.hasBb; } -- (int32_t) bb { +- (NSInteger) bb { return result.bb; } -- (TestReallyLargeTagNumber_Builder*) setBb:(int32_t) value { +- (TestReallyLargeTagNumber_Builder*) setBb:(NSInteger) value { result.hasBb = YES; result.bb = value; return self; @@ -10207,7 +10207,7 @@ - (TestReallyLargeTagNumber_Builder*) clearBb { @interface TestRecursiveMessage () @property (retain) TestRecursiveMessage* a; -@property int32_t i; +@property NSInteger i; @end @implementation TestRecursiveMessage @@ -10261,8 +10261,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10407,7 +10407,7 @@ - (TestRecursiveMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestRecursiveMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10468,10 +10468,10 @@ - (TestRecursiveMessage_Builder*) clearA { - (BOOL) hasI { return result.hasI; } -- (int32_t) i { +- (NSInteger) i { return result.i; } -- (TestRecursiveMessage_Builder*) setI:(int32_t) value { +- (TestRecursiveMessage_Builder*) setI:(NSInteger) value { result.hasI = YES; result.i = value; return self; @@ -10527,8 +10527,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10658,7 +10658,7 @@ - (TestMutualRecursionA_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestMutualRecursionA_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10716,7 +10716,7 @@ - (TestMutualRecursionA_Builder*) clearBb { @interface TestMutualRecursionB () @property (retain) TestMutualRecursionA* a; -@property int32_t optionalInt32; +@property NSInteger optionalInt32; @end @implementation TestMutualRecursionB @@ -10770,8 +10770,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10916,7 +10916,7 @@ - (TestMutualRecursionB_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestMutualRecursionB_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10977,10 +10977,10 @@ - (TestMutualRecursionB_Builder*) clearA { - (BOOL) hasOptionalInt32 { return result.hasOptionalInt32; } -- (int32_t) optionalInt32 { +- (NSInteger) optionalInt32 { return result.optionalInt32; } -- (TestMutualRecursionB_Builder*) setOptionalInt32:(int32_t) value { +- (TestMutualRecursionB_Builder*) setOptionalInt32:(NSInteger) value { result.hasOptionalInt32 = YES; result.optionalInt32 = value; return self; @@ -10993,7 +10993,7 @@ - (TestMutualRecursionB_Builder*) clearOptionalInt32 { @end @interface TestDupFieldNumber () -@property int32_t a; +@property NSInteger a; @property (retain) TestDupFieldNumber_Foo* foo; @property (retain) TestDupFieldNumber_Bar* bar; @end @@ -11061,8 +11061,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11166,7 +11166,7 @@ - (NSUInteger) hash { @end @interface TestDupFieldNumber_Foo () -@property int32_t a; +@property NSInteger a; @end @implementation TestDupFieldNumber_Foo @@ -11208,8 +11208,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11336,7 +11336,7 @@ - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -11358,10 +11358,10 @@ - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestDupFieldNumber_Foo_Builder*) setA:(int32_t) value { +- (TestDupFieldNumber_Foo_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -11374,7 +11374,7 @@ - (TestDupFieldNumber_Foo_Builder*) clearA { @end @interface TestDupFieldNumber_Bar () -@property int32_t a; +@property NSInteger a; @end @implementation TestDupFieldNumber_Bar @@ -11416,8 +11416,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11544,7 +11544,7 @@ - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -11566,10 +11566,10 @@ - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestDupFieldNumber_Bar_Builder*) setA:(int32_t) value { +- (TestDupFieldNumber_Bar_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -11641,7 +11641,7 @@ - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -11681,10 +11681,10 @@ - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestDupFieldNumber_Builder*) setA:(int32_t) value { +- (TestDupFieldNumber_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -11800,8 +11800,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11913,7 +11913,7 @@ - (TestNestedMessageHasBits_NestedMessage*) defaultInstance { - (PBArray *)nestedmessageRepeatedInt32 { return nestedmessageRepeatedInt32Array; } -- (int32_t)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index { return [nestedmessageRepeatedInt32Array int32AtIndex:index]; } - (PBArray *)nestedmessageRepeatedForeignmessage { @@ -11928,7 +11928,7 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { const NSUInteger nestedmessageRepeatedInt32ArrayCount = self.nestedmessageRepeatedInt32Array.count; if (nestedmessageRepeatedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.nestedmessageRepeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.nestedmessageRepeatedInt32Array.data; for (NSUInteger i = 0; i < nestedmessageRepeatedInt32ArrayCount; ++i) { [output writeInt32:1 value:values[i]]; } @@ -11938,17 +11938,17 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.nestedmessageRepeatedInt32Array.count; - const int32_t *values = (const int32_t *)self.nestedmessageRepeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.nestedmessageRepeatedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -12097,7 +12097,7 @@ - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(P - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -12125,10 +12125,10 @@ - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(P - (PBAppendableArray *)nestedmessageRepeatedInt32 { return result.nestedmessageRepeatedInt32Array; } -- (int32_t)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index { return [result nestedmessageRepeatedInt32AtIndex:index]; } -- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(int32_t)value { +- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(NSInteger)value { if (result.nestedmessageRepeatedInt32Array == nil) { result.nestedmessageRepeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -12139,7 +12139,7 @@ - (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt3 result.nestedmessageRepeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.nestedmessageRepeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -12228,7 +12228,7 @@ - (TestNestedMessageHasBits_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestNestedMessageHasBits_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -12285,7 +12285,7 @@ - (TestNestedMessageHasBits_Builder*) clearOptionalNestedMessage { @end @interface TestCamelCaseFieldNames () -@property int32_t primitiveField; +@property NSInteger primitiveField; @property (retain) NSString* stringField; @property ForeignEnum enumField; @property (retain) ForeignMessage* messageField; @@ -12394,7 +12394,7 @@ - (TestCamelCaseFieldNames*) defaultInstance { - (PBArray *)repeatedPrimitiveField { return repeatedPrimitiveFieldArray; } -- (int32_t)repeatedPrimitiveFieldAtIndex:(NSUInteger)index { +- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index { return [repeatedPrimitiveFieldArray int32AtIndex:index]; } - (PBArray *)repeatedStringField { @@ -12451,7 +12451,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedPrimitiveFieldArrayCount = self.repeatedPrimitiveFieldArray.count; if (repeatedPrimitiveFieldArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedPrimitiveFieldArray.data; + const NSInteger *values = (const NSInteger *)self.repeatedPrimitiveFieldArray.data; for (NSUInteger i = 0; i < repeatedPrimitiveFieldArrayCount; ++i) { [output writeInt32:7 value:values[i]]; } @@ -12487,8 +12487,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -12513,9 +12513,9 @@ - (int32_t) serializedSize { size += computeStringSize(6, self.cordField); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedPrimitiveFieldArray.count; - const int32_t *values = (const int32_t *)self.repeatedPrimitiveFieldArray.data; + const NSInteger *values = (const NSInteger *)self.repeatedPrimitiveFieldArray.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -12523,7 +12523,7 @@ - (int32_t) serializedSize { size += 1 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedStringFieldArray.count; const NSString* *values = (const NSString* *)self.repeatedStringFieldArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -12533,7 +12533,7 @@ - (int32_t) serializedSize { size += 1 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedEnumFieldArray.count; const ForeignEnum *values = (const ForeignEnum *)self.repeatedEnumFieldArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -12546,7 +12546,7 @@ - (int32_t) serializedSize { size += computeMessageSize(10, element); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedStringPieceFieldArray.count; const NSString* *values = (const NSString* *)self.repeatedStringPieceFieldArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -12556,7 +12556,7 @@ - (int32_t) serializedSize { size += 1 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedCordFieldArray.count; const NSString* *values = (const NSString* *)self.repeatedCordFieldArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -12839,7 +12839,7 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -12860,7 +12860,7 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre break; } case 24: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setEnumField:value]; } else { @@ -12894,7 +12894,7 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre break; } case 72: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addRepeatedEnumField:value]; } else { @@ -12922,10 +12922,10 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (BOOL) hasPrimitiveField { return result.hasPrimitiveField; } -- (int32_t) primitiveField { +- (NSInteger) primitiveField { return result.primitiveField; } -- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(int32_t) value { +- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(NSInteger) value { result.hasPrimitiveField = YES; result.primitiveField = value; return self; @@ -13032,10 +13032,10 @@ - (TestCamelCaseFieldNames_Builder*) clearCordField { - (PBAppendableArray *)repeatedPrimitiveField { return result.repeatedPrimitiveFieldArray; } -- (int32_t)repeatedPrimitiveFieldAtIndex:(NSUInteger)index { +- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index { return [result repeatedPrimitiveFieldAtIndex:index]; } -- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(int32_t)value { +- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(NSInteger)value { if (result.repeatedPrimitiveFieldArray == nil) { result.repeatedPrimitiveFieldArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -13046,7 +13046,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldArray:(NSArray *)a result.repeatedPrimitiveFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const int32_t *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const NSInteger *)values count:(NSUInteger)count { result.repeatedPrimitiveFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -13258,8 +13258,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -13432,7 +13432,7 @@ - (TestFieldOrderings_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestFieldOrderings_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -13511,9 +13511,9 @@ - (TestFieldOrderings_Builder*) clearMyFloat { @interface TestExtremeDefaultValues () @property (retain) NSData* escapedBytes; -@property uint32_t largeUint32; +@property uNSInteger largeUint32; @property uint64_t largeUint64; -@property int32_t smallInt32; +@property NSInteger smallInt32; @property int64_t smallInt64; @property (retain) NSString* utf8String; @property Float32 zeroFloat; @@ -13783,8 +13783,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -14196,7 +14196,7 @@ - (TestExtremeDefaultValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestExtremeDefaultValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -14310,10 +14310,10 @@ - (TestExtremeDefaultValues_Builder*) clearEscapedBytes { - (BOOL) hasLargeUint32 { return result.hasLargeUint32; } -- (uint32_t) largeUint32 { +- (uNSInteger) largeUint32 { return result.largeUint32; } -- (TestExtremeDefaultValues_Builder*) setLargeUint32:(uint32_t) value { +- (TestExtremeDefaultValues_Builder*) setLargeUint32:(uNSInteger) value { result.hasLargeUint32 = YES; result.largeUint32 = value; return self; @@ -14342,10 +14342,10 @@ - (TestExtremeDefaultValues_Builder*) clearLargeUint64 { - (BOOL) hasSmallInt32 { return result.hasSmallInt32; } -- (int32_t) smallInt32 { +- (NSInteger) smallInt32 { return result.smallInt32; } -- (TestExtremeDefaultValues_Builder*) setSmallInt32:(int32_t) value { +- (TestExtremeDefaultValues_Builder*) setSmallInt32:(NSInteger) value { result.hasSmallInt32 = YES; result.smallInt32 = value; return self; @@ -14656,8 +14656,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -14784,7 +14784,7 @@ - (SparseEnumMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (SparseEnumMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -14797,7 +14797,7 @@ - (SparseEnumMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i break; } case 8: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestSparseEnumIsValidValue(value)) { [self setSparseEnum:value]; } else { @@ -14870,8 +14870,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -14998,7 +14998,7 @@ - (OneString_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (OneString_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -15079,8 +15079,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -15207,7 +15207,7 @@ - (OneBytes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (OneBytes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -15328,7 +15328,7 @@ - (TestPackedTypes*) defaultInstance { - (PBArray *)packedInt32 { return packedInt32Array; } -- (int32_t)packedInt32AtIndex:(NSUInteger)index { +- (NSInteger)packedInt32AtIndex:(NSUInteger)index { return [packedInt32Array int32AtIndex:index]; } - (PBArray *)packedInt64 { @@ -15340,7 +15340,7 @@ - (int64_t)packedInt64AtIndex:(NSUInteger)index { - (PBArray *)packedUint32 { return packedUint32Array; } -- (uint32_t)packedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { return [packedUint32Array uint32AtIndex:index]; } - (PBArray *)packedUint64 { @@ -15352,7 +15352,7 @@ - (uint64_t)packedUint64AtIndex:(NSUInteger)index { - (PBArray *)packedSint32 { return packedSint32Array; } -- (int32_t)packedSint32AtIndex:(NSUInteger)index { +- (NSInteger)packedSint32AtIndex:(NSUInteger)index { return [packedSint32Array int32AtIndex:index]; } - (PBArray *)packedSint64 { @@ -15364,7 +15364,7 @@ - (int64_t)packedSint64AtIndex:(NSUInteger)index { - (PBArray *)packedFixed32 { return packedFixed32Array; } -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { return [packedFixed32Array uint32AtIndex:index]; } - (PBArray *)packedFixed64 { @@ -15376,7 +15376,7 @@ - (uint64_t)packedFixed64AtIndex:(NSUInteger)index { - (PBArray *)packedSfixed32 { return packedSfixed32Array; } -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { return [packedSfixed32Array int32AtIndex:index]; } - (PBArray *)packedSfixed64 { @@ -15415,7 +15415,7 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { const NSUInteger packedInt32ArrayCount = self.packedInt32Array.count; if (packedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; [output writeRawVarint32:722]; [output writeRawVarint32:packedInt32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedInt32ArrayCount; ++i) { @@ -15433,7 +15433,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedUint32ArrayCount = self.packedUint32Array.count; if (packedUint32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.packedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; [output writeRawVarint32:738]; [output writeRawVarint32:packedUint32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedUint32ArrayCount; ++i) { @@ -15451,7 +15451,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedSint32ArrayCount = self.packedSint32Array.count; if (packedSint32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; [output writeRawVarint32:754]; [output writeRawVarint32:packedSint32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedSint32ArrayCount; ++i) { @@ -15469,7 +15469,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedFixed32ArrayCount = self.packedFixed32Array.count; if (packedFixed32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.packedFixed32Array.data; + const uNSInteger *values = (const uNSInteger *)self.packedFixed32Array.data; [output writeRawVarint32:770]; [output writeRawVarint32:packedFixed32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedFixed32ArrayCount; ++i) { @@ -15487,7 +15487,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedSfixed32ArrayCount = self.packedSfixed32Array.count; if (packedSfixed32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedSfixed32Array.data; + const NSInteger *values = (const NSInteger *)self.packedSfixed32Array.data; [output writeRawVarint32:786]; [output writeRawVarint32:packedSfixed32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedSfixed32ArrayCount; ++i) { @@ -15541,17 +15541,17 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedInt32Array.count; - const int32_t *values = (const int32_t *)self.packedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -15563,7 +15563,7 @@ - (int32_t) serializedSize { packedInt32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedInt64Array.count; const int64_t *values = (const int64_t *)self.packedInt64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -15577,9 +15577,9 @@ - (int32_t) serializedSize { packedInt64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedUint32Array.count; - const uint32_t *values = (const uint32_t *)self.packedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -15591,7 +15591,7 @@ - (int32_t) serializedSize { packedUint32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedUint64Array.count; const uint64_t *values = (const uint64_t *)self.packedUint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -15605,9 +15605,9 @@ - (int32_t) serializedSize { packedUint64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSint32Array.count; - const int32_t *values = (const int32_t *)self.packedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } @@ -15619,7 +15619,7 @@ - (int32_t) serializedSize { packedSint32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSint64Array.count; const int64_t *values = (const int64_t *)self.packedSint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -15633,7 +15633,7 @@ - (int32_t) serializedSize { packedSint64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedFixed32Array.count; dataSize = 4 * count; size += dataSize; @@ -15644,7 +15644,7 @@ - (int32_t) serializedSize { packedFixed32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedFixed64Array.count; dataSize = 8 * count; size += dataSize; @@ -15655,7 +15655,7 @@ - (int32_t) serializedSize { packedFixed64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSfixed32Array.count; dataSize = 4 * count; size += dataSize; @@ -15666,7 +15666,7 @@ - (int32_t) serializedSize { packedSfixed32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSfixed64Array.count; dataSize = 8 * count; size += dataSize; @@ -15677,7 +15677,7 @@ - (int32_t) serializedSize { packedSfixed64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedFloatArray.count; dataSize = 4 * count; size += dataSize; @@ -15688,7 +15688,7 @@ - (int32_t) serializedSize { packedFloatMemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedDoubleArray.count; dataSize = 8 * count; size += dataSize; @@ -15699,7 +15699,7 @@ - (int32_t) serializedSize { packedDoubleMemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedBoolArray.count; dataSize = 1 * count; size += dataSize; @@ -15710,7 +15710,7 @@ - (int32_t) serializedSize { packedBoolMemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedEnumArray.count; const ForeignEnum *values = (const ForeignEnum *)self.packedEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -16039,7 +16039,7 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -16052,8 +16052,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 722: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16064,8 +16064,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 730: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedInt64Array == nil) { result.packedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16076,8 +16076,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 738: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16088,8 +16088,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 746: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16100,8 +16100,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 754: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16112,8 +16112,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 762: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSint64Array == nil) { result.packedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16124,8 +16124,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 770: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16136,8 +16136,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 778: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16148,8 +16148,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 786: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16160,8 +16160,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 794: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSfixed64Array == nil) { result.packedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16172,8 +16172,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 802: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedFloatArray == nil) { result.packedFloatArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeFloat]; } @@ -16184,8 +16184,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 810: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedDoubleArray == nil) { result.packedDoubleArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeDouble]; } @@ -16196,8 +16196,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 818: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedBoolArray == nil) { result.packedBoolArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeBool]; } @@ -16208,10 +16208,10 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 826: { - int32_t length = [input readRawVarint32]; - int32_t oldLimit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger oldLimit = [input pushLimit:length]; while (input.bytesUntilLimit > 0) { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addPackedEnum:value]; } else { @@ -16227,10 +16227,10 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp - (PBAppendableArray *)packedInt32 { return result.packedInt32Array; } -- (int32_t)packedInt32AtIndex:(NSUInteger)index { +- (NSInteger)packedInt32AtIndex:(NSUInteger)index { return [result packedInt32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedInt32:(int32_t)value { +- (TestPackedTypes_Builder *)addPackedInt32:(NSInteger)value { if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16241,7 +16241,7 @@ - (TestPackedTypes_Builder *)setPackedInt32Array:(NSArray *)array { result.packedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.packedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16277,10 +16277,10 @@ - (TestPackedTypes_Builder *)clearPackedInt64 { - (PBAppendableArray *)packedUint32 { return result.packedUint32Array; } -- (uint32_t)packedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { return [result packedUint32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedUint32:(uint32_t)value { +- (TestPackedTypes_Builder *)addPackedUint32:(uNSInteger)value { if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16291,7 +16291,7 @@ - (TestPackedTypes_Builder *)setPackedUint32Array:(NSArray *)array { result.packedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedUint32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { result.packedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -16327,10 +16327,10 @@ - (TestPackedTypes_Builder *)clearPackedUint64 { - (PBAppendableArray *)packedSint32 { return result.packedSint32Array; } -- (int32_t)packedSint32AtIndex:(NSUInteger)index { +- (NSInteger)packedSint32AtIndex:(NSUInteger)index { return [result packedSint32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedSint32:(int32_t)value { +- (TestPackedTypes_Builder *)addPackedSint32:(NSInteger)value { if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16341,7 +16341,7 @@ - (TestPackedTypes_Builder *)setPackedSint32Array:(NSArray *)array { result.packedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedSint32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count { result.packedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16377,10 +16377,10 @@ - (TestPackedTypes_Builder *)clearPackedSint64 { - (PBAppendableArray *)packedFixed32 { return result.packedFixed32Array; } -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { return [result packedFixed32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedFixed32:(uint32_t)value { +- (TestPackedTypes_Builder *)addPackedFixed32:(uNSInteger)value { if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16391,7 +16391,7 @@ - (TestPackedTypes_Builder *)setPackedFixed32Array:(NSArray *)array { result.packedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedFixed32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { result.packedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -16427,10 +16427,10 @@ - (TestPackedTypes_Builder *)clearPackedFixed64 { - (PBAppendableArray *)packedSfixed32 { return result.packedSfixed32Array; } -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { return [result packedSfixed32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedSfixed32:(int32_t)value { +- (TestPackedTypes_Builder *)addPackedSfixed32:(NSInteger)value { if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16441,7 +16441,7 @@ - (TestPackedTypes_Builder *)setPackedSfixed32Array:(NSArray *)array { result.packedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { result.packedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16660,7 +16660,7 @@ - (TestUnpackedTypes*) defaultInstance { - (PBArray *)unpackedInt32 { return unpackedInt32Array; } -- (int32_t)unpackedInt32AtIndex:(NSUInteger)index { +- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index { return [unpackedInt32Array int32AtIndex:index]; } - (PBArray *)unpackedInt64 { @@ -16672,7 +16672,7 @@ - (int64_t)unpackedInt64AtIndex:(NSUInteger)index { - (PBArray *)unpackedUint32 { return unpackedUint32Array; } -- (uint32_t)unpackedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index { return [unpackedUint32Array uint32AtIndex:index]; } - (PBArray *)unpackedUint64 { @@ -16684,7 +16684,7 @@ - (uint64_t)unpackedUint64AtIndex:(NSUInteger)index { - (PBArray *)unpackedSint32 { return unpackedSint32Array; } -- (int32_t)unpackedSint32AtIndex:(NSUInteger)index { +- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index { return [unpackedSint32Array int32AtIndex:index]; } - (PBArray *)unpackedSint64 { @@ -16696,7 +16696,7 @@ - (int64_t)unpackedSint64AtIndex:(NSUInteger)index { - (PBArray *)unpackedFixed32 { return unpackedFixed32Array; } -- (uint32_t)unpackedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index { return [unpackedFixed32Array uint32AtIndex:index]; } - (PBArray *)unpackedFixed64 { @@ -16708,7 +16708,7 @@ - (uint64_t)unpackedFixed64AtIndex:(NSUInteger)index { - (PBArray *)unpackedSfixed32 { return unpackedSfixed32Array; } -- (int32_t)unpackedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index { return [unpackedSfixed32Array int32AtIndex:index]; } - (PBArray *)unpackedSfixed64 { @@ -16747,7 +16747,7 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { const NSUInteger unpackedInt32ArrayCount = self.unpackedInt32Array.count; if (unpackedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.unpackedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.unpackedInt32Array.data; for (NSUInteger i = 0; i < unpackedInt32ArrayCount; ++i) { [output writeInt32:90 value:values[i]]; } @@ -16761,7 +16761,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger unpackedUint32ArrayCount = self.unpackedUint32Array.count; if (unpackedUint32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.unpackedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.unpackedUint32Array.data; for (NSUInteger i = 0; i < unpackedUint32ArrayCount; ++i) { [output writeUInt32:92 value:values[i]]; } @@ -16775,7 +16775,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger unpackedSint32ArrayCount = self.unpackedSint32Array.count; if (unpackedSint32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.unpackedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.unpackedSint32Array.data; for (NSUInteger i = 0; i < unpackedSint32ArrayCount; ++i) { [output writeSInt32:94 value:values[i]]; } @@ -16789,7 +16789,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger unpackedFixed32ArrayCount = self.unpackedFixed32Array.count; if (unpackedFixed32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.unpackedFixed32Array.data; + const uNSInteger *values = (const uNSInteger *)self.unpackedFixed32Array.data; for (NSUInteger i = 0; i < unpackedFixed32ArrayCount; ++i) { [output writeFixed32:96 value:values[i]]; } @@ -16803,7 +16803,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger unpackedSfixed32ArrayCount = self.unpackedSfixed32Array.count; if (unpackedSfixed32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.unpackedSfixed32Array.data; + const NSInteger *values = (const NSInteger *)self.unpackedSfixed32Array.data; for (NSUInteger i = 0; i < unpackedSfixed32ArrayCount; ++i) { [output writeSFixed32:98 value:values[i]]; } @@ -16843,17 +16843,17 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedInt32Array.count; - const int32_t *values = (const int32_t *)self.unpackedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.unpackedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -16861,7 +16861,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedInt64Array.count; const int64_t *values = (const int64_t *)self.unpackedInt64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -16871,9 +16871,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedUint32Array.count; - const uint32_t *values = (const uint32_t *)self.unpackedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.unpackedUint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -16881,7 +16881,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedUint64Array.count; const uint64_t *values = (const uint64_t *)self.unpackedUint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -16891,9 +16891,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedSint32Array.count; - const int32_t *values = (const int32_t *)self.unpackedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.unpackedSint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } @@ -16901,7 +16901,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedSint64Array.count; const int64_t *values = (const int64_t *)self.unpackedSint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -16911,56 +16911,56 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedSfixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedSfixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedDoubleArray.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedBoolArray.count; dataSize = 1 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.unpackedEnumArray.count; const ForeignEnum *values = (const ForeignEnum *)self.unpackedEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -17285,7 +17285,7 @@ - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -17350,7 +17350,7 @@ - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i break; } case 824: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addUnpackedEnum:value]; } else { @@ -17364,10 +17364,10 @@ - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (PBAppendableArray *)unpackedInt32 { return result.unpackedInt32Array; } -- (int32_t)unpackedInt32AtIndex:(NSUInteger)index { +- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index { return [result unpackedInt32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedInt32:(int32_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedInt32:(NSInteger)value { if (result.unpackedInt32Array == nil) { result.unpackedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -17378,7 +17378,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedInt32Array:(NSArray *)array { result.unpackedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.unpackedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17414,10 +17414,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedInt64 { - (PBAppendableArray *)unpackedUint32 { return result.unpackedUint32Array; } -- (uint32_t)unpackedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index { return [result unpackedUint32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedUint32:(uint32_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedUint32:(uNSInteger)value { if (result.unpackedUint32Array == nil) { result.unpackedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -17428,7 +17428,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedUint32Array:(NSArray *)array { result.unpackedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { result.unpackedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -17464,10 +17464,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedUint64 { - (PBAppendableArray *)unpackedSint32 { return result.unpackedSint32Array; } -- (int32_t)unpackedSint32AtIndex:(NSUInteger)index { +- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index { return [result unpackedSint32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedSint32:(int32_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedSint32:(NSInteger)value { if (result.unpackedSint32Array == nil) { result.unpackedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -17478,7 +17478,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedSint32Array:(NSArray *)array { result.unpackedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const NSInteger *)values count:(NSUInteger)count { result.unpackedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17514,10 +17514,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedSint64 { - (PBAppendableArray *)unpackedFixed32 { return result.unpackedFixed32Array; } -- (uint32_t)unpackedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index { return [result unpackedFixed32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(uint32_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(uNSInteger)value { if (result.unpackedFixed32Array == nil) { result.unpackedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -17528,7 +17528,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedFixed32Array:(NSArray *)array { result.unpackedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { result.unpackedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -17564,10 +17564,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedFixed64 { - (PBAppendableArray *)unpackedSfixed32 { return result.unpackedSfixed32Array; } -- (int32_t)unpackedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index { return [result unpackedSfixed32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(int32_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(NSInteger)value { if (result.unpackedSfixed32Array == nil) { result.unpackedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -17578,7 +17578,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedSfixed32Array:(NSArray *)array { result.unpackedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { result.unpackedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17750,8 +17750,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -17872,7 +17872,7 @@ - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -17890,7 +17890,7 @@ - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* @end @interface TestDynamicExtensions () -@property uint32_t scalarExtension; +@property uNSInteger scalarExtension; @property ForeignEnum enumExtension; @property TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; @property (retain) ForeignMessage* messageExtension; @@ -17978,7 +17978,7 @@ - (NSString*)repeatedExtensionAtIndex:(NSUInteger)index { - (PBArray *)packedExtension { return packedExtensionArray; } -- (int32_t)packedExtensionAtIndex:(NSUInteger)index { +- (NSInteger)packedExtensionAtIndex:(NSUInteger)index { return [packedExtensionArray int32AtIndex:index]; } - (BOOL) isInitialized { @@ -18009,7 +18009,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedExtensionArrayCount = self.packedExtensionArray.count; if (packedExtensionArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedExtensionArray.data; + const NSInteger *values = (const NSInteger *)self.packedExtensionArray.data; [output writeRawVarint32:16050]; [output writeRawVarint32:packedExtensionMemoizedSerializedSize]; for (NSUInteger i = 0; i < packedExtensionArrayCount; ++i) { @@ -18018,8 +18018,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -18041,7 +18041,7 @@ - (int32_t) serializedSize { size += computeMessageSize(2004, self.dynamicMessageExtension); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedExtensionArray.count; const NSString* *values = (const NSString* *)self.repeatedExtensionArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -18051,9 +18051,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedExtensionArray.count; - const int32_t *values = (const int32_t *)self.packedExtensionArray.data; + const NSInteger *values = (const NSInteger *)self.packedExtensionArray.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } @@ -18197,7 +18197,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn } } @interface TestDynamicExtensions_DynamicMessageType () -@property int32_t dynamicField; +@property NSInteger dynamicField; @end @implementation TestDynamicExtensions_DynamicMessageType @@ -18239,8 +18239,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -18367,7 +18367,7 @@ - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream: - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -18389,10 +18389,10 @@ - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream: - (BOOL) hasDynamicField { return result.hasDynamicField; } -- (int32_t) dynamicField { +- (NSInteger) dynamicField { return result.dynamicField; } -- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(int32_t) value { +- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(NSInteger) value { result.hasDynamicField = YES; result.dynamicField = value; return self; @@ -18484,7 +18484,7 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -18501,7 +18501,7 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 16008: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setEnumExtension:value]; } else { @@ -18510,7 +18510,7 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 16016: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestDynamicExtensions_DynamicEnumTypeIsValidValue(value)) { [self setDynamicEnumExtension:value]; } else { @@ -18541,8 +18541,8 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 16050: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedExtensionArray == nil) { result.packedExtensionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -18558,10 +18558,10 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (BOOL) hasScalarExtension { return result.hasScalarExtension; } -- (uint32_t) scalarExtension { +- (uNSInteger) scalarExtension { return result.scalarExtension; } -- (TestDynamicExtensions_Builder*) setScalarExtension:(uint32_t) value { +- (TestDynamicExtensions_Builder*) setScalarExtension:(uNSInteger) value { result.hasScalarExtension = YES; result.scalarExtension = value; return self; @@ -18691,10 +18691,10 @@ - (TestDynamicExtensions_Builder *)clearRepeatedExtension { - (PBAppendableArray *)packedExtension { return result.packedExtensionArray; } -- (int32_t)packedExtensionAtIndex:(NSUInteger)index { +- (NSInteger)packedExtensionAtIndex:(NSUInteger)index { return [result packedExtensionAtIndex:index]; } -- (TestDynamicExtensions_Builder *)addPackedExtension:(int32_t)value { +- (TestDynamicExtensions_Builder *)addPackedExtension:(NSInteger)value { if (result.packedExtensionArray == nil) { result.packedExtensionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -18705,7 +18705,7 @@ - (TestDynamicExtensions_Builder *)setPackedExtensionArray:(NSArray *)array { result.packedExtensionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const int32_t *)values count:(NSUInteger)count { +- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const NSInteger *)values count:(NSUInteger)count { result.packedExtensionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -18767,13 +18767,13 @@ - (TestRepeatedScalarDifferentTagSizes*) defaultInstance { - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedInt32 { return repeatedInt32Array; } -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { return [repeatedInt32Array int32AtIndex:index]; } - (PBArray *)repeatedFixed64 { @@ -18806,14 +18806,14 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { const NSUInteger repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.repeatedFixed32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedFixed32Array.data; for (NSUInteger i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:12 value:values[i]]; } } const NSUInteger repeatedInt32ArrayCount = self.repeatedInt32Array.count; if (repeatedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; for (NSUInteger i = 0; i < repeatedInt32ArrayCount; ++i) { [output writeInt32:13 value:values[i]]; } @@ -18848,24 +18848,24 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 1 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedInt32Array.count; - const int32_t *values = (const int32_t *)self.repeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -18873,14 +18873,14 @@ - (int32_t) serializedSize { size += 1 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedInt64Array.count; const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -18890,14 +18890,14 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 3 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedUint64Array.count; const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -19102,7 +19102,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCo - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19144,10 +19144,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCo - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { return [result repeatedFixed32AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(uint32_t)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(uNSInteger)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -19158,7 +19158,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Array:(NSArra result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -19169,10 +19169,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFixed32 { - (PBAppendableArray *)repeatedInt32 { return result.repeatedInt32Array; } -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { return [result repeatedInt32AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(int32_t)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(NSInteger)value { if (result.repeatedInt32Array == nil) { result.repeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -19183,7 +19183,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Array:(NSArray result.repeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -19324,8 +19324,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19437,7 +19437,7 @@ - (FooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (FooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19485,8 +19485,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19598,7 +19598,7 @@ - (FooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (FooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19646,8 +19646,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19759,7 +19759,7 @@ - (BarRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (BarRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19807,8 +19807,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19920,7 +19920,7 @@ - (BarResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (BarResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestCustomOptions.pb.h b/src/runtime/Tests/UnittestCustomOptions.pb.h index 4dc65ef..d00709a 100644 --- a/src/runtime/Tests/UnittestCustomOptions.pb.h +++ b/src/runtime/Tests/UnittestCustomOptions.pb.h @@ -586,16 +586,16 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE BOOL hasFoo_:1; BOOL hasFoo2_:1; BOOL hasFoo3_:1; - int32_t foo; - int32_t foo2; - int32_t foo3; + NSInteger foo; + NSInteger foo2; + NSInteger foo3; } - (BOOL) hasFoo; - (BOOL) hasFoo2; - (BOOL) hasFoo3; -@property (readonly) int32_t foo; -@property (readonly) int32_t foo2; -@property (readonly) int32_t foo3; +@property (readonly) NSInteger foo; +@property (readonly) NSInteger foo2; +@property (readonly) NSInteger foo3; + (ComplexOptionType1*) defaultInstance; - (ComplexOptionType1*) defaultInstance; @@ -633,18 +633,18 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasFoo; -- (int32_t) foo; -- (ComplexOptionType1_Builder*) setFoo:(int32_t) value; +- (NSInteger) foo; +- (ComplexOptionType1_Builder*) setFoo:(NSInteger) value; - (ComplexOptionType1_Builder*) clearFoo; - (BOOL) hasFoo2; -- (int32_t) foo2; -- (ComplexOptionType1_Builder*) setFoo2:(int32_t) value; +- (NSInteger) foo2; +- (ComplexOptionType1_Builder*) setFoo2:(NSInteger) value; - (ComplexOptionType1_Builder*) clearFoo2; - (BOOL) hasFoo3; -- (int32_t) foo3; -- (ComplexOptionType1_Builder*) setFoo3:(int32_t) value; +- (NSInteger) foo3; +- (ComplexOptionType1_Builder*) setFoo3:(NSInteger) value; - (ComplexOptionType1_Builder*) clearFoo3; @end @@ -653,7 +653,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE BOOL hasBaz_:1; BOOL hasBar_:1; BOOL hasFred_:1; - int32_t baz; + NSInteger baz; ComplexOptionType1* bar; ComplexOptionType2_ComplexOptionType4* fred; } @@ -661,7 +661,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (BOOL) hasBaz; - (BOOL) hasFred; @property (readonly, retain) ComplexOptionType1* bar; -@property (readonly) int32_t baz; +@property (readonly) NSInteger baz; @property (readonly, retain) ComplexOptionType2_ComplexOptionType4* fred; + (ComplexOptionType2*) defaultInstance; @@ -685,10 +685,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface ComplexOptionType2_ComplexOptionType4 : PBGeneratedMessage { @private BOOL hasWaldo_:1; - int32_t waldo; + NSInteger waldo; } - (BOOL) hasWaldo; -@property (readonly) int32_t waldo; +@property (readonly) NSInteger waldo; + (ComplexOptionType2_ComplexOptionType4*) defaultInstance; - (ComplexOptionType2_ComplexOptionType4*) defaultInstance; @@ -727,8 +727,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasWaldo; -- (int32_t) waldo; -- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(int32_t) value; +- (NSInteger) waldo; +- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(NSInteger) value; - (ComplexOptionType2_ComplexOptionType4_Builder*) clearWaldo; @end @@ -757,8 +757,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType2_Builder*) clearBar; - (BOOL) hasBaz; -- (int32_t) baz; -- (ComplexOptionType2_Builder*) setBaz:(int32_t) value; +- (NSInteger) baz; +- (ComplexOptionType2_Builder*) setBaz:(NSInteger) value; - (ComplexOptionType2_Builder*) clearBaz; - (BOOL) hasFred; @@ -773,12 +773,12 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @private BOOL hasQux_:1; BOOL hasComplexOptionType5_:1; - int32_t qux; + NSInteger qux; ComplexOptionType3_ComplexOptionType5* complexOptionType5; } - (BOOL) hasQux; - (BOOL) hasComplexOptionType5; -@property (readonly) int32_t qux; +@property (readonly) NSInteger qux; @property (readonly, retain) ComplexOptionType3_ComplexOptionType5* complexOptionType5; + (ComplexOptionType3*) defaultInstance; @@ -802,10 +802,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface ComplexOptionType3_ComplexOptionType5 : PBGeneratedMessage { @private BOOL hasPlugh_:1; - int32_t plugh; + NSInteger plugh; } - (BOOL) hasPlugh; -@property (readonly) int32_t plugh; +@property (readonly) NSInteger plugh; + (ComplexOptionType3_ComplexOptionType5*) defaultInstance; - (ComplexOptionType3_ComplexOptionType5*) defaultInstance; @@ -843,8 +843,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasPlugh; -- (int32_t) plugh; -- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(int32_t) value; +- (NSInteger) plugh; +- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(NSInteger) value; - (ComplexOptionType3_ComplexOptionType5_Builder*) clearPlugh; @end @@ -866,8 +866,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasQux; -- (int32_t) qux; -- (ComplexOptionType3_Builder*) setQux:(int32_t) value; +- (NSInteger) qux; +- (ComplexOptionType3_Builder*) setQux:(NSInteger) value; - (ComplexOptionType3_Builder*) clearQux; - (BOOL) hasComplexOptionType5; @@ -881,10 +881,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface ComplexOpt6 : PBGeneratedMessage { @private BOOL hasXyzzy_:1; - int32_t xyzzy; + NSInteger xyzzy; } - (BOOL) hasXyzzy; -@property (readonly) int32_t xyzzy; +@property (readonly) NSInteger xyzzy; + (ComplexOpt6*) defaultInstance; - (ComplexOpt6*) defaultInstance; @@ -922,8 +922,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasXyzzy; -- (int32_t) xyzzy; -- (ComplexOpt6_Builder*) setXyzzy:(int32_t) value; +- (NSInteger) xyzzy; +- (ComplexOpt6_Builder*) setXyzzy:(NSInteger) value; - (ComplexOpt6_Builder*) clearXyzzy; @end @@ -1064,7 +1064,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE BOOL hasSub_:1; BOOL hasFile_:1; BOOL hasMset_:1; - int32_t i; + NSInteger i; NSString* s; Aggregate* sub; PBFileOptions* file; @@ -1075,7 +1075,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (BOOL) hasSub; - (BOOL) hasFile; - (BOOL) hasMset; -@property (readonly) int32_t i; +@property (readonly) NSInteger i; @property (readonly, retain) NSString* s; @property (readonly, retain) Aggregate* sub; @property (readonly, retain) PBFileOptions* file; @@ -1118,8 +1118,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasI; -- (int32_t) i; -- (Aggregate_Builder*) setI:(int32_t) value; +- (NSInteger) i; +- (Aggregate_Builder*) setI:(NSInteger) value; - (Aggregate_Builder*) clearI; - (BOOL) hasS; @@ -1152,10 +1152,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface AggregateMessage : PBGeneratedMessage { @private BOOL hasFieldname_:1; - int32_t fieldname; + NSInteger fieldname; } - (BOOL) hasFieldname; -@property (readonly) int32_t fieldname; +@property (readonly) NSInteger fieldname; + (AggregateMessage*) defaultInstance; - (AggregateMessage*) defaultInstance; @@ -1193,8 +1193,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasFieldname; -- (int32_t) fieldname; -- (AggregateMessage_Builder*) setFieldname:(int32_t) value; +- (NSInteger) fieldname; +- (AggregateMessage_Builder*) setFieldname:(NSInteger) value; - (AggregateMessage_Builder*) clearFieldname; @end diff --git a/src/runtime/Tests/UnittestCustomOptions.pb.m b/src/runtime/Tests/UnittestCustomOptions.pb.m index 6edf5dd..e287ba2 100644 --- a/src/runtime/Tests/UnittestCustomOptions.pb.m +++ b/src/runtime/Tests/UnittestCustomOptions.pb.m @@ -674,8 +674,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -811,7 +811,7 @@ - (TestMessageWithCustomOptions_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (TestMessageWithCustomOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -879,8 +879,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -992,7 +992,7 @@ - (CustomOptionFooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (CustomOptionFooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1040,8 +1040,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1153,7 +1153,7 @@ - (CustomOptionFooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (CustomOptionFooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1201,8 +1201,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1323,7 +1323,7 @@ - (DummyMessageContainingEnum_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (DummyMessageContainingEnum_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1371,8 +1371,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1484,7 +1484,7 @@ - (DummyMessageInvalidAsOptionType_Builder*) mergeFromCodedInputStream:(PBCodedI - (DummyMessageInvalidAsOptionType_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1532,8 +1532,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1645,7 +1645,7 @@ - (CustomOptionMinIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (CustomOptionMinIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1693,8 +1693,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1806,7 +1806,7 @@ - (CustomOptionMaxIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (CustomOptionMaxIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1854,8 +1854,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1967,7 +1967,7 @@ - (CustomOptionOtherValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (CustomOptionOtherValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2015,8 +2015,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2128,7 +2128,7 @@ - (SettingRealsFromPositiveInts_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (SettingRealsFromPositiveInts_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2176,8 +2176,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2289,7 +2289,7 @@ - (SettingRealsFromNegativeInts_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (SettingRealsFromNegativeInts_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2307,9 +2307,9 @@ - (SettingRealsFromNegativeInts_Builder*) mergeFromCodedInputStream:(PBCodedInpu @end @interface ComplexOptionType1 () -@property int32_t foo; -@property int32_t foo2; -@property int32_t foo3; +@property NSInteger foo; +@property NSInteger foo2; +@property NSInteger foo3; @end @implementation ComplexOptionType1 @@ -2379,8 +2379,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2546,7 +2546,7 @@ - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2576,10 +2576,10 @@ - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasFoo { return result.hasFoo; } -- (int32_t) foo { +- (NSInteger) foo { return result.foo; } -- (ComplexOptionType1_Builder*) setFoo:(int32_t) value { +- (ComplexOptionType1_Builder*) setFoo:(NSInteger) value { result.hasFoo = YES; result.foo = value; return self; @@ -2592,10 +2592,10 @@ - (ComplexOptionType1_Builder*) clearFoo { - (BOOL) hasFoo2 { return result.hasFoo2; } -- (int32_t) foo2 { +- (NSInteger) foo2 { return result.foo2; } -- (ComplexOptionType1_Builder*) setFoo2:(int32_t) value { +- (ComplexOptionType1_Builder*) setFoo2:(NSInteger) value { result.hasFoo2 = YES; result.foo2 = value; return self; @@ -2608,10 +2608,10 @@ - (ComplexOptionType1_Builder*) clearFoo2 { - (BOOL) hasFoo3 { return result.hasFoo3; } -- (int32_t) foo3 { +- (NSInteger) foo3 { return result.foo3; } -- (ComplexOptionType1_Builder*) setFoo3:(int32_t) value { +- (ComplexOptionType1_Builder*) setFoo3:(NSInteger) value { result.hasFoo3 = YES; result.foo3 = value; return self; @@ -2625,7 +2625,7 @@ - (ComplexOptionType1_Builder*) clearFoo3 { @interface ComplexOptionType2 () @property (retain) ComplexOptionType1* bar; -@property int32_t baz; +@property NSInteger baz; @property (retain) ComplexOptionType2_ComplexOptionType4* fred; @end @@ -2703,8 +2703,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2816,7 +2816,7 @@ - (NSUInteger) hash { @end @interface ComplexOptionType2_ComplexOptionType4 () -@property int32_t waldo; +@property NSInteger waldo; @end @implementation ComplexOptionType2_ComplexOptionType4 @@ -2861,8 +2861,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2989,7 +2989,7 @@ - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PB - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3011,10 +3011,10 @@ - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PB - (BOOL) hasWaldo { return result.hasWaldo; } -- (int32_t) waldo { +- (NSInteger) waldo { return result.waldo; } -- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(int32_t) value { +- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(NSInteger) value { result.hasWaldo = YES; result.waldo = value; return self; @@ -3087,7 +3087,7 @@ - (ComplexOptionType2_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ComplexOptionType2_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3157,10 +3157,10 @@ - (ComplexOptionType2_Builder*) clearBar { - (BOOL) hasBaz { return result.hasBaz; } -- (int32_t) baz { +- (NSInteger) baz { return result.baz; } -- (ComplexOptionType2_Builder*) setBaz:(int32_t) value { +- (ComplexOptionType2_Builder*) setBaz:(NSInteger) value { result.hasBaz = YES; result.baz = value; return self; @@ -3203,7 +3203,7 @@ - (ComplexOptionType2_Builder*) clearFred { @end @interface ComplexOptionType3 () -@property int32_t qux; +@property NSInteger qux; @property (retain) ComplexOptionType3_ComplexOptionType5* complexOptionType5; @end @@ -3258,8 +3258,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3348,7 +3348,7 @@ - (NSUInteger) hash { @end @interface ComplexOptionType3_ComplexOptionType5 () -@property int32_t plugh; +@property NSInteger plugh; @end @implementation ComplexOptionType3_ComplexOptionType5 @@ -3390,8 +3390,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3518,7 +3518,7 @@ - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PB - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3540,10 +3540,10 @@ - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PB - (BOOL) hasPlugh { return result.hasPlugh; } -- (int32_t) plugh { +- (NSInteger) plugh { return result.plugh; } -- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(int32_t) value { +- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(NSInteger) value { result.hasPlugh = YES; result.plugh = value; return self; @@ -3612,7 +3612,7 @@ - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3643,10 +3643,10 @@ - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasQux { return result.hasQux; } -- (int32_t) qux { +- (NSInteger) qux { return result.qux; } -- (ComplexOptionType3_Builder*) setQux:(int32_t) value { +- (ComplexOptionType3_Builder*) setQux:(NSInteger) value { result.hasQux = YES; result.qux = value; return self; @@ -3689,7 +3689,7 @@ - (ComplexOptionType3_Builder*) clearComplexOptionType5 { @end @interface ComplexOpt6 () -@property int32_t xyzzy; +@property NSInteger xyzzy; @end @implementation ComplexOpt6 @@ -3731,8 +3731,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3859,7 +3859,7 @@ - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3881,10 +3881,10 @@ - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input e - (BOOL) hasXyzzy { return result.hasXyzzy; } -- (int32_t) xyzzy { +- (NSInteger) xyzzy { return result.xyzzy; } -- (ComplexOpt6_Builder*) setXyzzy:(int32_t) value { +- (ComplexOpt6_Builder*) setXyzzy:(NSInteger) value { result.hasXyzzy = YES; result.xyzzy = value; return self; @@ -3927,8 +3927,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4040,7 +4040,7 @@ - (VariousComplexOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (VariousComplexOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4094,8 +4094,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeAsMessageSetTo:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4216,7 +4216,7 @@ - (AggregateMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (AggregateMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4280,8 +4280,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4408,7 +4408,7 @@ - (AggregateMessageSetElement_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (AggregateMessageSetElement_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4446,7 +4446,7 @@ - (AggregateMessageSetElement_Builder*) clearS { @end @interface Aggregate () -@property int32_t i; +@property NSInteger i; @property (retain) NSString* s; @property (retain) Aggregate* sub; @property (retain) PBFileOptions* file; @@ -4558,8 +4558,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4755,7 +4755,7 @@ - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4808,10 +4808,10 @@ - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input ext - (BOOL) hasI { return result.hasI; } -- (int32_t) i { +- (NSInteger) i { return result.i; } -- (Aggregate_Builder*) setI:(int32_t) value { +- (Aggregate_Builder*) setI:(NSInteger) value { result.hasI = YES; result.i = value; return self; @@ -4930,7 +4930,7 @@ - (Aggregate_Builder*) clearMset { @end @interface AggregateMessage () -@property int32_t fieldname; +@property NSInteger fieldname; @end @implementation AggregateMessage @@ -4972,8 +4972,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5100,7 +5100,7 @@ - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5122,10 +5122,10 @@ - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (BOOL) hasFieldname { return result.hasFieldname; } -- (int32_t) fieldname { +- (NSInteger) fieldname { return result.fieldname; } -- (AggregateMessage_Builder*) setFieldname:(int32_t) value { +- (AggregateMessage_Builder*) setFieldname:(NSInteger) value { result.hasFieldname = YES; result.fieldname = value; return self; diff --git a/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m b/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m index e7d8b7b..c97d4f2 100644 --- a/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m +++ b/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m @@ -87,8 +87,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -239,7 +239,7 @@ - (TestEmbedOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputSt - (TestEmbedOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestEnormousDescriptor.pb.m b/src/runtime/Tests/UnittestEnormousDescriptor.pb.m index 66d915c..7de8fbf 100644 --- a/src/runtime/Tests/UnittestEnormousDescriptor.pb.m +++ b/src/runtime/Tests/UnittestEnormousDescriptor.pb.m @@ -13050,8 +13050,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -28163,7 +28163,7 @@ - (TestEnormousDescriptor_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestEnormousDescriptor_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestImport.pb.h b/src/runtime/Tests/UnittestImport.pb.h index 87611aa..3287ab1 100644 --- a/src/runtime/Tests/UnittestImport.pb.h +++ b/src/runtime/Tests/UnittestImport.pb.h @@ -34,10 +34,10 @@ BOOL ImportEnumIsValidValue(ImportEnum value); @interface ImportMessage : PBGeneratedMessage { @private BOOL hasD_:1; - int32_t d; + NSInteger d; } - (BOOL) hasD; -@property (readonly) int32_t d; +@property (readonly) NSInteger d; + (ImportMessage*) defaultInstance; - (ImportMessage*) defaultInstance; @@ -75,8 +75,8 @@ BOOL ImportEnumIsValidValue(ImportEnum value); - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasD; -- (int32_t) d; -- (ImportMessage_Builder*) setD:(int32_t) value; +- (NSInteger) d; +- (ImportMessage_Builder*) setD:(NSInteger) value; - (ImportMessage_Builder*) clearD; @end diff --git a/src/runtime/Tests/UnittestImport.pb.m b/src/runtime/Tests/UnittestImport.pb.m index bf80c75..d5c6158 100644 --- a/src/runtime/Tests/UnittestImport.pb.m +++ b/src/runtime/Tests/UnittestImport.pb.m @@ -30,7 +30,7 @@ BOOL ImportEnumIsValidValue(ImportEnum value) { } } @interface ImportMessage () -@property int32_t d; +@property NSInteger d; @end @implementation ImportMessage @@ -72,8 +72,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -200,7 +200,7 @@ - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -222,10 +222,10 @@ - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (BOOL) hasD { return result.hasD; } -- (int32_t) d { +- (NSInteger) d { return result.d; } -- (ImportMessage_Builder*) setD:(int32_t) value { +- (ImportMessage_Builder*) setD:(NSInteger) value { result.hasD = YES; result.d = value; return self; diff --git a/src/runtime/Tests/UnittestImportLite.pb.h b/src/runtime/Tests/UnittestImportLite.pb.h index 62015fd..77467ce 100644 --- a/src/runtime/Tests/UnittestImportLite.pb.h +++ b/src/runtime/Tests/UnittestImportLite.pb.h @@ -34,10 +34,10 @@ BOOL ImportEnumLiteIsValidValue(ImportEnumLite value); @interface ImportMessageLite : PBGeneratedMessage { @private BOOL hasD_:1; - int32_t d; + NSInteger d; } - (BOOL) hasD; -@property (readonly) int32_t d; +@property (readonly) NSInteger d; + (ImportMessageLite*) defaultInstance; - (ImportMessageLite*) defaultInstance; @@ -75,8 +75,8 @@ BOOL ImportEnumLiteIsValidValue(ImportEnumLite value); - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasD; -- (int32_t) d; -- (ImportMessageLite_Builder*) setD:(int32_t) value; +- (NSInteger) d; +- (ImportMessageLite_Builder*) setD:(NSInteger) value; - (ImportMessageLite_Builder*) clearD; @end diff --git a/src/runtime/Tests/UnittestImportLite.pb.m b/src/runtime/Tests/UnittestImportLite.pb.m index baef073..3a2207c 100644 --- a/src/runtime/Tests/UnittestImportLite.pb.m +++ b/src/runtime/Tests/UnittestImportLite.pb.m @@ -30,7 +30,7 @@ BOOL ImportEnumLiteIsValidValue(ImportEnumLite value) { } } @interface ImportMessageLite () -@property int32_t d; +@property NSInteger d; @end @implementation ImportMessageLite @@ -72,8 +72,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -200,7 +200,7 @@ - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -222,10 +222,10 @@ - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (BOOL) hasD { return result.hasD; } -- (int32_t) d { +- (NSInteger) d { return result.d; } -- (ImportMessageLite_Builder*) setD:(int32_t) value { +- (ImportMessageLite_Builder*) setD:(NSInteger) value { result.hasD = YES; result.d = value; return self; diff --git a/src/runtime/Tests/UnittestLite.pb.h b/src/runtime/Tests/UnittestLite.pb.h index 6657342..4467007 100644 --- a/src/runtime/Tests/UnittestLite.pb.h +++ b/src/runtime/Tests/UnittestLite.pb.h @@ -203,12 +203,12 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); int64_t defaultInt64; uint64_t optionalUint64; uint64_t defaultUint64; - int32_t defaultInt32; - int32_t optionalInt32; + NSInteger defaultInt32; + NSInteger optionalInt32; uint64_t optionalFixed64; uint64_t defaultFixed64; - uint32_t optionalFixed32; - uint32_t defaultFixed32; + uNSInteger optionalFixed32; + uNSInteger defaultFixed32; NSString* defaultString; NSString* defaultStringPiece; NSString* defaultCord; @@ -221,20 +221,20 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); ImportMessageLite* optionalImportMessage; NSData* defaultBytes; NSData* optionalBytes; - uint32_t optionalUint32; - uint32_t defaultUint32; + uNSInteger optionalUint32; + uNSInteger defaultUint32; ImportEnumLite defaultImportEnum; ForeignEnumLite defaultForeignEnum; TestAllTypesLite_NestedEnum defaultNestedEnum; ImportEnumLite optionalImportEnum; ForeignEnumLite optionalForeignEnum; TestAllTypesLite_NestedEnum optionalNestedEnum; - int32_t defaultSfixed32; - int32_t optionalSfixed32; + NSInteger defaultSfixed32; + NSInteger optionalSfixed32; int64_t defaultSfixed64; int64_t optionalSfixed64; - int32_t defaultSint32; - int32_t optionalSint32; + NSInteger defaultSint32; + NSInteger optionalSint32; int64_t optionalSint64; int64_t defaultSint64; PBAppendableArray * repeatedBoolArray; @@ -306,15 +306,15 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (BOOL) hasDefaultImportEnum; - (BOOL) hasDefaultStringPiece; - (BOOL) hasDefaultCord; -@property (readonly) int32_t optionalInt32; +@property (readonly) NSInteger optionalInt32; @property (readonly) int64_t optionalInt64; -@property (readonly) uint32_t optionalUint32; +@property (readonly) uNSInteger optionalUint32; @property (readonly) uint64_t optionalUint64; -@property (readonly) int32_t optionalSint32; +@property (readonly) NSInteger optionalSint32; @property (readonly) int64_t optionalSint64; -@property (readonly) uint32_t optionalFixed32; +@property (readonly) uNSInteger optionalFixed32; @property (readonly) uint64_t optionalFixed64; -@property (readonly) int32_t optionalSfixed32; +@property (readonly) NSInteger optionalSfixed32; @property (readonly) int64_t optionalSfixed64; @property (readonly) Float32 optionalFloat; @property (readonly) Float64 optionalDouble; @@ -354,15 +354,15 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) PBArray * repeatedImportEnum; @property (readonly, retain) PBArray * repeatedStringPiece; @property (readonly, retain) PBArray * repeatedCord; -@property (readonly) int32_t defaultInt32; +@property (readonly) NSInteger defaultInt32; @property (readonly) int64_t defaultInt64; -@property (readonly) uint32_t defaultUint32; +@property (readonly) uNSInteger defaultUint32; @property (readonly) uint64_t defaultUint64; -@property (readonly) int32_t defaultSint32; +@property (readonly) NSInteger defaultSint32; @property (readonly) int64_t defaultSint64; -@property (readonly) uint32_t defaultFixed32; +@property (readonly) uNSInteger defaultFixed32; @property (readonly) uint64_t defaultFixed64; -@property (readonly) int32_t defaultSfixed32; +@property (readonly) NSInteger defaultSfixed32; @property (readonly) int64_t defaultSfixed64; @property (readonly) Float32 defaultFloat; @property (readonly) Float64 defaultDouble; @@ -374,15 +374,15 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly) ImportEnumLite defaultImportEnum; @property (readonly, retain) NSString* defaultStringPiece; @property (readonly, retain) NSString* defaultCord; -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; - (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index; +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; - (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; - (int64_t)repeatedSint64AtIndex:(NSUInteger)index; -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index; +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; - (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index; +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; - (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index; - (Float32)repeatedFloatAtIndex:(NSUInteger)index; - (Float64)repeatedDoubleAtIndex:(NSUInteger)index; @@ -420,10 +420,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface TestAllTypesLite_NestedMessage : PBGeneratedMessage { @private BOOL hasBb_:1; - int32_t bb; + NSInteger bb; } - (BOOL) hasBb; -@property (readonly) int32_t bb; +@property (readonly) NSInteger bb; + (TestAllTypesLite_NestedMessage*) defaultInstance; - (TestAllTypesLite_NestedMessage*) defaultInstance; @@ -461,18 +461,18 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBb; -- (int32_t) bb; -- (TestAllTypesLite_NestedMessage_Builder*) setBb:(int32_t) value; +- (NSInteger) bb; +- (TestAllTypesLite_NestedMessage_Builder*) setBb:(NSInteger) value; - (TestAllTypesLite_NestedMessage_Builder*) clearBb; @end @interface TestAllTypesLite_OptionalGroup : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestAllTypesLite_OptionalGroup*) defaultInstance; - (TestAllTypesLite_OptionalGroup*) defaultInstance; @@ -510,18 +510,18 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestAllTypesLite_OptionalGroup_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestAllTypesLite_OptionalGroup_Builder*) setA:(NSInteger) value; - (TestAllTypesLite_OptionalGroup_Builder*) clearA; @end @interface TestAllTypesLite_RepeatedGroup : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestAllTypesLite_RepeatedGroup*) defaultInstance; - (TestAllTypesLite_RepeatedGroup*) defaultInstance; @@ -559,8 +559,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(NSInteger) value; - (TestAllTypesLite_RepeatedGroup_Builder*) clearA; @end @@ -582,8 +582,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasOptionalInt32; -- (int32_t) optionalInt32; -- (TestAllTypesLite_Builder*) setOptionalInt32:(int32_t) value; +- (NSInteger) optionalInt32; +- (TestAllTypesLite_Builder*) setOptionalInt32:(NSInteger) value; - (TestAllTypesLite_Builder*) clearOptionalInt32; - (BOOL) hasOptionalInt64; @@ -592,8 +592,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalInt64; - (BOOL) hasOptionalUint32; -- (uint32_t) optionalUint32; -- (TestAllTypesLite_Builder*) setOptionalUint32:(uint32_t) value; +- (uNSInteger) optionalUint32; +- (TestAllTypesLite_Builder*) setOptionalUint32:(uNSInteger) value; - (TestAllTypesLite_Builder*) clearOptionalUint32; - (BOOL) hasOptionalUint64; @@ -602,8 +602,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalUint64; - (BOOL) hasOptionalSint32; -- (int32_t) optionalSint32; -- (TestAllTypesLite_Builder*) setOptionalSint32:(int32_t) value; +- (NSInteger) optionalSint32; +- (TestAllTypesLite_Builder*) setOptionalSint32:(NSInteger) value; - (TestAllTypesLite_Builder*) clearOptionalSint32; - (BOOL) hasOptionalSint64; @@ -612,8 +612,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalSint64; - (BOOL) hasOptionalFixed32; -- (uint32_t) optionalFixed32; -- (TestAllTypesLite_Builder*) setOptionalFixed32:(uint32_t) value; +- (uNSInteger) optionalFixed32; +- (TestAllTypesLite_Builder*) setOptionalFixed32:(uNSInteger) value; - (TestAllTypesLite_Builder*) clearOptionalFixed32; - (BOOL) hasOptionalFixed64; @@ -622,8 +622,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalFixed64; - (BOOL) hasOptionalSfixed32; -- (int32_t) optionalSfixed32; -- (TestAllTypesLite_Builder*) setOptionalSfixed32:(int32_t) value; +- (NSInteger) optionalSfixed32; +- (TestAllTypesLite_Builder*) setOptionalSfixed32:(NSInteger) value; - (TestAllTypesLite_Builder*) clearOptionalSfixed32; - (BOOL) hasOptionalSfixed64; @@ -710,10 +710,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalCord; - (PBAppendableArray *)repeatedInt32; -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedInt32:(int32_t)value; +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; +- (TestAllTypesLite_Builder *)addRepeatedInt32:(NSInteger)value; - (TestAllTypesLite_Builder *)setRepeatedInt32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestAllTypesLite_Builder *)clearRepeatedInt32; - (PBAppendableArray *)repeatedInt64; @@ -724,10 +724,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedInt64; - (PBAppendableArray *)repeatedUint32; -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedUint32:(uint32_t)value; +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; +- (TestAllTypesLite_Builder *)addRepeatedUint32:(uNSInteger)value; - (TestAllTypesLite_Builder *)setRepeatedUint32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestAllTypesLite_Builder *)clearRepeatedUint32; - (PBAppendableArray *)repeatedUint64; @@ -738,10 +738,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedUint64; - (PBAppendableArray *)repeatedSint32; -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedSint32:(int32_t)value; +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; +- (TestAllTypesLite_Builder *)addRepeatedSint32:(NSInteger)value; - (TestAllTypesLite_Builder *)setRepeatedSint32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestAllTypesLite_Builder *)clearRepeatedSint32; - (PBAppendableArray *)repeatedSint64; @@ -752,10 +752,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedSint64; - (PBAppendableArray *)repeatedFixed32; -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedFixed32:(uint32_t)value; +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; +- (TestAllTypesLite_Builder *)addRepeatedFixed32:(uNSInteger)value; - (TestAllTypesLite_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestAllTypesLite_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedFixed64; @@ -766,10 +766,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedFixed64; - (PBAppendableArray *)repeatedSfixed32; -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(int32_t)value; +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; +- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(NSInteger)value; - (TestAllTypesLite_Builder *)setRepeatedSfixed32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestAllTypesLite_Builder *)clearRepeatedSfixed32; - (PBAppendableArray *)repeatedSfixed64; @@ -878,8 +878,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedCord; - (BOOL) hasDefaultInt32; -- (int32_t) defaultInt32; -- (TestAllTypesLite_Builder*) setDefaultInt32:(int32_t) value; +- (NSInteger) defaultInt32; +- (TestAllTypesLite_Builder*) setDefaultInt32:(NSInteger) value; - (TestAllTypesLite_Builder*) clearDefaultInt32; - (BOOL) hasDefaultInt64; @@ -888,8 +888,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearDefaultInt64; - (BOOL) hasDefaultUint32; -- (uint32_t) defaultUint32; -- (TestAllTypesLite_Builder*) setDefaultUint32:(uint32_t) value; +- (uNSInteger) defaultUint32; +- (TestAllTypesLite_Builder*) setDefaultUint32:(uNSInteger) value; - (TestAllTypesLite_Builder*) clearDefaultUint32; - (BOOL) hasDefaultUint64; @@ -898,8 +898,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearDefaultUint64; - (BOOL) hasDefaultSint32; -- (int32_t) defaultSint32; -- (TestAllTypesLite_Builder*) setDefaultSint32:(int32_t) value; +- (NSInteger) defaultSint32; +- (TestAllTypesLite_Builder*) setDefaultSint32:(NSInteger) value; - (TestAllTypesLite_Builder*) clearDefaultSint32; - (BOOL) hasDefaultSint64; @@ -908,8 +908,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearDefaultSint64; - (BOOL) hasDefaultFixed32; -- (uint32_t) defaultFixed32; -- (TestAllTypesLite_Builder*) setDefaultFixed32:(uint32_t) value; +- (uNSInteger) defaultFixed32; +- (TestAllTypesLite_Builder*) setDefaultFixed32:(uNSInteger) value; - (TestAllTypesLite_Builder*) clearDefaultFixed32; - (BOOL) hasDefaultFixed64; @@ -918,8 +918,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearDefaultFixed64; - (BOOL) hasDefaultSfixed32; -- (int32_t) defaultSfixed32; -- (TestAllTypesLite_Builder*) setDefaultSfixed32:(int32_t) value; +- (NSInteger) defaultSfixed32; +- (TestAllTypesLite_Builder*) setDefaultSfixed32:(NSInteger) value; - (TestAllTypesLite_Builder*) clearDefaultSfixed32; - (BOOL) hasDefaultSfixed64; @@ -981,10 +981,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface ForeignMessageLite : PBGeneratedMessage { @private BOOL hasC_:1; - int32_t c; + NSInteger c; } - (BOOL) hasC; -@property (readonly) int32_t c; +@property (readonly) NSInteger c; + (ForeignMessageLite*) defaultInstance; - (ForeignMessageLite*) defaultInstance; @@ -1022,41 +1022,41 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasC; -- (int32_t) c; -- (ForeignMessageLite_Builder*) setC:(int32_t) value; +- (NSInteger) c; +- (ForeignMessageLite_Builder*) setC:(NSInteger) value; - (ForeignMessageLite_Builder*) clearC; @end @interface TestPackedTypesLite : PBGeneratedMessage { @private PBAppendableArray * packedBoolArray; - int32_t packedBoolMemoizedSerializedSize; + NSInteger packedBoolMemoizedSerializedSize; PBAppendableArray * packedDoubleArray; - int32_t packedDoubleMemoizedSerializedSize; + NSInteger packedDoubleMemoizedSerializedSize; PBAppendableArray * packedFloatArray; - int32_t packedFloatMemoizedSerializedSize; + NSInteger packedFloatMemoizedSerializedSize; PBAppendableArray * packedInt64Array; - int32_t packedInt64MemoizedSerializedSize; + NSInteger packedInt64MemoizedSerializedSize; PBAppendableArray * packedUint64Array; - int32_t packedUint64MemoizedSerializedSize; + NSInteger packedUint64MemoizedSerializedSize; PBAppendableArray * packedInt32Array; - int32_t packedInt32MemoizedSerializedSize; + NSInteger packedInt32MemoizedSerializedSize; PBAppendableArray * packedFixed64Array; - int32_t packedFixed64MemoizedSerializedSize; + NSInteger packedFixed64MemoizedSerializedSize; PBAppendableArray * packedFixed32Array; - int32_t packedFixed32MemoizedSerializedSize; + NSInteger packedFixed32MemoizedSerializedSize; PBAppendableArray * packedUint32Array; - int32_t packedUint32MemoizedSerializedSize; + NSInteger packedUint32MemoizedSerializedSize; PBAppendableArray * packedEnumArray; - int32_t packedEnumMemoizedSerializedSize; + NSInteger packedEnumMemoizedSerializedSize; PBAppendableArray * packedSfixed32Array; - int32_t packedSfixed32MemoizedSerializedSize; + NSInteger packedSfixed32MemoizedSerializedSize; PBAppendableArray * packedSfixed64Array; - int32_t packedSfixed64MemoizedSerializedSize; + NSInteger packedSfixed64MemoizedSerializedSize; PBAppendableArray * packedSint32Array; - int32_t packedSint32MemoizedSerializedSize; + NSInteger packedSint32MemoizedSerializedSize; PBAppendableArray * packedSint64Array; - int32_t packedSint64MemoizedSerializedSize; + NSInteger packedSint64MemoizedSerializedSize; } @property (readonly, retain) PBArray * packedInt32; @property (readonly, retain) PBArray * packedInt64; @@ -1072,15 +1072,15 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) PBArray * packedDouble; @property (readonly, retain) PBArray * packedBool; @property (readonly, retain) PBArray * packedEnum; -- (int32_t)packedInt32AtIndex:(NSUInteger)index; +- (NSInteger)packedInt32AtIndex:(NSUInteger)index; - (int64_t)packedInt64AtIndex:(NSUInteger)index; -- (uint32_t)packedUint32AtIndex:(NSUInteger)index; +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; - (uint64_t)packedUint64AtIndex:(NSUInteger)index; -- (int32_t)packedSint32AtIndex:(NSUInteger)index; +- (NSInteger)packedSint32AtIndex:(NSUInteger)index; - (int64_t)packedSint64AtIndex:(NSUInteger)index; -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index; +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; - (uint64_t)packedFixed64AtIndex:(NSUInteger)index; -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index; +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; - (int64_t)packedSfixed64AtIndex:(NSUInteger)index; - (Float32)packedFloatAtIndex:(NSUInteger)index; - (Float64)packedDoubleAtIndex:(NSUInteger)index; @@ -1123,10 +1123,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)packedInt32; -- (int32_t)packedInt32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedInt32:(int32_t)value; +- (NSInteger)packedInt32AtIndex:(NSUInteger)index; +- (TestPackedTypesLite_Builder *)addPackedInt32:(NSInteger)value; - (TestPackedTypesLite_Builder *)setPackedInt32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestPackedTypesLite_Builder *)clearPackedInt32; - (PBAppendableArray *)packedInt64; @@ -1137,10 +1137,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder *)clearPackedInt64; - (PBAppendableArray *)packedUint32; -- (uint32_t)packedUint32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedUint32:(uint32_t)value; +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; +- (TestPackedTypesLite_Builder *)addPackedUint32:(uNSInteger)value; - (TestPackedTypesLite_Builder *)setPackedUint32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestPackedTypesLite_Builder *)clearPackedUint32; - (PBAppendableArray *)packedUint64; @@ -1151,10 +1151,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder *)clearPackedUint64; - (PBAppendableArray *)packedSint32; -- (int32_t)packedSint32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedSint32:(int32_t)value; +- (NSInteger)packedSint32AtIndex:(NSUInteger)index; +- (TestPackedTypesLite_Builder *)addPackedSint32:(NSInteger)value; - (TestPackedTypesLite_Builder *)setPackedSint32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestPackedTypesLite_Builder *)clearPackedSint32; - (PBAppendableArray *)packedSint64; @@ -1165,10 +1165,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder *)clearPackedSint64; - (PBAppendableArray *)packedFixed32; -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedFixed32:(uint32_t)value; +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; +- (TestPackedTypesLite_Builder *)addPackedFixed32:(uNSInteger)value; - (TestPackedTypesLite_Builder *)setPackedFixed32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const uint32_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; - (TestPackedTypesLite_Builder *)clearPackedFixed32; - (PBAppendableArray *)packedFixed64; @@ -1179,10 +1179,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder *)clearPackedFixed64; - (PBAppendableArray *)packedSfixed32; -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedSfixed32:(int32_t)value; +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; +- (TestPackedTypesLite_Builder *)addPackedSfixed32:(NSInteger)value; - (TestPackedTypesLite_Builder *)setPackedSfixed32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const int32_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; - (TestPackedTypesLite_Builder *)clearPackedSfixed32; - (PBAppendableArray *)packedSfixed64; @@ -1264,10 +1264,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface OptionalGroup_extension_lite : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (OptionalGroup_extension_lite*) defaultInstance; - (OptionalGroup_extension_lite*) defaultInstance; @@ -1305,18 +1305,18 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (OptionalGroup_extension_lite_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (OptionalGroup_extension_lite_Builder*) setA:(NSInteger) value; - (OptionalGroup_extension_lite_Builder*) clearA; @end @interface RepeatedGroup_extension_lite : PBGeneratedMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (RepeatedGroup_extension_lite*) defaultInstance; - (RepeatedGroup_extension_lite*) defaultInstance; @@ -1354,8 +1354,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (RepeatedGroup_extension_lite_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (RepeatedGroup_extension_lite_Builder*) setA:(NSInteger) value; - (RepeatedGroup_extension_lite_Builder*) clearA; @end @@ -1443,10 +1443,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface TestDeprecatedLite : PBGeneratedMessage { @private BOOL hasDeprecatedField_:1; - int32_t deprecatedField; + NSInteger deprecatedField; } - (BOOL) hasDeprecatedField; -@property (readonly) int32_t deprecatedField; +@property (readonly) NSInteger deprecatedField; + (TestDeprecatedLite*) defaultInstance; - (TestDeprecatedLite*) defaultInstance; @@ -1484,8 +1484,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDeprecatedField; -- (int32_t) deprecatedField; -- (TestDeprecatedLite_Builder*) setDeprecatedField:(int32_t) value; +- (NSInteger) deprecatedField; +- (TestDeprecatedLite_Builder*) setDeprecatedField:(NSInteger) value; - (TestDeprecatedLite_Builder*) clearDeprecatedField; @end diff --git a/src/runtime/Tests/UnittestLite.pb.m b/src/runtime/Tests/UnittestLite.pb.m index 9a64c8c..f0e1134 100644 --- a/src/runtime/Tests/UnittestLite.pb.m +++ b/src/runtime/Tests/UnittestLite.pb.m @@ -1190,15 +1190,15 @@ BOOL ForeignEnumLiteIsValidValue(ForeignEnumLite value) { } } @interface TestAllTypesLite () -@property int32_t optionalInt32; +@property NSInteger optionalInt32; @property int64_t optionalInt64; -@property uint32_t optionalUint32; +@property uNSInteger optionalUint32; @property uint64_t optionalUint64; -@property int32_t optionalSint32; +@property NSInteger optionalSint32; @property int64_t optionalSint64; -@property uint32_t optionalFixed32; +@property uNSInteger optionalFixed32; @property uint64_t optionalFixed64; -@property int32_t optionalSfixed32; +@property NSInteger optionalSfixed32; @property int64_t optionalSfixed64; @property Float32 optionalFloat; @property Float64 optionalDouble; @@ -1238,15 +1238,15 @@ @interface TestAllTypesLite () @property (retain) PBAppendableArray * repeatedImportEnumArray; @property (retain) PBAppendableArray * repeatedStringPieceArray; @property (retain) PBAppendableArray * repeatedCordArray; -@property int32_t defaultInt32; +@property NSInteger defaultInt32; @property int64_t defaultInt64; -@property uint32_t defaultUint32; +@property uNSInteger defaultUint32; @property uint64_t defaultUint64; -@property int32_t defaultSint32; +@property NSInteger defaultSint32; @property int64_t defaultSint64; -@property uint32_t defaultFixed32; +@property uNSInteger defaultFixed32; @property uint64_t defaultFixed64; -@property int32_t defaultSfixed32; +@property NSInteger defaultSfixed32; @property int64_t defaultSfixed64; @property Float32 defaultFloat; @property Float64 defaultDouble; @@ -1731,7 +1731,7 @@ - (TestAllTypesLite*) defaultInstance { - (PBArray *)repeatedInt32 { return repeatedInt32Array; } -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { return [repeatedInt32Array int32AtIndex:index]; } - (PBArray *)repeatedInt64 { @@ -1743,7 +1743,7 @@ - (int64_t)repeatedInt64AtIndex:(NSUInteger)index { - (PBArray *)repeatedUint32 { return repeatedUint32Array; } -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { return [repeatedUint32Array uint32AtIndex:index]; } - (PBArray *)repeatedUint64 { @@ -1755,7 +1755,7 @@ - (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { - (PBArray *)repeatedSint32 { return repeatedSint32Array; } -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { return [repeatedSint32Array int32AtIndex:index]; } - (PBArray *)repeatedSint64 { @@ -1767,7 +1767,7 @@ - (int64_t)repeatedSint64AtIndex:(NSUInteger)index { - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedFixed64 { @@ -1779,7 +1779,7 @@ - (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { - (PBArray *)repeatedSfixed32 { return repeatedSfixed32Array; } -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { return [repeatedSfixed32Array int32AtIndex:index]; } - (PBArray *)repeatedSfixed64 { @@ -1950,7 +1950,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedInt32ArrayCount = self.repeatedInt32Array.count; if (repeatedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; for (NSUInteger i = 0; i < repeatedInt32ArrayCount; ++i) { [output writeInt32:31 value:values[i]]; } @@ -1964,7 +1964,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedUint32ArrayCount = self.repeatedUint32Array.count; if (repeatedUint32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.repeatedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; for (NSUInteger i = 0; i < repeatedUint32ArrayCount; ++i) { [output writeUInt32:33 value:values[i]]; } @@ -1978,7 +1978,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedSint32ArrayCount = self.repeatedSint32Array.count; if (repeatedSint32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; for (NSUInteger i = 0; i < repeatedSint32ArrayCount; ++i) { [output writeSInt32:35 value:values[i]]; } @@ -1992,7 +1992,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.repeatedFixed32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedFixed32Array.data; for (NSUInteger i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:37 value:values[i]]; } @@ -2006,7 +2006,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger repeatedSfixed32ArrayCount = self.repeatedSfixed32Array.count; if (repeatedSfixed32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.repeatedSfixed32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedSfixed32Array.data; for (NSUInteger i = 0; i < repeatedSfixed32ArrayCount; ++i) { [output writeSFixed32:39 value:values[i]]; } @@ -2156,8 +2156,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2236,9 +2236,9 @@ - (int32_t) serializedSize { size += computeStringSize(25, self.optionalCord); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedInt32Array.count; - const int32_t *values = (const int32_t *)self.repeatedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -2246,7 +2246,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedInt64Array.count; const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2256,9 +2256,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedUint32Array.count; - const uint32_t *values = (const uint32_t *)self.repeatedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -2266,7 +2266,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedUint64Array.count; const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2276,9 +2276,9 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSint32Array.count; - const int32_t *values = (const int32_t *)self.repeatedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } @@ -2286,7 +2286,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSint64Array.count; const int64_t *values = (const int64_t *)self.repeatedSint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2296,56 +2296,56 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSfixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedSfixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedDoubleArray.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedBoolArray.count; dataSize = 1 * count; size += dataSize; size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedStringArray.count; const NSString* *values = (const NSString* *)self.repeatedStringArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2355,7 +2355,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedBytesArray.count; const NSData* *values = (const NSData* *)self.repeatedBytesArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2377,7 +2377,7 @@ - (int32_t) serializedSize { size += computeMessageSize(50, element); } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedNestedEnumArray.count; const TestAllTypesLite_NestedEnum *values = (const TestAllTypesLite_NestedEnum *)self.repeatedNestedEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2387,7 +2387,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedForeignEnumArray.count; const ForeignEnumLite *values = (const ForeignEnumLite *)self.repeatedForeignEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2397,7 +2397,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedImportEnumArray.count; const ImportEnumLite *values = (const ImportEnumLite *)self.repeatedImportEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2407,7 +2407,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedStringPieceArray.count; const NSString* *values = (const NSString* *)self.repeatedStringPieceArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -2417,7 +2417,7 @@ - (int32_t) serializedSize { size += 2 * count; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.repeatedCordArray.count; const NSString* *values = (const NSString* *)self.repeatedCordArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -3164,7 +3164,7 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value) } } @interface TestAllTypesLite_NestedMessage () -@property int32_t bb; +@property NSInteger bb; @end @implementation TestAllTypesLite_NestedMessage @@ -3206,8 +3206,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3334,7 +3334,7 @@ - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3356,10 +3356,10 @@ - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedIn - (BOOL) hasBb { return result.hasBb; } -- (int32_t) bb { +- (NSInteger) bb { return result.bb; } -- (TestAllTypesLite_NestedMessage_Builder*) setBb:(int32_t) value { +- (TestAllTypesLite_NestedMessage_Builder*) setBb:(NSInteger) value { result.hasBb = YES; result.bb = value; return self; @@ -3372,7 +3372,7 @@ - (TestAllTypesLite_NestedMessage_Builder*) clearBb { @end @interface TestAllTypesLite_OptionalGroup () -@property int32_t a; +@property NSInteger a; @end @implementation TestAllTypesLite_OptionalGroup @@ -3414,8 +3414,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3542,7 +3542,7 @@ - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3564,10 +3564,10 @@ - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestAllTypesLite_OptionalGroup_Builder*) setA:(int32_t) value { +- (TestAllTypesLite_OptionalGroup_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -3580,7 +3580,7 @@ - (TestAllTypesLite_OptionalGroup_Builder*) clearA { @end @interface TestAllTypesLite_RepeatedGroup () -@property int32_t a; +@property NSInteger a; @end @implementation TestAllTypesLite_RepeatedGroup @@ -3622,8 +3622,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3750,7 +3750,7 @@ - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3772,10 +3772,10 @@ - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(int32_t) value { +- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -4138,7 +4138,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4247,7 +4247,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 168: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestAllTypesLite_NestedEnumIsValidValue(value)) { [self setOptionalNestedEnum:value]; } else { @@ -4256,7 +4256,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 176: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self setOptionalForeignEnum:value]; } else { @@ -4265,7 +4265,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 184: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ImportEnumLiteIsValidValue(value)) { [self setOptionalImportEnum:value]; } else { @@ -4366,7 +4366,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 408: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestAllTypesLite_NestedEnumIsValidValue(value)) { [self addRepeatedNestedEnum:value]; } else { @@ -4375,7 +4375,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 416: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self addRepeatedForeignEnum:value]; } else { @@ -4384,7 +4384,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 424: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ImportEnumLiteIsValidValue(value)) { [self addRepeatedImportEnum:value]; } else { @@ -4461,7 +4461,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 648: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (TestAllTypesLite_NestedEnumIsValidValue(value)) { [self setDefaultNestedEnum:value]; } else { @@ -4470,7 +4470,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 656: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self setDefaultForeignEnum:value]; } else { @@ -4479,7 +4479,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 664: { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ImportEnumLiteIsValidValue(value)) { [self setDefaultImportEnum:value]; } else { @@ -4501,10 +4501,10 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (BOOL) hasOptionalInt32 { return result.hasOptionalInt32; } -- (int32_t) optionalInt32 { +- (NSInteger) optionalInt32 { return result.optionalInt32; } -- (TestAllTypesLite_Builder*) setOptionalInt32:(int32_t) value { +- (TestAllTypesLite_Builder*) setOptionalInt32:(NSInteger) value { result.hasOptionalInt32 = YES; result.optionalInt32 = value; return self; @@ -4533,10 +4533,10 @@ - (TestAllTypesLite_Builder*) clearOptionalInt64 { - (BOOL) hasOptionalUint32 { return result.hasOptionalUint32; } -- (uint32_t) optionalUint32 { +- (uNSInteger) optionalUint32 { return result.optionalUint32; } -- (TestAllTypesLite_Builder*) setOptionalUint32:(uint32_t) value { +- (TestAllTypesLite_Builder*) setOptionalUint32:(uNSInteger) value { result.hasOptionalUint32 = YES; result.optionalUint32 = value; return self; @@ -4565,10 +4565,10 @@ - (TestAllTypesLite_Builder*) clearOptionalUint64 { - (BOOL) hasOptionalSint32 { return result.hasOptionalSint32; } -- (int32_t) optionalSint32 { +- (NSInteger) optionalSint32 { return result.optionalSint32; } -- (TestAllTypesLite_Builder*) setOptionalSint32:(int32_t) value { +- (TestAllTypesLite_Builder*) setOptionalSint32:(NSInteger) value { result.hasOptionalSint32 = YES; result.optionalSint32 = value; return self; @@ -4597,10 +4597,10 @@ - (TestAllTypesLite_Builder*) clearOptionalSint64 { - (BOOL) hasOptionalFixed32 { return result.hasOptionalFixed32; } -- (uint32_t) optionalFixed32 { +- (uNSInteger) optionalFixed32 { return result.optionalFixed32; } -- (TestAllTypesLite_Builder*) setOptionalFixed32:(uint32_t) value { +- (TestAllTypesLite_Builder*) setOptionalFixed32:(uNSInteger) value { result.hasOptionalFixed32 = YES; result.optionalFixed32 = value; return self; @@ -4629,10 +4629,10 @@ - (TestAllTypesLite_Builder*) clearOptionalFixed64 { - (BOOL) hasOptionalSfixed32 { return result.hasOptionalSfixed32; } -- (int32_t) optionalSfixed32 { +- (NSInteger) optionalSfixed32 { return result.optionalSfixed32; } -- (TestAllTypesLite_Builder*) setOptionalSfixed32:(int32_t) value { +- (TestAllTypesLite_Builder*) setOptionalSfixed32:(NSInteger) value { result.hasOptionalSfixed32 = YES; result.optionalSfixed32 = value; return self; @@ -4941,10 +4941,10 @@ - (TestAllTypesLite_Builder*) clearOptionalCord { - (PBAppendableArray *)repeatedInt32 { return result.repeatedInt32Array; } -- (int32_t)repeatedInt32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { return [result repeatedInt32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedInt32:(int32_t)value { +- (TestAllTypesLite_Builder *)addRepeatedInt32:(NSInteger)value { if (result.repeatedInt32Array == nil) { result.repeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -4955,7 +4955,7 @@ - (TestAllTypesLite_Builder *)setRepeatedInt32Array:(NSArray *)array { result.repeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -4991,10 +4991,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedUint32 { return result.repeatedUint32Array; } -- (uint32_t)repeatedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { return [result repeatedUint32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedUint32:(uint32_t)value { +- (TestAllTypesLite_Builder *)addRepeatedUint32:(uNSInteger)value { if (result.repeatedUint32Array == nil) { result.repeatedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5005,7 +5005,7 @@ - (TestAllTypesLite_Builder *)setRepeatedUint32Array:(NSArray *)array { result.repeatedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { result.repeatedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5041,10 +5041,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedUint64 { - (PBAppendableArray *)repeatedSint32 { return result.repeatedSint32Array; } -- (int32_t)repeatedSint32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { return [result repeatedSint32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedSint32:(int32_t)value { +- (TestAllTypesLite_Builder *)addRepeatedSint32:(NSInteger)value { if (result.repeatedSint32Array == nil) { result.repeatedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5055,7 +5055,7 @@ - (TestAllTypesLite_Builder *)setRepeatedSint32Array:(NSArray *)array { result.repeatedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5091,10 +5091,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedSint64 { - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (uint32_t)repeatedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { return [result repeatedFixed32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedFixed32:(uint32_t)value { +- (TestAllTypesLite_Builder *)addRepeatedFixed32:(uNSInteger)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5105,7 +5105,7 @@ - (TestAllTypesLite_Builder *)setRepeatedFixed32Array:(NSArray *)array { result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5141,10 +5141,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedFixed64 { - (PBAppendableArray *)repeatedSfixed32 { return result.repeatedSfixed32Array; } -- (int32_t)repeatedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { return [result repeatedSfixed32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(int32_t)value { +- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(NSInteger)value { if (result.repeatedSfixed32Array == nil) { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5155,7 +5155,7 @@ - (TestAllTypesLite_Builder *)setRepeatedSfixed32Array:(NSArray *)array { result.repeatedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5541,10 +5541,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedCord { - (BOOL) hasDefaultInt32 { return result.hasDefaultInt32; } -- (int32_t) defaultInt32 { +- (NSInteger) defaultInt32 { return result.defaultInt32; } -- (TestAllTypesLite_Builder*) setDefaultInt32:(int32_t) value { +- (TestAllTypesLite_Builder*) setDefaultInt32:(NSInteger) value { result.hasDefaultInt32 = YES; result.defaultInt32 = value; return self; @@ -5573,10 +5573,10 @@ - (TestAllTypesLite_Builder*) clearDefaultInt64 { - (BOOL) hasDefaultUint32 { return result.hasDefaultUint32; } -- (uint32_t) defaultUint32 { +- (uNSInteger) defaultUint32 { return result.defaultUint32; } -- (TestAllTypesLite_Builder*) setDefaultUint32:(uint32_t) value { +- (TestAllTypesLite_Builder*) setDefaultUint32:(uNSInteger) value { result.hasDefaultUint32 = YES; result.defaultUint32 = value; return self; @@ -5605,10 +5605,10 @@ - (TestAllTypesLite_Builder*) clearDefaultUint64 { - (BOOL) hasDefaultSint32 { return result.hasDefaultSint32; } -- (int32_t) defaultSint32 { +- (NSInteger) defaultSint32 { return result.defaultSint32; } -- (TestAllTypesLite_Builder*) setDefaultSint32:(int32_t) value { +- (TestAllTypesLite_Builder*) setDefaultSint32:(NSInteger) value { result.hasDefaultSint32 = YES; result.defaultSint32 = value; return self; @@ -5637,10 +5637,10 @@ - (TestAllTypesLite_Builder*) clearDefaultSint64 { - (BOOL) hasDefaultFixed32 { return result.hasDefaultFixed32; } -- (uint32_t) defaultFixed32 { +- (uNSInteger) defaultFixed32 { return result.defaultFixed32; } -- (TestAllTypesLite_Builder*) setDefaultFixed32:(uint32_t) value { +- (TestAllTypesLite_Builder*) setDefaultFixed32:(uNSInteger) value { result.hasDefaultFixed32 = YES; result.defaultFixed32 = value; return self; @@ -5669,10 +5669,10 @@ - (TestAllTypesLite_Builder*) clearDefaultFixed64 { - (BOOL) hasDefaultSfixed32 { return result.hasDefaultSfixed32; } -- (int32_t) defaultSfixed32 { +- (NSInteger) defaultSfixed32 { return result.defaultSfixed32; } -- (TestAllTypesLite_Builder*) setDefaultSfixed32:(int32_t) value { +- (TestAllTypesLite_Builder*) setDefaultSfixed32:(NSInteger) value { result.hasDefaultSfixed32 = YES; result.defaultSfixed32 = value; return self; @@ -5861,7 +5861,7 @@ - (TestAllTypesLite_Builder*) clearDefaultCord { @end @interface ForeignMessageLite () -@property int32_t c; +@property NSInteger c; @end @implementation ForeignMessageLite @@ -5903,8 +5903,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6031,7 +6031,7 @@ - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6053,10 +6053,10 @@ - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasC { return result.hasC; } -- (int32_t) c { +- (NSInteger) c { return result.c; } -- (ForeignMessageLite_Builder*) setC:(int32_t) value { +- (ForeignMessageLite_Builder*) setC:(NSInteger) value { result.hasC = YES; result.c = value; return self; @@ -6152,7 +6152,7 @@ - (TestPackedTypesLite*) defaultInstance { - (PBArray *)packedInt32 { return packedInt32Array; } -- (int32_t)packedInt32AtIndex:(NSUInteger)index { +- (NSInteger)packedInt32AtIndex:(NSUInteger)index { return [packedInt32Array int32AtIndex:index]; } - (PBArray *)packedInt64 { @@ -6164,7 +6164,7 @@ - (int64_t)packedInt64AtIndex:(NSUInteger)index { - (PBArray *)packedUint32 { return packedUint32Array; } -- (uint32_t)packedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { return [packedUint32Array uint32AtIndex:index]; } - (PBArray *)packedUint64 { @@ -6176,7 +6176,7 @@ - (uint64_t)packedUint64AtIndex:(NSUInteger)index { - (PBArray *)packedSint32 { return packedSint32Array; } -- (int32_t)packedSint32AtIndex:(NSUInteger)index { +- (NSInteger)packedSint32AtIndex:(NSUInteger)index { return [packedSint32Array int32AtIndex:index]; } - (PBArray *)packedSint64 { @@ -6188,7 +6188,7 @@ - (int64_t)packedSint64AtIndex:(NSUInteger)index { - (PBArray *)packedFixed32 { return packedFixed32Array; } -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { return [packedFixed32Array uint32AtIndex:index]; } - (PBArray *)packedFixed64 { @@ -6200,7 +6200,7 @@ - (uint64_t)packedFixed64AtIndex:(NSUInteger)index { - (PBArray *)packedSfixed32 { return packedSfixed32Array; } -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { return [packedSfixed32Array int32AtIndex:index]; } - (PBArray *)packedSfixed64 { @@ -6239,7 +6239,7 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { const NSUInteger packedInt32ArrayCount = self.packedInt32Array.count; if (packedInt32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; [output writeRawVarint32:722]; [output writeRawVarint32:packedInt32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedInt32ArrayCount; ++i) { @@ -6257,7 +6257,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedUint32ArrayCount = self.packedUint32Array.count; if (packedUint32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.packedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; [output writeRawVarint32:738]; [output writeRawVarint32:packedUint32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedUint32ArrayCount; ++i) { @@ -6275,7 +6275,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedSint32ArrayCount = self.packedSint32Array.count; if (packedSint32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; [output writeRawVarint32:754]; [output writeRawVarint32:packedSint32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedSint32ArrayCount; ++i) { @@ -6293,7 +6293,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedFixed32ArrayCount = self.packedFixed32Array.count; if (packedFixed32ArrayCount > 0) { - const uint32_t *values = (const uint32_t *)self.packedFixed32Array.data; + const uNSInteger *values = (const uNSInteger *)self.packedFixed32Array.data; [output writeRawVarint32:770]; [output writeRawVarint32:packedFixed32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedFixed32ArrayCount; ++i) { @@ -6311,7 +6311,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const NSUInteger packedSfixed32ArrayCount = self.packedSfixed32Array.count; if (packedSfixed32ArrayCount > 0) { - const int32_t *values = (const int32_t *)self.packedSfixed32Array.data; + const NSInteger *values = (const NSInteger *)self.packedSfixed32Array.data; [output writeRawVarint32:786]; [output writeRawVarint32:packedSfixed32MemoizedSerializedSize]; for (NSUInteger i = 0; i < packedSfixed32ArrayCount; ++i) { @@ -6365,17 +6365,17 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedInt32Array.count; - const int32_t *values = (const int32_t *)self.packedInt32Array.data; + const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } @@ -6387,7 +6387,7 @@ - (int32_t) serializedSize { packedInt32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedInt64Array.count; const int64_t *values = (const int64_t *)self.packedInt64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -6401,9 +6401,9 @@ - (int32_t) serializedSize { packedInt64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedUint32Array.count; - const uint32_t *values = (const uint32_t *)self.packedUint32Array.data; + const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -6415,7 +6415,7 @@ - (int32_t) serializedSize { packedUint32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedUint64Array.count; const uint64_t *values = (const uint64_t *)self.packedUint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -6429,9 +6429,9 @@ - (int32_t) serializedSize { packedUint64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSint32Array.count; - const int32_t *values = (const int32_t *)self.packedSint32Array.data; + const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; for (NSUInteger i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } @@ -6443,7 +6443,7 @@ - (int32_t) serializedSize { packedSint32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSint64Array.count; const int64_t *values = (const int64_t *)self.packedSint64Array.data; for (NSUInteger i = 0; i < count; ++i) { @@ -6457,7 +6457,7 @@ - (int32_t) serializedSize { packedSint64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedFixed32Array.count; dataSize = 4 * count; size += dataSize; @@ -6468,7 +6468,7 @@ - (int32_t) serializedSize { packedFixed32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedFixed64Array.count; dataSize = 8 * count; size += dataSize; @@ -6479,7 +6479,7 @@ - (int32_t) serializedSize { packedFixed64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSfixed32Array.count; dataSize = 4 * count; size += dataSize; @@ -6490,7 +6490,7 @@ - (int32_t) serializedSize { packedSfixed32MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedSfixed64Array.count; dataSize = 8 * count; size += dataSize; @@ -6501,7 +6501,7 @@ - (int32_t) serializedSize { packedSfixed64MemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedFloatArray.count; dataSize = 4 * count; size += dataSize; @@ -6512,7 +6512,7 @@ - (int32_t) serializedSize { packedFloatMemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedDoubleArray.count; dataSize = 8 * count; size += dataSize; @@ -6523,7 +6523,7 @@ - (int32_t) serializedSize { packedDoubleMemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedBoolArray.count; dataSize = 1 * count; size += dataSize; @@ -6534,7 +6534,7 @@ - (int32_t) serializedSize { packedBoolMemoizedSerializedSize = dataSize; } { - int32_t dataSize = 0; + NSInteger dataSize = 0; const NSUInteger count = self.packedEnumArray.count; const ForeignEnumLite *values = (const ForeignEnumLite *)self.packedEnumArray.data; for (NSUInteger i = 0; i < count; ++i) { @@ -6863,7 +6863,7 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6876,8 +6876,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 722: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -6888,8 +6888,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 730: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedInt64Array == nil) { result.packedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -6900,8 +6900,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 738: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -6912,8 +6912,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 746: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -6924,8 +6924,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 754: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -6936,8 +6936,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 762: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSint64Array == nil) { result.packedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -6948,8 +6948,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 770: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -6960,8 +6960,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 778: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -6972,8 +6972,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 786: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -6984,8 +6984,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 794: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedSfixed64Array == nil) { result.packedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -6996,8 +6996,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 802: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedFloatArray == nil) { result.packedFloatArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeFloat]; } @@ -7008,8 +7008,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 810: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedDoubleArray == nil) { result.packedDoubleArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeDouble]; } @@ -7020,8 +7020,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 818: { - int32_t length = [input readRawVarint32]; - int32_t limit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; if (result.packedBoolArray == nil) { result.packedBoolArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeBool]; } @@ -7032,10 +7032,10 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 826: { - int32_t length = [input readRawVarint32]; - int32_t oldLimit = [input pushLimit:length]; + NSInteger length = [input readRawVarint32]; + NSInteger oldLimit = [input pushLimit:length]; while (input.bytesUntilLimit > 0) { - int32_t value = [input readEnum]; + NSInteger value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self addPackedEnum:value]; } else { @@ -7051,10 +7051,10 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (PBAppendableArray *)packedInt32 { return result.packedInt32Array; } -- (int32_t)packedInt32AtIndex:(NSUInteger)index { +- (NSInteger)packedInt32AtIndex:(NSUInteger)index { return [result packedInt32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedInt32:(int32_t)value { +- (TestPackedTypesLite_Builder *)addPackedInt32:(NSInteger)value { if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -7065,7 +7065,7 @@ - (TestPackedTypesLite_Builder *)setPackedInt32Array:(NSArray *)array { result.packedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count { result.packedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7101,10 +7101,10 @@ - (TestPackedTypesLite_Builder *)clearPackedInt64 { - (PBAppendableArray *)packedUint32 { return result.packedUint32Array; } -- (uint32_t)packedUint32AtIndex:(NSUInteger)index { +- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { return [result packedUint32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedUint32:(uint32_t)value { +- (TestPackedTypesLite_Builder *)addPackedUint32:(uNSInteger)value { if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -7115,7 +7115,7 @@ - (TestPackedTypesLite_Builder *)setPackedUint32Array:(NSArray *)array { result.packedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { result.packedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -7151,10 +7151,10 @@ - (TestPackedTypesLite_Builder *)clearPackedUint64 { - (PBAppendableArray *)packedSint32 { return result.packedSint32Array; } -- (int32_t)packedSint32AtIndex:(NSUInteger)index { +- (NSInteger)packedSint32AtIndex:(NSUInteger)index { return [result packedSint32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedSint32:(int32_t)value { +- (TestPackedTypesLite_Builder *)addPackedSint32:(NSInteger)value { if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -7165,7 +7165,7 @@ - (TestPackedTypesLite_Builder *)setPackedSint32Array:(NSArray *)array { result.packedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count { result.packedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7201,10 +7201,10 @@ - (TestPackedTypesLite_Builder *)clearPackedSint64 { - (PBAppendableArray *)packedFixed32 { return result.packedFixed32Array; } -- (uint32_t)packedFixed32AtIndex:(NSUInteger)index { +- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { return [result packedFixed32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedFixed32:(uint32_t)value { +- (TestPackedTypesLite_Builder *)addPackedFixed32:(uNSInteger)value { if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -7215,7 +7215,7 @@ - (TestPackedTypesLite_Builder *)setPackedFixed32Array:(NSArray *)array { result.packedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const uint32_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { result.packedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -7251,10 +7251,10 @@ - (TestPackedTypesLite_Builder *)clearPackedFixed64 { - (PBAppendableArray *)packedSfixed32 { return result.packedSfixed32Array; } -- (int32_t)packedSfixed32AtIndex:(NSUInteger)index { +- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { return [result packedSfixed32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedSfixed32:(int32_t)value { +- (TestPackedTypesLite_Builder *)addPackedSfixed32:(NSInteger)value { if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -7265,7 +7265,7 @@ - (TestPackedTypesLite_Builder *)setPackedSfixed32Array:(NSArray *)array { result.packedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const int32_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { result.packedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7437,8 +7437,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7559,7 +7559,7 @@ - (TestAllExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (TestAllExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7577,7 +7577,7 @@ - (TestAllExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream @end @interface OptionalGroup_extension_lite () -@property int32_t a; +@property NSInteger a; @end @implementation OptionalGroup_extension_lite @@ -7619,8 +7619,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7747,7 +7747,7 @@ - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7769,10 +7769,10 @@ - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (OptionalGroup_extension_lite_Builder*) setA:(int32_t) value { +- (OptionalGroup_extension_lite_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -7785,7 +7785,7 @@ - (OptionalGroup_extension_lite_Builder*) clearA { @end @interface RepeatedGroup_extension_lite () -@property int32_t a; +@property NSInteger a; @end @implementation RepeatedGroup_extension_lite @@ -7827,8 +7827,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7955,7 +7955,7 @@ - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7977,10 +7977,10 @@ - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (RepeatedGroup_extension_lite_Builder*) setA:(int32_t) value { +- (RepeatedGroup_extension_lite_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; @@ -8029,8 +8029,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8151,7 +8151,7 @@ - (TestPackedExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestPackedExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8202,8 +8202,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8315,7 +8315,7 @@ - (TestNestedExtensionLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (TestNestedExtensionLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8333,7 +8333,7 @@ - (TestNestedExtensionLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStre @end @interface TestDeprecatedLite () -@property int32_t deprecatedField; +@property NSInteger deprecatedField; @end @implementation TestDeprecatedLite @@ -8375,8 +8375,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8503,7 +8503,7 @@ - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8525,10 +8525,10 @@ - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasDeprecatedField { return result.hasDeprecatedField; } -- (int32_t) deprecatedField { +- (NSInteger) deprecatedField { return result.deprecatedField; } -- (TestDeprecatedLite_Builder*) setDeprecatedField:(int32_t) value { +- (TestDeprecatedLite_Builder*) setDeprecatedField:(NSInteger) value { result.hasDeprecatedField = YES; result.deprecatedField = value; return self; diff --git a/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m b/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m index e647a3a..003fb2a 100644 --- a/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m +++ b/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m @@ -64,8 +64,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -195,7 +195,7 @@ - (TestLiteImportsNonlite_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestLiteImportsNonlite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestMset.pb.h b/src/runtime/Tests/UnittestMset.pb.h index b03cf4d..f1d9bf6 100644 --- a/src/runtime/Tests/UnittestMset.pb.h +++ b/src/runtime/Tests/UnittestMset.pb.h @@ -127,10 +127,10 @@ @interface TestMessageSetExtension1 : PBGeneratedMessage { @private BOOL hasI_:1; - int32_t i; + NSInteger i; } - (BOOL) hasI; -@property (readonly) int32_t i; +@property (readonly) NSInteger i; + (TestMessageSetExtension1*) defaultInstance; - (TestMessageSetExtension1*) defaultInstance; @@ -169,8 +169,8 @@ - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasI; -- (int32_t) i; -- (TestMessageSetExtension1_Builder*) setI:(int32_t) value; +- (NSInteger) i; +- (TestMessageSetExtension1_Builder*) setI:(NSInteger) value; - (TestMessageSetExtension1_Builder*) clearI; @end @@ -253,12 +253,12 @@ @private BOOL hasTypeId_:1; BOOL hasMessage_:1; - int32_t typeId; + NSInteger typeId; NSData* message; } - (BOOL) hasTypeId; - (BOOL) hasMessage; -@property (readonly) int32_t typeId; +@property (readonly) NSInteger typeId; @property (readonly, retain) NSData* message; + (RawMessageSet_Item*) defaultInstance; @@ -297,8 +297,8 @@ - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasTypeId; -- (int32_t) typeId; -- (RawMessageSet_Item_Builder*) setTypeId:(int32_t) value; +- (NSInteger) typeId; +- (RawMessageSet_Item_Builder*) setTypeId:(NSInteger) value; - (RawMessageSet_Item_Builder*) clearTypeId; - (BOOL) hasMessage; diff --git a/src/runtime/Tests/UnittestMset.pb.m b/src/runtime/Tests/UnittestMset.pb.m index c4538bf..192302c 100644 --- a/src/runtime/Tests/UnittestMset.pb.m +++ b/src/runtime/Tests/UnittestMset.pb.m @@ -78,8 +78,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeAsMessageSetTo:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -200,7 +200,7 @@ - (TestMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (TestMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -266,8 +266,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -397,7 +397,7 @@ - (TestMessageSetContainer_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (TestMessageSetContainer_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -454,7 +454,7 @@ - (TestMessageSetContainer_Builder*) clearMessageSet { @end @interface TestMessageSetExtension1 () -@property int32_t i; +@property NSInteger i; @end @implementation TestMessageSetExtension1 @@ -499,8 +499,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -627,7 +627,7 @@ - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -649,10 +649,10 @@ - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (BOOL) hasI { return result.hasI; } -- (int32_t) i { +- (NSInteger) i { return result.i; } -- (TestMessageSetExtension1_Builder*) setI:(int32_t) value { +- (TestMessageSetExtension1_Builder*) setI:(NSInteger) value { result.hasI = YES; result.i = value; return self; @@ -711,8 +711,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -839,7 +839,7 @@ - (TestMessageSetExtension2_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestMessageSetExtension2_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -925,8 +925,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1002,7 +1002,7 @@ - (NSUInteger) hash { @end @interface RawMessageSet_Item () -@property int32_t typeId; +@property NSInteger typeId; @property (retain) NSData* message; @end @@ -1063,8 +1063,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1206,7 +1206,7 @@ - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1232,10 +1232,10 @@ - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasTypeId { return result.hasTypeId; } -- (int32_t) typeId { +- (NSInteger) typeId { return result.typeId; } -- (RawMessageSet_Item_Builder*) setTypeId:(int32_t) value { +- (RawMessageSet_Item_Builder*) setTypeId:(NSInteger) value { result.hasTypeId = YES; result.typeId = value; return self; @@ -1321,7 +1321,7 @@ - (RawMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (RawMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestNoGenericServices.pb.h b/src/runtime/Tests/UnittestNoGenericServices.pb.h index 0dd5b58..d165bbe 100644 --- a/src/runtime/Tests/UnittestNoGenericServices.pb.h +++ b/src/runtime/Tests/UnittestNoGenericServices.pb.h @@ -33,10 +33,10 @@ BOOL TestEnumIsValidValue(TestEnum value); @interface TestMessage : PBExtendableMessage { @private BOOL hasA_:1; - int32_t a; + NSInteger a; } - (BOOL) hasA; -@property (readonly) int32_t a; +@property (readonly) NSInteger a; + (TestMessage*) defaultInstance; - (TestMessage*) defaultInstance; @@ -74,8 +74,8 @@ BOOL TestEnumIsValidValue(TestEnum value); - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (int32_t) a; -- (TestMessage_Builder*) setA:(int32_t) value; +- (NSInteger) a; +- (TestMessage_Builder*) setA:(NSInteger) value; - (TestMessage_Builder*) clearA; @end diff --git a/src/runtime/Tests/UnittestNoGenericServices.pb.m b/src/runtime/Tests/UnittestNoGenericServices.pb.m index b01fbba..f66c039 100644 --- a/src/runtime/Tests/UnittestNoGenericServices.pb.m +++ b/src/runtime/Tests/UnittestNoGenericServices.pb.m @@ -42,7 +42,7 @@ BOOL TestEnumIsValidValue(TestEnum value) { } } @interface TestMessage () -@property int32_t a; +@property NSInteger a; @end @implementation TestMessage @@ -90,8 +90,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -227,7 +227,7 @@ - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -249,10 +249,10 @@ - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input e - (BOOL) hasA { return result.hasA; } -- (int32_t) a { +- (NSInteger) a { return result.a; } -- (TestMessage_Builder*) setA:(int32_t) value { +- (TestMessage_Builder*) setA:(NSInteger) value { result.hasA = YES; result.a = value; return self; diff --git a/src/runtime/Tests/UnittestOptimizeFor.pb.h b/src/runtime/Tests/UnittestOptimizeFor.pb.h index e21a2e3..14f277b 100644 --- a/src/runtime/Tests/UnittestOptimizeFor.pb.h +++ b/src/runtime/Tests/UnittestOptimizeFor.pb.h @@ -117,12 +117,12 @@ @private BOOL hasI_:1; BOOL hasMsg_:1; - int32_t i; + NSInteger i; ForeignMessage* msg; } - (BOOL) hasI; - (BOOL) hasMsg; -@property (readonly) int32_t i; +@property (readonly) NSInteger i; @property (readonly, retain) ForeignMessage* msg; + (TestOptimizedForSize*) defaultInstance; @@ -163,8 +163,8 @@ - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasI; -- (int32_t) i; -- (TestOptimizedForSize_Builder*) setI:(int32_t) value; +- (NSInteger) i; +- (TestOptimizedForSize_Builder*) setI:(NSInteger) value; - (TestOptimizedForSize_Builder*) clearI; - (BOOL) hasMsg; @@ -178,10 +178,10 @@ @interface TestRequiredOptimizedForSize : PBGeneratedMessage { @private BOOL hasX_:1; - int32_t x; + NSInteger x; } - (BOOL) hasX; -@property (readonly) int32_t x; +@property (readonly) NSInteger x; + (TestRequiredOptimizedForSize*) defaultInstance; - (TestRequiredOptimizedForSize*) defaultInstance; @@ -219,8 +219,8 @@ - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasX; -- (int32_t) x; -- (TestRequiredOptimizedForSize_Builder*) setX:(int32_t) value; +- (NSInteger) x; +- (TestRequiredOptimizedForSize_Builder*) setX:(NSInteger) value; - (TestRequiredOptimizedForSize_Builder*) clearX; @end diff --git a/src/runtime/Tests/UnittestOptimizeFor.pb.m b/src/runtime/Tests/UnittestOptimizeFor.pb.m index 676950a..31997de 100644 --- a/src/runtime/Tests/UnittestOptimizeFor.pb.m +++ b/src/runtime/Tests/UnittestOptimizeFor.pb.m @@ -43,7 +43,7 @@ + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry { @end @interface TestOptimizedForSize () -@property int32_t i; +@property NSInteger i; @property (retain) ForeignMessage* msg; @end @@ -110,8 +110,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -265,7 +265,7 @@ - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -296,10 +296,10 @@ - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (BOOL) hasI { return result.hasI; } -- (int32_t) i { +- (NSInteger) i { return result.i; } -- (TestOptimizedForSize_Builder*) setI:(int32_t) value { +- (TestOptimizedForSize_Builder*) setI:(NSInteger) value { result.hasI = YES; result.i = value; return self; @@ -342,7 +342,7 @@ - (TestOptimizedForSize_Builder*) clearMsg { @end @interface TestRequiredOptimizedForSize () -@property int32_t x; +@property NSInteger x; @end @implementation TestRequiredOptimizedForSize @@ -387,8 +387,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -515,7 +515,7 @@ - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -537,10 +537,10 @@ - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (BOOL) hasX { return result.hasX; } -- (int32_t) x { +- (NSInteger) x { return result.x; } -- (TestRequiredOptimizedForSize_Builder*) setX:(int32_t) value { +- (TestRequiredOptimizedForSize_Builder*) setX:(NSInteger) value { result.hasX = YES; result.x = value; return self; @@ -601,8 +601,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (int32_t) serializedSize { - int32_t size = memoizedSerializedSize; +- (NSInteger) serializedSize { + NSInteger size = memoizedSerializedSize; if (size != -1) { return size; } @@ -732,7 +732,7 @@ - (TestOptionalOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (TestOptionalOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnknownFieldSetTest.m b/src/runtime/Tests/UnknownFieldSetTest.m index 76af07b..39d8b33 100644 --- a/src/runtime/Tests/UnknownFieldSetTest.m +++ b/src/runtime/Tests/UnknownFieldSetTest.m @@ -52,7 +52,7 @@ - (id) init { } -- (PBField*) getField:(int32_t) number { +- (PBField*) getField:(NSInteger) number { return [unknownFields getField:number]; } diff --git a/src/runtime/Tests/WireFormatTests.m b/src/runtime/Tests/WireFormatTests.m index 40bfc08..c0cc20f 100644 --- a/src/runtime/Tests/WireFormatTests.m +++ b/src/runtime/Tests/WireFormatTests.m @@ -113,10 +113,10 @@ - (void) testParsePackedExtensions { - (void) assertFieldsInOrder:(NSData*) data { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; - int32_t previousTag = 0; + NSInteger previousTag = 0; while (YES) { - int32_t tag = [input readTag]; + NSInteger tag = [input readTag]; if (tag == 0) { break; } From 8bee38719fdad6e0b3d77e51ac28da72df811b55 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Sun, 20 Apr 2014 00:17:08 +0400 Subject: [PATCH 02/18] Initial Commit --- .../project.pbxproj | 215 ++ .../contents.xcworkspacedata | 7 + src/runtime/Classes/AbstractMessage.m | 2 +- src/runtime/Classes/CodedInputStream.h | 68 +- src/runtime/Classes/CodedInputStream.m | 132 +- src/runtime/Classes/CodedOutputStream.h | 90 +- src/runtime/Classes/CodedOutputStream.m | 106 +- src/runtime/Classes/ConcreteExtensionField.h | 4 +- src/runtime/Classes/ConcreteExtensionField.m | 28 +- src/runtime/Classes/Descriptor.pb.h | 174 +- src/runtime/Classes/Descriptor.pb.m | 280 +-- src/runtime/Classes/ExtendableMessage.h | 18 +- src/runtime/Classes/ExtendableMessage.m | 30 +- .../Classes/ExtendableMessage_Builder.h | 2 +- .../Classes/ExtendableMessage_Builder.m | 8 +- src/runtime/Classes/ExtensionField.h | 6 +- src/runtime/Classes/ExtensionRegistry.h | 2 +- src/runtime/Classes/ExtensionRegistry.m | 2 +- src/runtime/Classes/Field.h | 10 +- src/runtime/Classes/Field.m | 50 +- src/runtime/Classes/GeneratedMessage.h | 2 +- .../Classes/GeneratedMessage_Builder.h | 2 +- .../Classes/GeneratedMessage_Builder.m | 2 +- src/runtime/Classes/Message.h | 2 +- src/runtime/Classes/MutableField.h | 6 +- src/runtime/Classes/MutableField.m | 6 +- src/runtime/Classes/PBArray.h | 43 +- src/runtime/Classes/PBArray.m | 80 +- src/runtime/Classes/RingBuffer.h | 10 +- src/runtime/Classes/RingBuffer.m | 18 +- src/runtime/Classes/TextFormat.h | 8 +- src/runtime/Classes/TextFormat.m | 26 +- src/runtime/Classes/UnknownFieldSet.h | 8 +- src/runtime/Classes/UnknownFieldSet.m | 12 +- src/runtime/Classes/UnknownFieldSet_Builder.h | 10 +- src/runtime/Classes/UnknownFieldSet_Builder.m | 18 +- src/runtime/Classes/Utilities.h | 114 +- src/runtime/Classes/Utilities.m | 138 +- src/runtime/Classes/WireFormat.h | 6 +- src/runtime/Classes/WireFormat.m | 6 +- .../ProtocolBuffers.xcodeproj/project.pbxproj | 12 +- .../xcshareddata/ProtocolBuffers.xccheckout | 14 +- .../UserInterfaceState.xcuserstate | Bin 28920 -> 32587 bytes .../WorkspaceSettings.xcsettings | 4 + src/runtime/Tests/ArrayTests.m | 42 +- src/runtime/Tests/CodedInputStreamTests.m | 62 +- src/runtime/Tests/CodedOuputStreamTests.m | 22 +- src/runtime/Tests/CoreTests.m | 4 +- src/runtime/Tests/SmallBlockInputStream.h | 4 +- src/runtime/Tests/SmallBlockInputStream.m | 10 +- src/runtime/Tests/Unittest.pb.h | 1128 ++++----- src/runtime/Tests/Unittest.pb.m | 2144 ++++++++--------- src/runtime/Tests/UnittestCustomOptions.pb.h | 80 +- src/runtime/Tests/UnittestCustomOptions.pb.m | 270 +-- .../Tests/UnittestEmbedOptimizeFor.pb.h | 6 +- .../Tests/UnittestEmbedOptimizeFor.pb.m | 16 +- .../Tests/UnittestEnormousDescriptor.pb.m | 10 +- src/runtime/Tests/UnittestImport.pb.h | 8 +- src/runtime/Tests/UnittestImport.pb.m | 16 +- src/runtime/Tests/UnittestImportLite.pb.h | 8 +- src/runtime/Tests/UnittestImportLite.pb.m | 16 +- src/runtime/Tests/UnittestLite.pb.h | 512 ++-- src/runtime/Tests/UnittestLite.pb.m | 1002 ++++---- .../Tests/UnittestLiteImportsNonlite.pb.m | 10 +- src/runtime/Tests/UnittestMset.pb.h | 22 +- src/runtime/Tests/UnittestMset.pb.m | 78 +- .../Tests/UnittestNoGenericServices.pb.h | 8 +- .../Tests/UnittestNoGenericServices.pb.m | 16 +- src/runtime/Tests/UnittestOptimizeFor.pb.h | 16 +- src/runtime/Tests/UnittestOptimizeFor.pb.m | 42 +- src/runtime/Tests/UnknownFieldSetTest.m | 4 +- src/runtime/Tests/WireFormatTests.m | 4 +- 72 files changed, 3784 insertions(+), 3557 deletions(-) create mode 100644 src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj create mode 100644 src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj b/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj new file mode 100644 index 0000000..313bdbc --- /dev/null +++ b/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj @@ -0,0 +1,215 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXFileReference section */ + 3F867E641903114100D99AD9 /* libprotocolBufGenerators.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libprotocolBufGenerators.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 3F867E611903114100D99AD9 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 3F867E5B1903114100D99AD9 = { + isa = PBXGroup; + children = ( + 3F867E651903114100D99AD9 /* Products */, + ); + sourceTree = ""; + }; + 3F867E651903114100D99AD9 /* Products */ = { + isa = PBXGroup; + children = ( + 3F867E641903114100D99AD9 /* libprotocolBufGenerators.dylib */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 3F867E621903114100D99AD9 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 3F867E631903114100D99AD9 /* protocolBufGenerators */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3F867E681903114100D99AD9 /* Build configuration list for PBXNativeTarget "protocolBufGenerators" */; + buildPhases = ( + 3F867E601903114100D99AD9 /* Sources */, + 3F867E611903114100D99AD9 /* Frameworks */, + 3F867E621903114100D99AD9 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = protocolBufGenerators; + productName = protocolBufGenerators; + productReference = 3F867E641903114100D99AD9 /* libprotocolBufGenerators.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 3F867E5C1903114100D99AD9 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + ORGANIZATIONNAME = "Alexey Khokhlov"; + }; + buildConfigurationList = 3F867E5F1903114100D99AD9 /* Build configuration list for PBXProject "protocolBufGenerators" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 3F867E5B1903114100D99AD9; + productRefGroup = 3F867E651903114100D99AD9 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 3F867E631903114100D99AD9 /* protocolBufGenerators */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 3F867E601903114100D99AD9 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 3F867E661903114100D99AD9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.9; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 3F867E671903114100D99AD9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.9; + SDKROOT = macosx; + }; + name = Release; + }; + 3F867E691903114100D99AD9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 3F867E6A1903114100D99AD9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 3F867E5F1903114100D99AD9 /* Build configuration list for PBXProject "protocolBufGenerators" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3F867E661903114100D99AD9 /* Debug */, + 3F867E671903114100D99AD9 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3F867E681903114100D99AD9 /* Build configuration list for PBXNativeTarget "protocolBufGenerators" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3F867E691903114100D99AD9 /* Debug */, + 3F867E6A1903114100D99AD9 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 3F867E5C1903114100D99AD9 /* Project object */; +} diff --git a/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..bc76292 --- /dev/null +++ b/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/src/runtime/Classes/AbstractMessage.m b/src/runtime/Classes/AbstractMessage.m index d152a50..3017727 100644 --- a/src/runtime/Classes/AbstractMessage.m +++ b/src/runtime/Classes/AbstractMessage.m @@ -42,7 +42,7 @@ - (BOOL) isInitialized { } -- (NSInteger) serializedSize { +- (long) serializedSize { @throw [NSException exceptionWithName:@"ImproperSubclassing" reason:@"" userInfo:nil]; } diff --git a/src/runtime/Classes/CodedInputStream.h b/src/runtime/Classes/CodedInputStream.h index c2a02e1..4302132 100644 --- a/src/runtime/Classes/CodedInputStream.h +++ b/src/runtime/Classes/CodedInputStream.h @@ -34,28 +34,28 @@ @interface PBCodedInputStream : NSObject { @private NSMutableData* buffer; - NSInteger bufferSize; - NSInteger bufferSizeAfterLimit; - NSInteger bufferPos; + long bufferSize; + long bufferSizeAfterLimit; + long bufferPos; NSInputStream* input; - NSInteger lastTag; + long lastTag; /** * The total number of bytes read before the current buffer. The total * bytes read up to the current position can be computed as * {@code totalBytesRetired + bufferPos}. */ - NSInteger totalBytesRetired; + long totalBytesRetired; /** The absolute position of the end of the current message. */ - NSInteger currentLimit; + long currentLimit; /** See setRecursionLimit() */ - NSInteger recursionDepth; - NSInteger recursionLimit; + long recursionDepth; + long recursionLimit; /** See setSizeLimit() */ - NSInteger sizeLimit; + long sizeLimit; } + (PBCodedInputStream*) streamWithData:(NSData*) data; @@ -66,22 +66,22 @@ * Protocol message parsers use this to read tags, since a protocol message * may legally end wherever a tag occurs, and zero is not a valid tag number. */ -- (NSInteger) readTag; +- (long) readTag; - (BOOL) refillBuffer:(BOOL) mustSucceed; - (Float64) readDouble; - (Float32) readFloat; -- (int64_t) readUInt64; -- (NSInteger) readUInt32; -- (int64_t) readInt64; -- (NSInteger) readInt32; -- (int64_t) readFixed64; -- (NSInteger) readFixed32; -- (NSInteger) readEnum; -- (NSInteger) readSFixed32; -- (int64_t) readSFixed64; -- (NSInteger) readSInt32; -- (int64_t) readSInt64; +- (long long) readUInt64; +- (long) readUInt32; +- (long long) readInt64; +- (long) readInt32; +- (long long) readFixed64; +- (long) readFixed32; +- (long) readEnum; +- (long) readSFixed32; +- (long long) readSFixed64; +- (long) readSInt32; +- (long long) readSInt64; /** * Read one byte from the input. @@ -95,10 +95,10 @@ * Read a raw Varint from the stream. If larger than 32 bits, discard the * upper bits. */ -- (NSInteger) readRawVarint32; -- (int64_t) readRawVarint64; -- (NSInteger) readRawLittleEndian32; -- (int64_t) readRawLittleEndian64; +- (long) readRawVarint32; +- (long long) readRawVarint64; +- (long) readRawLittleEndian32; +- (long long) readRawLittleEndian64; /** * Read a fixed size of bytes from the input. @@ -106,7 +106,7 @@ * @throws InvalidProtocolBuffer The end of the stream or the current * limit was reached. */ -- (NSData*) readRawData:(NSInteger) size; +- (NSData*) readRawData:(long) size; /** * Reads and discards a single field, given its tag value. @@ -114,7 +114,7 @@ * @return {@code false} if the tag is an endgroup tag, in which case * nothing is skipped. Otherwise, returns {@code true}. */ -- (BOOL) skipField:(NSInteger) tag; +- (BOOL) skipField:(long) tag; /** @@ -123,7 +123,7 @@ * @throws InvalidProtocolBuffer The end of the stream or the current * limit was reached. */ -- (void) skipRawData:(NSInteger) size; +- (void) skipRawData:(long) size; /** * Reads and discards an entire message. This will read either until EOF @@ -132,10 +132,10 @@ - (void) skipMessage; - (BOOL) isAtEnd; -- (NSInteger) pushLimit:(NSInteger) byteLimit; +- (long) pushLimit:(long) byteLimit; - (void) recomputeBufferSizeAfterLimit; -- (void) popLimit:(NSInteger) oldLimit; -- (NSInteger) bytesUntilLimit; +- (void) popLimit:(long) oldLimit; +- (long) bytesUntilLimit; /** Read an embedded message field value from the stream. */ @@ -145,13 +145,13 @@ - (NSString*) readString; - (NSData*) readData; -- (void) readGroup:(NSInteger) fieldNumber builder:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (void) readGroup:(long) fieldNumber builder:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry; /** * Reads a {@code group} field value from the stream and merges it into the * given {@link UnknownFieldSet}. */ -- (void) readUnknownGroup:(NSInteger) fieldNumber builder:(PBUnknownFieldSet_Builder*) builder; +- (void) readUnknownGroup:(long) fieldNumber builder:(PBUnknownFieldSet_Builder*) builder; /** * Verifies that the last call to readTag() returned the given tag value. @@ -161,6 +161,6 @@ * @throws InvalidProtocolBuffer {@code value} does not match the * last tag. */ -- (void) checkLastTagWas:(NSInteger) value; +- (void) checkLastTagWas:(long) value; @end diff --git a/src/runtime/Classes/CodedInputStream.m b/src/runtime/Classes/CodedInputStream.m index fc7219e..e398f97 100644 --- a/src/runtime/Classes/CodedInputStream.m +++ b/src/runtime/Classes/CodedInputStream.m @@ -30,9 +30,9 @@ @interface PBCodedInputStream () @implementation PBCodedInputStream -const NSInteger DEFAULT_RECURSION_LIMIT = 64; -const NSInteger DEFAULT_SIZE_LIMIT = 64 << 20; // 64MB -const NSInteger BUFFER_SIZE = 4096; +const long DEFAULT_RECURSION_LIMIT = 64; +const long DEFAULT_SIZE_LIMIT = 64 << 20; // 64MB +const long BUFFER_SIZE = 4096; @synthesize buffer; @synthesize input; @@ -93,7 +93,7 @@ + (PBCodedInputStream*) streamWithInputStream:(NSInputStream*) input { * Protocol message parsers use this to read tags, since a protocol message * may legally end wherever a tag occurs, and zero is not a valid tag number. */ -- (NSInteger) readTag { +- (long) readTag { if (self.isAtEnd) { lastTag = 0; return 0; @@ -115,7 +115,7 @@ - (NSInteger) readTag { * @throws InvalidProtocolBufferException {@code value} does not match the * last tag. */ -- (void) checkLastTagWas:(NSInteger) value { +- (void) checkLastTagWas:(long) value { if (lastTag != value) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"Invalid End Tag" userInfo:nil]; } @@ -127,7 +127,7 @@ - (void) checkLastTagWas:(NSInteger) value { * @return {@code NO} if the tag is an endgroup tag, in which case * nothing is skipped. Otherwise, returns {@code YES}. */ -- (BOOL) skipField:(NSInteger) tag { +- (BOOL) skipField:(long) tag { switch (PBWireFormatGetTagWireType(tag)) { case PBWireFormatVarint: [self readInt32]; @@ -161,7 +161,7 @@ - (BOOL) skipField:(NSInteger) tag { */ - (void) skipMessage { while (YES) { - NSInteger tag = [self readTag]; + long tag = [self readTag]; if (tag == 0 || ![self skipField:tag]) { return; } @@ -182,31 +182,31 @@ - (Float32) readFloat { /** Read a {@code uint64} field value from the stream. */ -- (int64_t) readUInt64 { +- (long long) readUInt64 { return [self readRawVarint64]; } /** Read an {@code int64} field value from the stream. */ -- (int64_t) readInt64 { +- (long long) readInt64 { return [self readRawVarint64]; } /** Read an {@code int32} field value from the stream. */ -- (NSInteger) readInt32 { +- (long) readInt32 { return [self readRawVarint32]; } /** Read a {@code fixed64} field value from the stream. */ -- (int64_t) readFixed64 { +- (long long) readFixed64 { return [self readRawLittleEndian64]; } /** Read a {@code fixed32} field value from the stream. */ -- (NSInteger) readFixed32 { +- (long) readFixed32 { return [self readRawLittleEndian32]; } @@ -219,7 +219,7 @@ - (BOOL) readBool { /** Read a {@code string} field value from the stream. */ - (NSString*) readString { - NSInteger size = [self readRawVarint32]; + long size = [self readRawVarint32]; if (size <= (bufferSize - bufferPos) && size > 0) { // Fast path: We already have the bytes in a contiguous buffer, so // just copy directly from it. @@ -238,7 +238,7 @@ - (NSString*) readString { /** Read a {@code group} field value from the stream. */ -- (void) readGroup:(NSInteger) fieldNumber +- (void) readGroup:(long) fieldNumber builder:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry { if (recursionDepth >= recursionLimit) { @@ -255,7 +255,7 @@ - (void) readGroup:(NSInteger) fieldNumber * Reads a {@code group} field value from the stream and merges it into the * given {@link PBUnknownFieldSet}. */ -- (void) readUnknownGroup:(NSInteger) fieldNumber +- (void) readUnknownGroup:(long) fieldNumber builder:(PBUnknownFieldSet_Builder*) builder { if (recursionDepth >= recursionLimit) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"Recursion Limit Exceeded" userInfo:nil]; @@ -270,11 +270,11 @@ - (void) readUnknownGroup:(NSInteger) fieldNumber /** Read an embedded message field value from the stream. */ - (void) readMessage:(id) builder extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - NSInteger length = [self readRawVarint32]; + long length = [self readRawVarint32]; if (recursionDepth >= recursionLimit) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"Recursion Limit Exceeded" userInfo:nil]; } - NSInteger oldLimit = [self pushLimit:length]; + long oldLimit = [self pushLimit:length]; ++recursionDepth; [builder mergeFromCodedInputStream:self extensionRegistry:extensionRegistry]; [self checkLastTagWas:0]; @@ -285,7 +285,7 @@ - (void) readMessage:(id) builder /** Read a {@code bytes} field value from the stream. */ - (NSData*) readData { - NSInteger size = [self readRawVarint32]; + long size = [self readRawVarint32]; if (size < bufferSize - bufferPos && size > 0) { // Fast path: We already have the bytes in a contiguous buffer, so // just copy directly from it. @@ -300,7 +300,7 @@ - (NSData*) readData { /** Read a {@code uint32} field value from the stream. */ -- (NSInteger) readUInt32 { +- (long) readUInt32 { return [self readRawVarint32]; } @@ -309,31 +309,31 @@ - (NSInteger) readUInt32 { * Read an enum field value from the stream. Caller is responsible * for converting the numeric value to an actual enum. */ -- (NSInteger) readEnum { +- (long) readEnum { return [self readRawVarint32]; } /** Read an {@code sfixed32} field value from the stream. */ -- (NSInteger) readSFixed32 { +- (long) readSFixed32 { return [self readRawLittleEndian32]; } /** Read an {@code sfixed64} field value from the stream. */ -- (int64_t) readSFixed64 { +- (long long) readSFixed64 { return [self readRawLittleEndian64]; } /** Read an {@code sint32} field value from the stream. */ -- (NSInteger) readSInt32 { +- (long) readSInt32 { return decodeZigZag32([self readRawVarint32]); } /** Read an {@code sint64} field value from the stream. */ -- (int64_t) readSInt64 { +- (long long) readSInt64 { return decodeZigZag64([self readRawVarint64]); } @@ -344,12 +344,12 @@ - (int64_t) readSInt64 { * Read a raw Varint from the stream. If larger than 32 bits, discard the * upper bits. */ -- (NSInteger) readRawVarint32 { +- (long) readRawVarint32 { int8_t tmp = [self readRawByte]; if (tmp >= 0) { return tmp; } - NSInteger result = tmp & 0x7f; + long result = tmp & 0x7f; if ((tmp = [self readRawByte]) >= 0) { result |= tmp << 7; } else { @@ -380,12 +380,12 @@ - (NSInteger) readRawVarint32 { /** Read a raw Varint from the stream. */ -- (int64_t) readRawVarint64 { - NSInteger shift = 0; - int64_t result = 0; +- (long long) readRawVarint64 { + long shift = 0; + long long result = 0; while (shift < 64) { int8_t b = [self readRawByte]; - result |= (int64_t)(b & 0x7F) << shift; + result |= (long long)(b & 0x7F) << shift; if ((b & 0x80) == 0) { return result; } @@ -396,21 +396,21 @@ - (int64_t) readRawVarint64 { /** Read a 32-bit little-endian integer from the stream. */ -- (NSInteger) readRawLittleEndian32 { +- (long) readRawLittleEndian32 { int8_t b1 = [self readRawByte]; int8_t b2 = [self readRawByte]; int8_t b3 = [self readRawByte]; int8_t b4 = [self readRawByte]; return - (((NSInteger)b1 & 0xff) ) | - (((NSInteger)b2 & 0xff) << 8) | - (((NSInteger)b3 & 0xff) << 16) | - (((NSInteger)b4 & 0xff) << 24); + (((long)b1 & 0xff) ) | + (((long)b2 & 0xff) << 8) | + (((long)b3 & 0xff) << 16) | + (((long)b4 & 0xff) << 24); } /** Read a 64-bit little-endian integer from the stream. */ -- (int64_t) readRawLittleEndian64 { +- (long long) readRawLittleEndian64 { int8_t b1 = [self readRawByte]; int8_t b2 = [self readRawByte]; int8_t b3 = [self readRawByte]; @@ -420,14 +420,14 @@ - (int64_t) readRawLittleEndian64 { int8_t b7 = [self readRawByte]; int8_t b8 = [self readRawByte]; return - (((int64_t)b1 & 0xff) ) | - (((int64_t)b2 & 0xff) << 8) | - (((int64_t)b3 & 0xff) << 16) | - (((int64_t)b4 & 0xff) << 24) | - (((int64_t)b5 & 0xff) << 32) | - (((int64_t)b6 & 0xff) << 40) | - (((int64_t)b7 & 0xff) << 48) | - (((int64_t)b8 & 0xff) << 56); + (((long long)b1 & 0xff) ) | + (((long long)b2 & 0xff) << 8) | + (((long long)b3 & 0xff) << 16) | + (((long long)b4 & 0xff) << 24) | + (((long long)b5 & 0xff) << 32) | + (((long long)b6 & 0xff) << 40) | + (((long long)b7 & 0xff) << 48) | + (((long long)b8 & 0xff) << 56); } @@ -438,11 +438,11 @@ - (int64_t) readRawLittleEndian64 { * * @return the old limit. */ -- (NSInteger) setRecursionLimit:(NSInteger) limit { +- (long) setRecursionLimit:(long) limit { if (limit < 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"Recursion limit cannot be negative" userInfo:nil]; } - NSInteger oldLimit = recursionLimit; + long oldLimit = recursionLimit; recursionLimit = limit; return oldLimit; } @@ -459,11 +459,11 @@ - (NSInteger) setRecursionLimit:(NSInteger) limit { * * @return the old limit. */ -- (NSInteger) setSizeLimit:(NSInteger) limit { +- (long) setSizeLimit:(long) limit { if (limit < 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"Size limit cannot be negative:" userInfo:nil]; } - NSInteger oldLimit = sizeLimit; + long oldLimit = sizeLimit; sizeLimit = limit; return oldLimit; } @@ -483,12 +483,12 @@ - (void) resetSizeCounter { * * @return the old limit. */ -- (NSInteger) pushLimit:(NSInteger) byteLimit { +- (long) pushLimit:(long) byteLimit { if (byteLimit < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"negativeSize" userInfo:nil]; } byteLimit += totalBytesRetired + bufferPos; - NSInteger oldLimit = currentLimit; + long oldLimit = currentLimit; if (byteLimit > oldLimit) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"truncatedMessage" userInfo:nil]; } @@ -502,7 +502,7 @@ - (NSInteger) pushLimit:(NSInteger) byteLimit { - (void) recomputeBufferSizeAfterLimit { bufferSize += bufferSizeAfterLimit; - NSInteger bufferEnd = totalBytesRetired + bufferSize; + long bufferEnd = totalBytesRetired + bufferSize; if (bufferEnd > currentLimit) { // Limit is in current buffer. bufferSizeAfterLimit = bufferEnd - currentLimit; @@ -518,7 +518,7 @@ - (void) recomputeBufferSizeAfterLimit { * * @param oldLimit The old limit, as returned by {@code pushLimit}. */ -- (void) popLimit:(NSInteger) oldLimit { +- (void) popLimit:(long) oldLimit { currentLimit = oldLimit; [self recomputeBufferSizeAfterLimit]; } @@ -528,12 +528,12 @@ - (void) popLimit:(NSInteger) oldLimit { * Returns the number of bytes to be read before the current limit. * If no limit is set, returns -1. */ -- (NSInteger) bytesUntilLimit { +- (long) bytesUntilLimit { if (currentLimit == INT_MAX) { return -1; } - NSInteger currentAbsolutePosition = totalBytesRetired + bufferPos; + long currentAbsolutePosition = totalBytesRetired + bufferPos; return currentLimit - currentAbsolutePosition; } @@ -587,7 +587,7 @@ - (BOOL) refillBuffer:(BOOL) mustSucceed { } } else { [self recomputeBufferSizeAfterLimit]; - NSInteger totalBytesRead = totalBytesRetired + bufferSize + bufferSizeAfterLimit; + long totalBytesRead = totalBytesRetired + bufferSize + bufferSizeAfterLimit; if (totalBytesRead > sizeLimit || totalBytesRead < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"sizeLimitExceeded" userInfo:nil]; } @@ -617,7 +617,7 @@ - (int8_t) readRawByte { * @throws InvalidProtocolBufferException The end of the stream or the current * limit was reached. */ -- (NSData*) readRawData:(NSInteger) size { +- (NSData*) readRawData:(long) size { if (size < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"negativeSize" userInfo:nil]; } @@ -640,7 +640,7 @@ - (NSData*) readRawData:(NSInteger) size { // First copy what we have. NSMutableData* bytes = [NSMutableData dataWithLength:size]; - NSInteger pos = bufferSize - bufferPos; + long pos = bufferSize - bufferPos; memcpy(bytes.mutableBytes, ((int8_t*)buffer.bytes) + bufferPos, pos); bufferPos = bufferSize; @@ -671,8 +671,8 @@ - (NSData*) readRawData:(NSInteger) size { // Remember the buffer markers since we'll have to copy the bytes out of // it later. - NSInteger originalBufferPos = bufferPos; - NSInteger originalBufferSize = bufferSize; + long originalBufferPos = bufferPos; + long originalBufferSize = bufferSize; // Mark the current buffer consumed. totalBytesRetired += bufferSize; @@ -680,15 +680,15 @@ - (NSData*) readRawData:(NSInteger) size { bufferSize = 0; // Read all the rest of the bytes we need. - NSInteger sizeLeft = size - (originalBufferSize - originalBufferPos); + long sizeLeft = size - (originalBufferSize - originalBufferPos); NSMutableArray* chunks = [NSMutableArray array]; while (sizeLeft > 0) { NSMutableData* chunk = [NSMutableData dataWithLength:MIN(sizeLeft, BUFFER_SIZE)]; - NSInteger pos = 0; + long pos = 0; while (pos < chunk.length) { - NSInteger n = 0; + long n = 0; if (input != nil) { n = [input read:(((uint8_t*) chunk.mutableBytes) + pos) maxLength:chunk.length - pos]; } @@ -706,7 +706,7 @@ - (NSData*) readRawData:(NSInteger) size { NSMutableData* bytes = [NSMutableData dataWithLength:size]; // Start by copying the leftover bytes from this.buffer. - NSInteger pos = originalBufferSize - originalBufferPos; + long pos = originalBufferSize - originalBufferPos; memcpy(bytes.mutableBytes, ((int8_t*)buffer.bytes) + originalBufferPos, pos); // And now all the chunks. @@ -727,7 +727,7 @@ - (NSData*) readRawData:(NSInteger) size { * @throws InvalidProtocolBufferException The end of the stream or the current * limit was reached. */ -- (void) skipRawData:(NSInteger) size { +- (void) skipRawData:(long) size { if (size < 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"negativeSize" userInfo:nil]; } @@ -744,7 +744,7 @@ - (void) skipRawData:(NSInteger) size { bufferPos += size; } else { // Skipping more bytes than are in the buffer. First skip what we have. - NSInteger pos = bufferSize - bufferPos; + long pos = bufferSize - bufferPos; totalBytesRetired += pos; bufferPos = 0; bufferSize = 0; @@ -752,7 +752,7 @@ - (void) skipRawData:(NSInteger) size { // Then skip directly from the InputStream for the rest. while (pos < size) { NSMutableData* data = [NSMutableData dataWithLength:(size - pos)]; - NSInteger n = (input == nil) ? -1 : (NSInteger)[input read:data.mutableBytes maxLength:(size - pos)]; + long n = (input == nil) ? -1 : (long)[input read:data.mutableBytes maxLength:(size - pos)]; if (n <= 0) { @throw [NSException exceptionWithName:@"InvalidProtocolBuffer" reason:@"truncatedMessage" userInfo:nil]; } diff --git a/src/runtime/Classes/CodedOutputStream.h b/src/runtime/Classes/CodedOutputStream.h index 88c45ba..640c65e 100644 --- a/src/runtime/Classes/CodedOutputStream.h +++ b/src/runtime/Classes/CodedOutputStream.h @@ -41,7 +41,7 @@ + (PBCodedOutputStream*) streamWithData:(NSMutableData*) data; + (PBCodedOutputStream*) streamWithOutputStream:(NSOutputStream*) output; -+ (PBCodedOutputStream*) streamWithOutputStream:(NSOutputStream*) output bufferSize:(NSInteger) bufferSize; ++ (PBCodedOutputStream*) streamWithOutputStream:(NSOutputStream*) output bufferSize:(long) bufferSize; /** * Flushes the stream and forces any buffered bytes to be written. This @@ -53,85 +53,85 @@ - (void) writeRawByte:(uint8_t) value; /** Encode and write a tag. */ -- (void) writeTag:(NSInteger) fieldNumber format:(NSInteger) format; +- (void) writeTag:(long) fieldNumber format:(long) format; /** Write a little-endian 32-bit integer. */ -- (void) writeRawLittleEndian32:(NSInteger) value; +- (void) writeRawLittleEndian32:(long) value; /** Write a little-endian 64-bit integer. */ -- (void) writeRawLittleEndian64:(int64_t) value; +- (void) writeRawLittleEndian64:(long long) value; /** * Encode and write a varint. {@code value} is treated as * unsigned, so it won't be sign-extended if negative. */ -- (void) writeRawVarint32:(NSInteger) value; +- (void) writeRawVarint32:(long) value; /** Encode and write a varint. */ -- (void) writeRawVarint64:(int64_t) value; +- (void) writeRawVarint64:(long long) value; -//- (void) writeRawLittleEndian32:(NSInteger) value; -//- (void) writeRawLittleEndian64:(int64_t) value; +//- (void) writeRawLittleEndian32:(long) value; +//- (void) writeRawLittleEndian64:(long long) value; /** Write an array of bytes. */ - (void) writeRawData:(const NSData*) data; -- (void) writeRawData:(const NSData*) data offset:(NSInteger) offset length:(NSInteger) length; - -- (void) writeData:(NSInteger) fieldNumber value:(const NSData*) value; - -- (void) writeDouble:(NSInteger) fieldNumber value:(Float64) value; -- (void) writeFloat:(NSInteger) fieldNumber value:(Float32) value; -- (void) writeUInt64:(NSInteger) fieldNumber value:(int64_t) value; -- (void) writeInt64:(NSInteger) fieldNumber value:(int64_t) value; -- (void) writeInt32:(NSInteger) fieldNumber value:(NSInteger) value; -- (void) writeFixed64:(NSInteger) fieldNumber value:(int64_t) value; -- (void) writeFixed32:(NSInteger) fieldNumber value:(NSInteger) value; -- (void) writeBool:(NSInteger) fieldNumber value:(BOOL) value; -- (void) writeString:(NSInteger) fieldNumber value:(const NSString*) value; -- (void) writeGroup:(NSInteger) fieldNumber value:(const id) value; -- (void) writeUnknownGroup:(NSInteger) fieldNumber value:(const PBUnknownFieldSet*) value; -- (void) writeMessage:(NSInteger) fieldNumber value:(const id) value; -- (void) writeUInt32:(NSInteger) fieldNumber value:(NSInteger) value; -- (void) writeSFixed32:(NSInteger) fieldNumber value:(NSInteger) value; -- (void) writeSFixed64:(NSInteger) fieldNumber value:(int64_t) value; -- (void) writeSInt32:(NSInteger) fieldNumber value:(NSInteger) value; -- (void) writeSInt64:(NSInteger) fieldNumber value:(int64_t) value; +- (void) writeRawData:(const NSData*) data offset:(long) offset length:(long) length; + +- (void) writeData:(long) fieldNumber value:(const NSData*) value; + +- (void) writeDouble:(long) fieldNumber value:(Float64) value; +- (void) writeFloat:(long) fieldNumber value:(Float32) value; +- (void) writeUInt64:(long) fieldNumber value:(long long) value; +- (void) writeInt64:(long) fieldNumber value:(long long) value; +- (void) writeInt32:(long) fieldNumber value:(long) value; +- (void) writeFixed64:(long) fieldNumber value:(long long) value; +- (void) writeFixed32:(long) fieldNumber value:(long) value; +- (void) writeBool:(long) fieldNumber value:(BOOL) value; +- (void) writeString:(long) fieldNumber value:(const NSString*) value; +- (void) writeGroup:(long) fieldNumber value:(const id) value; +- (void) writeUnknownGroup:(long) fieldNumber value:(const PBUnknownFieldSet*) value; +- (void) writeMessage:(long) fieldNumber value:(const id) value; +- (void) writeUInt32:(long) fieldNumber value:(long) value; +- (void) writeSFixed32:(long) fieldNumber value:(long) value; +- (void) writeSFixed64:(long) fieldNumber value:(long long) value; +- (void) writeSInt32:(long) fieldNumber value:(long) value; +- (void) writeSInt64:(long) fieldNumber value:(long long) value; - (void) writeDoubleNoTag:(Float64) value; - (void) writeFloatNoTag:(Float32) value; -- (void) writeUInt64NoTag:(int64_t) value; -- (void) writeInt64NoTag:(int64_t) value; -- (void) writeInt32NoTag:(NSInteger) value; -- (void) writeFixed64NoTag:(int64_t) value; -- (void) writeFixed32NoTag:(NSInteger) value; +- (void) writeUInt64NoTag:(long long) value; +- (void) writeInt64NoTag:(long long) value; +- (void) writeInt32NoTag:(long) value; +- (void) writeFixed64NoTag:(long long) value; +- (void) writeFixed32NoTag:(long) value; - (void) writeBoolNoTag:(BOOL) value; - (void) writeStringNoTag:(const NSString*) value; -- (void) writeGroupNoTag:(NSInteger) fieldNumber value:(const id) value; -- (void) writeUnknownGroupNoTag:(NSInteger) fieldNumber value:(const PBUnknownFieldSet*) value; +- (void) writeGroupNoTag:(long) fieldNumber value:(const id) value; +- (void) writeUnknownGroupNoTag:(long) fieldNumber value:(const PBUnknownFieldSet*) value; - (void) writeMessageNoTag:(const id) value; - (void) writeDataNoTag:(const NSData*) value; -- (void) writeUInt32NoTag:(NSInteger) value; -- (void) writeEnumNoTag:(NSInteger) value; -- (void) writeSFixed32NoTag:(NSInteger) value; -- (void) writeSFixed64NoTag:(int64_t) value; -- (void) writeSInt32NoTag:(NSInteger) value; -- (void) writeSInt64NoTag:(int64_t) value; +- (void) writeUInt32NoTag:(long) value; +- (void) writeEnumNoTag:(long) value; +- (void) writeSFixed32NoTag:(long) value; +- (void) writeSFixed64NoTag:(long long) value; +- (void) writeSInt32NoTag:(long) value; +- (void) writeSInt64NoTag:(long long) value; /** * Write a MessageSet extension field to the stream. For historical reasons, * the wire format differs from normal fields. */ -- (void) writeMessageSetExtension:(NSInteger) fieldNumber value:(const id) value; +- (void) writeMessageSetExtension:(long) fieldNumber value:(const id) value; /** * Write an unparsed MessageSet extension field to the stream. For * historical reasons, the wire format differs from normal fields. */ -- (void) writeRawMessageSetExtension:(NSInteger) fieldNumber value:(const NSData*) value; +- (void) writeRawMessageSetExtension:(long) fieldNumber value:(const NSData*) value; /** * Write an enum field, including tag, to the stream. Caller is responsible * for converting the enum value to its numeric value. */ -- (void) writeEnum:(NSInteger) fieldNumber value:(NSInteger) value; +- (void) writeEnum:(long) fieldNumber value:(long) value; @end diff --git a/src/runtime/Classes/CodedOutputStream.m b/src/runtime/Classes/CodedOutputStream.m index 9cc7110..b26efe1 100644 --- a/src/runtime/Classes/CodedOutputStream.m +++ b/src/runtime/Classes/CodedOutputStream.m @@ -24,7 +24,7 @@ @implementation PBCodedOutputStream -const NSInteger DEFAULT_BUFFER_SIZE = 4 * 1024; +const long DEFAULT_BUFFER_SIZE = 4 * 1024; - (id)initWithOutputStream:(NSOutputStream*)_output data:(NSMutableData*)data { @@ -43,7 +43,7 @@ - (void)dealloc { } -+ (PBCodedOutputStream*)streamWithOutputStream:(NSOutputStream*)output bufferSize:(NSInteger)bufferSize { ++ (PBCodedOutputStream*)streamWithOutputStream:(NSOutputStream*)output bufferSize:(long)bufferSize { NSMutableData *data = [NSMutableData dataWithLength:bufferSize]; return [[[PBCodedOutputStream alloc] initWithOutputStream:output data:data] autorelease]; } @@ -81,9 +81,9 @@ - (void)writeRawData:(const NSData*)data { } -- (void)writeRawData:(const NSData*)value offset:(NSInteger)offset length:(NSInteger)length { +- (void)writeRawData:(const NSData*)value offset:(long)offset length:(long)length { while (length > 0) { - NSInteger written = [buffer appendData:value offset:offset length:length]; + long written = [buffer appendData:value offset:offset length:length]; offset += written; length -= written; if (!written || length > 0) { @@ -99,7 +99,7 @@ - (void)writeDoubleNoTag:(Float64)value { /** Write a {@code double} field, including tag, to the stream. */ -- (void)writeDouble:(NSInteger)fieldNumber value:(Float64)value { +- (void)writeDouble:(long)fieldNumber value:(Float64)value { [self writeTag:fieldNumber format:PBWireFormatFixed64]; [self writeDoubleNoTag:value]; } @@ -111,37 +111,37 @@ - (void)writeFloatNoTag:(Float32)value { /** Write a {@code float} field, including tag, to the stream. */ -- (void)writeFloat:(NSInteger)fieldNumber value:(Float32)value { +- (void)writeFloat:(long)fieldNumber value:(Float32)value { [self writeTag:fieldNumber format:PBWireFormatFixed32]; [self writeFloatNoTag:value]; } -- (void)writeUInt64NoTag:(int64_t)value { +- (void)writeUInt64NoTag:(long long)value { [self writeRawVarint64:value]; } /** Write a {@code uint64} field, including tag, to the stream. */ -- (void)writeUInt64:(NSInteger)fieldNumber value:(int64_t)value { +- (void)writeUInt64:(long)fieldNumber value:(long long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeUInt64NoTag:value]; } -- (void)writeInt64NoTag:(int64_t)value { +- (void)writeInt64NoTag:(long long)value { [self writeRawVarint64:value]; } /** Write an {@code int64} field, including tag, to the stream. */ -- (void)writeInt64:(NSInteger)fieldNumber value:(int64_t)value { +- (void)writeInt64:(long)fieldNumber value:(long long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeInt64NoTag:value]; } -- (void)writeInt32NoTag:(NSInteger)value { +- (void)writeInt32NoTag:(long)value { if (value >= 0) { [self writeRawVarint32:value]; } else { @@ -152,31 +152,31 @@ - (void)writeInt32NoTag:(NSInteger)value { /** Write an {@code int32} field, including tag, to the stream. */ -- (void)writeInt32:(NSInteger)fieldNumber value:(NSInteger)value { +- (void)writeInt32:(long)fieldNumber value:(long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeInt32NoTag:value]; } -- (void)writeFixed64NoTag:(int64_t)value { +- (void)writeFixed64NoTag:(long long)value { [self writeRawLittleEndian64:value]; } /** Write a {@code fixed64} field, including tag, to the stream. */ -- (void)writeFixed64:(NSInteger)fieldNumber value:(int64_t)value { +- (void)writeFixed64:(long)fieldNumber value:(long long)value { [self writeTag:fieldNumber format:PBWireFormatFixed64]; [self writeFixed64NoTag:value]; } -- (void)writeFixed32NoTag:(NSInteger)value { +- (void)writeFixed32NoTag:(long)value { [self writeRawLittleEndian32:value]; } /** Write a {@code fixed32} field, including tag, to the stream. */ -- (void)writeFixed32:(NSInteger)fieldNumber value:(NSInteger)value { +- (void)writeFixed32:(long)fieldNumber value:(long)value { [self writeTag:fieldNumber format:PBWireFormatFixed32]; [self writeFixed32NoTag:value]; } @@ -188,7 +188,7 @@ - (void)writeBoolNoTag:(BOOL)value { /** Write a {@code bool} field, including tag, to the stream. */ -- (void)writeBool:(NSInteger)fieldNumber value:(BOOL)value { +- (void)writeBool:(long)fieldNumber value:(BOOL)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeBoolNoTag:value]; } @@ -202,33 +202,33 @@ - (void)writeStringNoTag:(const NSString*)value { /** Write a {@code string} field, including tag, to the stream. */ -- (void)writeString:(NSInteger)fieldNumber value:(const NSString*)value { +- (void)writeString:(long)fieldNumber value:(const NSString*)value { [self writeTag:fieldNumber format:PBWireFormatLengthDelimited]; [self writeStringNoTag:value]; } -- (void)writeGroupNoTag:(NSInteger)fieldNumber value:(const id)value { +- (void)writeGroupNoTag:(long)fieldNumber value:(const id)value { [value writeToCodedOutputStream:self]; [self writeTag:fieldNumber format:PBWireFormatEndGroup]; } /** Write a {@code group} field, including tag, to the stream. */ -- (void)writeGroup:(NSInteger)fieldNumber value:(const id)value { +- (void)writeGroup:(long)fieldNumber value:(const id)value { [self writeTag:fieldNumber format:PBWireFormatStartGroup]; [self writeGroupNoTag:fieldNumber value:value]; } -- (void)writeUnknownGroupNoTag:(NSInteger)fieldNumber value:(const PBUnknownFieldSet*)value { +- (void)writeUnknownGroupNoTag:(long)fieldNumber value:(const PBUnknownFieldSet*)value { [value writeToCodedOutputStream:self]; [self writeTag:fieldNumber format:PBWireFormatEndGroup]; } /** Write a group represented by an {@link PBUnknownFieldSet}. */ -- (void)writeUnknownGroup:(NSInteger)fieldNumber value:(const PBUnknownFieldSet*)value { +- (void)writeUnknownGroup:(long)fieldNumber value:(const PBUnknownFieldSet*)value { [self writeTag:fieldNumber format:PBWireFormatStartGroup]; [self writeUnknownGroupNoTag:fieldNumber value:value]; } @@ -241,7 +241,7 @@ - (void)writeMessageNoTag:(const id)value { /** Write an embedded message field, including tag, to the stream. */ -- (void)writeMessage:(NSInteger)fieldNumber value:(const id)value { +- (void)writeMessage:(long)fieldNumber value:(const id)value { [self writeTag:fieldNumber format:PBWireFormatLengthDelimited]; [self writeMessageNoTag:value]; } @@ -254,78 +254,78 @@ - (void)writeDataNoTag:(const NSData*)value { /** Write a {@code bytes} field, including tag, to the stream. */ -- (void)writeData:(NSInteger)fieldNumber value:(const NSData*)value { +- (void)writeData:(long)fieldNumber value:(const NSData*)value { [self writeTag:fieldNumber format:PBWireFormatLengthDelimited]; [self writeDataNoTag:value]; } -- (void)writeUInt32NoTag:(NSInteger)value { +- (void)writeUInt32NoTag:(long)value { [self writeRawVarint32:value]; } /** Write a {@code uint32} field, including tag, to the stream. */ -- (void)writeUInt32:(NSInteger)fieldNumber value:(NSInteger)value { +- (void)writeUInt32:(long)fieldNumber value:(long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeUInt32NoTag:value]; } -- (void)writeEnumNoTag:(NSInteger)value { +- (void)writeEnumNoTag:(long)value { [self writeRawVarint32:value]; } -- (void)writeEnum:(NSInteger)fieldNumber value:(NSInteger)value { +- (void)writeEnum:(long)fieldNumber value:(long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeEnumNoTag:value]; } -- (void)writeSFixed32NoTag:(NSInteger)value { +- (void)writeSFixed32NoTag:(long)value { [self writeRawLittleEndian32:value]; } /** Write an {@code sfixed32} field, including tag, to the stream. */ -- (void)writeSFixed32:(NSInteger)fieldNumber value:(NSInteger)value { +- (void)writeSFixed32:(long)fieldNumber value:(long)value { [self writeTag:fieldNumber format:PBWireFormatFixed32]; [self writeSFixed32NoTag:value]; } -- (void)writeSFixed64NoTag:(int64_t)value { +- (void)writeSFixed64NoTag:(long long)value { [self writeRawLittleEndian64:value]; } /** Write an {@code sfixed64} field, including tag, to the stream. */ -- (void)writeSFixed64:(NSInteger)fieldNumber value:(int64_t)value { +- (void)writeSFixed64:(long)fieldNumber value:(long long)value { [self writeTag:fieldNumber format:PBWireFormatFixed64]; [self writeSFixed64NoTag:value]; } -- (void)writeSInt32NoTag:(NSInteger)value { +- (void)writeSInt32NoTag:(long)value { [self writeRawVarint32:encodeZigZag32(value)]; } /** Write an {@code sint32} field, including tag, to the stream. */ -- (void)writeSInt32:(NSInteger)fieldNumber value:(NSInteger)value { +- (void)writeSInt32:(long)fieldNumber value:(long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeSInt32NoTag:value]; } -- (void)writeSInt64NoTag:(int64_t)value { +- (void)writeSInt64NoTag:(long long)value { [self writeRawVarint64:encodeZigZag64(value)]; } /** Write an {@code sint64} field, including tag, to the stream. */ -- (void)writeSInt64:(NSInteger)fieldNumber value:(int64_t)value { +- (void)writeSInt64:(long)fieldNumber value:(long long)value { [self writeTag:fieldNumber format:PBWireFormatVarint]; [self writeSInt64NoTag:value]; } @@ -335,7 +335,7 @@ - (void)writeSInt64:(NSInteger)fieldNumber value:(int64_t)value { * Write a MessageSet extension field to the stream. For historical reasons, * the wire format differs from normal fields. */ -- (void)writeMessageSetExtension:(NSInteger)fieldNumber value:(const id)value { +- (void)writeMessageSetExtension:(long)fieldNumber value:(const id)value { [self writeTag:PBWireFormatMessageSetItem format:PBWireFormatStartGroup]; [self writeUInt32:PBWireFormatMessageSetTypeId value:fieldNumber]; [self writeMessage:PBWireFormatMessageSetMessage value:value]; @@ -347,7 +347,7 @@ - (void)writeMessageSetExtension:(NSInteger)fieldNumber value:(const id> 8) & 0xFF)]; [self writeRawByte:((value >> 16) & 0xFF)]; @@ -394,15 +394,15 @@ - (void)writeRawLittleEndian32:(NSInteger)value { } -- (void)writeRawLittleEndian64:(int64_t)value { - [self writeRawByte:((NSInteger)(value ) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 8) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 16) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 24) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 32) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 40) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 48) & 0xFF)]; - [self writeRawByte:((NSInteger)(value >> 56) & 0xFF)]; +- (void)writeRawLittleEndian64:(long long)value { + [self writeRawByte:((long)(value ) & 0xFF)]; + [self writeRawByte:((long)(value >> 8) & 0xFF)]; + [self writeRawByte:((long)(value >> 16) & 0xFF)]; + [self writeRawByte:((long)(value >> 24) & 0xFF)]; + [self writeRawByte:((long)(value >> 32) & 0xFF)]; + [self writeRawByte:((long)(value >> 40) & 0xFF)]; + [self writeRawByte:((long)(value >> 48) & 0xFF)]; + [self writeRawByte:((long)(value >> 56) & 0xFF)]; } @end diff --git a/src/runtime/Classes/ConcreteExtensionField.h b/src/runtime/Classes/ConcreteExtensionField.h index f22975e..27fe829 100644 --- a/src/runtime/Classes/ConcreteExtensionField.h +++ b/src/runtime/Classes/ConcreteExtensionField.h @@ -43,7 +43,7 @@ typedef enum { PBExtensionType type; Class extendedClass; - NSInteger fieldNumber; + long fieldNumber; id defaultValue; Class messageOrGroupClass; @@ -55,7 +55,7 @@ typedef enum { + (PBConcreteExtensionField*) extensionWithType:(PBExtensionType) type extendedClass:(Class) extendedClass - fieldNumber:(NSInteger) fieldNumber + fieldNumber:(long) fieldNumber defaultValue:(id) defaultValue messageOrGroupClass:(Class) messageOrGroupClass isRepeated:(BOOL) isRepeated diff --git a/src/runtime/Classes/ConcreteExtensionField.m b/src/runtime/Classes/ConcreteExtensionField.m index fe23af6..ea9ab0c 100644 --- a/src/runtime/Classes/ConcreteExtensionField.m +++ b/src/runtime/Classes/ConcreteExtensionField.m @@ -28,7 +28,7 @@ @interface PBConcreteExtensionField() @property PBExtensionType type; @property (assign) Class extendedClass; -@property NSInteger fieldNumber; +@property long fieldNumber; @property (retain) id defaultValue; @property (assign) Class messageOrGroupClass; @property BOOL isRepeated; @@ -62,7 +62,7 @@ - (void) dealloc { - (id) initWithType:(PBExtensionType) type_ extendedClass:(Class) extendedClass_ - fieldNumber:(NSInteger) fieldNumber_ + fieldNumber:(long) fieldNumber_ defaultValue:(id) defaultValue_ messageOrGroupClass:(Class) messageOrGroupClass_ isRepeated:(BOOL) isRepeated_ @@ -85,7 +85,7 @@ - (id) initWithType:(PBExtensionType) type_ + (PBConcreteExtensionField*) extensionWithType:(PBExtensionType) type extendedClass:(Class) extendedClass - fieldNumber:(NSInteger) fieldNumber + fieldNumber:(long) fieldNumber defaultValue:(id) defaultValue messageOrGroupClass:(Class) messageOrGroupClass isRepeated:(BOOL) isRepeated @@ -148,7 +148,7 @@ BOOL typeIsFixedSize(PBExtensionType type) { } -NSInteger typeSize(PBExtensionType type) { +long typeSize(PBExtensionType type) { switch (type) { case PBExtensionTypeBool: return 1; @@ -298,7 +298,7 @@ - (void) writeSingleValue:(id) value } -- (NSInteger) computeSingleSerializedSizeNoTag:(id) value { +- (long) computeSingleSerializedSizeNoTag:(id) value { switch (type) { case PBExtensionTypeBool: return computeBoolSizeNoTag([value boolValue]); case PBExtensionTypeFixed32: return computeFixed32SizeNoTag([value intValue]); @@ -324,7 +324,7 @@ - (NSInteger) computeSingleSerializedSizeNoTag:(id) value { } -- (NSInteger) computeSingleSerializedSizeIncludingTag:(id) value { +- (long) computeSingleSerializedSizeIncludingTag:(id) value { switch (type) { case PBExtensionTypeBool: return computeBoolSize(fieldNumber, [value boolValue]); case PBExtensionTypeFixed32: return computeFixed32Size(fieldNumber, [value intValue]); @@ -390,7 +390,7 @@ - (void) writeRepeatedValues:(NSArray*) values includingTagsToCodedOutputStream:(PBCodedOutputStream*) output { if (isPacked) { [output writeTag:fieldNumber format:PBWireFormatLengthDelimited]; - NSInteger dataSize = 0; + long dataSize = 0; if (typeIsFixedSize(type)) { dataSize = values.count * typeSize(type); } else { @@ -419,9 +419,9 @@ - (void) writeValue:(id) value includingTagToCodedOutputStream:(PBCodedOutputStr } -- (NSInteger) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { +- (long) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { if (isPacked) { - NSInteger size = 0; + long size = 0; if (typeIsFixedSize(type)) { size = values.count * typeSize(type); } else { @@ -431,7 +431,7 @@ - (NSInteger) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { } return size + computeTagSize(fieldNumber) + computeRawVarint32Size(size); } else { - NSInteger size = 0; + long size = 0; for (id value in values) { size += [self computeSingleSerializedSizeIncludingTag:value]; } @@ -440,7 +440,7 @@ - (NSInteger) computeRepeatedSerializedSizeIncludingTags:(NSArray*) values { } -- (NSInteger) computeSerializedSizeIncludingTag:(id) value { +- (long) computeSerializedSizeIncludingTag:(id) value { if (isRepeated) { return [self computeRepeatedSerializedSizeIncludingTags:value]; } else { @@ -568,10 +568,10 @@ - (void) mergeFromCodedInputStream:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry builder:(PBExtendableMessage_Builder*) builder - tag:(NSInteger) tag { + tag:(long) tag { if (isPacked) { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; while ([input bytesUntilLimit] > 0) { id value = [self readSingleValueFromCodedInputStream:input extensionRegistry:extensionRegistry]; [builder addExtension:self value:value]; diff --git a/src/runtime/Classes/Descriptor.pb.h b/src/runtime/Classes/Descriptor.pb.h index 0d98753..ddceba2 100644 --- a/src/runtime/Classes/Descriptor.pb.h +++ b/src/runtime/Classes/Descriptor.pb.h @@ -96,7 +96,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableFileList; } - (NSArray*) fileList; -- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index; +- (PBFileDescriptorProto*) fileAtIndex:(long) index; + (PBFileDescriptorSet*) defaultInstance; - (PBFileDescriptorSet*) defaultInstance; @@ -133,8 +133,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) fileList; -- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index; -- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(NSInteger) index with:(PBFileDescriptorProto*) value; +- (PBFileDescriptorProto*) fileAtIndex:(long) index; +- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(long) index with:(PBFileDescriptorProto*) value; - (PBFileDescriptorSet_Builder*) addFile:(PBFileDescriptorProto*) value; - (PBFileDescriptorSet_Builder*) addAllFile:(NSArray*) values; - (PBFileDescriptorSet_Builder*) clearFileList; @@ -161,15 +161,15 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* package; @property (readonly, retain) PBFileOptions* options; - (NSArray*) dependencyList; -- (NSString*) dependencyAtIndex:(NSInteger) index; +- (NSString*) dependencyAtIndex:(long) index; - (NSArray*) messageTypeList; -- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index; +- (PBDescriptorProto*) messageTypeAtIndex:(long) index; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; - (NSArray*) serviceList; -- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index; +- (PBServiceDescriptorProto*) serviceAtIndex:(long) index; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; + (PBFileDescriptorProto*) defaultInstance; - (PBFileDescriptorProto*) defaultInstance; @@ -216,36 +216,36 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFileDescriptorProto_Builder*) clearPackage; - (NSArray*) dependencyList; -- (NSString*) dependencyAtIndex:(NSInteger) index; -- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(NSInteger) index with:(NSString*) value; +- (NSString*) dependencyAtIndex:(long) index; +- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(long) index with:(NSString*) value; - (PBFileDescriptorProto_Builder*) addDependency:(NSString*) value; - (PBFileDescriptorProto_Builder*) addAllDependency:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearDependencyList; - (NSArray*) messageTypeList; -- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index; -- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value; +- (PBDescriptorProto*) messageTypeAtIndex:(long) index; +- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(long) index with:(PBDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addMessageType:(PBDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllMessageType:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearMessageTypeList; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; -- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; +- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllEnumType:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearEnumTypeList; - (NSArray*) serviceList; -- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index; -- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(NSInteger) index with:(PBServiceDescriptorProto*) value; +- (PBServiceDescriptorProto*) serviceAtIndex:(long) index; +- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(long) index with:(PBServiceDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addService:(PBServiceDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllService:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearServiceList; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; -- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value; +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; +- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value; - (PBFileDescriptorProto_Builder*) addAllExtension:(NSArray*) values; - (PBFileDescriptorProto_Builder*) clearExtensionList; @@ -275,15 +275,15 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* name; @property (readonly, retain) PBMessageOptions* options; - (NSArray*) fieldList; -- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index; +- (PBFieldDescriptorProto*) fieldAtIndex:(long) index; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; - (NSArray*) nestedTypeList; -- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index; +- (PBDescriptorProto*) nestedTypeAtIndex:(long) index; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; - (NSArray*) extensionRangeList; -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index; +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index; + (PBDescriptorProto*) defaultInstance; - (PBDescriptorProto*) defaultInstance; @@ -306,13 +306,13 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @private BOOL hasStart_:1; BOOL hasEnd_:1; - NSInteger start; - NSInteger end; + long start; + long end; } - (BOOL) hasStart; - (BOOL) hasEnd; -@property (readonly) NSInteger start; -@property (readonly) NSInteger end; +@property (readonly) long start; +@property (readonly) long end; + (PBDescriptorProto_ExtensionRange*) defaultInstance; - (PBDescriptorProto_ExtensionRange*) defaultInstance; @@ -349,13 +349,13 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasStart; -- (NSInteger) start; -- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(NSInteger) value; +- (long) start; +- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(long) value; - (PBDescriptorProto_ExtensionRange_Builder*) clearStart; - (BOOL) hasEnd; -- (NSInteger) end; -- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(NSInteger) value; +- (long) end; +- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(long) value; - (PBDescriptorProto_ExtensionRange_Builder*) clearEnd; @end @@ -382,36 +382,36 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBDescriptorProto_Builder*) clearName; - (NSArray*) fieldList; -- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index; -- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value; +- (PBFieldDescriptorProto*) fieldAtIndex:(long) index; +- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(long) index with:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addField:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllField:(NSArray*) values; - (PBDescriptorProto_Builder*) clearFieldList; - (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index; -- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value; +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; +- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllExtension:(NSArray*) values; - (PBDescriptorProto_Builder*) clearExtensionList; - (NSArray*) nestedTypeList; -- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index; -- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value; +- (PBDescriptorProto*) nestedTypeAtIndex:(long) index; +- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(long) index with:(PBDescriptorProto*) value; - (PBDescriptorProto_Builder*) addNestedType:(PBDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllNestedType:(NSArray*) values; - (PBDescriptorProto_Builder*) clearNestedTypeList; - (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index; -- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value; +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; +- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value; - (PBDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value; - (PBDescriptorProto_Builder*) addAllEnumType:(NSArray*) values; - (PBDescriptorProto_Builder*) clearEnumTypeList; - (NSArray*) extensionRangeList; -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index; -- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(NSInteger) index with:(PBDescriptorProto_ExtensionRange*) value; +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index; +- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(long) index with:(PBDescriptorProto_ExtensionRange*) value; - (PBDescriptorProto_Builder*) addExtensionRange:(PBDescriptorProto_ExtensionRange*) value; - (PBDescriptorProto_Builder*) addAllExtensionRange:(NSArray*) values; - (PBDescriptorProto_Builder*) clearExtensionRangeList; @@ -434,7 +434,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasOptions_:1; BOOL hasLabel_:1; BOOL hasType_:1; - NSInteger number; + long number; NSString* name; NSString* typeName; NSString* extendee; @@ -452,7 +452,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasDefaultValue; - (BOOL) hasOptions; @property (readonly, retain) NSString* name; -@property (readonly) NSInteger number; +@property (readonly) long number; @property (readonly) PBFieldDescriptorProto_Label label; @property (readonly) PBFieldDescriptorProto_Type type; @property (readonly, retain) NSString* typeName; @@ -500,8 +500,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFieldDescriptorProto_Builder*) clearName; - (BOOL) hasNumber; -- (NSInteger) number; -- (PBFieldDescriptorProto_Builder*) setNumber:(NSInteger) value; +- (long) number; +- (PBFieldDescriptorProto_Builder*) setNumber:(long) value; - (PBFieldDescriptorProto_Builder*) clearNumber; - (BOOL) hasLabel; @@ -550,7 +550,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* name; @property (readonly, retain) PBEnumOptions* options; - (NSArray*) valueList; -- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index; +- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index; + (PBEnumDescriptorProto*) defaultInstance; - (PBEnumDescriptorProto*) defaultInstance; @@ -592,8 +592,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumDescriptorProto_Builder*) clearName; - (NSArray*) valueList; -- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index; -- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(NSInteger) index with:(PBEnumValueDescriptorProto*) value; +- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index; +- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(long) index with:(PBEnumValueDescriptorProto*) value; - (PBEnumDescriptorProto_Builder*) addValue:(PBEnumValueDescriptorProto*) value; - (PBEnumDescriptorProto_Builder*) addAllValue:(NSArray*) values; - (PBEnumDescriptorProto_Builder*) clearValueList; @@ -611,7 +611,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasNumber_:1; BOOL hasName_:1; BOOL hasOptions_:1; - NSInteger number; + long number; NSString* name; PBEnumValueOptions* options; } @@ -619,7 +619,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasNumber; - (BOOL) hasOptions; @property (readonly, retain) NSString* name; -@property (readonly) NSInteger number; +@property (readonly) long number; @property (readonly, retain) PBEnumValueOptions* options; + (PBEnumValueDescriptorProto*) defaultInstance; @@ -662,8 +662,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumValueDescriptorProto_Builder*) clearName; - (BOOL) hasNumber; -- (NSInteger) number; -- (PBEnumValueDescriptorProto_Builder*) setNumber:(NSInteger) value; +- (long) number; +- (PBEnumValueDescriptorProto_Builder*) setNumber:(long) value; - (PBEnumValueDescriptorProto_Builder*) clearNumber; - (BOOL) hasOptions; @@ -687,7 +687,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly, retain) NSString* name; @property (readonly, retain) PBServiceOptions* options; - (NSArray*) methodList; -- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index; +- (PBMethodDescriptorProto*) methodAtIndex:(long) index; + (PBServiceDescriptorProto*) defaultInstance; - (PBServiceDescriptorProto*) defaultInstance; @@ -729,8 +729,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBServiceDescriptorProto_Builder*) clearName; - (NSArray*) methodList; -- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index; -- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(NSInteger) index with:(PBMethodDescriptorProto*) value; +- (PBMethodDescriptorProto*) methodAtIndex:(long) index; +- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(long) index with:(PBMethodDescriptorProto*) value; - (PBServiceDescriptorProto_Builder*) addMethod:(PBMethodDescriptorProto*) value; - (PBServiceDescriptorProto_Builder*) addAllMethod:(NSArray*) values; - (PBServiceDescriptorProto_Builder*) clearMethodList; @@ -841,7 +841,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) javaMultipleFiles; @property (readonly) PBFileOptions_OptimizeMode optimizeFor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBFileOptions*) defaultInstance; - (PBFileOptions*) defaultInstance; @@ -898,8 +898,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFileOptions_Builder*) clearOptimizeFor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBFileOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBFileOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBFileOptions_Builder*) clearUninterpretedOptionList; @@ -918,7 +918,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) messageSetWireFormat; - (BOOL) noStandardDescriptorAccessor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBMessageOptions*) defaultInstance; - (PBMessageOptions*) defaultInstance; @@ -965,8 +965,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBMessageOptions_Builder*) clearNoStandardDescriptorAccessor; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBMessageOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBMessageOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBMessageOptions_Builder*) clearUninterpretedOptionList; @@ -993,7 +993,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) deprecated; @property (readonly, retain) NSString* experimentalMapKey; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBFieldOptions*) defaultInstance; - (PBFieldOptions*) defaultInstance; @@ -1050,8 +1050,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBFieldOptions_Builder*) clearExperimentalMapKey; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBFieldOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBFieldOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBFieldOptions_Builder*) clearUninterpretedOptionList; @@ -1062,7 +1062,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBEnumOptions*) defaultInstance; - (PBEnumOptions*) defaultInstance; @@ -1099,8 +1099,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBEnumOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBEnumOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBEnumOptions_Builder*) clearUninterpretedOptionList; @@ -1111,7 +1111,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBEnumValueOptions*) defaultInstance; - (PBEnumValueOptions*) defaultInstance; @@ -1148,8 +1148,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBEnumValueOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBEnumValueOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBEnumValueOptions_Builder*) clearUninterpretedOptionList; @@ -1160,7 +1160,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBServiceOptions*) defaultInstance; - (PBServiceOptions*) defaultInstance; @@ -1197,8 +1197,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBServiceOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBServiceOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBServiceOptions_Builder*) clearUninterpretedOptionList; @@ -1209,7 +1209,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSMutableArray* mutableUninterpretedOptionList; } - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; + (PBMethodOptions*) defaultInstance; - (PBMethodOptions*) defaultInstance; @@ -1246,8 +1246,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index; -- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value; +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; - (PBMethodOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; - (PBMethodOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; - (PBMethodOptions_Builder*) clearUninterpretedOptionList; @@ -1261,8 +1261,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasIdentifierValue_:1; BOOL hasStringValue_:1; Float64 doubleValue; - int64_t negativeIntValue; - int64_t positiveIntValue; + long long negativeIntValue; + long long positiveIntValue; NSString* identifierValue; NSData* stringValue; NSMutableArray* mutableNameList; @@ -1273,12 +1273,12 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasDoubleValue; - (BOOL) hasStringValue; @property (readonly, retain) NSString* identifierValue; -@property (readonly) int64_t positiveIntValue; -@property (readonly) int64_t negativeIntValue; +@property (readonly) long long positiveIntValue; +@property (readonly) long long negativeIntValue; @property (readonly) Float64 doubleValue; @property (readonly, retain) NSData* stringValue; - (NSArray*) nameList; -- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index; +- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index; + (PBUninterpretedOption*) defaultInstance; - (PBUninterpretedOption*) defaultInstance; @@ -1372,8 +1372,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSArray*) nameList; -- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index; -- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(NSInteger) index with:(PBUninterpretedOption_NamePart*) value; +- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index; +- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(long) index with:(PBUninterpretedOption_NamePart*) value; - (PBUninterpretedOption_Builder*) addName:(PBUninterpretedOption_NamePart*) value; - (PBUninterpretedOption_Builder*) addAllName:(NSArray*) values; - (PBUninterpretedOption_Builder*) clearNameList; @@ -1384,13 +1384,13 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (PBUninterpretedOption_Builder*) clearIdentifierValue; - (BOOL) hasPositiveIntValue; -- (int64_t) positiveIntValue; -- (PBUninterpretedOption_Builder*) setPositiveIntValue:(int64_t) value; +- (long long) positiveIntValue; +- (PBUninterpretedOption_Builder*) setPositiveIntValue:(long long) value; - (PBUninterpretedOption_Builder*) clearPositiveIntValue; - (BOOL) hasNegativeIntValue; -- (int64_t) negativeIntValue; -- (PBUninterpretedOption_Builder*) setNegativeIntValue:(int64_t) value; +- (long long) negativeIntValue; +- (PBUninterpretedOption_Builder*) setNegativeIntValue:(long long) value; - (PBUninterpretedOption_Builder*) clearNegativeIntValue; - (BOOL) hasDoubleValue; diff --git a/src/runtime/Classes/Descriptor.pb.m b/src/runtime/Classes/Descriptor.pb.m index 8b84e5f..1faf3d2 100644 --- a/src/runtime/Classes/Descriptor.pb.m +++ b/src/runtime/Classes/Descriptor.pb.m @@ -50,7 +50,7 @@ - (PBFileDescriptorSet*) defaultInstance { - (NSArray*) fileList { return mutableFileList; } -- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index { +- (PBFileDescriptorProto*) fileAtIndex:(long) index { id value = [mutableFileList objectAtIndex:index]; return value; } @@ -68,8 +68,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -168,7 +168,7 @@ - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -193,10 +193,10 @@ - (NSArray*) fileList { if (result.mutableFileList == nil) { return [NSArray array]; } return result.mutableFileList; } -- (PBFileDescriptorProto*) fileAtIndex:(NSInteger) index { +- (PBFileDescriptorProto*) fileAtIndex:(long) index { return [result fileAtIndex:index]; } -- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(NSInteger) index with:(PBFileDescriptorProto*) value { +- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(long) index with:(PBFileDescriptorProto*) value { [result.mutableFileList replaceObjectAtIndex:index withObject:value]; return self; } @@ -293,35 +293,35 @@ - (PBFileDescriptorProto*) defaultInstance { - (NSArray*) dependencyList { return mutableDependencyList; } -- (NSString*) dependencyAtIndex:(NSInteger) index { +- (NSString*) dependencyAtIndex:(long) index { id value = [mutableDependencyList objectAtIndex:index]; return value; } - (NSArray*) messageTypeList { return mutableMessageTypeList; } -- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index { +- (PBDescriptorProto*) messageTypeAtIndex:(long) index { id value = [mutableMessageTypeList objectAtIndex:index]; return value; } - (NSArray*) enumTypeList { return mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { id value = [mutableEnumTypeList objectAtIndex:index]; return value; } - (NSArray*) serviceList { return mutableServiceList; } -- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index { +- (PBServiceDescriptorProto*) serviceAtIndex:(long) index { id value = [mutableServiceList objectAtIndex:index]; return value; } - (NSArray*) extensionList { return mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { id value = [mutableExtensionList objectAtIndex:index]; return value; } @@ -380,8 +380,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -394,7 +394,7 @@ - (NSInteger) serializedSize { size += computeStringSize(2, self.package); } { - NSInteger dataSize = 0; + long dataSize = 0; for (NSString* element in self.mutableDependencyList) { dataSize += computeStringSizeNoTag(element); } @@ -539,7 +539,7 @@ - (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -637,10 +637,10 @@ - (NSArray*) dependencyList { } return result.mutableDependencyList; } -- (NSString*) dependencyAtIndex:(NSInteger) index { +- (NSString*) dependencyAtIndex:(long) index { return [result dependencyAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(NSInteger) index with:(NSString*) value { +- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(long) index with:(NSString*) value { [result.mutableDependencyList replaceObjectAtIndex:index withObject:value]; return self; } @@ -666,10 +666,10 @@ - (NSArray*) messageTypeList { if (result.mutableMessageTypeList == nil) { return [NSArray array]; } return result.mutableMessageTypeList; } -- (PBDescriptorProto*) messageTypeAtIndex:(NSInteger) index { +- (PBDescriptorProto*) messageTypeAtIndex:(long) index { return [result messageTypeAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(long) index with:(PBDescriptorProto*) value { [result.mutableMessageTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -695,10 +695,10 @@ - (NSArray*) enumTypeList { if (result.mutableEnumTypeList == nil) { return [NSArray array]; } return result.mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { return [result enumTypeAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value { [result.mutableEnumTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -724,10 +724,10 @@ - (NSArray*) serviceList { if (result.mutableServiceList == nil) { return [NSArray array]; } return result.mutableServiceList; } -- (PBServiceDescriptorProto*) serviceAtIndex:(NSInteger) index { +- (PBServiceDescriptorProto*) serviceAtIndex:(long) index { return [result serviceAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(NSInteger) index with:(PBServiceDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(long) index with:(PBServiceDescriptorProto*) value { [result.mutableServiceList replaceObjectAtIndex:index withObject:value]; return self; } @@ -753,10 +753,10 @@ - (NSArray*) extensionList { if (result.mutableExtensionList == nil) { return [NSArray array]; } return result.mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { return [result extensionAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value { +- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value { [result.mutableExtensionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -873,35 +873,35 @@ - (PBDescriptorProto*) defaultInstance { - (NSArray*) fieldList { return mutableFieldList; } -- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index { +- (PBFieldDescriptorProto*) fieldAtIndex:(long) index { id value = [mutableFieldList objectAtIndex:index]; return value; } - (NSArray*) extensionList { return mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { id value = [mutableExtensionList objectAtIndex:index]; return value; } - (NSArray*) nestedTypeList { return mutableNestedTypeList; } -- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index { +- (PBDescriptorProto*) nestedTypeAtIndex:(long) index { id value = [mutableNestedTypeList objectAtIndex:index]; return value; } - (NSArray*) enumTypeList { return mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { id value = [mutableEnumTypeList objectAtIndex:index]; return value; } - (NSArray*) extensionRangeList { return mutableExtensionRangeList; } -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index { +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index { id value = [mutableExtensionRangeList objectAtIndex:index]; return value; } @@ -957,8 +957,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1019,8 +1019,8 @@ - (PBDescriptorProto_Builder*) builder { @end @interface PBDescriptorProto_ExtensionRange () -@property NSInteger start; -@property NSInteger end; +@property long start; +@property long end; @end @implementation PBDescriptorProto_ExtensionRange @@ -1073,8 +1073,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1176,7 +1176,7 @@ - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCoded - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1202,10 +1202,10 @@ - (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCoded - (BOOL) hasStart { return result.hasStart; } -- (NSInteger) start { +- (long) start { return result.start; } -- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(NSInteger) value { +- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(long) value { result.hasStart = YES; result.start = value; return self; @@ -1218,10 +1218,10 @@ - (PBDescriptorProto_ExtensionRange_Builder*) clearStart { - (BOOL) hasEnd { return result.hasEnd; } -- (NSInteger) end { +- (long) end { return result.end; } -- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(NSInteger) value { +- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(long) value { result.hasEnd = YES; result.end = value; return self; @@ -1320,7 +1320,7 @@ - (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1398,10 +1398,10 @@ - (NSArray*) fieldList { if (result.mutableFieldList == nil) { return [NSArray array]; } return result.mutableFieldList; } -- (PBFieldDescriptorProto*) fieldAtIndex:(NSInteger) index { +- (PBFieldDescriptorProto*) fieldAtIndex:(long) index { return [result fieldAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(long) index with:(PBFieldDescriptorProto*) value { [result.mutableFieldList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1427,10 +1427,10 @@ - (NSArray*) extensionList { if (result.mutableExtensionList == nil) { return [NSArray array]; } return result.mutableExtensionList; } -- (PBFieldDescriptorProto*) extensionAtIndex:(NSInteger) index { +- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { return [result extensionAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(NSInteger) index with:(PBFieldDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value { [result.mutableExtensionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1456,10 +1456,10 @@ - (NSArray*) nestedTypeList { if (result.mutableNestedTypeList == nil) { return [NSArray array]; } return result.mutableNestedTypeList; } -- (PBDescriptorProto*) nestedTypeAtIndex:(NSInteger) index { +- (PBDescriptorProto*) nestedTypeAtIndex:(long) index { return [result nestedTypeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(NSInteger) index with:(PBDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(long) index with:(PBDescriptorProto*) value { [result.mutableNestedTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1485,10 +1485,10 @@ - (NSArray*) enumTypeList { if (result.mutableEnumTypeList == nil) { return [NSArray array]; } return result.mutableEnumTypeList; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(NSInteger) index { +- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { return [result enumTypeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(NSInteger) index with:(PBEnumDescriptorProto*) value { +- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value { [result.mutableEnumTypeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1514,10 +1514,10 @@ - (NSArray*) extensionRangeList { if (result.mutableExtensionRangeList == nil) { return [NSArray array]; } return result.mutableExtensionRangeList; } -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(NSInteger) index { +- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index { return [result extensionRangeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(NSInteger) index with:(PBDescriptorProto_ExtensionRange*) value { +- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(long) index with:(PBDescriptorProto_ExtensionRange*) value { [result.mutableExtensionRangeList replaceObjectAtIndex:index withObject:value]; return self; } @@ -1573,7 +1573,7 @@ - (PBDescriptorProto_Builder*) clearOptions { @interface PBFieldDescriptorProto () @property (retain) NSString* name; -@property NSInteger number; +@property long number; @property PBFieldDescriptorProto_Label label; @property PBFieldDescriptorProto_Type type; @property (retain) NSString* typeName; @@ -1708,8 +1708,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1882,7 +1882,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1907,7 +1907,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 32: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (PBFieldDescriptorProto_LabelIsValidValue(value)) { [self setLabel:value]; } else { @@ -1916,7 +1916,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 40: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (PBFieldDescriptorProto_TypeIsValidValue(value)) { [self setType:value]; } else { @@ -1963,10 +1963,10 @@ - (PBFieldDescriptorProto_Builder*) clearName { - (BOOL) hasNumber { return result.hasNumber; } -- (NSInteger) number { +- (long) number { return result.number; } -- (PBFieldDescriptorProto_Builder*) setNumber:(NSInteger) value { +- (PBFieldDescriptorProto_Builder*) setNumber:(long) value { result.hasNumber = YES; result.number = value; return self; @@ -2139,7 +2139,7 @@ - (PBEnumDescriptorProto*) defaultInstance { - (NSArray*) valueList { return mutableValueList; } -- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index { +- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index { id value = [mutableValueList objectAtIndex:index]; return value; } @@ -2168,8 +2168,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2280,7 +2280,7 @@ - (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2334,10 +2334,10 @@ - (NSArray*) valueList { if (result.mutableValueList == nil) { return [NSArray array]; } return result.mutableValueList; } -- (PBEnumValueDescriptorProto*) valueAtIndex:(NSInteger) index { +- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index { return [result valueAtIndex:index]; } -- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(NSInteger) index with:(PBEnumValueDescriptorProto*) value { +- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(long) index with:(PBEnumValueDescriptorProto*) value { [result.mutableValueList replaceObjectAtIndex:index withObject:value]; return self; } @@ -2393,7 +2393,7 @@ - (PBEnumDescriptorProto_Builder*) clearOptions { @interface PBEnumValueDescriptorProto () @property (retain) NSString* name; -@property NSInteger number; +@property long number; @property (retain) PBEnumValueOptions* options; @end @@ -2465,8 +2465,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2574,7 +2574,7 @@ - (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2625,10 +2625,10 @@ - (PBEnumValueDescriptorProto_Builder*) clearName { - (BOOL) hasNumber { return result.hasNumber; } -- (NSInteger) number { +- (long) number { return result.number; } -- (PBEnumValueDescriptorProto_Builder*) setNumber:(NSInteger) value { +- (PBEnumValueDescriptorProto_Builder*) setNumber:(long) value { result.hasNumber = YES; result.number = value; return self; @@ -2721,7 +2721,7 @@ - (PBServiceDescriptorProto*) defaultInstance { - (NSArray*) methodList { return mutableMethodList; } -- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index { +- (PBMethodDescriptorProto*) methodAtIndex:(long) index { id value = [mutableMethodList objectAtIndex:index]; return value; } @@ -2750,8 +2750,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2862,7 +2862,7 @@ - (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2916,10 +2916,10 @@ - (NSArray*) methodList { if (result.mutableMethodList == nil) { return [NSArray array]; } return result.mutableMethodList; } -- (PBMethodDescriptorProto*) methodAtIndex:(NSInteger) index { +- (PBMethodDescriptorProto*) methodAtIndex:(long) index { return [result methodAtIndex:index]; } -- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(NSInteger) index with:(PBMethodDescriptorProto*) value { +- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(long) index with:(PBMethodDescriptorProto*) value { [result.mutableMethodList replaceObjectAtIndex:index withObject:value]; return self; } @@ -3061,8 +3061,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3176,7 +3176,7 @@ - (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3366,7 +3366,7 @@ - (PBFileOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -3402,8 +3402,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3538,7 +3538,7 @@ - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3559,7 +3559,7 @@ - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 72: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (PBFileOptions_OptimizeModeIsValidValue(value)) { [self setOptimizeFor:value]; } else { @@ -3648,10 +3648,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -3734,7 +3734,7 @@ - (PBMessageOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -3764,8 +3764,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3878,7 +3878,7 @@ - (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3943,10 +3943,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4048,7 +4048,7 @@ - (PBFieldOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4084,8 +4084,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4219,7 +4219,7 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4232,7 +4232,7 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu break; } case 8: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (PBFieldOptions_CTypeIsValidValue(value)) { [self setCtype:value]; } else { @@ -4329,10 +4329,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4387,7 +4387,7 @@ - (PBEnumOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4411,8 +4411,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4513,7 +4513,7 @@ - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4538,10 +4538,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4596,7 +4596,7 @@ - (PBEnumValueOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4620,8 +4620,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4722,7 +4722,7 @@ - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4747,10 +4747,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -4805,7 +4805,7 @@ - (PBServiceOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -4829,8 +4829,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4931,7 +4931,7 @@ - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4956,10 +4956,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -5014,7 +5014,7 @@ - (PBMethodOptions*) defaultInstance { - (NSArray*) uninterpretedOptionList { return mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { id value = [mutableUninterpretedOptionList objectAtIndex:index]; return value; } @@ -5038,8 +5038,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5140,7 +5140,7 @@ - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5165,10 +5165,10 @@ - (NSArray*) uninterpretedOptionList { if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } return result.mutableUninterpretedOptionList; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(NSInteger) index { +- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { return [result uninterpretedOptionAtIndex:index]; } -- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(NSInteger) index with:(PBUninterpretedOption*) value { +- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; return self; } @@ -5195,8 +5195,8 @@ - (PBMethodOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) val @interface PBUninterpretedOption () @property (retain) NSMutableArray* mutableNameList; @property (retain) NSString* identifierValue; -@property int64_t positiveIntValue; -@property int64_t negativeIntValue; +@property long long positiveIntValue; +@property long long negativeIntValue; @property Float64 doubleValue; @property (retain) NSData* stringValue; @end @@ -5270,7 +5270,7 @@ - (PBUninterpretedOption*) defaultInstance { - (NSArray*) nameList { return mutableNameList; } -- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index { +- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index { id value = [mutableNameList objectAtIndex:index]; return value; } @@ -5303,8 +5303,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5428,8 +5428,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5531,7 +5531,7 @@ - (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedIn - (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5660,7 +5660,7 @@ - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5705,10 +5705,10 @@ - (NSArray*) nameList { if (result.mutableNameList == nil) { return [NSArray array]; } return result.mutableNameList; } -- (PBUninterpretedOption_NamePart*) nameAtIndex:(NSInteger) index { +- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index { return [result nameAtIndex:index]; } -- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(NSInteger) index with:(PBUninterpretedOption_NamePart*) value { +- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(long) index with:(PBUninterpretedOption_NamePart*) value { [result.mutableNameList replaceObjectAtIndex:index withObject:value]; return self; } @@ -5749,10 +5749,10 @@ - (PBUninterpretedOption_Builder*) clearIdentifierValue { - (BOOL) hasPositiveIntValue { return result.hasPositiveIntValue; } -- (int64_t) positiveIntValue { +- (long long) positiveIntValue { return result.positiveIntValue; } -- (PBUninterpretedOption_Builder*) setPositiveIntValue:(int64_t) value { +- (PBUninterpretedOption_Builder*) setPositiveIntValue:(long long) value { result.hasPositiveIntValue = YES; result.positiveIntValue = value; return self; @@ -5765,10 +5765,10 @@ - (PBUninterpretedOption_Builder*) clearPositiveIntValue { - (BOOL) hasNegativeIntValue { return result.hasNegativeIntValue; } -- (int64_t) negativeIntValue { +- (long long) negativeIntValue { return result.negativeIntValue; } -- (PBUninterpretedOption_Builder*) setNegativeIntValue:(int64_t) value { +- (PBUninterpretedOption_Builder*) setNegativeIntValue:(long long) value { result.hasNegativeIntValue = YES; result.negativeIntValue = value; return self; diff --git a/src/runtime/Classes/ExtendableMessage.h b/src/runtime/Classes/ExtendableMessage.h index eb7ee78..dd05daa 100644 --- a/src/runtime/Classes/ExtendableMessage.h +++ b/src/runtime/Classes/ExtendableMessage.h @@ -68,19 +68,19 @@ //@protected - (BOOL) extensionsAreInitialized; -- (NSInteger) extensionsSerializedSize; +- (long) extensionsSerializedSize; - (void) writeExtensionsToCodedOutputStream:(PBCodedOutputStream*) output - from:(NSInteger) startInclusive - to:(NSInteger) endExclusive; + from:(long) startInclusive + to:(long) endExclusive; - (void) writeExtensionDescriptionToMutableString:(NSMutableString*) output - from:(NSInteger) startInclusive - to:(NSInteger) endExclusive + from:(long) startInclusive + to:(long) endExclusive withIndent:(NSString*) indent; - (BOOL) isEqualExtensionsInOther:(PBExtendableMessage*)otherMessage - from:(NSInteger) startInclusive - to:(NSInteger) endExclusive; -- (NSUInteger) hashExtensionsFrom:(NSInteger) startInclusive - to:(NSInteger) endExclusive; + from:(long) startInclusive + to:(long) endExclusive; +- (unsigned long) hashExtensionsFrom:(long) startInclusive + to:(long) endExclusive; diff --git a/src/runtime/Classes/ExtendableMessage.m b/src/runtime/Classes/ExtendableMessage.m index efa5f30..5bdeba8 100644 --- a/src/runtime/Classes/ExtendableMessage.m +++ b/src/runtime/Classes/ExtendableMessage.m @@ -81,12 +81,12 @@ - (BOOL) hasExtension:(id) extension { - (void) writeExtensionsToCodedOutputStream:(PBCodedOutputStream*) output - from:(NSInteger) startInclusive - to:(NSInteger) endExclusive { + from:(long) startInclusive + to:(long) endExclusive { // man, i really wish Cocoa had a Sorted/TreeMap NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - NSInteger fieldNumber = [number intValue]; + long fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id extension = [extensionRegistry objectForKey:number]; id value = [extensionMap objectForKey:number]; @@ -97,12 +97,12 @@ - (void) writeExtensionsToCodedOutputStream:(PBCodedOutputStream*) output - (void) writeExtensionDescriptionToMutableString:(NSMutableString*) output - from:(NSInteger) startInclusive - to:(NSInteger) endExclusive + from:(long) startInclusive + to:(long) endExclusive withIndent:(NSString*) indent { NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - NSInteger fieldNumber = [number intValue]; + long fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id extension = [extensionRegistry objectForKey:number]; id value = [extensionMap objectForKey:number]; @@ -113,11 +113,11 @@ - (void) writeExtensionDescriptionToMutableString:(NSMutableString*) output - (BOOL) isEqualExtensionsInOther:(PBExtendableMessage*)otherMessage - from:(NSInteger) startInclusive - to:(NSInteger) endExclusive { + from:(long) startInclusive + to:(long) endExclusive { NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - NSInteger fieldNumber = [number intValue]; + long fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id value = [extensionMap objectForKey:number]; id otherValue = [otherMessage.extensionMap objectForKey:number]; @@ -130,12 +130,12 @@ - (BOOL) isEqualExtensionsInOther:(PBExtendableMessage*)otherMessage } -- (NSUInteger) hashExtensionsFrom:(NSInteger) startInclusive - to:(NSInteger) endExclusive { - NSUInteger hashCode = 0; +- (unsigned long) hashExtensionsFrom:(long) startInclusive + to:(long) endExclusive { + unsigned long hashCode = 0; NSArray* sortedKeys = [extensionMap.allKeys sortedArrayUsingSelector:@selector(compare:)]; for (NSNumber* number in sortedKeys) { - NSInteger fieldNumber = [number intValue]; + long fieldNumber = [number intValue]; if (fieldNumber >= startInclusive && fieldNumber < endExclusive) { id value = [extensionMap objectForKey:number]; hashCode = hashCode * 31 + [value hash]; @@ -145,8 +145,8 @@ - (NSUInteger) hashExtensionsFrom:(NSInteger) startInclusive } -- (NSInteger) extensionsSerializedSize { - NSInteger size = 0; +- (long) extensionsSerializedSize { + long size = 0; for (NSNumber* number in extensionMap) { id extension = [extensionRegistry objectForKey:number]; id value = [extensionMap objectForKey:number]; diff --git a/src/runtime/Classes/ExtendableMessage_Builder.h b/src/runtime/Classes/ExtendableMessage_Builder.h index c063381..640fe35 100644 --- a/src/runtime/Classes/ExtendableMessage_Builder.h +++ b/src/runtime/Classes/ExtendableMessage_Builder.h @@ -68,7 +68,7 @@ - (PBExtendableMessage_Builder*) addExtension:(id) extension value:(id) value; - (PBExtendableMessage_Builder*) setExtension:(id) extension - index:(NSInteger) index + index:(long) index value:(id) value; - (PBExtendableMessage_Builder*) clearExtension:(id) extension; diff --git a/src/runtime/Classes/ExtendableMessage_Builder.m b/src/runtime/Classes/ExtendableMessage_Builder.m index fb18acf..804a0c6 100644 --- a/src/runtime/Classes/ExtendableMessage_Builder.m +++ b/src/runtime/Classes/ExtendableMessage_Builder.m @@ -35,10 +35,10 @@ - (PBExtendableMessage*) internalGetResult { - (BOOL) parseUnknownField:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry - tag:(NSInteger) tag { + tag:(long) tag { PBExtendableMessage* message = [self internalGetResult]; - NSInteger wireType = PBWireFormatGetTagWireType(tag); - NSInteger fieldNumber = PBWireFormatGetTagFieldNumber(tag); + long wireType = PBWireFormatGetTagWireType(tag); + long fieldNumber = PBWireFormatGetTagFieldNumber(tag); id extension = [extensionRegistry getExtension:[message class] fieldNumber:fieldNumber]; @@ -110,7 +110,7 @@ - (PBExtendableMessage_Builder*) addExtension:(id) extension - (PBExtendableMessage_Builder*) setExtension:(id) extension - index:(NSInteger) index + index:(long) index value:(id) value { PBExtendableMessage* message = [self internalGetResult]; [message ensureExtensionIsRegistered:extension]; diff --git a/src/runtime/Classes/ExtensionField.h b/src/runtime/Classes/ExtensionField.h index fe13d2c..171625d 100644 --- a/src/runtime/Classes/ExtensionField.h +++ b/src/runtime/Classes/ExtensionField.h @@ -24,7 +24,7 @@ @class PBUnknownFieldSet_Builder; @protocol PBExtensionField -- (NSInteger) fieldNumber; +- (long) fieldNumber; - (PBWireFormat) wireType; - (BOOL) isRepeated; - (Class) extendedClass; @@ -34,9 +34,9 @@ unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry builder:(PBExtendableMessage_Builder*) builder - tag:(NSInteger) tag; + tag:(long) tag; - (void) writeValue:(id) value includingTagToCodedOutputStream:(PBCodedOutputStream*) output; -- (NSInteger) computeSerializedSizeIncludingTag:(id) value; +- (long) computeSerializedSizeIncludingTag:(id) value; - (void) writeDescriptionOf:(id) value to:(NSMutableString*) output withIndent:(NSString*) indent; diff --git a/src/runtime/Classes/ExtensionRegistry.h b/src/runtime/Classes/ExtensionRegistry.h index 2a927cf..fbb9b1b 100644 --- a/src/runtime/Classes/ExtensionRegistry.h +++ b/src/runtime/Classes/ExtensionRegistry.h @@ -77,7 +77,7 @@ } + (PBExtensionRegistry*) emptyRegistry; -- (id) getExtension:(Class) clazz fieldNumber:(NSInteger) fieldNumber; +- (id) getExtension:(Class) clazz fieldNumber:(long) fieldNumber; /* @protected */ - (id) initWithClassMap:(NSDictionary*) classMap; diff --git a/src/runtime/Classes/ExtensionRegistry.m b/src/runtime/Classes/ExtensionRegistry.m index b0f5504..7172f55 100644 --- a/src/runtime/Classes/ExtensionRegistry.m +++ b/src/runtime/Classes/ExtensionRegistry.m @@ -58,7 +58,7 @@ + (PBExtensionRegistry*) emptyRegistry { } -- (id) getExtension:(Class) clazz fieldNumber:(NSInteger) fieldNumber { +- (id) getExtension:(Class) clazz fieldNumber:(long) fieldNumber { NSDictionary* extensionMap = [classMap objectForKey:[self keyForClass:clazz]]; return [extensionMap objectForKey:[NSNumber numberWithInteger:fieldNumber]]; } diff --git a/src/runtime/Classes/Field.h b/src/runtime/Classes/Field.h index f881312..a493073 100644 --- a/src/runtime/Classes/Field.h +++ b/src/runtime/Classes/Field.h @@ -39,12 +39,12 @@ + (PBField *)defaultInstance; -- (NSInteger)getSerializedSize:(NSInteger)fieldNumber; -- (NSInteger)getSerializedSizeAsMessageSetExtension:(NSInteger)fieldNumber; +- (long)getSerializedSize:(long)fieldNumber; +- (long)getSerializedSizeAsMessageSetExtension:(long)fieldNumber; -- (void)writeTo:(NSInteger) fieldNumber output:(PBCodedOutputStream *)output; -- (void)writeAsMessageSetExtensionTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *)output; -- (void)writeDescriptionFor:(NSInteger) fieldNumber +- (void)writeTo:(long) fieldNumber output:(PBCodedOutputStream *)output; +- (void)writeAsMessageSetExtensionTo:(long)fieldNumber output:(PBCodedOutputStream *)output; +- (void)writeDescriptionFor:(long) fieldNumber to:(NSMutableString*) output withIndent:(NSString*) indent; @end diff --git a/src/runtime/Classes/Field.m b/src/runtime/Classes/Field.m index a3e3e14..393ba81 100644 --- a/src/runtime/Classes/Field.m +++ b/src/runtime/Classes/Field.m @@ -51,29 +51,29 @@ + (PBField *)defaultInstance { return sDefaultInstance; } -- (NSInteger)getSerializedSize:(NSInteger)fieldNumber { - NSInteger result = 0; +- (long)getSerializedSize:(long)fieldNumber { + long result = 0; - const int64_t *varintValues = (const int64_t *)_varintArray.data; + const long long *varintValues = (const long long *)_varintArray.data; if (varintValues) { - const NSUInteger count = _varintArray.count; - for (NSUInteger i = 0; i < count; ++i) { + const unsigned long count = _varintArray.count; + for (unsigned long i = 0; i < count; ++i) { result += computeInt64Size(fieldNumber, varintValues[i]); } } - const NSInteger *fixed32Values = (const NSInteger *)_fixed32Array.data; + const long *fixed32Values = (const long *)_fixed32Array.data; if (fixed32Values) { - const NSUInteger count = _fixed32Array.count; - for (NSUInteger i = 0; i < count; ++i) { + const unsigned long count = _fixed32Array.count; + for (unsigned long i = 0; i < count; ++i) { result += computeFixed32Size(fieldNumber, fixed32Values[i]); } } - const int64_t *fixed64Values = (const int64_t *)_fixed64Array.data; + const long long *fixed64Values = (const long long *)_fixed64Array.data; if (fixed64Values) { - const NSUInteger count = _fixed64Array.count; - for (NSUInteger i = 0; i < count; ++i) { + const unsigned long count = _fixed64Array.count; + for (unsigned long i = 0; i < count; ++i) { result += computeFixed64Size(fieldNumber, fixed64Values[i]); } } @@ -89,8 +89,8 @@ - (NSInteger)getSerializedSize:(NSInteger)fieldNumber { return result; } -- (NSInteger)getSerializedSizeAsMessageSetExtension:(NSInteger)fieldNumber { - NSInteger result = 0; +- (long)getSerializedSizeAsMessageSetExtension:(long)fieldNumber { + long result = 0; for (NSData *value in _lengthDelimitedArray) { result += computeRawMessageSetExtensionSize(fieldNumber, value); @@ -99,27 +99,27 @@ - (NSInteger)getSerializedSizeAsMessageSetExtension:(NSInteger)fieldNumber { return result; } -- (void)writeTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *) output { - const int64_t *varintValues = (const int64_t *)_varintArray.data; +- (void)writeTo:(long)fieldNumber output:(PBCodedOutputStream *) output { + const long long *varintValues = (const long long *)_varintArray.data; if (varintValues) { - const NSUInteger count = _varintArray.count; - for (NSUInteger i = 0; i < count; ++i) { + const unsigned long count = _varintArray.count; + for (unsigned long i = 0; i < count; ++i) { [output writeInt64:fieldNumber value:varintValues[i]]; } } - const NSInteger *fixed32Values = (const NSInteger *)_fixed32Array.data; + const long *fixed32Values = (const long *)_fixed32Array.data; if (fixed32Values) { - const NSUInteger count = _fixed32Array.count; - for (NSUInteger i = 0; i < count; ++i) { + const unsigned long count = _fixed32Array.count; + for (unsigned long i = 0; i < count; ++i) { [output writeFixed32:fieldNumber value:fixed32Values[i]]; } } - const int64_t *fixed64Values = (const int64_t *)_fixed64Array.data; + const long long *fixed64Values = (const long long *)_fixed64Array.data; if (fixed64Values) { - const NSUInteger count = _fixed64Array.count; - for (NSUInteger i = 0; i < count; ++i) { + const unsigned long count = _fixed64Array.count; + for (unsigned long i = 0; i < count; ++i) { [output writeFixed64:fieldNumber value:fixed64Values[i]]; } } @@ -133,7 +133,7 @@ - (void)writeTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *) output { } } -- (void)writeDescriptionFor:(NSInteger) fieldNumber +- (void)writeDescriptionFor:(long) fieldNumber to:(NSMutableString*) output withIndent:(NSString*) indent { for (NSNumber* value in self.varintArray) { @@ -155,7 +155,7 @@ - (void)writeDescriptionFor:(NSInteger) fieldNumber } } -- (void)writeAsMessageSetExtensionTo:(NSInteger)fieldNumber output:(PBCodedOutputStream *) output { +- (void)writeAsMessageSetExtensionTo:(long)fieldNumber output:(PBCodedOutputStream *) output { for (NSData *value in _lengthDelimitedArray) { [output writeRawMessageSetExtension:fieldNumber value:value]; } diff --git a/src/runtime/Classes/GeneratedMessage.h b/src/runtime/Classes/GeneratedMessage.h index 0ac1c98..a3458f9 100644 --- a/src/runtime/Classes/GeneratedMessage.h +++ b/src/runtime/Classes/GeneratedMessage.h @@ -30,7 +30,7 @@ PBUnknownFieldSet* unknownFields; @protected - NSInteger memoizedSerializedSize; + long memoizedSerializedSize; } @end diff --git a/src/runtime/Classes/GeneratedMessage_Builder.h b/src/runtime/Classes/GeneratedMessage_Builder.h index 1bc3a7c..ed913f1 100644 --- a/src/runtime/Classes/GeneratedMessage_Builder.h +++ b/src/runtime/Classes/GeneratedMessage_Builder.h @@ -26,7 +26,7 @@ - (BOOL) parseUnknownField:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry - tag:(NSInteger) tag; + tag:(long) tag; - (void) checkInitialized; diff --git a/src/runtime/Classes/GeneratedMessage_Builder.m b/src/runtime/Classes/GeneratedMessage_Builder.m index a3233fe..78b6b37 100644 --- a/src/runtime/Classes/GeneratedMessage_Builder.m +++ b/src/runtime/Classes/GeneratedMessage_Builder.m @@ -80,7 +80,7 @@ - (BOOL) isInitialized { - (BOOL) parseUnknownField:(PBCodedInputStream*) input unknownFields:(PBUnknownFieldSet_Builder*) unknownFields extensionRegistry:(PBExtensionRegistry*) extensionRegistry - tag:(NSInteger) tag { + tag:(long) tag { return [unknownFields mergeFieldFrom:tag input:input]; } diff --git a/src/runtime/Classes/Message.h b/src/runtime/Classes/Message.h index 614b7ef..f81c94c 100644 --- a/src/runtime/Classes/Message.h +++ b/src/runtime/Classes/Message.h @@ -44,7 +44,7 @@ * Get the number of bytes required to encode this message. The result * is only computed on the first call and memoized after that. */ -- (NSInteger) serializedSize; +- (long) serializedSize; /** * Returns true if all required fields in the message and all embedded diff --git a/src/runtime/Classes/MutableField.h b/src/runtime/Classes/MutableField.h index d357173..97db3af 100644 --- a/src/runtime/Classes/MutableField.h +++ b/src/runtime/Classes/MutableField.h @@ -26,9 +26,9 @@ - (PBMutableField *)mergeFromField:(PBField *)other; - (PBMutableField *)clear; -- (PBMutableField *)addVarint:(int64_t)value; -- (PBMutableField *)addFixed32:(NSInteger)value; -- (PBMutableField *)addFixed64:(int64_t)value; +- (PBMutableField *)addVarint:(long long)value; +- (PBMutableField *)addFixed32:(long)value; +- (PBMutableField *)addFixed64:(long long)value; - (PBMutableField *)addLengthDelimited:(NSData *)value; - (PBMutableField *)addGroup:(PBUnknownFieldSet *)value; diff --git a/src/runtime/Classes/MutableField.m b/src/runtime/Classes/MutableField.m index d6600c1..7ad47a6 100644 --- a/src/runtime/Classes/MutableField.m +++ b/src/runtime/Classes/MutableField.m @@ -84,7 +84,7 @@ - (PBMutableField *)mergeFromField:(PBField *)other { return self; } -- (PBMutableField *)addVarint:(int64_t)value { +- (PBMutableField *)addVarint:(long long)value { if (_varintArray == nil) { _varintArray = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt64]; } @@ -93,7 +93,7 @@ - (PBMutableField *)addVarint:(int64_t)value { return self; } -- (PBMutableField *)addFixed32:(NSInteger)value { +- (PBMutableField *)addFixed32:(long)value { if (_fixed32Array == nil) { _fixed32Array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; } @@ -102,7 +102,7 @@ - (PBMutableField *)addFixed32:(NSInteger)value { return self; } -- (PBMutableField *)addFixed64:(int64_t)value { +- (PBMutableField *)addFixed64:(long long)value { if (_fixed64Array == nil) { _fixed64Array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt64]; } diff --git a/src/runtime/Classes/PBArray.h b/src/runtime/Classes/PBArray.h index 8f3466c..934426c 100644 --- a/src/runtime/Classes/PBArray.h +++ b/src/runtime/Classes/PBArray.h @@ -41,29 +41,30 @@ typedef enum _PBArrayValueType { @protected PBArrayValueType _valueType; - NSUInteger _capacity; - NSUInteger _count; + unsigned long _capacity; + unsigned long _count; void * _data; + } -- (NSUInteger)count; -- (id)objectAtIndex:(NSUInteger)index; -- (BOOL)boolAtIndex:(NSUInteger)index; -- (NSInteger)int32AtIndex:(NSUInteger)index; -- (NSUInteger)uint32AtIndex:(NSUInteger)index; -- (int64_t)int64AtIndex:(NSUInteger)index; -- (uint64_t)uint64AtIndex:(NSUInteger)index; -- (Float32)floatAtIndex:(NSUInteger)index; -- (Float64)doubleAtIndex:(NSUInteger)index; +- (unsigned long)count; +- (id)objectAtIndex:(unsigned long)index; +- (BOOL)boolAtIndex:(unsigned long)index; +- (long)int32AtIndex:(unsigned long)index; +- (unsigned long)uint32AtIndex:(unsigned long)index; +- (long long)int64AtIndex:(unsigned long)index; +- (unsigned long long)uint64AtIndex:(unsigned long)index; +- (Float32)floatAtIndex:(unsigned long)index; +- (Float64)doubleAtIndex:(unsigned long)index; - (BOOL)isEqualToArray:(PBArray *)array; -- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block; +- (void)enumerateObjectsUsingBlock:(void (^)(id obj, unsigned long idx, BOOL *stop))block; - (id)firstObject; - (id)lastObject; -- (id)objectAtIndexedSubscript:(NSUInteger)idx; +- (id)objectAtIndexedSubscript:(unsigned long)idx; @property (nonatomic,assign,readonly) PBArrayValueType valueType; @property (nonatomic,assign,readonly) const void * data; -@property (nonatomic,assign,readonly,getter=count) NSUInteger count; +@property (nonatomic,assign,readonly,getter=count) unsigned long count; @end @@ -76,10 +77,10 @@ typedef enum _PBArrayValueType @interface PBArray (PBArrayCreation) + (id)arrayWithValueType:(PBArrayValueType)valueType; -+ (id)arrayWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType; ++ (id)arrayWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType; + (id)arrayWithArray:(NSArray *)array valueType:(PBArrayValueType)valueType; - (id)initWithValueType:(PBArrayValueType)valueType; -- (id)initWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType; +- (id)initWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType; - (id)initWithArray:(NSArray *)array valueType:(PBArrayValueType)valueType; @end @@ -90,14 +91,14 @@ typedef enum _PBArrayValueType - (void)addObject:(id)value; - (void)addBool:(BOOL)value; -- (void)addInt32:(NSInteger)value; -- (void)addUint32:(NSUInteger)value; -- (void)addInt64:(int64_t)value; -- (void)addUint64:(uint64_t)value; +- (void)addInt32:(long)value; +- (void)addUint32:(unsigned long)value; +- (void)addInt64:(long long)value; +- (void)addUint64:(unsigned long long)value; - (void)addFloat:(Float32)value; - (void)addDouble:(Float64)value; - (void)appendArray:(PBArray *)array; -- (void)appendValues:(const void *)values count:(NSUInteger)count; +- (void)appendValues:(const void *)values count:(unsigned long)count; @end diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 9717cbe..b564a7c 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -33,22 +33,22 @@ static void PBArraySetBoolValue(NSNumber *number, void *value) static void PBArraySetInt32Value(NSNumber *number, void *value) { - *((NSInteger *)value) = [number intValue]; + *((long *)value) = [number intValue]; } static void PBArraySetUInt32Value(NSNumber *number, void *value) { - *((NSUInteger *)value) = [number unsignedIntValue]; + *((unsigned long *)value) = [number unsignedIntValue]; } static void PBArraySetInt64Value(NSNumber *number, void *value) { - *((int64_t *)value) = [number longLongValue]; + *((long long *)value) = [number longLongValue]; } static void PBArraySetUInt64Value(NSNumber *number, void *value) { - *((uint64_t *)value) = [number unsignedLongLongValue]; + *((ulong long *)value) = [number unsignedLongLongValue]; } static void PBArraySetFloatValue(NSNumber *number, void *value) @@ -73,10 +73,10 @@ static void PBArraySetDoubleValue(NSNumber *number, void *value) { { sizeof(id), NULL }, { sizeof(BOOL), PBArraySetBoolValue }, - { sizeof(NSInteger), PBArraySetInt32Value }, - { sizeof(NSUInteger), PBArraySetUInt32Value }, - { sizeof(int64_t), PBArraySetInt64Value }, - { sizeof(uint64_t), PBArraySetUInt64Value }, + { sizeof(long), PBArraySetInt32Value }, + { sizeof(unsigned long), PBArraySetUInt32Value }, + { sizeof(long long), PBArraySetInt64Value }, + { sizeof(ulong long), PBArraySetUInt64Value }, { sizeof(Float32), PBArraySetFloatValue }, { sizeof(Float64), PBArraySetDoubleValue }, }; @@ -90,7 +90,7 @@ static void PBArraySetDoubleValue(NSNumber *number, void *value) #define PBArrayForEachObject(__data, __count, x) \ if (_valueType == PBArrayValueTypeObject) \ - for (NSUInteger i = 0; i < __count; ++i) { id object = ((id *)__data)[i]; [object x]; } + for (unsigned long i = 0; i < __count; ++i) { id object = ((id *)__data)[i]; [object x]; } #define PBArrayValueTypeAssert(type) \ if (__builtin_expect(_valueType != type, 0)) \ @@ -117,7 +117,7 @@ @implementation PBArray @synthesize valueType = _valueType; @dynamic data; -- (id)initWithCount:(NSUInteger)count valueType:(PBArrayValueType)valueType +- (id)initWithCount:(unsigned long)count valueType:(PBArrayValueType)valueType { if ((self = [super init])) { @@ -168,7 +168,7 @@ - (NSString *)description [self class], self, _valueType, (long)_count, (long)_capacity, _data]; } -- (NSUInteger)count +- (unsigned long)count { return _count; } @@ -178,7 +178,7 @@ - (const void *)data return _data; } -- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len +- (unsigned long)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(unsigned long)len { // TODO: We only support enumeration of object values. In the future, we // can extend this code to return a new list of NSNumber* objects wrapping @@ -197,56 +197,56 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state object return _count; } -- (id)objectAtIndex:(NSUInteger)index +- (id)objectAtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeObject); return ((id *)_data)[index]; } -- (BOOL)boolAtIndex:(NSUInteger)index +- (BOOL)boolAtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeBool); return ((BOOL *)_data)[index]; } -- (NSInteger)int32AtIndex:(NSUInteger)index +- (long)int32AtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt32); - return ((NSInteger *)_data)[index]; + return ((long *)_data)[index]; } -- (NSUInteger)uint32AtIndex:(NSUInteger)index +- (unsigned long)uint32AtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt32); - return ((NSUInteger *)_data)[index]; + return ((unsigned long *)_data)[index]; } -- (int64_t)int64AtIndex:(NSUInteger)index +- (long long)int64AtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt64); - return ((int64_t *)_data)[index]; + return ((long long *)_data)[index]; } -- (uint64_t)uint64AtIndex:(NSUInteger)index +- (ulong long)uint64AtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt64); - return ((uint64_t *)_data)[index]; + return ((ulong long *)_data)[index]; } -- (Float32)floatAtIndex:(NSUInteger)index +- (Float32)floatAtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeFloat); return ((Float32 *)_data)[index]; } -- (Float64)doubleAtIndex:(NSUInteger)index +- (Float64)doubleAtIndex:(unsigned long)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeDouble); @@ -295,7 +295,7 @@ -(id)lastObject return nil; } -- (id)objectAtIndexedSubscript:(NSUInteger)idx +- (id)objectAtIndexedSubscript:(unsigned long)idx { if (idx > 0 && idx < self.count) { return [self objectAtIndex:idx]; @@ -303,11 +303,11 @@ - (id)objectAtIndexedSubscript:(NSUInteger)idx return nil; } -- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block +- (void)enumerateObjectsUsingBlock:(void (^)(id obj, unsigned long idx, BOOL *stop))block { if (!block) return; BOOL stop = NO; - for (NSInteger i = 0; i < self.count; i++) { + for (long i = 0; i < self.count; i++) { block([self objectAtIndex:i],i,&stop); if(stop){ break; @@ -347,7 +347,7 @@ + (id)arrayWithValueType:(PBArrayValueType)valueType return [[[self alloc] initWithValueType:valueType] autorelease]; } -+ (id)arrayWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType ++ (id)arrayWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType { return [[[self alloc] initWithValues:values count:count valueType:valueType] autorelease]; } @@ -362,7 +362,7 @@ - (id)initWithValueType:(PBArrayValueType)valueType return [self initWithCount:0 valueType:valueType]; } -- (id)initWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType +- (id)initWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType { if ((self = [self initWithCount:count valueType:valueType])) { @@ -410,9 +410,9 @@ - (id)initWithArray:(NSArray *)array valueType:(PBArrayValueType)valueType @implementation PBAppendableArray -- (void)ensureAdditionalCapacity:(NSUInteger)additionalSlots +- (void)ensureAdditionalCapacity:(unsigned long)additionalSlots { - const NSUInteger requiredSlots = _count + additionalSlots; + const unsigned long requiredSlots = _count + additionalSlots; if (requiredSlots > _capacity) { @@ -454,35 +454,35 @@ - (void)addBool:(BOOL)value _count++; } -- (void)addInt32:(NSInteger)value +- (void)addInt32:(long)value { PBArrayValueTypeAssert(PBArrayValueTypeInt32); [self ensureAdditionalCapacity:1]; - *(NSInteger *)PBArraySlot(_count) = value; + *(long *)PBArraySlot(_count) = value; _count++; } -- (void)addUint32:(NSUInteger)value +- (void)addUint32:(unsigned long)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt32); [self ensureAdditionalCapacity:1]; - *(NSUInteger *)PBArraySlot(_count) = value; + *(unsigned long *)PBArraySlot(_count) = value; _count++; } -- (void)addInt64:(int64_t)value +- (void)addInt64:(long long)value { PBArrayValueTypeAssert(PBArrayValueTypeInt64); [self ensureAdditionalCapacity:1]; - *(int64_t *)PBArraySlot(_count) = value; + *(long long *)PBArraySlot(_count) = value; _count++; } -- (void)addUint64:(uint64_t)value +- (void)addUint64:(ulong long)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt64); [self ensureAdditionalCapacity:1]; - *(uint64_t *)PBArraySlot(_count) = value; + *(ulong long *)PBArraySlot(_count) = value; _count++; } @@ -514,7 +514,7 @@ - (void)appendArray:(PBArray *)array PBArrayForEachObject(array->_data, array->_count, retain); } -- (void)appendValues:(const void *)values count:(NSUInteger)count +- (void)appendValues:(const void *)values count:(unsigned long)count { [self ensureAdditionalCapacity:count]; diff --git a/src/runtime/Classes/RingBuffer.h b/src/runtime/Classes/RingBuffer.h index 5abab3e..c49ecc3 100644 --- a/src/runtime/Classes/RingBuffer.h +++ b/src/runtime/Classes/RingBuffer.h @@ -2,10 +2,10 @@ @interface RingBuffer : NSObject { NSMutableData *buffer; - NSInteger position; - NSInteger tail; + long position; + long tail; } -@property (nonatomic, readonly) NSUInteger freeSpace; +@property (nonatomic, readonly) unsigned long freeSpace; - (id)initWithData:(NSMutableData*)data; @@ -13,9 +13,9 @@ - (BOOL)appendByte:(uint8_t)byte; // Returns number of bytes written -- (NSInteger)appendData:(const NSData*)value offset:(NSInteger)offset length:(NSInteger)length; +- (long)appendData:(const NSData*)value offset:(long)offset length:(long)length; // Returns number of bytes written -- (NSInteger)flushToOutputStream:(NSOutputStream*)stream; +- (long)flushToOutputStream:(NSOutputStream*)stream; @end diff --git a/src/runtime/Classes/RingBuffer.m b/src/runtime/Classes/RingBuffer.m index 1a71219..0b3c79e 100644 --- a/src/runtime/Classes/RingBuffer.m +++ b/src/runtime/Classes/RingBuffer.m @@ -10,7 +10,7 @@ - (id)initWithData:(NSMutableData*)data { } -- (NSUInteger)freeSpace { +- (unsigned long)freeSpace { return (position < tail ? tail - position : (buffer.length - position) + tail) - (tail ? 1 : 0); } @@ -22,8 +22,8 @@ - (BOOL)appendByte:(uint8_t)byte { } -- (NSInteger)appendData:(const NSData*)value offset:(NSInteger)offset length:(NSInteger)length { - NSInteger totalWritten = 0; +- (long)appendData:(const NSData*)value offset:(long)offset length:(long)length { + long totalWritten = 0; const uint8_t *input = value.bytes; uint8_t *data = buffer.mutableBytes; @@ -36,7 +36,7 @@ - (NSInteger)appendData:(const NSData*)value offset:(NSInteger)offset length:(NS offset += totalWritten; } - NSUInteger freeSpace = self.freeSpace; + unsigned long freeSpace = self.freeSpace; if (!freeSpace) return totalWritten; if (position == buffer.length) { @@ -44,7 +44,7 @@ - (NSInteger)appendData:(const NSData*)value offset:(NSInteger)offset length:(NS } // position < tail - NSInteger written = MIN(freeSpace, length); + long written = MIN(freeSpace, length); memcpy(data + position, input + offset, written); position += written; totalWritten += written; @@ -53,12 +53,12 @@ - (NSInteger)appendData:(const NSData*)value offset:(NSInteger)offset length:(NS } -- (NSInteger)flushToOutputStream:(NSOutputStream*)stream { - NSInteger totalWritten = 0; +- (long)flushToOutputStream:(NSOutputStream*)stream { + long totalWritten = 0; const uint8_t *data = buffer.bytes; if (tail > position) { - NSInteger written = [stream write:data + tail maxLength:buffer.length - tail]; + long written = [stream write:data + tail maxLength:buffer.length - tail]; if (written <= 0) return totalWritten; totalWritten += written; tail += written; @@ -68,7 +68,7 @@ - (NSInteger)flushToOutputStream:(NSOutputStream*)stream { } if (tail < position) { - NSInteger written = [stream write:data + tail maxLength:position - tail]; + long written = [stream write:data + tail maxLength:position - tail]; if (written <= 0) return totalWritten; totalWritten += written; tail += written; diff --git a/src/runtime/Classes/TextFormat.h b/src/runtime/Classes/TextFormat.h index 8f39f6a..a6ffbc5 100644 --- a/src/runtime/Classes/TextFormat.h +++ b/src/runtime/Classes/TextFormat.h @@ -19,10 +19,10 @@ } -+ (NSInteger) parseInt32:(NSString*) text; -+ (NSInteger) parseUInt32:(NSString*) text; -+ (int64_t) parseInt64:(NSString*) text; -+ (int64_t) parseUInt64:(NSString*) text; ++ (long) parseInt32:(NSString*) text; ++ (long) parseUInt32:(NSString*) text; ++ (long long) parseInt64:(NSString*) text; ++ (long long) parseUInt64:(NSString*) text; + (NSData*) unescapeBytes:(NSString*) input; diff --git a/src/runtime/Classes/TextFormat.m b/src/runtime/Classes/TextFormat.m index 0caeabd..9024893 100644 --- a/src/runtime/Classes/TextFormat.m +++ b/src/runtime/Classes/TextFormat.m @@ -53,7 +53,7 @@ BOOL isHex(unichar c) { } -+ (int64_t) parseInteger:(NSString*) text ++ (long long) parseInteger:(NSString*) text isSigned:(BOOL) isSigned isLong:(BOOL) isLong { if (text.length == 0) { @@ -71,7 +71,7 @@ + (int64_t) parseInteger:(NSString*) text } // now call into the appropriate conversion utilities. - int64_t result; + long long result; const char* in_string = text.UTF8String; char* out_string = NULL; errno = 0; @@ -109,8 +109,8 @@ + (int64_t) parseInteger:(NSString*) text * the prefixes "0x" and "0" to signify hexidecimal and octal numbers, * respectively. */ -+ (NSInteger) parseInt32:(NSString*) text { - return (NSInteger)[self parseInteger:text isSigned:YES isLong:NO]; ++ (long) parseInt32:(NSString*) text { + return (long)[self parseInteger:text isSigned:YES isLong:NO]; } @@ -119,8 +119,8 @@ + (NSInteger) parseInt32:(NSString*) text { * the prefixes "0x" and "0" to signify hexidecimal and octal numbers, * respectively. The result is coerced to a (signed) {@code int} when returned. */ -+ (NSInteger) parseUInt32:(NSString*) text { - return (NSInteger)[self parseInteger:text isSigned:NO isLong:NO]; ++ (long) parseUInt32:(NSString*) text { + return (long)[self parseInteger:text isSigned:NO isLong:NO]; } @@ -129,7 +129,7 @@ + (NSInteger) parseUInt32:(NSString*) text { * the prefixes "0x" and "0" to signify hexidecimal and octal numbers, * respectively. */ -+ (int64_t) parseInt64:(NSString*) text { ++ (long long) parseInt64:(NSString*) text { return [self parseInteger:text isSigned:YES isLong:YES]; } @@ -140,7 +140,7 @@ + (int64_t) parseInt64:(NSString*) text { * respectively. The result is coerced to a (signed) {@code long} when * returned. */ -+ (int64_t) parseUInt64:(NSString*) text { ++ (long long) parseUInt64:(NSString*) text { return [self parseInteger:text isSigned:NO isLong:YES]; } @@ -149,7 +149,7 @@ + (int64_t) parseUInt64:(NSString*) text { * numeric value. This is like {@code Character.digit()} but we don't accept * non-ASCII digits. */ -NSInteger digitValue(unichar c) { +long digitValue(unichar c) { if ('0' <= c && c <= '9') { return c - '0'; } else if ('a' <= c && c <= 'z') { @@ -168,8 +168,8 @@ NSInteger digitValue(unichar c) { + (NSData*) unescapeBytes:(NSString*) input { NSMutableData* result = [NSMutableData dataWithLength:input.length]; - NSInteger pos = 0; - for (NSInteger i = 0; i < input.length; i++) { + long pos = 0; + for (long i = 0; i < input.length; i++) { unichar c = [input characterAtIndex:i]; if (c == '\\') { if (i + 1 < input.length) { @@ -177,7 +177,7 @@ + (NSData*) unescapeBytes:(NSString*) input { c = [input characterAtIndex:i]; if (isOctal(c)) { // Octal escape. - NSInteger code = digitValue(c); + long code = digitValue(c); if (i + 1 < input.length && isOctal([input characterAtIndex:(i + 1)])) { ++i; code = code * 8 + digitValue([input characterAtIndex:i]); @@ -202,7 +202,7 @@ + (NSData*) unescapeBytes:(NSString*) input { case 'x': // hex escape { - NSInteger code = 0; + long code = 0; if (i + 1 < input.length && isHex([input characterAtIndex:(i + 1)])) { ++i; code = digitValue([input characterAtIndex:i]); diff --git a/src/runtime/Classes/UnknownFieldSet.h b/src/runtime/Classes/UnknownFieldSet.h index 760b9ca..de26bd5 100644 --- a/src/runtime/Classes/UnknownFieldSet.h +++ b/src/runtime/Classes/UnknownFieldSet.h @@ -38,11 +38,11 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; - (NSData*) data; -- (NSInteger) serializedSize; -- (NSInteger) serializedSizeAsMessageSet; +- (long) serializedSize; +- (long) serializedSizeAsMessageSet; -- (BOOL) hasField:(NSInteger) number; -- (PBField*) getField:(NSInteger) number; +- (BOOL) hasField:(long) number; +- (PBField*) getField:(long) number; - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent; diff --git a/src/runtime/Classes/UnknownFieldSet.m b/src/runtime/Classes/UnknownFieldSet.m index 1df7688..40c650b 100644 --- a/src/runtime/Classes/UnknownFieldSet.m +++ b/src/runtime/Classes/UnknownFieldSet.m @@ -66,12 +66,12 @@ + (PBUnknownFieldSet*) setWithFields:(NSMutableDictionary*) fields { } -- (BOOL) hasField:(NSInteger) number { +- (BOOL) hasField:(long) number { return [fields objectForKey:@(number)] != nil; } -- (PBField*) getField:(NSInteger) number { +- (PBField*) getField:(long) number { PBField* result = [fields objectForKey:@(number)]; return (result == nil) ? [PBField defaultInstance] : result; } @@ -129,8 +129,8 @@ + (PBUnknownFieldSet_Builder*) builderWithUnknownFields:(PBUnknownFieldSet*) cop /** Get the number of bytes required to encode this set. */ -- (NSInteger) serializedSize { - NSInteger result = 0; +- (long) serializedSize { + long result = 0; for (NSNumber* number in fields) { result += [[fields objectForKey:number] getSerializedSize:number.intValue]; } @@ -152,8 +152,8 @@ - (void) writeAsMessageSetTo:(PBCodedOutputStream*) output { * Get the number of bytes required to encode this set using * {@code MessageSet} wire format. */ -- (NSInteger) serializedSizeAsMessageSet { - NSInteger result = 0; +- (long) serializedSizeAsMessageSet { + long result = 0; for (NSNumber* number in fields) { result += [[fields objectForKey:number] getSerializedSizeAsMessageSetExtension:number.intValue]; } diff --git a/src/runtime/Classes/UnknownFieldSet_Builder.h b/src/runtime/Classes/UnknownFieldSet_Builder.h index f88bd04..212d6cd 100644 --- a/src/runtime/Classes/UnknownFieldSet_Builder.h +++ b/src/runtime/Classes/UnknownFieldSet_Builder.h @@ -27,7 +27,7 @@ // Optimization: We keep around a builder for the last field that was // modified so that we can efficiently add to it multiple times in a // row (important when parsing an unknown repeated field). - NSInteger lastFieldNumber; + long lastFieldNumber; PBMutableField* lastField; } @@ -41,13 +41,13 @@ - (PBUnknownFieldSet_Builder*) mergeFromData:(NSData*) data; - (PBUnknownFieldSet_Builder*) mergeFromInputStream:(NSInputStream*) input; -- (PBUnknownFieldSet_Builder*) mergeVarintField:(NSInteger) number value:(NSInteger) value; +- (PBUnknownFieldSet_Builder*) mergeVarintField:(long) number value:(long) value; -- (BOOL) mergeFieldFrom:(NSInteger) tag input:(PBCodedInputStream*) input; +- (BOOL) mergeFieldFrom:(long) tag input:(PBCodedInputStream*) input; -- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(NSInteger) number; +- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(long) number; - (PBUnknownFieldSet_Builder*) clear; -- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(NSInteger) number; +- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(long) number; @end diff --git a/src/runtime/Classes/UnknownFieldSet_Builder.m b/src/runtime/Classes/UnknownFieldSet_Builder.m index 14cd149..2dd3be6 100644 --- a/src/runtime/Classes/UnknownFieldSet_Builder.m +++ b/src/runtime/Classes/UnknownFieldSet_Builder.m @@ -25,7 +25,7 @@ @interface PBUnknownFieldSet_Builder () @property (retain) NSMutableDictionary* fields; -@property NSInteger lastFieldNumber; +@property long lastFieldNumber; @property (retain) PBMutableField* lastField; @end @@ -65,7 +65,7 @@ + (PBUnknownFieldSet_Builder*) createBuilder:(PBUnknownFieldSet*) unknownFields * Add a field to the {@code PBUnknownFieldSet}. If a field with the same * number already exists, it is removed. */ -- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(NSInteger) number { +- (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(long) number { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"" userInfo:nil]; } @@ -83,7 +83,7 @@ - (PBUnknownFieldSet_Builder*) addField:(PBField*) field forNumber:(NSInteger) n * Get a field builder for the given field number which includes any * values that already exist. */ -- (PBMutableField*) getFieldBuilder:(NSInteger) number { +- (PBMutableField*) getFieldBuilder:(long) number { if (lastField != nil) { if (number == lastFieldNumber) { return lastField; @@ -142,7 +142,7 @@ - (PBUnknownFieldSet*) unknownFields { } /** Check if the given field number is present in the set. */ -- (BOOL) hasField:(NSInteger) number { +- (BOOL) hasField:(long) number { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"" userInfo:nil]; } @@ -155,7 +155,7 @@ - (BOOL) hasField:(NSInteger) number { * Add a field to the {@code PBUnknownFieldSet}. If a field with the same * number already exists, the two are merged. */ -- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(NSInteger) number { +- (PBUnknownFieldSet_Builder*) mergeField:(PBField*) field forNumber:(long) number { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"" userInfo:nil]; } @@ -207,7 +207,7 @@ - (PBUnknownFieldSet_Builder*) mergeFromInputStream:(NSInputStream*) input exten @throw [NSException exceptionWithName:@"UnsupportedMethod" reason:@"" userInfo:nil]; } -- (PBUnknownFieldSet_Builder*) mergeVarintField:(NSInteger) number value:(NSInteger) value { +- (PBUnknownFieldSet_Builder*) mergeVarintField:(long) number value:(long) value { if (number == 0) { @throw [NSException exceptionWithName:@"IllegalArgument" reason:@"Zero is not a valid field number." userInfo:nil]; } @@ -222,8 +222,8 @@ - (PBUnknownFieldSet_Builder*) mergeVarintField:(NSInteger) number value:(NSInte * @param tag The field's tag number, which was already parsed. * @return {@code NO} if the tag is an engroup tag. */ -- (BOOL) mergeFieldFrom:(NSInteger) tag input:(PBCodedInputStream*) input { - NSInteger number = PBWireFormatGetTagFieldNumber(tag); +- (BOOL) mergeFieldFrom:(long) tag input:(PBCodedInputStream*) input { + long number = PBWireFormatGetTagFieldNumber(tag); switch (PBWireFormatGetTagWireType(tag)) { case PBWireFormatVarint: [[self getFieldBuilder:number] addVarint:[input readInt64]]; @@ -257,7 +257,7 @@ - (BOOL) mergeFieldFrom:(NSInteger) tag input:(PBCodedInputStream*) input { */ - (PBUnknownFieldSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; if (tag == 0 || ![self mergeFieldFrom:tag input:input]) { break; } diff --git a/src/runtime/Classes/Utilities.h b/src/runtime/Classes/Utilities.h index a703478..0dcb6a8 100644 --- a/src/runtime/Classes/Utilities.h +++ b/src/runtime/Classes/Utilities.h @@ -17,18 +17,18 @@ #import "Message.h" -int64_t convertFloat64ToInt64(Float64 f); -NSInteger convertFloat32ToInt32(Float32 f); -Float64 convertInt64ToFloat64(int64_t f); -Float32 convertInt32ToFloat32(NSInteger f); +long long convertFloat64ToInt64(Float64 f); +long convertFloat32ToInt32(Float32 f); +Float64 convertInt64ToFloat64(long long f); +Float32 convertInt32ToFloat32(long f); -uint64_t convertInt64ToUInt64(int64_t i); -int64_t convertUInt64ToInt64(uint64_t u); -NSUInteger convertInt32ToUInt32(NSInteger i); -int64_t convertUInt32ToInt32(NSUInteger u); +ulong long convertInt64ToUInt64(long long i); +long long convertUInt64ToInt64(ulong long u); +unsigned long convertInt32ToUInt32(long i); +long long convertUInt32ToInt32(unsigned long u); -NSInteger logicalRightShift32(NSInteger value, NSInteger spaces); -int64_t logicalRightShift64(int64_t value, NSInteger spaces); +long logicalRightShift32(long value, long spaces); +long long logicalRightShift64(long long value, long spaces); /** @@ -40,7 +40,7 @@ int64_t logicalRightShift64(int64_t value, NSInteger spaces); * @param n An unsigned 32-bit integer, stored in a signed int. * @return A signed 32-bit integer. */ -NSInteger decodeZigZag32(NSInteger n); +long decodeZigZag32(long n); /** * Decode a ZigZag-encoded 64-bit value. ZigZag encodes signed integers @@ -51,7 +51,7 @@ NSInteger decodeZigZag32(NSInteger n); * @param n An unsigned 64-bit integer, stored in a signed int. * @return A signed 64-bit integer. */ -int64_t decodeZigZag64(int64_t n); +long long decodeZigZag64(long long n); /** @@ -63,7 +63,7 @@ int64_t decodeZigZag64(int64_t n); * @param n A signed 32-bit integer. * @return An unsigned 32-bit integer, stored in a signed int. */ -NSInteger encodeZigZag32(NSInteger n); +long encodeZigZag32(long n); /** * Encode a ZigZag-encoded 64-bit value. ZigZag encodes signed integers @@ -74,262 +74,262 @@ NSInteger encodeZigZag32(NSInteger n); * @param n A signed 64-bit integer. * @return An unsigned 64-bit integer, stored in a signed int. */ -int64_t encodeZigZag64(int64_t n); +long long encodeZigZag64(long long n); /** * Compute the number of bytes that would be needed to encode a * {@code double} field, including tag. */ -NSInteger computeDoubleSize(NSInteger fieldNumber, Float64 value); +long computeDoubleSize(long fieldNumber, Float64 value); /** * Compute the number of bytes that would be needed to encode a * {@code float} field, including tag. */ -NSInteger computeFloatSize(NSInteger fieldNumber, Float32 value); +long computeFloatSize(long fieldNumber, Float32 value); /** * Compute the number of bytes that would be needed to encode a * {@code uint64} field, including tag. */ -NSInteger computeUInt64Size(NSInteger fieldNumber, int64_t value); +long computeUInt64Size(long fieldNumber, long long value); /** * Compute the number of bytes that would be needed to encode an * {@code int64} field, including tag. */ -NSInteger computeInt64Size(NSInteger fieldNumber, int64_t value); +long computeInt64Size(long fieldNumber, long long value); /** * Compute the number of bytes that would be needed to encode an * {@code int32} field, including tag. */ -NSInteger computeInt32Size(NSInteger fieldNumber, NSInteger value); +long computeInt32Size(long fieldNumber, long value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed64} field, including tag. */ -NSInteger computeFixed64Size(NSInteger fieldNumber, int64_t value); +long computeFixed64Size(long fieldNumber, long long value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed32} field, including tag. */ -NSInteger computeFixed32Size(NSInteger fieldNumber, NSInteger value); +long computeFixed32Size(long fieldNumber, long value); /** * Compute the number of bytes that would be needed to encode a * {@code bool} field, including tag. */ -NSInteger computeBoolSize(NSInteger fieldNumber, BOOL value); +long computeBoolSize(long fieldNumber, BOOL value); /** * Compute the number of bytes that would be needed to encode a * {@code string} field, including tag. */ -NSInteger computeStringSize(NSInteger fieldNumber, const NSString* value); +long computeStringSize(long fieldNumber, const NSString* value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field, including tag. */ -NSInteger computeGroupSize(NSInteger fieldNumber, const id value); +long computeGroupSize(long fieldNumber, const id value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field represented by an {@code PBUnknownFieldSet}, including * tag. */ -NSInteger computeUnknownGroupSize(NSInteger fieldNumber, const PBUnknownFieldSet* value); +long computeUnknownGroupSize(long fieldNumber, const PBUnknownFieldSet* value); /** * Compute the number of bytes that would be needed to encode an * embedded message field, including tag. */ -NSInteger computeMessageSize(NSInteger fieldNumber, const id value); +long computeMessageSize(long fieldNumber, const id value); /** * Compute the number of bytes that would be needed to encode a * {@code bytes} field, including tag. */ -NSInteger computeDataSize(NSInteger fieldNumber, const NSData* value); +long computeDataSize(long fieldNumber, const NSData* value); /** * Compute the number of bytes that would be needed to encode a * {@code uint32} field, including tag. */ -NSInteger computeUInt32Size(NSInteger fieldNumber, NSInteger value); +long computeUInt32Size(long fieldNumber, long value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed32} field, including tag. */ -NSInteger computeSFixed32Size(NSInteger fieldNumber, NSInteger value); +long computeSFixed32Size(long fieldNumber, long value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed64} field, including tag. */ -NSInteger computeSFixed64Size(NSInteger fieldNumber, int64_t value); +long computeSFixed64Size(long fieldNumber, long long value); /** * Compute the number of bytes that would be needed to encode an * {@code sint32} field, including tag. */ -NSInteger computeSInt32Size(NSInteger fieldNumber, NSInteger value); +long computeSInt32Size(long fieldNumber, long value); /** * Compute the number of bytes that would be needed to encode an * {@code sint64} field, including tag. */ -NSInteger computeSInt64Size(NSInteger fieldNumber, int64_t value); +long computeSInt64Size(long fieldNumber, long long value); /** Compute the number of bytes that would be needed to encode a tag. */ -NSInteger computeTagSize(NSInteger fieldNumber); +long computeTagSize(long fieldNumber); /** * Compute the number of bytes that would be needed to encode a * {@code double} field, including tag. */ -NSInteger computeDoubleSizeNoTag(Float64 value); +long computeDoubleSizeNoTag(Float64 value); /** * Compute the number of bytes that would be needed to encode a * {@code float} field, including tag. */ -NSInteger computeFloatSizeNoTag(Float32 value); +long computeFloatSizeNoTag(Float32 value); /** * Compute the number of bytes that would be needed to encode a * {@code uint64} field, including tag. */ -NSInteger computeUInt64SizeNoTag(int64_t value); +long computeUInt64SizeNoTag(long long value); /** * Compute the number of bytes that would be needed to encode an * {@code int64} field, including tag. */ -NSInteger computeInt64SizeNoTag(int64_t value); +long computeInt64SizeNoTag(long long value); /** * Compute the number of bytes that would be needed to encode an * {@code int32} field, including tag. */ -NSInteger computeInt32SizeNoTag(NSInteger value); +long computeInt32SizeNoTag(long value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed64} field, including tag. */ -NSInteger computeFixed64SizeNoTag(int64_t value); +long computeFixed64SizeNoTag(long long value); /** * Compute the number of bytes that would be needed to encode a * {@code fixed32} field, including tag. */ -NSInteger computeFixed32SizeNoTag(NSInteger value); +long computeFixed32SizeNoTag(long value); /** * Compute the number of bytes that would be needed to encode a * {@code bool} field, including tag. */ -NSInteger computeBoolSizeNoTag(BOOL value); +long computeBoolSizeNoTag(BOOL value); /** * Compute the number of bytes that would be needed to encode a * {@code string} field, including tag. */ -NSInteger computeStringSizeNoTag(const NSString* value); +long computeStringSizeNoTag(const NSString* value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field, including tag. */ -NSInteger computeGroupSizeNoTag(const id value); +long computeGroupSizeNoTag(const id value); /** * Compute the number of bytes that would be needed to encode a * {@code group} field represented by an {@code PBUnknownFieldSet}, including * tag. */ -NSInteger computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value); +long computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value); /** * Compute the number of bytes that would be needed to encode an * embedded message field, including tag. */ -NSInteger computeMessageSizeNoTag(const id value); +long computeMessageSizeNoTag(const id value); /** * Compute the number of bytes that would be needed to encode a * {@code bytes} field, including tag. */ -NSInteger computeDataSizeNoTag(const NSData* value); +long computeDataSizeNoTag(const NSData* value); /** * Compute the number of bytes that would be needed to encode a * {@code uint32} field, including tag. */ -NSInteger computeUInt32SizeNoTag(NSInteger value); +long computeUInt32SizeNoTag(long value); /** * Compute the number of bytes that would be needed to encode an * enum field, including tag. Caller is responsible for converting the * enum value to its numeric value. */ -NSInteger computeEnumSizeNoTag(NSInteger value); +long computeEnumSizeNoTag(long value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed32} field, including tag. */ -NSInteger computeSFixed32SizeNoTag(NSInteger value); +long computeSFixed32SizeNoTag(long value); /** * Compute the number of bytes that would be needed to encode an * {@code sfixed64} field, including tag. */ -NSInteger computeSFixed64SizeNoTag(int64_t value); +long computeSFixed64SizeNoTag(long long value); /** * Compute the number of bytes that would be needed to encode an * {@code sint32} field, including tag. */ -NSInteger computeSInt32SizeNoTag(NSInteger value); +long computeSInt32SizeNoTag(long value); /** * Compute the number of bytes that would be needed to encode an * {@code sint64} field, including tag. */ -NSInteger computeSInt64SizeNoTag(int64_t value); +long computeSInt64SizeNoTag(long long value); /** * Compute the number of bytes that would be needed to encode a varint. * {@code value} is treated as unsigned, so it won't be sign-extended if * negative. */ -NSInteger computeRawVarint32Size(NSInteger value); +long computeRawVarint32Size(long value); /** Compute the number of bytes that would be needed to encode a varint. */ -NSInteger computeRawVarint64Size(int64_t value); +long computeRawVarint64Size(long long value); /** * Compute the number of bytes that would be needed to encode a * MessageSet extension to the stream. For historical reasons, * the wire format differs from normal fields. */ -NSInteger computeMessageSetExtensionSize(NSInteger fieldNumber, const id value); +long computeMessageSetExtensionSize(long fieldNumber, const id value); /** * Compute the number of bytes that would be needed to encode an * unparsed MessageSet extension field to the stream. For * historical reasons, the wire format differs from normal fields. */ -NSInteger computeRawMessageSetExtensionSize(NSInteger fieldNumber, const NSData* value); +long computeRawMessageSetExtensionSize(long fieldNumber, const NSData* value); /** * Compute the number of bytes that would be needed to encode an * enum field, including tag. Caller is responsible for converting the * enum value to its numeric value. */ -NSInteger computeEnumSize(NSInteger fieldNumber, NSInteger value); +long computeEnumSize(long fieldNumber, long value); diff --git a/src/runtime/Classes/Utilities.m b/src/runtime/Classes/Utilities.m index 5a4f8f4..ac05d37 100644 --- a/src/runtime/Classes/Utilities.m +++ b/src/runtime/Classes/Utilities.m @@ -20,118 +20,118 @@ #import "UnknownFieldSet.h" #import "WireFormat.h" -const NSInteger LITTLE_ENDIAN_32_SIZE = 4; -const NSInteger LITTLE_ENDIAN_64_SIZE = 8; +const long LITTLE_ENDIAN_32_SIZE = 4; +const long LITTLE_ENDIAN_64_SIZE = 8; -int64_t convertFloat64ToInt64(Float64 v) { - union { Float64 f; int64_t i; } u; +long long convertFloat64ToInt64(Float64 v) { + union { Float64 f; long long i; } u; u.f = v; return u.i; } -NSInteger convertFloat32ToInt32(Float32 v) { - union { Float32 f; NSInteger i; } u; +long convertFloat32ToInt32(Float32 v) { + union { Float32 f; long i; } u; u.f = v; return u.i; } -Float64 convertInt64ToFloat64(int64_t v) { - union { Float64 f; int64_t i; } u; +Float64 convertInt64ToFloat64(long long v) { + union { Float64 f; long long i; } u; u.i = v; return u.f; } -Float32 convertInt32ToFloat32(NSInteger v) { - union { Float32 f; NSInteger i; } u; +Float32 convertInt32ToFloat32(long v) { + union { Float32 f; long i; } u; u.i = v; return u.f; } -uint64_t convertInt64ToUInt64(int64_t v) { - union { int64_t i; uint64_t u; } u; +ulong long convertInt64ToUInt64(long long v) { + union { long long i; ulong long u; } u; u.i = v; return u.u; } -int64_t convertUInt64ToInt64(uint64_t v) { - union { int64_t i; uint64_t u; } u; +long long convertUInt64ToInt64(ulong long v) { + union { long long i; ulong long u; } u; u.u = v; return u.i; } -NSUInteger convertInt32ToUInt32(NSInteger v) { - union { NSInteger i; NSUInteger u; } u; +unsigned long convertInt32ToUInt32(long v) { + union { long i; unsigned long u; } u; u.i = v; return u.u; } -int64_t convertUInt32ToInt32(NSUInteger v) { - union { NSInteger i; NSUInteger u; } u; +long long convertUInt32ToInt32(unsigned long v) { + union { long i; unsigned long u; } u; u.u = v; return u.i; } -NSInteger logicalRightShift32(NSInteger value, NSInteger spaces) { +long logicalRightShift32(long value, long spaces) { return convertUInt32ToInt32((convertInt32ToUInt32(value) >> spaces)); } -int64_t logicalRightShift64(int64_t value, NSInteger spaces) { +long long logicalRightShift64(long long value, long spaces) { return convertUInt64ToInt64((convertInt64ToUInt64(value) >> spaces)); } -NSInteger decodeZigZag32(NSInteger n) { +long decodeZigZag32(long n) { return logicalRightShift32(n, 1) ^ -(n & 1); } -int64_t decodeZigZag64(int64_t n) { +long long decodeZigZag64(long long n) { return logicalRightShift64(n, 1) ^ -(n & 1); } -NSInteger encodeZigZag32(NSInteger n) { +long encodeZigZag32(long n) { // Note: the right-shift must be arithmetic return (n << 1) ^ (n >> 31); } -int64_t encodeZigZag64(int64_t n) { +long long encodeZigZag64(long long n) { // Note: the right-shift must be arithmetic return (n << 1) ^ (n >> 63); } -NSInteger computeDoubleSizeNoTag(Float64 value) { +long computeDoubleSizeNoTag(Float64 value) { return LITTLE_ENDIAN_64_SIZE; } -NSInteger computeFloatSizeNoTag(Float32 value) { +long computeFloatSizeNoTag(Float32 value) { return LITTLE_ENDIAN_32_SIZE; } -NSInteger computeUInt64SizeNoTag(int64_t value) { +long computeUInt64SizeNoTag(long long value) { return computeRawVarint64Size(value); } -NSInteger computeInt64SizeNoTag(int64_t value) { +long computeInt64SizeNoTag(long long value) { return computeRawVarint64Size(value); } -NSInteger computeInt32SizeNoTag(NSInteger value) { +long computeInt32SizeNoTag(long value) { if (value >= 0) { return computeRawVarint32Size(value); } else { @@ -141,180 +141,180 @@ NSInteger computeInt32SizeNoTag(NSInteger value) { } -NSInteger computeFixed64SizeNoTag(int64_t value) { +long computeFixed64SizeNoTag(long long value) { return LITTLE_ENDIAN_64_SIZE; } -NSInteger computeFixed32SizeNoTag(NSInteger value) { +long computeFixed32SizeNoTag(long value) { return LITTLE_ENDIAN_32_SIZE; } -NSInteger computeBoolSizeNoTag(BOOL value) { +long computeBoolSizeNoTag(BOOL value) { return 1; } -NSInteger computeStringSizeNoTag(const NSString* value) { - const NSUInteger length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; +long computeStringSizeNoTag(const NSString* value) { + const unsigned long length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; return computeRawVarint32Size(length) + length; } -NSInteger computeGroupSizeNoTag(const id value) { +long computeGroupSizeNoTag(const id value) { return [value serializedSize]; } -NSInteger computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value) { +long computeUnknownGroupSizeNoTag(const PBUnknownFieldSet* value) { return value.serializedSize; } -NSInteger computeMessageSizeNoTag(const id value) { - NSInteger size = [value serializedSize]; +long computeMessageSizeNoTag(const id value) { + long size = [value serializedSize]; return computeRawVarint32Size(size) + size; } -NSInteger computeDataSizeNoTag(const NSData* value) { +long computeDataSizeNoTag(const NSData* value) { return computeRawVarint32Size(value.length) + value.length; } -NSInteger computeUInt32SizeNoTag(NSInteger value) { +long computeUInt32SizeNoTag(long value) { return computeRawVarint32Size(value); } -NSInteger computeEnumSizeNoTag(NSInteger value) { +long computeEnumSizeNoTag(long value) { return computeRawVarint32Size(value); } -NSInteger computeSFixed32SizeNoTag(NSInteger value) { +long computeSFixed32SizeNoTag(long value) { return LITTLE_ENDIAN_32_SIZE; } -NSInteger computeSFixed64SizeNoTag(int64_t value) { +long computeSFixed64SizeNoTag(long long value) { return LITTLE_ENDIAN_64_SIZE; } -NSInteger computeSInt32SizeNoTag(NSInteger value) { +long computeSInt32SizeNoTag(long value) { return computeRawVarint32Size(encodeZigZag32(value)); } -NSInteger computeSInt64SizeNoTag(int64_t value) { +long computeSInt64SizeNoTag(long long value) { return computeRawVarint64Size(encodeZigZag64(value)); } -NSInteger computeDoubleSize(NSInteger fieldNumber, Float64 value) { +long computeDoubleSize(long fieldNumber, Float64 value) { return computeTagSize(fieldNumber) + computeDoubleSizeNoTag(value); } -NSInteger computeFloatSize(NSInteger fieldNumber, Float32 value) { +long computeFloatSize(long fieldNumber, Float32 value) { return computeTagSize(fieldNumber) + computeFloatSizeNoTag(value); } -NSInteger computeUInt64Size(NSInteger fieldNumber, int64_t value) { +long computeUInt64Size(long fieldNumber, long long value) { return computeTagSize(fieldNumber) + computeUInt64SizeNoTag(value); } -NSInteger computeInt64Size(NSInteger fieldNumber, int64_t value) { +long computeInt64Size(long fieldNumber, long long value) { return computeTagSize(fieldNumber) + computeInt64SizeNoTag(value); } -NSInteger computeInt32Size(NSInteger fieldNumber, NSInteger value) { +long computeInt32Size(long fieldNumber, long value) { return computeTagSize(fieldNumber) + computeInt32SizeNoTag(value); } -NSInteger computeFixed64Size(NSInteger fieldNumber, int64_t value) { +long computeFixed64Size(long fieldNumber, long long value) { return computeTagSize(fieldNumber) + computeFixed64SizeNoTag(value); } -NSInteger computeFixed32Size(NSInteger fieldNumber, NSInteger value) { +long computeFixed32Size(long fieldNumber, long value) { return computeTagSize(fieldNumber) + computeFixed32SizeNoTag(value); } -NSInteger computeBoolSize(NSInteger fieldNumber, BOOL value) { +long computeBoolSize(long fieldNumber, BOOL value) { return computeTagSize(fieldNumber) + computeBoolSizeNoTag(value); } -NSInteger computeStringSize(NSInteger fieldNumber, const NSString* value) { +long computeStringSize(long fieldNumber, const NSString* value) { return computeTagSize(fieldNumber) + computeStringSizeNoTag(value); } -NSInteger computeGroupSize(NSInteger fieldNumber, const id value) { +long computeGroupSize(long fieldNumber, const id value) { return computeTagSize(fieldNumber) * 2 + computeGroupSizeNoTag(value); } -NSInteger computeUnknownGroupSize(NSInteger fieldNumber, const PBUnknownFieldSet* value) { +long computeUnknownGroupSize(long fieldNumber, const PBUnknownFieldSet* value) { return computeTagSize(fieldNumber) * 2 + computeUnknownGroupSizeNoTag(value); } -NSInteger computeMessageSize(NSInteger fieldNumber, const id value) { +long computeMessageSize(long fieldNumber, const id value) { return computeTagSize(fieldNumber) + computeMessageSizeNoTag(value); } -NSInteger computeDataSize(NSInteger fieldNumber, const NSData* value) { +long computeDataSize(long fieldNumber, const NSData* value) { return computeTagSize(fieldNumber) + computeDataSizeNoTag(value); } -NSInteger computeUInt32Size(NSInteger fieldNumber, NSInteger value) { +long computeUInt32Size(long fieldNumber, long value) { return computeTagSize(fieldNumber) + computeUInt32SizeNoTag(value); } -NSInteger computeEnumSize(NSInteger fieldNumber, NSInteger value) { +long computeEnumSize(long fieldNumber, long value) { return computeTagSize(fieldNumber) + computeEnumSizeNoTag(value); } -NSInteger computeSFixed32Size(NSInteger fieldNumber, NSInteger value) { +long computeSFixed32Size(long fieldNumber, long value) { return computeTagSize(fieldNumber) + computeSFixed32SizeNoTag(value); } -NSInteger computeSFixed64Size(NSInteger fieldNumber, int64_t value) { +long computeSFixed64Size(long fieldNumber, long long value) { return computeTagSize(fieldNumber) + computeSFixed64SizeNoTag(value); } -NSInteger computeSInt32Size(NSInteger fieldNumber, NSInteger value) { +long computeSInt32Size(long fieldNumber, long value) { return computeTagSize(fieldNumber) + computeSInt32SizeNoTag(value); } -NSInteger computeTagSize(NSInteger fieldNumber) { +long computeTagSize(long fieldNumber) { return computeRawVarint32Size(PBWireFormatMakeTag(fieldNumber, 0)); } -NSInteger computeSInt64Size(NSInteger fieldNumber, int64_t value) { +long computeSInt64Size(long fieldNumber, long long value) { return computeTagSize(fieldNumber) + computeRawVarint64Size(encodeZigZag64(value)); } -NSInteger computeRawVarint32Size(NSInteger value) { +long computeRawVarint32Size(long value) { if ((value & (0xffffffff << 7)) == 0) return 1; if ((value & (0xffffffff << 14)) == 0) return 2; if ((value & (0xffffffff << 21)) == 0) return 3; @@ -323,7 +323,7 @@ NSInteger computeRawVarint32Size(NSInteger value) { } -NSInteger computeRawVarint64Size(int64_t value) { +long computeRawVarint64Size(long long value) { if ((value & (0xffffffffffffffffL << 7)) == 0) return 1; if ((value & (0xffffffffffffffffL << 14)) == 0) return 2; if ((value & (0xffffffffffffffffL << 21)) == 0) return 3; @@ -337,14 +337,14 @@ NSInteger computeRawVarint64Size(int64_t value) { } -NSInteger computeMessageSetExtensionSize(NSInteger fieldNumber, const id value) { +long computeMessageSetExtensionSize(long fieldNumber, const id value) { return computeTagSize(PBWireFormatMessageSetItem) * 2 + computeUInt32Size(PBWireFormatMessageSetTypeId, fieldNumber) + computeMessageSize(PBWireFormatMessageSetMessage, value); } -NSInteger computeRawMessageSetExtensionSize(NSInteger fieldNumber, const NSData* value) { +long computeRawMessageSetExtensionSize(long fieldNumber, const NSData* value) { return computeTagSize(PBWireFormatMessageSetItem) * 2 + computeUInt32Size(PBWireFormatMessageSetTypeId, fieldNumber) + computeDataSize(PBWireFormatMessageSetMessage, value); diff --git a/src/runtime/Classes/WireFormat.h b/src/runtime/Classes/WireFormat.h index 4bd4230..12614d3 100644 --- a/src/runtime/Classes/WireFormat.h +++ b/src/runtime/Classes/WireFormat.h @@ -31,9 +31,9 @@ typedef enum { PBWireFormatMessageSetMessage = 3 } PBWireFormat; -NSInteger PBWireFormatMakeTag(NSInteger fieldNumber, NSInteger wireType); -NSInteger PBWireFormatGetTagWireType(NSInteger tag); -NSInteger PBWireFormatGetTagFieldNumber(NSInteger tag); +long PBWireFormatMakeTag(long fieldNumber, long wireType); +long PBWireFormatGetTagWireType(long tag); +long PBWireFormatGetTagFieldNumber(long tag); #define PBWireFormatMessageSetItemTag (PBWireFormatMakeTag(PBWireFormatMessageSetItem, PBWireFormatStartGroup)) #define PBWireFormatMessageSetItemEndTag (PBWireFormatMakeTag(PBWireFormatMessageSetItem, PBWireFormatEndGroup)) diff --git a/src/runtime/Classes/WireFormat.m b/src/runtime/Classes/WireFormat.m index c9665ec..d5f576d 100644 --- a/src/runtime/Classes/WireFormat.m +++ b/src/runtime/Classes/WireFormat.m @@ -19,16 +19,16 @@ #import "Utilities.h" -NSInteger PBWireFormatMakeTag(NSInteger fieldNumber, NSInteger wireType) { +long PBWireFormatMakeTag(long fieldNumber, long wireType) { return (fieldNumber << PBWireFormatTagTypeBits) | wireType; } -NSInteger PBWireFormatGetTagWireType(NSInteger tag) { +long PBWireFormatGetTagWireType(long tag) { return tag & PBWireFormatTagTypeMask; } -NSInteger PBWireFormatGetTagFieldNumber(NSInteger tag) { +long PBWireFormatGetTagFieldNumber(long tag) { return logicalRightShift32(tag, PBWireFormatTagTypeBits); } diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj b/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj index f3c1c4c..91856e3 100644 --- a/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj +++ b/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj @@ -135,8 +135,8 @@ C586264412668C2000204EE1 /* UnknownFieldSet_Builder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnknownFieldSet_Builder.m; sourceTree = ""; }; C586264512668C2000204EE1 /* UnknownFieldSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnknownFieldSet.h; sourceTree = ""; }; C586264612668C2000204EE1 /* UnknownFieldSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnknownFieldSet.m; sourceTree = ""; }; - C586264B12668C2F00204EE1 /* CodedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodedInputStream.h; sourceTree = ""; }; - C586264C12668C2F00204EE1 /* CodedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodedInputStream.m; sourceTree = ""; }; + C586264B12668C2F00204EE1 /* CodedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CodedInputStream.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + C586264C12668C2F00204EE1 /* CodedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CodedInputStream.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; C586264D12668C2F00204EE1 /* CodedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodedOutputStream.h; sourceTree = ""; }; C586264E12668C2F00204EE1 /* CodedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodedOutputStream.m; sourceTree = ""; }; C586265312668C3900204EE1 /* TextFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextFormat.h; sourceTree = ""; }; @@ -146,7 +146,7 @@ C586265B12668C4D00204EE1 /* AbstractMessage_Builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractMessage_Builder.h; sourceTree = ""; }; C586265C12668C4D00204EE1 /* AbstractMessage_Builder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AbstractMessage_Builder.m; sourceTree = ""; }; C586265D12668C4D00204EE1 /* AbstractMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractMessage.h; sourceTree = ""; }; - C586265E12668C4D00204EE1 /* AbstractMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AbstractMessage.m; sourceTree = ""; }; + C586265E12668C4D00204EE1 /* AbstractMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AbstractMessage.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; C586266312668C5800204EE1 /* GeneratedMessage_Builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedMessage_Builder.h; sourceTree = ""; }; C586266412668C5800204EE1 /* GeneratedMessage_Builder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedMessage_Builder.m; sourceTree = ""; }; C586266512668C5800204EE1 /* GeneratedMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedMessage.h; sourceTree = ""; }; @@ -160,9 +160,9 @@ C5B03F76125179F30087887C /* UnitTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; C5B03F77125179F30087887C /* UnitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UnitTests-Info.plist"; sourceTree = ""; }; C5B03F7B12517A1A0087887C /* CodedInputStreamTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodedInputStreamTests.h; path = Tests/CodedInputStreamTests.h; sourceTree = ""; }; - C5B03F7C12517A1A0087887C /* CodedInputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodedInputStreamTests.m; path = Tests/CodedInputStreamTests.m; sourceTree = ""; }; + C5B03F7C12517A1A0087887C /* CodedInputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = CodedInputStreamTests.m; path = Tests/CodedInputStreamTests.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; C5B03F7D12517A1A0087887C /* CodedOuputStreamTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodedOuputStreamTests.h; path = Tests/CodedOuputStreamTests.h; sourceTree = ""; }; - C5B03F7E12517A1A0087887C /* CodedOuputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodedOuputStreamTests.m; path = Tests/CodedOuputStreamTests.m; sourceTree = ""; }; + C5B03F7E12517A1A0087887C /* CodedOuputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = CodedOuputStreamTests.m; path = Tests/CodedOuputStreamTests.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; C5B03F7F12517A1A0087887C /* CoreTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreTests.h; path = Tests/CoreTests.h; sourceTree = ""; }; C5B03F8012517A1A0087887C /* CoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CoreTests.m; path = Tests/CoreTests.m; sourceTree = ""; }; C5B03F8112517A1A0087887C /* GeneratedMessageTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeneratedMessageTests.h; path = Tests/GeneratedMessageTests.h; sourceTree = ""; }; @@ -196,7 +196,7 @@ C5CBB7FB126CBD5100354923 /* Descriptor.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Descriptor.pb.h; sourceTree = ""; }; C5CBB7FC126CBD5100354923 /* Descriptor.pb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Descriptor.pb.m; sourceTree = ""; }; C5D8D6E912767BC300F0BAE4 /* ArrayTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArrayTests.h; path = Tests/ArrayTests.h; sourceTree = ""; }; - C5D8D6EA12767BC300F0BAE4 /* ArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; name = ArrayTests.m; path = Tests/ArrayTests.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; + C5D8D6EA12767BC300F0BAE4 /* ArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = ArrayTests.m; path = Tests/ArrayTests.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; C5F36E031275FA5A00013BB4 /* PBArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBArray.h; sourceTree = ""; }; C5F36E041275FA5A00013BB4 /* PBArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBArray.m; sourceTree = ""; }; D2AAC07E0554694100DB518D /* libProtocolBuffers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libProtocolBuffers.a; sourceTree = BUILT_PRODUCTS_DIR; }; diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers.xccheckout b/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers.xccheckout index 871efd6..606028c 100644 --- a/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers.xccheckout +++ b/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers.xccheckout @@ -5,34 +5,34 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - A7D79CC3-BB74-4EBD-B9EB-59B3748FCC6E + 386DBA84-094C-473C-BC94-F2E7E4330C52 IDESourceControlProjectName ProtocolBuffers IDESourceControlProjectOriginsDictionary - 1324E432-E35E-48F7-AEB7-E55B78E341A8 - https://github.com/Serheo/protobuf-objc.git + 32ECE5D6-F2C4-4A07-A196-D17BD058FEFE + https://github.com/alexeyxo/protobuf-objc.git IDESourceControlProjectPath src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - 1324E432-E35E-48F7-AEB7-E55B78E341A8 + 32ECE5D6-F2C4-4A07-A196-D17BD058FEFE ../../../.. IDESourceControlProjectURL - https://github.com/Serheo/protobuf-objc.git + https://github.com/alexeyxo/protobuf-objc.git IDESourceControlProjectVersion 110 IDESourceControlProjectWCCIdentifier - 1324E432-E35E-48F7-AEB7-E55B78E341A8 + 32ECE5D6-F2C4-4A07-A196-D17BD058FEFE IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 1324E432-E35E-48F7-AEB7-E55B78E341A8 + 32ECE5D6-F2C4-4A07-A196-D17BD058FEFE IDESourceControlWCCName protobuf-objc diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/UserInterfaceState.xcuserstate b/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/UserInterfaceState.xcuserstate index e4af044c4c73db4ca9d2b20150a10edad89810df..ff0035e9151da6a7cccdd8e31f6d5e73cb6e5a13 100644 GIT binary patch delta 16465 zcmZ`=2VhfG_ka7PgS>R_z4xTMbniAvlcqaO(e7z&^=s2q|)3aA-ULM@OA(n0M|H#7zs3yp)uLldAkpsCO_=s(a*Xf`wldKX#( zErpgrYoT?}dT0amA+!mLr46YGf_40WoYswjkS(Pms@$J;*-f0CEU9ihP3{ zLrx&4kspztkzbHY$nVG%W4#!Sy@gH1 z-o|ENv#~kYyV!he5%xZ|2KxY8i><@fV;is!v5nX!>@#c^wj0}n?ZrOF_F?<6Z?W&N zW7zlDIqW?43w8m!j{Sw*Fkm;ad)R&K0rnhwfkQZqBRGNE;sV?b55j}-5IhtQ!^80i zJQ9z>^YDDU058Og@M63KFU8C7a=Zms;c8rix8hp74cFoAcn3ZT@4?67PLO|FN_JkARL3k4WL#1e5tJdr@8 z6B$G%kwX*_#Y6=mBdUoSLP0bWN>`XOgqX`Q&@#B65ISLvAKNBDat`$WO_=vKAEyi&uB72A8m^<^dKyj#e~qDxJ$@6X;V|$O zMWiwF>%xLhLROG9WCLYGxls53lw))lfbxva#?X^cAs`n)#ZU=U$}A;3;YwydnZoF; z-K6u>%Nn}E)Oj2Gel!{u~HL5;~(kiG93SR}uplYZFsx`V8U5#!= z_f=3m)BrU?a-)Ya%ot9?p}?L`t@qohp;p!gjnQ)e(i*)0b%u?5Ob6682z5ewqqi~8 z7-CU966%HQ2cc0=kI~2II|%hb{YF2dKWP0a8?k{kZz43QQ7FyVsrq!?UCN$ugMcEj zh#R2EuZd5A-ZTaogN*^=fb6Nw5c?n3$m!7AO+sl!f1k3YQIj3V|C#4|8Ld*%F>}A!Y!YXN;iX;8W0i=sjow@bp4x z5%fN^nAvCRXA^CVGDgyHh(aJS``n!wG0e_yIkXZAUkR;%2B1M>j4{?2w-Q z0NMrq1webD&y5+zOzLYeuBnVqaH28Gm}AT}<{9&i z1;#>Sk+IlVVk|Y58Ox0oMxjw;6dNmz5~I{uWt17KjWxzvW8KyZf?co++e{mH8@wIf zQ74o}_xAPZy0pe@=9zt94G1)NC;X{GKw0`;BQ=$;1mw>k2}lVJTU6{ZW-A0va88e^ zP1grfrN2khJ8@!;B(GR%Vc7?Ck8$wgnW{Vhz!HaG4jcmDD~B)+90lO1gHMc!?Hg9D z8=Tv(>s0%ecdL|a&;!My+){~1RAo_p49Ju?MsNyF05H)pkOQXySnKG=fgb@l?ikI1 zp8+79qB!si02xk&9JmC)+fFGQ_#J?+oPs$=U17}$VxpbhTndC$B~|4G72x+!3$Fp* z2l__$y;~4mW zq1n}!19m3h%B*nZDnlFr;UibhnTQJj=Um-6R(AlNyZUgz3xFUut^*KX0BS8D0Du{8 zX0~7eK6VR_X8RTiV~ufz^ED$oyT|D@U40WLN~t1^~IYnQc4()4k0uodm!pZ*zYe0XXd)V#;M?3Tvj@OEYV7B*GG5(Z3Cy z3S=UD%&MmYP~&4ZbS40A`y_Ja%m(0)4>y1y^8mQ#WA3i`0QmUEacm0#sP#2ly%>OL zz5%f&uPtNEafii9Rfke*>Z1~2p-5a_BCS#smb?tW0U&hNH<634Rjg0|bKcj5iS?tn zDn0-VMSfh2y?$WIQIQyFeYX<;j{@$Fvh9O@7Ff72_?t=iN1emoQ0YD#McHGwhtOy9@RDTD+_W|6n zgB%9{4m1b-DFC7ab2+v%0F1SOvjBV%XjXk5fQNx*LoWj06=XK_HvmLIfn4MNU>hIA zYzcB_76$P-rB?yNrXX{t{bd4Pc2ZekVM(pULAOjgTwK}6kk(173Mwomf3phxScUev zvXb)r0*R&MK9JcL8pOOEY#zoQnF(hsgr|V;A~>D1;yD1uI7jA}Fej!Xgo|4g2E;ib zX(kR717Kum81poQ3uKghMWig$EMjfqD&|Cn0kAK$fCB;mhK0qN9DzEpb|*06@L;AZ zOu*5cSz3~bwmHm!qq(uP7?$Qzm;-{aBB!d@+(OioElV-+$A&v`mH2>4?6SFLj1G6> zl=!oZ@g~N7;aq^CL4a{ih!YbX;U#!=Oh7};8lobiIq3+_EYFBg=A8&`en6v5(vHmX z7#_1Xl36gHu`l(k$<2E2cAg7^hNXV&sNFR06=95R3j{%&llUPFluFhYuMV z9>c{vS_=fSWAZpv4FIrxwmin{@g`O(9!PmI>th6tCApFuNu9-iO16+~yC*X-){!ZW zH5;TJvO&P4#!}3jSZ*#vwV+^mY!+uwJ1d=TlHLoL9OE1~8}xuFCa#17BLOhRaSI=` z7l7~L^0|`H0I&@m8BZ~p@h%*393ZmxkBm3lKas7Zl2OEGFqh+9IVJ-und!m!CUD~q zI@zpBlt==iql360KL;$I@+|Fq3zY8zea4o5ln~CD{~uO!8IzNe$halCbF>*OO=zNB zOeL7HiRK`A$HE)I2vTgA?-R|I%ms>XCrUW8-ZhyO&2l&uREVqU6uF}OAzv>rv4YY> zE9Tg6b40w)>P=(ovy&F*cp4)>K7>k=7{ zWN!6@u6ael=wy4&!gZ{L$)%jO4_PU;t*ka~$V4{-h7l=s9QVg26=fXvc9y%y2mA zb$tm6=42)_*V8D@ki(WrBbeCqNRIXuOH%^fG0c1E!#UcwEKP2r;ThayjeZZ5jmVI4 z3@2HJBIZs;5_2MhTiK#N0EVp0R3;=-!1>@O6TuwI=S;SkWBCFLlDS4YjWCD)uYedk z!pw2mBs+rHJ;H`l_9q~)Lx(8QhKbD9pRhD3prtamv%NUJe_qlm zb2u6XS!BTkm1D(h$l=y*7z!#lmeXVs#0ZOEBGZ}6t&TA(mIi_(j}!blmrE1O76>j+ z@nLS}I5WO^++GEv05J^yTdPOM59P#MDb<;msV?Ah1oHzGjV(y#lm@a)3Cx57FXl`E z*DqKIV0cu(Em*K{07ex%F~bV&n6|hfVjLck5duLs>o-uisBgWB6BMf07FI* zH-}?M0L(1n)&N*40N+_kG63){F5{GD0Whjq#(`Xxt+;}#p@6NSm^ogQ;Vu)(qy_nk zlIk3ZWetuMv&98$F|)J8mJ=x(5@Bpgxg5fTEUg0Yc`(_fT)tqHEUm;$^Jn&0c&k`? z?GXLvGF!&Cj2n=!8n#UOYME5bnt|yC*;6JH!aA@{rnADAT#4zi zE=U5tN2o?(qoD8=E7*fN(+M8dhmD8AS7ZIyXlx8N78^&y;Ajn;B1O}1EDgu6#wK7B zu}Rn)n1O~9X*iRH3uw56hAUn>>%-nOLPjSVj!+1uFrN__Je|0$yGtXIGS3LNGz&9nm7_y!I;Sp**-Mr=y;kxLR}#Z~LhNyT zRfORR;(&F^4MS7(Hg#I(=a&vN}}Op z8ctb-4Pb*%D7K1*Q)xKObQGEaPRicrjj#I@74&{3oY6R8cuHz=q;FhmQtBjL{egycyU?VGV}toDzvE!fA{RvHFJV_7tuO~W~>u^qh?#X0Vu4Aqv8j{lCL|>%MEb_3 z3>kDB`{93TJ%jxSw4SBmQW~}@GpQ{H7QJf~+KyesF8@zA{efKpa#v|sNW&tNn3%N& z_~_F5oAWtqh9@KeYZ4M-QzCt1hpf4U-2vye*lik?3}AoLuoP7HT}7zZL+l9@K8QWS z9@DUlhN}m$r`R(ZuA$*tz~La2r{O5nH30FAsQD-nC!wyD*f^{ow+10=ir@zJ%y%dX zaEgn9MmA~`=KjI$aStebE$)Cj;!e0T?t;7GZn!%QH_@{R-X66ZyafJQ`1d!q?$3cq|@=$Kwfj zB0d~X!a;CpX}FDsbu`>g!yPo-NyB;??xNxDb$BXJ9DrxwnfM6E56{MPXn3TNZv@Bk zr)c1AuhtjcqJ~urFa!C z!>eg{6b<*#a4!w_(QrQvkEY=I$ zFc6qd!*73pzl+bu-@_N+3-Lwx`!qa*hG)|792#Ch!|&4Y01XcUlh4(xRj$U@L-zlD zw81yv9|8| z4FgNTU^ds7!F(@GDgGQ{R^j{b{rDI70UBm#_&pk4NW;L?;1l>EpkX0?q`pKAP6&0a zIt}PvVD|49lFkTO|B<{4$d+i$ebZ)O1;dZ9|k&t(NJ!`jQe&H&ljKv;Su<`Q;U6K*LG`!UqYH|h<0Itc1 zKmu65jfOuRx+o(;i3o7hMT8OIG`yXLcMKAdL=+8wLc=>j)~FlO8xx7-e{rM`V5ZqYRHDrK*fZXXk!*i%Kg7LLNt7shEM)Lv=bemu#?aeU4TJDjKZ`;4|JFzq$0!j zG<<@FkGztXL?6-5<|PzB!^dd&s3k2q*N+EzNlYLn5|fBGX!t7{{+forq2X^|%}XvB z|CMb2N-+~8-sZ8n^_@Als{TuEy=FZz57<8nyc8*hK+BG^Ej(f5F6oE`AVCPNsmZ~n z>?alzOB8|-)0}ZzMv=r)_GZ$8`CLj8%ZU|?vN{+aBnCiIDyyRm#7biIP}G6kIcD*hw{=;POqQ=H^(_6zf&10*M_BqOMHW7d=!EUDDgzuj#b}{c++)aFa@$ zAWjmeh||Om1hDZE4gX5RztQmTG<=zc|5!u(M4Sa_9!i`ifKgXy_&!K>f74{}kcJm~Rrd*%SnW;%iZ3iPXbGrgJ5cdf%2o4et@RKzB7Z}yS zC-KDedBYegwy1bc5@5n4UXT#rJVv4V~f zY4`<=Kr{l=2zY#j(g;Q)IE@fALedD2MyxiFGAMwoA#2GxvYu=JKjn}gSxY0zxSE&U+ZxQlR*d>pTVOGc@xdnA}nonKW@!DgzoZ(JuR z2zj+&$V^NAO1j6CfD{_50hUJoS567IHdU%L|KAJ)n}S0QU`=JWui(AItK^{y*>Y~; zf6dYoZC7`XCQsQ51lgfuNZ*j4#nPcmd1;@rPgABDXE;IX!Mf=%*#(}dNR(Y#O>+#EQTzWF)eEH-u9IXxWJ8W7$B<*maYK&~ zKt)4-=rz#DFdFfq5x)7bmIPmj^z5ZS}0{p4B!O~ zh_>#YQ{+43Y;q2;cP=@PWXN{`gH$(O1I%tM>{M!d0TwFtnt<$J(<}hl*#Z+BX~YSP zgVE*vDxF$c)WeRXvJ%d93&@4$N(RXVkmMBkKDijEUjh}A%gE*A3gDW9!Kcje`Ds6++43(~VnGq%qpdXoH@Tnp;iN^T?91FzSxPfv0Uv5)|a zD4tx)J|TBn`eTs%#C-5Xen##BSJ6Z59SR^IBji!?D{`!<*M>|h>1yq! zkpLPAqme)m-iUW; z-E)Gx4jS_pc>{Dnv>J48J_a6d(nvVxja%ex(Cy|IX!)RcC3%ay14%%Hvq%7g#Z3U% zC7BlGg0%lQeh~U?}Kf zAIPbjKuNW(R|mc&V1dOA_8@k}Iq7M`f30UT|SGJ0#CBpEOlu46JYk8g%&v^xnq?%mM zbLF{#^fSAj9eV-A-SpZK0FK|2<2P`~=jE$7p1(yCcrM2a;()oAc%i&-ure@h;&>4> zl4V{_^P<7=7cYhv%L9FsO(S_UQaBWqyhPr=_G!EnUMh{`&`7Qk4q(ER0rk8Qyqwn; z(!5+A(2`Fh1;&8a51In9r@gkS<`whG{v}(^tDuo08Yu?5sx?Y)IGxF`_F@lS4Q)dU znKsLsE7`R5j*CwLd++4fA&1J?O}c~WEDmha!T1WMK8@P+{%y3T=QyvP*B~=ZiAEUW zL2i&g6afu~(x5ExwD~veHueZdaci6cZSwU5Ijd-gRce0Fq^=m zHfzEDWh1efxC$Qs`jGx$F&V-x6Uh|t?6({&#>8MD#=hhIj649woA1EO-Sed38hEmM zALQ6$@+lAF5j-AvzB>#&+)d-@cnf()c&B+k^3L+k^Dgi%@$U1UTcK9C6=`K<1f3m10$9)onG_ine;kim_T@wc6?ft94eJtUj{(*lL^AcB{Qshpm3F zI&XE^>ZUbjZDSo`9c!InJ=|cOVqIb_wU%4!tUIjr*4@@U)`zXXw?1$EyY(N|e_CI& zzGHpY`o8r;>&G@=Y_W;7DYmJ%QQ5TGwApmnjJ0{oW}3}(n;AB-ZgfJ-?f87{%}9_w&c_ z$MGldC-Dt@nm>jA7JnLlI)4U#7JoK>E}!Ag=P%$d;xFbeN^6&E>@*ne`^8ew#pkNB6aEhd?C>v@RMNxK?1LZ`y zP;Qh5b_u zl#)?3R2|ho$teY;q*RoK(o#CAgVIxmZfX?OOZ8J@sBzQ;Y7%9jXle@e7B!8UPR*cZ zQM0MJ6hqCY7Ep_*#ne)2IW<77q*hZOQ0u4-)JAGEwT0SBZKpn=KBab1d#KN;{nP>K zAa$5JN_|azOC6(*Qzxm@)EVk0>SyXab%DA>{YG7;{-mx`H>o=Y>K^rwdP4mp0CTv2 z5LgLp1(d*E;3RMrcnG`&eu6+jh#*`LC5ROy2$BS;f(${HAXiWzC>E3ngn~*zm7rRn z5a@%1qTE_3w{^;VF%e++1c1d+a=qj+9~YX?Aq<7+Re6`Yq!yE zhuu!Qi*|;qcGvA~?Vaph?1$Tru+O&duGvj<6%@819(hINY(pQSI33Xmp(JIKy$h<5tJ*j;9>YJ6>@7 z$BA&_IVCt{IE`>>aq4i=JI!%g3g(Am-1%h|^{+quNK%(=z6 z!&&b<-Fcq#yUx3v4>})qzUBPL`H73Oi;s(+OR-C(i`1pdWsJ)>mjx~>Tn1hCxg2%* z+U1(dU6=c=4z8ZA-mY1$#jd5UYFE8$x9bAe6|RG>U%Gzldd&5f>m%1EZh>x5ZZU36 zZdx~;+YGmN-3;%!?R4AkcEIf?w_n|Ucl*bkaOb(lxu>~jxL3K$-4*Vm-3{)v`(pQ1 z?rYq?azE*Q+Wj97!h`4G=MnA^=~3ZP?NRG7&ttL2Qjh%}UwM4val_+*$0JXBPY+Ko z&s5J`&wS4|&rzPep0hm{dcNGkY_gmf@ytjGp@V?@G+xu@HS06v00G~o1 zkx!-1c%LagZ~1KY+3E9{&uO1ud@lNuz5-u+-*n%6-$LI}zT z>c886um1)AKmD%-*avt7cm-q!lmwIobOnqF7#Hw=*9CtZ zye;@z@ZI41A<-epA*mr9A$=jEL$-u`7P33!X($#-gruk4cZojCmtwTFmsA zeKAL4zK*qyb%=F})y4M2_Qie@yD#>O*vD~592Qp?CyJ|#TOPMIZhhR-c+3z_#8<`3 z;}!9n;y;Q1H2zrvo3Cj{bNLZI}C*euLv&7=W%0y}6K;rtu4-@Yt{*(A( zc;Rr-@XFzX!#51yn1m+TCh?Q1lN3qHqzy^il6E8yOLk6nP1YulOzuhEn|wI=Xo_o! zUrInqYf5*@sFWiq$5T$GCZ}en8gf$yQ#Yh;O#LT~NaLkR(i+m_X)Dt{Oxu)pFYTYS z7wNg_W$6{^@1`$JU!MMJ`t|f183`E~86z^LWX#NXC*yd=*^G0UewpE!k(vFOZ)6%X zKhHdp`PB&55q={AMvNOVdBmF|&W`wP#O17ntcysOr8=gBM_s!g?x#w~(=U&P4$P3I1&TGum zEvk@fMYe`$l&XWBl2TGkvy-R&dN0p8*omjfGbb0C8(v77%N`ELlU;0m(Lz!=x zUzvYdU|C#QMp;%_ZdpNDaambeby;0mW0|6?rA$+%E$b^AT{gCCLOEQ{FBg>Cmphd! z4dq?sBg=cr`zzurvMO>a@+t}|=2a}O7^qlTv8LjB#Umjs#Dt{KS~yJTEOZlk3VnqB z!a!k`uvOS6Tq0a8{8+eExL5eK@Rab3@T~B>@S^al@Gs#l;orjh!iOSzQL3m&)GZn- zdQ&u8v_!O8v{tl1v`Mr@^qFXnXrIV%Ky*lSM08yAv*@zuZ_!iHb1^K&#H3gtb`U#@ z-Nc?^Z*hn?QJf_%7t6%8;s$Y(SSfB7>%}9*z2ed0v0_?0Lp)zRC|)gIE8Za9B>qUe zSNy&By!cn~W$~Zl8{*sIyW;zmR+WC0g_RYR)s=OX4VCiB)=GWl$jV+r<><<>m2Xu} ztDIgrQ&J+SmS`pI61`-kq*pRpGEOp4Vvx*{Fp~EqizG`V%OnGmm6A1*wUVonM^aB| zic~9|E?q6%C;e7>QTm(o59w9uU(#FBzoqx3kEBnl_*HgQ4pmN7u2mjY-c`O;0ad|O zp;bxX|6^#Wnpd^D>Qt5CO4S1yBBNyfvLIQgEJ7A7i<2eFl4WVKOqp0Fl~v1XW%aT~ znL^eg)5zLn?XpR-_hhSNyJUxC=VULc9jd*nBdVjT)y+zf(QGdSUhA>SfidtJhYquijX_x%%hoyEQg7jx{bd?uHt#n(&&`nv9yPn%tU# zn&O(W8exsRrnyE{(^{je>8$Cl>8a_fp=)NM(7K4a z=(@PNw7P=2;yOcFovf~@Zc^Rkx`Dd&bsOtGs{5?&K;5CbqjksY&eol;yIA*k-HUpp z9s4 zz41=tgT}{=&*ZQilaq2Qxr;npo*>VVm&k?kN_myMPTnY2$d&RAd7qq?PnJ)Sza^h1 zpD$l1Uo2lHUm-Valkbs#AwMWTBL7N$Mt)9yLH?`!iu{`VhWwWNaTC%+H90o9G`TnV zH2F6LHH9>#Hsv-+o7$QtH!W>i(KOh!x@m3G{-&>*jyIiGKnhz0Utyg_oSJ|&zsNAJIro5$m)?(FS+d{S2w>Y)9ws^FJwnVfa?X)$&Kn-IfO}k6WI#yima^2bHfXKozVCQ$?zxRoSWvl|&^|)vDyG zW|c~%QMIaiRg+b3ss5vyp?XI(SM{!HfkCxKwNCY+YP0HN)ppfR)h^W@)t9QnsuQYT zR995@RF759R4>$+np9h>ZPiX{e|3;LR2`v?R>!I{)g#nd>Kt{wTB~kX>(wLGz3P7T zWc6F>|EOoE-%-y|FIBHluT-y5uTyVO?^N$n?^W+tf2lsCKB@je{ge8f`hwbUNqt@Y zNJDAtHBK5=jfcit?0EkTzADudUS9Yqi>TtzJ7)J5D=6`=)lT z_I>SA?F#Km?HcW7?Z*b~cI{5>F6|!eH`)u@KeRWsFWQJUs?E90r_H}Ds4cWDtu3#u zv`y63+}6=HrfquLjJ8>AbK2&$EpFT1w!7_zwySN=b=Eo;U63wR7om&N#p)7tX}Sts zy{<*40mrxP;1Fkm&ZwKNTdn(0cSLtycSUzq_qXo8?s>aayMf>C)*jxT(Vo?w+g{LK z++Nu(ZI`#Vws*95wU27=Z8x@0X`k9Yy?ti;JMD|x2isS-uWjGZ{&D;E_MPp!+V`}d zXg}TlWBbqTzqJ3^ey9C$`|}RC!@9$@!>1#-BebKeqqd`?qpM?7M_R8gTykoFqwV`8e$A*qg9a}oKb?oRk-f^+xUMH{9r8A~8uT#<4*Eyr}-Ol-) z3p)ooH+63B+|~JI=fTb+oyR**be`%w-}y`DrOs=e*E?@^KJ9$2hxDkP(DU?mdRM)N z-dpdd575WzhwD@H>H2Jap1x3DtZ&e(^`rEo_2cvt^|by?y=a<#x_*Ivg?^*{WBqph zPW>MJKK%jxLH&>VOI)uV%z4xMfucT>{HqC01LV*gD(Xxb^JOvR!hL5Qt6p$gv zMnnWr_Ff{gw+ITNh=8o`zPz-c|Buo(zjJ@*+;h%5cl6$O=mmIu70mF!1$lz}nLd#y zcrvp%!cvLUA__!}=ny?(Ld?hzq#YTG3`2$^BajZH6B&t&MJ6KeB9oB!kXguVWDYVH zS%7pSi;*?RT4Wuv9@&6=g=|H3AbXL0$bRGiau7L;{D7QBenie8=aI|EE#w#EHu3=Z z3wenAjXXjgBhP>na0V{G6^Jc>0yJ;~p1=#dL@`u=I-<^~7zvW=mqpLdJVma{(}CB-b4RD|3V+3|Dew?1j8^A6Jk!7D@J1;m^bE!1!58`6pO&3 zu{bOdOTp5yEG!4h$BM90tOBdX*cR+-Y&*6S+lB4L4q%6|W7tXT zH1-pA9=n8H#cp7?ushgY>^}AY`x|?LJ;Pq&C{ExGxCnQ_Dcl|R!hP`oJQ$ba;dm5o ziNzD}WIPSe#QWfRcp+Ybm*Z8q3|HVvyb;&ndfbS&;H~&Td=TD_563(4(fFHq7jDJh z!QaIv<5ThJ_=osxd>;NW{wdy#FU6PRpW|QP>+p^EX8db>2fiEMgYU(U;>Ymg_zCDu@-t z3E~Cmf(${XAWM+VUc~dU8fy+4M7-zL$bdoylrW%@0aaEB{F1WY5chCvEc|erjAGZ4 z+3BYcA>xRLkOHIxiC%&fB1K5C)y?W@^5=y8|rJCDtbt3Bfk+z?i43v^S%YD4 zAuy^(@~#kE8#7fiE-^MZDKRmt%Rw_PJtHMHI61S6_jMF9n!P9VE*^!9K^paPWl3A# z&bFcL<`H9ix_c9`{J-5<5e9bmjy2304!eth-32NlqmjwTwEver9hm{?A6lcV(U2Yk z=|gKHB9VE>M@V!xGT$24jeKlP_;+F#*|HFC6xZ8Rc78)C#LQ|KC}P zk=#M;?P4esBOB1c$(3a0DC$$G~xL0-OY=zz^Uw_z|1|KY_F095@dy zfQ#S~xD2j;P(gk6FdNafrsF4@CZBx zPryImDR>5+Tbnk{ci9G77!byQa0Wy$Ad&%542Whx3bkpW2zNM=9^ z15z1~#(;DNWH2C;0a*;lW{92Wz1md4ac05X1vN2)?3Xcn}D| zuT&@xBoKJf5*~y?P(a7?AOeC>bQ}+&Ay`G1@gNR@Cv+wc5+TTP3+JO!t!4GrBGvvdkC*yVFSMGF?R=EPz?o_-6eeQa?V~PJI&pT z4e@a233ZT==MljJ6$C>(>~X0%b~roC!<+rmgW?HVNI2#Z%mafBc(bma_RdUD5ael3 za$g9lJ$-p$7zjetPn6&-I&#YoN>Z}2~v%)PEeGnXgueOkG$nuauV? zYfAoA@+YCrNB(vXPD8NQ-|py75Ipfu<=r_CL0UjK4=zE_H^BZ_u0k*^Ac=3e0l~fi zyVtiM_`8R82Lef8Fh6+ia=yj0GXp%?mOwvVcAt|;ZL&`T#k}mnE8ejl-ruiyq98l( z2`3A-=^hJo6!nzwGuUTckp02EgkWM2Up^QL!Ph~7Hm5NHf-6D%q=7j=KnL?WmWr_tuus~A8 z)1(mG>H*;pB!$>bM?ug(#O`P;1XDxojwV2`BP7(8C@h&vKp6X7h%YOUy700zJ}FS< zuBb09t8B8T1w9bzLaHP*hJ7jJ zs~;<|2}=2R${}bE?ZbmA2-b)4Q$Hqy;ALnw-=ct^Fsy{>oNX*wjGh_*ki4 zXSO-ko`Y^q9^LEl{8$&h|E18t+Sp=(F2*ZyLF|?|dx5X(@xh<{HIARuv5k=E5}(hT{E{Q|fhJ?vcjDdnzPCcc zr}33M_y&UYp`2L}>yp54O|Wk{tvt3nK8jtJN3uf`Xx`fQe0N6^g4xvxUc7-l&;S?7 z4`DCwWGW>D%~5(+}#wVC53R$RNNEr38*81 zo^d)sN%mRe2Pmvds^hJm;XqnEyC}nzy_ID5=bViZ&sx$%Y<{x6|BFy)Os?nEu0X(r zyfZc2U8YcJj77C2y=lH~V{$fyY+i~zr9VTVIi-MCzYT#)I^V&y6nkcV<6@~~sq`3I z$7!kjh7S83lIxN(*!NTI^UR;GY2Qqxd6N&J@MUTh4<2(WX(~QPPdU3vXg8I;k;ZTA zuopHH)iyQ`ATX!Pcz{DNJd<<-1ihL@@Qlbg_o zuXQ~BKkOfS*hw~i2Ve*ljudM1p7cGE@1e za=EC=*qJ%etR|PA@bLmjvgY#ZBVG(aT~ZKh$ajVVO2mRZUtY6}(^RsB`P@Jgv&Ost zUS9dSoL@@unqDKGtZ%+Od9_fOm*325)xXj@o^RJ`fCO_o*R>~`UBFMrcoRn~h218z z(+l{C7T0mI;$By77dZ2IX@&+~6xe$(bEF0q6c$2Xg+BGAs=`XSQCV73W*@b9zgG-V z5kDmH0i5S)L2N)_7~5XNuW0xi98n2P<*<8-_`!h>fy7%y8GJOuI6?}0rzn6eEB4`K z9h@wOrAnmi2gUXjjDkw*iyL@v$3oyzQp~f*bL9G{?6=-k>Zk zF;+Gf*7y8fhR@=fOSxt*E>}iwm)?`GxxK3Fo8|UW{s`KhS+3-5FW?B3P}z@NTOPv3 zR=D!=MV!2;S8l3uVy9Q|(-FReYg4}7=3QQ@QmBpaXRlYwIFjOZ5-qD%s!C;w9^Y2l z{3u|dZP)rjdCy{vukKBV(B>1@w`-Md3i ziEm*qRs{=|;9ucekw*AAFLWFJ4HCU*5qGX;JK4m)#lM56VE9f36m{d@GoTor+pJSW z2JFKRBGHTS{rCX}lro@fF@6X?%z$zRR6xc?^?%z%eE_!(sTQlywW zB*o8Ly}4sj22^urXs^yOZ`w}qN_slKhX0C0ufVV4H}ISI&-g9;7yLGUhXL^TNzQ;; z1}GR%$AEeUC>fwyf&Yfz#qYsmLl^uy;x9qqDNF+c9x>oCJVL~vn$-n+*=JrmW(NSX_J9K2HMp0xt z`HSy4<0S%#NEieWL<)DT5PF{^B@2^j~EeZe3Gy!9hdN|eFIa-xE$goFa32GE2I zc(UI$*ZPiQKo4~40w|PL#&PLrKZdZEpllo zp(FH!foNvHPzH=(Kqmu6!DGpjgc(|BA^K`7`@v(Hw*GCcuyGgzhQCUit^SGr!~nKg zBf$p3+Hckb<@1_v5HMLC9KE5lZE#y>TWbg3(9SiCgbnKA!RC&R9`OiHJQ|AGD;jq{ z?zHtPVkAZ*HC7)6jJ3jpOn6{Nyh)5>hiN^D#l(2n+c2%SfRnyOSlH>>ILr!V)3q^$ z|4I_^HcV3u@I>G@1IBZS?BdM9p+roA$FM|^Ewg!i2UCctMsWnJ9jTLiXusCQ#0N;D zUEs_Kc-C}c2HR|kz=@e$%%*U5tx4ccu*7UQ#)(-Buyzx37{I_0oYk0E_7U+3C;ylM zZ+8<581Rl&s*;)8+U>)W=q5fx=p`_wCB#w&Oklu72E4n3SOzO<1p_8=MYIqefv;_B zX<5TLyp{p)y*fB1HV|JU(aVXA#3o`h@g=c^_=?!dfXNJap8-=CFqHuxFkl)3rY|S9 z5#JEoi5>8_MgJy;U8Qm2+xzw24sdr<7T&R^T+*L0U=ei0D0UymUF#%v#RiYd z%!HpZGt#@d?2nQ}NCMuCkbp!O5eTU8AB(kgAL zY3<+H*w#84o-A`y+Aug$IB1&@3gvJn)ADnb4A!2ezHPujTXRo$V$y@_jv{H&jdW+g zat6SPS;>IUm%`~=N_ry_IPJjtSp{b!DU0g6^ufp_E{+}xQZlUPc7_aRz!z4jEoL$b z-p`QHBs_Ot!+?#wH#B5CnFQ}!$OJNx0k96&EhdvmcnH6q0UK<$G!i!2;9HeV=KhD3 zN9HqN69YC|b6$lZEf_bU3xTPCjb8wd%i}e1X)nv`TR#UQ;tmAkJ z27KL3!ewh4Bwls!NhcdQx78$EY`$T@x3ApRkAx6dJ;L3^Jo+aXSUr8*!Rk#H_5Ko z`?J7IzC~IXu!jMAZMRqN%=?%93FM^L`8GNn}*_WMe7Pj;}j(OxlcqK*7CqE)T zCO;t;ke@Q(C}XyGdA9r@Kj5Q9r^*1N!>9Z6>#H zPy0&-oarXvQu-5o+HjGu*mhRrH{`c4RHB{SVOv(tE+%(!AI~x1tW~P$vAu^p0w+mw z2f2^jPaYuNAPP z;hJDccXX3a8F1@W(+dH@S$xTWU%G9sTBW^f{1AJ$0zx3@^+@2rfIGb&2}A;?-r=d{ z)>VP4fPxlncfJCe0l(P?gTMpXzC_?D@Dg}4;4TC1GvGn*h!FS*0{>m%f*?UK1MV^4 zcUTA&L!=f#m>}{$lqf+o1O8yZpVpjz?*OF*Q>?EK2|Z|l#ej$00Oxj; zy*m|d3n?uaR$wz=6c;5lbhM7>V7;_n@P&a;%RqRdKW242;qj>g%A@o+?kfaH&liY6NowRy^}+>#q~b%kaz@NEO`OfDwM?G zD{&!-a{$EMcv%QP@{FOgL6JPS_>12pQq~!l}Y(!WqI3g|mbUgr5sH3%?g05*`sA z6P^&B5?&Bq5?&Er6W$R1Ec{*g)X_pZx;c6}dOP|#1~>*e#yZA3CORfNPI8>(xWI9t zW4GfH$Il$sIIeTt;JC?gi{n6+6Gr=Oi}JLfr^&IV_rv)Or|^Bc~C zo!gy`FH1M&M#aL7t{rJAzd6?JY2k7d|doo0$hSz zBrZ~y3YUH^Q(V@&oN;;N^28N&#au0ftH4z(z9_ydzAC;hzA3&XzAgS$d{_Lt_z&>| z@k8+=@e}b=@pJJ@3Q!nDPy$Lwi702vm7*v&%7gNvd?-IEfC{1{l#~jiBB&@ThKi#S zs3a(TfI37Sp^i}}s8f{XG*!|M zO!uP)Sm-zCA@nf1gC0eXrN`42`fYk5{T@Aqo<`54XVG)%kLU&TB63`^FZh>wQZdq;xZk2BJ zZYsCIZX?}ByUld_$n6uiZ{7C09dx_zW_jZF)ZNQH*geEO&%NBe(tWu5o9^S?7q~BT zU*W#j{h0d+_h%l2hrlDrBikd#!{YIt$NL`NdhGW&=yBKMZ;!{G!Jbi`F`l)aO`clM z$(|p2&hp&mx!ZHE=Wm`5Js){dUcO%bUVXeuyvn>ownNx7QJ`V_pxu zo>{zJcuTyay<@!_yqmpE-d*1BdcWuWnfDs+b>1hu&v{?)e&GGg`-P9MkJKm3N9NP$ z)8u3Ind~#gXSvThpA9}|eXjZ3@OkO$;Opoc>6_%6;#=pd_0{{1^PS-PuJ2OcFMQYf z9``-#d*1h8v6PQTy%9{c^{@9!VxAK_o= zU+=H-f5X4Sf2993|GED2{lE7=1Xb5~Oa8lspz$JmJ1J?u|3_KNhI`Byl8iWT0 z2So+NSb}PT8iLe8mZ0~7-VfRqv^!{T(CwfJ34-NHtTt>|*x0afVN1eRhph=a z5q2)@LfFf2hj7R6nDEr_^l)u>-|*J(<>BkXH-!Hc{yh9;L`FnGL{Y@Vh-ncsBKAcb zk2o3WWr+-q42f)wY>ylkxjAx2EO@N6Vt8M$e9(8+|zXbo7}Rml&@YpO~f?b4=fuPhvicSsrsK=2pz@*nrsZ*vMEz zZ2#DSv2$Y=#V(FL8GAnVVw`WBG%hSo9cPMbiCZ3LSr@kw~Nu8QHJ9TdA&D49T_tWyzD$=UbK1iFBHZSc~+WoXY z(-YD&)3ejxPM?zgLHgPBYw0&Kk~8{b9S zm3cq&&#auR(ya2VPqUV1t;~9y4YIN9+U%xmZT8CS4cV4W*^l}leb7FdJ}rIv_1WL& zM4wYRDLFYgc{$T^=H|@Lxt{Y|&b{2!+}zy!+=;o9tz=-1+u;+*2V;t9nc6i+X{Q~aR#VTr7y zv81VFUCGvxZKY179;IHTLrO=LjwxMTy18^q>D|)5OCOhIlogZ}mCY(!P`0q_a@j9s zcgmB>v&(bJnez9`rt5%PR_Klvber+l=0tbCk&g8T#dboopoT)tAiO8%An zfc&uhnEa&twEQRedHE&zRr#Othw{hrr}F3Wm$hguUQ5#n5Ep>zI#@0=(n_l-}-R!z~bsyJ#TGw5-v~GFb*LBTlKK2GHQu;NOtk(5In) z!=Q#a4Qm@VG;C_v(y+DR`-VLY`x_25{Lt{C(SkL`HKsS}8_kWA8fP`mZTzTlLF1yv z#f=9W&orKEyx4f9@p|LU#ygFV8egb^8dnR{E^12cruI~Ot4q{+b*H*ZZB@Ucepk(^ z7pp&0uTZa2uTig8Z&Ghj?^PdAA66ezpH!b#|D-;rzM#IXe%K^#3T-NAYHoU?X?)XU zOVfurn$|R}Yuehhr|Edp&8Awf^heW!re_*LdxZ$TSK~i)N^1xTaGxN;6xtL$gnFP;*3cTysnF zm*%+^(PCOsE7a0j53RS>R~w)W(pn<51=?zDgSJIGNZYO*uI<#0)>^f1YbR(YX(wx^ zXjf|YYH#aMok-`TbJh9lf^-sHs4hYmrAyXj=(2UWx_n)Yu1=@YsdajtQP-mDryHT0 zsGFvnt6QpDsavgEtJ|d8qWfC+jc%{*nC^n^vhJGhrtX&Rw(hy!(V`dWo%AkxKYgHH zq7T(a=%e(x`Z9gBUaqgxEA=LQtA3z4hCm~*x+XHHuxC=4Z#M9A=;2($T8#_ ziVWq3Duc{msWmhiS`BX)h8Tt!MjFN##u>T{GYy*zXACzCe;EEUJTm-ac;1XOW6k1b zw`R{~pJu=2z~4b)Yml3)L|NB8fzMFddoD$G|e>AG|M#CG~cwuw9d5A^rdO5=^K+} zhv|^%u<3~DnCXJ)vgxYnhUu2+w&_pP6Vo%(OEYT5&6L^G>|^#fOU$9>2y>J<$6RWz zH>=HBv%%bAZZ!`yzhNF@X3W#fta*-kzWGygw|S{~nR%=E`xZfqv?aDBp(VK`t);xB XrlsEYS1^L2{BJ>#nE%l8vqklP_U9}I diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/WorkspaceSettings.xcsettings b/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/WorkspaceSettings.xcsettings index a8f6112..702ef29 100644 --- a/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/WorkspaceSettings.xcsettings +++ b/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/WorkspaceSettings.xcsettings @@ -4,5 +4,9 @@ BuildLocationStyle UseTargetSettings + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + diff --git a/src/runtime/Tests/ArrayTests.m b/src/runtime/Tests/ArrayTests.m index 1a932a0..ece96d3 100644 --- a/src/runtime/Tests/ArrayTests.m +++ b/src/runtime/Tests/ArrayTests.m @@ -24,16 +24,16 @@ @implementation ArrayTests - (void)testCount { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; - STAssertEquals([array count], (NSUInteger)3, nil); - STAssertEquals(array.count, (NSUInteger)3, nil); + STAssertEquals([array count], (unsigned long)3, nil); + STAssertEquals(array.count, (unsigned long)3, nil); [array release]; } - (void)testValueType { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertEquals(array.valueType, PBArrayValueTypeInt32, nil); [array release]; @@ -41,7 +41,7 @@ - (void)testValueType - (void)testPrimitiveAccess { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertEquals([array int32AtIndex:1], 2, nil); [array release]; @@ -58,7 +58,7 @@ - (void)testObjectAccess - (void)testEmpty { PBArray *array = [[PBArray alloc] init]; - STAssertEquals(array.count, (NSUInteger)0, nil); + STAssertEquals(array.count, (unsigned long)0, nil); STAssertEquals(array.valueType, PBArrayValueTypeObject, nil); STAssertEquals(array.data, (const void *)nil, nil); STAssertThrowsSpecificNamed([array objectAtIndex:0], NSException, NSRangeException, nil); @@ -67,7 +67,7 @@ - (void)testEmpty - (void)testCopy { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *original = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; PBArray *copy = [original copy]; STAssertEquals(original.valueType, copy.valueType, nil); @@ -94,19 +94,19 @@ - (void)testFastEnumeration const id kValues[2] = { [NSString stringWithFormat:@"1"], [NSString stringWithFormat:@"2"] }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:2 valueType:PBArrayValueTypeObject]; - NSUInteger count = 0; + unsigned long count = 0; for (NSString *s in array) { STAssertTrue([s isEqualToString:kValues[count++]], nil); } - STAssertEquals(count, (NSUInteger)2, nil); + STAssertEquals(count, (unsigned long)2, nil); [array release]; } - (void)testArrayAppendingArray { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *a = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; PBArray *b = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; @@ -136,8 +136,8 @@ - (void)testArrayAppendingArrayObjects - (void)testAppendArrayTypeException { - const NSInteger kValuesA[3] = { 1, 2, 3 }; - const int64_t kValuesB[3] = { 1, 2, 3 }; + const long kValuesA[3] = { 1, 2, 3 }; + const long long kValuesB[3] = { 1, 2, 3 }; PBArray *a = [[PBArray alloc] initWithValues:kValuesA count:3 valueType:PBArrayValueTypeInt32]; PBArray *b = [[PBArray alloc] initWithValues:kValuesB count:3 valueType:PBArrayValueTypeInt64]; STAssertThrowsSpecificNamed([a arrayByAppendingArray:b], NSException, PBArrayTypeMismatchException, nil); @@ -147,7 +147,7 @@ - (void)testAppendArrayTypeException - (void)testRangeException { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertThrowsSpecificNamed([array objectAtIndex:10], NSException, NSRangeException, nil); [array release]; @@ -155,7 +155,7 @@ - (void)testRangeException - (void)testTypeMismatchException { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *array = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; STAssertThrowsSpecificNamed([array objectAtIndex:0], NSException, PBArrayTypeMismatchException, nil); [array release]; @@ -176,7 +176,7 @@ - (void)testAddValue PBAppendableArray *array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; [array addInt32:1]; [array addInt32:4]; - STAssertEquals(array.count, (NSUInteger)2, nil); + STAssertEquals(array.count, (unsigned long)2, nil); STAssertThrowsSpecificNamed([array addBool:NO], NSException, PBArrayTypeMismatchException, nil); [array release]; } @@ -186,14 +186,14 @@ - (void)testAddObject PBAppendableArray *array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeObject]; [array addObject:[NSString stringWithFormat:@"One"]]; [array addObject:[NSString stringWithFormat:@"Two"]]; - STAssertEquals(array.count, (NSUInteger)2, nil); + STAssertEquals(array.count, (unsigned long)2, nil); STAssertThrowsSpecificNamed([array addBool:NO], NSException, PBArrayTypeMismatchException, nil); [array release]; } - (void)testAppendArray { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *source = [[PBArray alloc] initWithValues:kValues count:3 valueType:PBArrayValueTypeInt32]; PBAppendableArray *array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; [array appendArray:source]; @@ -205,17 +205,17 @@ - (void)testAppendArray - (void)testAppendValues { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBAppendableArray *array = [[PBAppendableArray alloc] initWithValueType:PBArrayValueTypeInt32]; [array appendValues:kValues count:3]; - STAssertEquals(array.count, (NSUInteger)3, nil); + STAssertEquals(array.count, (unsigned long)3, nil); STAssertEquals([array int32AtIndex:1], 2, nil); [array release]; } - (void)testEqualValues { - const NSInteger kValues[3] = { 1, 2, 3 }; + const long kValues[3] = { 1, 2, 3 }; PBArray *array1 = [[PBArray alloc] initWithValues:kValues count:2 valueType:PBArrayValueTypeInt32]; // Test self equality. @@ -236,7 +236,7 @@ - (void)testEqualValues STAssertFalse([array1 isEqual:array3], nil); // Test non equality of arrays of same sizes with different contents. - const NSInteger kValues2[2] = { 2, 1 }; + const long kValues2[2] = { 2, 1 }; PBArray *array4 = [[PBArray alloc] initWithValues:kValues2 count:2 valueType:PBArrayValueTypeInt32]; STAssertFalse([array1 isEqual:array4], nil); diff --git a/src/runtime/Tests/CodedInputStreamTests.m b/src/runtime/Tests/CodedInputStreamTests.m index cb4b048..16d8958 100644 --- a/src/runtime/Tests/CodedInputStreamTests.m +++ b/src/runtime/Tests/CodedInputStreamTests.m @@ -23,14 +23,14 @@ @implementation CodedInputStreamTests -- (NSData*) bytes_with_sentinel:(NSInteger) unused, ... { +- (NSData*) bytes_with_sentinel:(long) unused, ... { va_list list; va_start(list, unused); NSMutableData* values = [NSMutableData dataWithCapacity:0]; - NSInteger i; + long i; - while ((i = va_arg(list, NSInteger)) != 256) { + while ((i = va_arg(list, long)) != 256) { NSAssert(i >= 0 && i < 256, @""); uint8_t u = (uint8_t)i; [values appendBytes:&u length:1]; @@ -48,21 +48,21 @@ - (void) testDecodeZigZag { STAssertEquals(-1, decodeZigZag32(1), nil); STAssertEquals( 1, decodeZigZag32(2), nil); STAssertEquals(-2, decodeZigZag32(3), nil); - STAssertEquals((NSInteger)0x3FFFFFFF, decodeZigZag32(0x7FFFFFFE), nil); - STAssertEquals((NSInteger)0xC0000000, decodeZigZag32(0x7FFFFFFF), nil); - STAssertEquals((NSInteger)0x7FFFFFFF, decodeZigZag32(0xFFFFFFFE), nil); - STAssertEquals((NSInteger)0x80000000, decodeZigZag32(0xFFFFFFFF), nil); - - STAssertEquals((int64_t) 0, decodeZigZag64(0), nil); - STAssertEquals((int64_t)-1, decodeZigZag64(1), nil); - STAssertEquals((int64_t) 1, decodeZigZag64(2), nil); - STAssertEquals((int64_t)-2, decodeZigZag64(3), nil); - STAssertEquals((int64_t)0x000000003FFFFFFFL, decodeZigZag64(0x000000007FFFFFFEL), nil); - STAssertEquals((int64_t)0xFFFFFFFFC0000000L, decodeZigZag64(0x000000007FFFFFFFL), nil); - STAssertEquals((int64_t)0x000000007FFFFFFFL, decodeZigZag64(0x00000000FFFFFFFEL), nil); - STAssertEquals((int64_t)0xFFFFFFFF80000000L, decodeZigZag64(0x00000000FFFFFFFFL), nil); - STAssertEquals((int64_t)0x7FFFFFFFFFFFFFFFL, decodeZigZag64(0xFFFFFFFFFFFFFFFEL), nil); - STAssertEquals((int64_t)0x8000000000000000L, decodeZigZag64(0xFFFFFFFFFFFFFFFFL), nil); + STAssertEquals((long)0x3FFFFFFF, decodeZigZag32(0x7FFFFFFE), nil); + STAssertEquals((long)0xC0000000, decodeZigZag32(0x7FFFFFFF), nil); + STAssertEquals((long)0x7FFFFFFF, decodeZigZag32(0xFFFFFFFE), nil); + STAssertEquals((long)0x80000000, decodeZigZag32(0xFFFFFFFF), nil); + + STAssertEquals((long long) 0, decodeZigZag64(0), nil); + STAssertEquals((long long)-1, decodeZigZag64(1), nil); + STAssertEquals((long long) 1, decodeZigZag64(2), nil); + STAssertEquals((long long)-2, decodeZigZag64(3), nil); + STAssertEquals((long long)0x000000003FFFFFFFL, decodeZigZag64(0x000000007FFFFFFEL), nil); + STAssertEquals((long long)0xFFFFFFFFC0000000L, decodeZigZag64(0x000000007FFFFFFFL), nil); + STAssertEquals((long long)0x000000007FFFFFFFL, decodeZigZag64(0x00000000FFFFFFFEL), nil); + STAssertEquals((long long)0xFFFFFFFF80000000L, decodeZigZag64(0x00000000FFFFFFFFL), nil); + STAssertEquals((long long)0x7FFFFFFFFFFFFFFFL, decodeZigZag64(0xFFFFFFFFFFFFFFFEL), nil); + STAssertEquals((long long)0x8000000000000000L, decodeZigZag64(0xFFFFFFFFFFFFFFFFL), nil); } @@ -70,10 +70,10 @@ - (void) testDecodeZigZag { * Parses the given bytes using readRawVarint32() and readRawVarint64() and * checks that the result matches the given value. */ -- (void) assertReadVarint:(NSData*) data value:(int64_t) value { +- (void) assertReadVarint:(NSData*) data value:(long long) value { { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; - STAssertTrue((NSInteger)value == [input readRawVarint32], @""); + STAssertTrue((long)value == [input readRawVarint32], @""); } { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; @@ -82,7 +82,7 @@ - (void) assertReadVarint:(NSData*) data value:(int64_t) value { { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[NSInputStream inputStreamWithData:data]]; - STAssertTrue((NSInteger)value == [input readRawVarint32], @""); + STAssertTrue((long)value == [input readRawVarint32], @""); } { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[NSInputStream inputStreamWithData:data]]; @@ -90,10 +90,10 @@ - (void) assertReadVarint:(NSData*) data value:(int64_t) value { } // Try different block sizes. - for (NSInteger blockSize = 1; blockSize <= 16; blockSize *= 2) { + for (long blockSize = 1; blockSize <= 16; blockSize *= 2) { { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[SmallBlockInputStream streamWithData:data blockSize:blockSize]]; - STAssertTrue((NSInteger)value == [input readRawVarint32], @""); + STAssertTrue((long)value == [input readRawVarint32], @""); } { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream:[SmallBlockInputStream streamWithData:data blockSize:blockSize]]; @@ -107,12 +107,12 @@ - (void) assertReadVarint:(NSData*) data value:(int64_t) value { * Parses the given bytes using readRawLittleEndian32() and checks * that the result matches the given value. */ -- (void) assertReadLittleEndian32:(NSData*) data value:(NSInteger) value { +- (void) assertReadLittleEndian32:(NSData*) data value:(long) value { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; STAssertTrue(value == [input readRawLittleEndian32], @""); // Try different block sizes. - for (NSInteger blockSize = 1; blockSize <= 16; blockSize *= 2) { + for (long blockSize = 1; blockSize <= 16; blockSize *= 2) { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream: [SmallBlockInputStream streamWithData:data blockSize:blockSize]]; @@ -125,12 +125,12 @@ - (void) assertReadLittleEndian32:(NSData*) data value:(NSInteger) value { * Parses the given bytes using readRawLittleEndian64() and checks * that the result matches the given value. */ -- (void) assertReadLittleEndian64:(NSData*) data value:(int64_t) value { +- (void) assertReadLittleEndian64:(NSData*) data value:(long long) value { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; STAssertTrue(value == [input readRawLittleEndian64], @""); // Try different block sizes. - for (NSInteger blockSize = 1; blockSize <= 16; blockSize *= 2) { + for (long blockSize = 1; blockSize <= 16; blockSize *= 2) { PBCodedInputStream* input = [PBCodedInputStream streamWithInputStream: [SmallBlockInputStream streamWithData:data blockSize:blockSize]]; @@ -223,7 +223,7 @@ - (void) testReadWholeMessage { [TestUtilities assertAllFieldsSet:message2]; // Try different block sizes. - for (NSInteger blockSize = 1; blockSize < 256; blockSize *= 2) { + for (long blockSize = 1; blockSize < 256; blockSize *= 2) { message2 = [TestAllTypes parseFromInputStream: [SmallBlockInputStream streamWithData:rawBytes blockSize:blockSize]]; [TestUtilities assertAllFieldsSet:message2]; @@ -243,7 +243,7 @@ - (void) testSkipWholeMessage { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builder]; while (YES) { - NSInteger tag = [input1 readTag]; + long tag = [input1 readTag]; STAssertTrue(tag == [input2 readTag], @""); if (tag == 0) { break; @@ -257,7 +257,7 @@ - (void) testSkipWholeMessage { - (void) testReadHugeBlob { // Allocate and initialize a 1MB blob. NSMutableData* blob = [NSMutableData dataWithLength:1 << 20]; - for (NSInteger i = 0; i < blob.length; i++) { + for (long i = 0; i < blob.length; i++) { ((uint8_t*)blob.mutableBytes)[i] = (uint8_t)i; } @@ -288,7 +288,7 @@ - (void) testReadMaliciouslyLargeBlob { [rawOutput open]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; - NSInteger tag = PBWireFormatMakeTag(1, PBWireFormatLengthDelimited); + long tag = PBWireFormatMakeTag(1, PBWireFormatLengthDelimited); [output writeRawVarint32:tag]; [output writeRawVarint32:0x7FFFFFFF]; uint8_t bytes[32] = { 0 }; diff --git a/src/runtime/Tests/CodedOuputStreamTests.m b/src/runtime/Tests/CodedOuputStreamTests.m index f339ca3..472226e 100644 --- a/src/runtime/Tests/CodedOuputStreamTests.m +++ b/src/runtime/Tests/CodedOuputStreamTests.m @@ -22,14 +22,14 @@ @implementation CodedOutputStreamTests -- (NSData*) bytes_with_sentinel:(NSInteger) unused, ... { +- (NSData*) bytes_with_sentinel:(long) unused, ... { va_list list; va_start(list, unused); NSMutableData* values = [NSMutableData dataWithCapacity:0]; - NSInteger i; + long i; - while ((i = va_arg(list, NSInteger)) != 256) { + while ((i = va_arg(list, long)) != 256) { NSAssert(i >= 0 && i < 256, @""); uint8_t u = (uint8_t)i; [values appendBytes:&u length:1]; @@ -58,10 +58,10 @@ - (NSOutputStream*)openMemoryStream { * Parses the given bytes using writeRawLittleEndian32() and checks * that the result matches the given value. */ -- (void) assertWriteLittleEndian32:(NSData*) data value:(NSInteger) value { +- (void) assertWriteLittleEndian32:(NSData*) data value:(long) value { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; - [output writeRawLittleEndian32:(NSInteger)value]; + [output writeRawLittleEndian32:(long)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; @@ -71,7 +71,7 @@ - (void) assertWriteLittleEndian32:(NSData*) data value:(NSInteger) value { for (int blockSize = 1; blockSize <= 16; blockSize *= 2) { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput bufferSize:blockSize]; - [output writeRawLittleEndian32:(NSInteger)value]; + [output writeRawLittleEndian32:(long)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; @@ -84,7 +84,7 @@ - (void) assertWriteLittleEndian32:(NSData*) data value:(NSInteger) value { * Parses the given bytes using writeRawLittleEndian64() and checks * that the result matches the given value. */ -- (void) assertWriteLittleEndian64:(NSData*) data value:(int64_t) value { +- (void) assertWriteLittleEndian64:(NSData*) data value:(long long) value { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; [output writeRawLittleEndian64:value]; @@ -111,19 +111,19 @@ - (void) assertWriteLittleEndian64:(NSData*) data value:(int64_t) value { * Writes the given value using writeRawVarint32() and writeRawVarint64() and * checks that the result matches the given bytes. */ -- (void) assertWriteVarint:(NSData*) data value:(int64_t) value { +- (void) assertWriteVarint:(NSData*) data value:(long long) value { // Only do 32-bit write if the value fits in 32 bits. if (logicalRightShift64(value, 32) == 0) { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput]; - [output writeRawVarint32:(NSInteger)value]; + [output writeRawVarint32:(long)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; STAssertEqualObjects(data, actual, @""); // Also try computing size. - STAssertTrue(data.length == computeRawVarint32Size((NSInteger)value), @""); + STAssertTrue(data.length == computeRawVarint32Size((long)value), @""); } { @@ -147,7 +147,7 @@ - (void) assertWriteVarint:(NSData*) data value:(int64_t) value { NSOutputStream* rawOutput = [self openMemoryStream]; PBCodedOutputStream* output = [PBCodedOutputStream streamWithOutputStream:rawOutput bufferSize:blockSize]; - [output writeRawVarint32:(NSInteger)value]; + [output writeRawVarint32:(long)value]; [output flush]; NSData* actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; diff --git a/src/runtime/Tests/CoreTests.m b/src/runtime/Tests/CoreTests.m index e3b0bd7..3402db3 100644 --- a/src/runtime/Tests/CoreTests.m +++ b/src/runtime/Tests/CoreTests.m @@ -26,8 +26,8 @@ - (void) testTypeSizes { STAssertEquals(4, (int)sizeof(long), nil); #endif STAssertEquals(8, (int)sizeof(long long), nil); - STAssertEquals(4, (int)sizeof(NSInteger), nil); - STAssertEquals(8, (int)sizeof(int64_t), nil); + STAssertEquals(4, (int)sizeof(long), nil); + STAssertEquals(8, (int)sizeof(long long), nil); STAssertEquals(4, (int)sizeof(Float32), nil); STAssertEquals(8, (int)sizeof(Float64), nil); STAssertEquals(0, !!0, nil); diff --git a/src/runtime/Tests/SmallBlockInputStream.h b/src/runtime/Tests/SmallBlockInputStream.h index 98a566d..8f20e48 100644 --- a/src/runtime/Tests/SmallBlockInputStream.h +++ b/src/runtime/Tests/SmallBlockInputStream.h @@ -17,11 +17,11 @@ @interface SmallBlockInputStream : NSInputStream { NSInputStream* underlyingStream; - NSInteger blockSize; + long blockSize; } @property (retain) NSInputStream* underlyingStream; -+ (SmallBlockInputStream*) streamWithData:(NSData*) data blockSize:(NSInteger) blockSize; ++ (SmallBlockInputStream*) streamWithData:(NSData*) data blockSize:(long) blockSize; @end diff --git a/src/runtime/Tests/SmallBlockInputStream.m b/src/runtime/Tests/SmallBlockInputStream.m index 4752e32..f3ba36e 100644 --- a/src/runtime/Tests/SmallBlockInputStream.m +++ b/src/runtime/Tests/SmallBlockInputStream.m @@ -29,7 +29,7 @@ - (void) dealloc { - (id) initWithData:(NSData*) data_ - blockSize:(NSInteger) blockSize_ { + blockSize:(long) blockSize_ { if ((self = [super init])) { self.underlyingStream = [NSInputStream inputStreamWithData:data_]; blockSize = blockSize_; @@ -40,7 +40,7 @@ - (id) initWithData:(NSData*) data_ + (SmallBlockInputStream*) streamWithData:(NSData*) data - blockSize:(NSInteger) blockSize { + blockSize:(long) blockSize { return [[[SmallBlockInputStream alloc] initWithData:data blockSize:blockSize] autorelease]; } @@ -55,13 +55,13 @@ - (void) close { } -- (NSInteger) read:(uint8_t*) buffer - maxLength:(NSUInteger) len { +- (long) read:(uint8_t*) buffer + maxLength:(unsigned long) len { return [underlyingStream read:buffer maxLength:MIN(len, blockSize)]; } -- (BOOL) getBuffer:(uint8_t**) buffer length:(NSUInteger*)len { +- (BOOL) getBuffer:(uint8_t**) buffer length:(unsigned long*)len { return [underlyingStream getBuffer:buffer length:len]; } diff --git a/src/runtime/Tests/Unittest.pb.h b/src/runtime/Tests/Unittest.pb.h index ac2c70d..18ab633 100644 --- a/src/runtime/Tests/Unittest.pb.h +++ b/src/runtime/Tests/Unittest.pb.h @@ -287,16 +287,16 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn Float64 defaultDouble; Float32 defaultFloat; Float32 optionalFloat; - int64_t optionalInt64; - int64_t defaultInt64; - uint64_t optionalUint64; - uint64_t defaultUint64; - NSInteger defaultInt32; - NSInteger optionalInt32; - uint64_t optionalFixed64; - uint64_t defaultFixed64; - uNSInteger optionalFixed32; - uNSInteger defaultFixed32; + long long optionalInt64; + long long defaultInt64; + ulong long optionalUint64; + ulong long defaultUint64; + long defaultInt32; + long optionalInt32; + ulong long optionalFixed64; + ulong long defaultFixed64; + ulong optionalFixed32; + ulong defaultFixed32; NSString* defaultString; NSString* defaultStringPiece; NSString* defaultCord; @@ -309,22 +309,22 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn ImportMessage* optionalImportMessage; NSData* defaultBytes; NSData* optionalBytes; - uNSInteger optionalUint32; - uNSInteger defaultUint32; + ulong optionalUint32; + ulong defaultUint32; ImportEnum defaultImportEnum; ForeignEnum defaultForeignEnum; TestAllTypes_NestedEnum defaultNestedEnum; ImportEnum optionalImportEnum; ForeignEnum optionalForeignEnum; TestAllTypes_NestedEnum optionalNestedEnum; - NSInteger defaultSfixed32; - NSInteger optionalSfixed32; - int64_t defaultSfixed64; - int64_t optionalSfixed64; - NSInteger defaultSint32; - NSInteger optionalSint32; - int64_t optionalSint64; - int64_t defaultSint64; + long defaultSfixed32; + long optionalSfixed32; + long long defaultSfixed64; + long long optionalSfixed64; + long defaultSint32; + long optionalSint32; + long long optionalSint64; + long long defaultSint64; PBAppendableArray * repeatedBoolArray; PBAppendableArray * repeatedDoubleArray; PBAppendableArray * repeatedFloatArray; @@ -394,16 +394,16 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasDefaultImportEnum; - (BOOL) hasDefaultStringPiece; - (BOOL) hasDefaultCord; -@property (readonly) NSInteger optionalInt32; -@property (readonly) int64_t optionalInt64; -@property (readonly) uNSInteger optionalUint32; -@property (readonly) uint64_t optionalUint64; -@property (readonly) NSInteger optionalSint32; -@property (readonly) int64_t optionalSint64; -@property (readonly) uNSInteger optionalFixed32; -@property (readonly) uint64_t optionalFixed64; -@property (readonly) NSInteger optionalSfixed32; -@property (readonly) int64_t optionalSfixed64; +@property (readonly) long optionalInt32; +@property (readonly) long long optionalInt64; +@property (readonly) ulong optionalUint32; +@property (readonly) ulong long optionalUint64; +@property (readonly) long optionalSint32; +@property (readonly) long long optionalSint64; +@property (readonly) ulong optionalFixed32; +@property (readonly) ulong long optionalFixed64; +@property (readonly) long optionalSfixed32; +@property (readonly) long long optionalSfixed64; @property (readonly) Float32 optionalFloat; @property (readonly) Float64 optionalDouble; - (BOOL) optionalBool; @@ -442,16 +442,16 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedImportEnum; @property (readonly, retain) PBArray * repeatedStringPiece; @property (readonly, retain) PBArray * repeatedCord; -@property (readonly) NSInteger defaultInt32; -@property (readonly) int64_t defaultInt64; -@property (readonly) uNSInteger defaultUint32; -@property (readonly) uint64_t defaultUint64; -@property (readonly) NSInteger defaultSint32; -@property (readonly) int64_t defaultSint64; -@property (readonly) uNSInteger defaultFixed32; -@property (readonly) uint64_t defaultFixed64; -@property (readonly) NSInteger defaultSfixed32; -@property (readonly) int64_t defaultSfixed64; +@property (readonly) long defaultInt32; +@property (readonly) long long defaultInt64; +@property (readonly) ulong defaultUint32; +@property (readonly) ulong long defaultUint64; +@property (readonly) long defaultSint32; +@property (readonly) long long defaultSint64; +@property (readonly) ulong defaultFixed32; +@property (readonly) ulong long defaultFixed64; +@property (readonly) long defaultSfixed32; +@property (readonly) long long defaultSfixed64; @property (readonly) Float32 defaultFloat; @property (readonly) Float64 defaultDouble; - (BOOL) defaultBool; @@ -462,30 +462,30 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly) ImportEnum defaultImportEnum; @property (readonly, retain) NSString* defaultStringPiece; @property (readonly, retain) NSString* defaultCord; -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index; -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index; -- (Float32)repeatedFloatAtIndex:(NSUInteger)index; -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index; -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index; -- (NSString*)repeatedStringAtIndex:(NSUInteger)index; -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index; -- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index; -- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index; -- (ForeignMessage*)repeatedForeignMessageAtIndex:(NSUInteger)index; -- (ImportMessage*)repeatedImportMessageAtIndex:(NSUInteger)index; -- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index; -- (ForeignEnum)repeatedForeignEnumAtIndex:(NSUInteger)index; -- (ImportEnum)repeatedImportEnumAtIndex:(NSUInteger)index; -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index; -- (NSString*)repeatedCordAtIndex:(NSUInteger)index; +- (long)repeatedInt32AtIndex:(unsigned long)index; +- (long long)repeatedInt64AtIndex:(unsigned long)index; +- (ulong)repeatedUint32AtIndex:(unsigned long)index; +- (ulong long)repeatedUint64AtIndex:(unsigned long)index; +- (long)repeatedSint32AtIndex:(unsigned long)index; +- (long long)repeatedSint64AtIndex:(unsigned long)index; +- (ulong)repeatedFixed32AtIndex:(unsigned long)index; +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (long)repeatedSfixed32AtIndex:(unsigned long)index; +- (long long)repeatedSfixed64AtIndex:(unsigned long)index; +- (Float32)repeatedFloatAtIndex:(unsigned long)index; +- (Float64)repeatedDoubleAtIndex:(unsigned long)index; +- (BOOL)repeatedBoolAtIndex:(unsigned long)index; +- (NSString*)repeatedStringAtIndex:(unsigned long)index; +- (NSData*)repeatedBytesAtIndex:(unsigned long)index; +- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index; +- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index; +- (ForeignMessage*)repeatedForeignMessageAtIndex:(unsigned long)index; +- (ImportMessage*)repeatedImportMessageAtIndex:(unsigned long)index; +- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index; +- (ForeignEnum)repeatedForeignEnumAtIndex:(unsigned long)index; +- (ImportEnum)repeatedImportEnumAtIndex:(unsigned long)index; +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index; +- (NSString*)repeatedCordAtIndex:(unsigned long)index; + (TestAllTypes*) defaultInstance; - (TestAllTypes*) defaultInstance; @@ -508,10 +508,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestAllTypes_NestedMessage : PBGeneratedMessage { @private BOOL hasBb_:1; - NSInteger bb; + long bb; } - (BOOL) hasBb; -@property (readonly) NSInteger bb; +@property (readonly) long bb; + (TestAllTypes_NestedMessage*) defaultInstance; - (TestAllTypes_NestedMessage*) defaultInstance; @@ -549,18 +549,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBb; -- (NSInteger) bb; -- (TestAllTypes_NestedMessage_Builder*) setBb:(NSInteger) value; +- (long) bb; +- (TestAllTypes_NestedMessage_Builder*) setBb:(long) value; - (TestAllTypes_NestedMessage_Builder*) clearBb; @end @interface TestAllTypes_OptionalGroup : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestAllTypes_OptionalGroup*) defaultInstance; - (TestAllTypes_OptionalGroup*) defaultInstance; @@ -598,18 +598,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestAllTypes_OptionalGroup_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestAllTypes_OptionalGroup_Builder*) setA:(long) value; - (TestAllTypes_OptionalGroup_Builder*) clearA; @end @interface TestAllTypes_RepeatedGroup : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestAllTypes_RepeatedGroup*) defaultInstance; - (TestAllTypes_RepeatedGroup*) defaultInstance; @@ -647,8 +647,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestAllTypes_RepeatedGroup_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestAllTypes_RepeatedGroup_Builder*) setA:(long) value; - (TestAllTypes_RepeatedGroup_Builder*) clearA; @end @@ -670,53 +670,53 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasOptionalInt32; -- (NSInteger) optionalInt32; -- (TestAllTypes_Builder*) setOptionalInt32:(NSInteger) value; +- (long) optionalInt32; +- (TestAllTypes_Builder*) setOptionalInt32:(long) value; - (TestAllTypes_Builder*) clearOptionalInt32; - (BOOL) hasOptionalInt64; -- (int64_t) optionalInt64; -- (TestAllTypes_Builder*) setOptionalInt64:(int64_t) value; +- (long long) optionalInt64; +- (TestAllTypes_Builder*) setOptionalInt64:(long long) value; - (TestAllTypes_Builder*) clearOptionalInt64; - (BOOL) hasOptionalUint32; -- (uNSInteger) optionalUint32; -- (TestAllTypes_Builder*) setOptionalUint32:(uNSInteger) value; +- (ulong) optionalUint32; +- (TestAllTypes_Builder*) setOptionalUint32:(ulong) value; - (TestAllTypes_Builder*) clearOptionalUint32; - (BOOL) hasOptionalUint64; -- (uint64_t) optionalUint64; -- (TestAllTypes_Builder*) setOptionalUint64:(uint64_t) value; +- (ulong long) optionalUint64; +- (TestAllTypes_Builder*) setOptionalUint64:(ulong long) value; - (TestAllTypes_Builder*) clearOptionalUint64; - (BOOL) hasOptionalSint32; -- (NSInteger) optionalSint32; -- (TestAllTypes_Builder*) setOptionalSint32:(NSInteger) value; +- (long) optionalSint32; +- (TestAllTypes_Builder*) setOptionalSint32:(long) value; - (TestAllTypes_Builder*) clearOptionalSint32; - (BOOL) hasOptionalSint64; -- (int64_t) optionalSint64; -- (TestAllTypes_Builder*) setOptionalSint64:(int64_t) value; +- (long long) optionalSint64; +- (TestAllTypes_Builder*) setOptionalSint64:(long long) value; - (TestAllTypes_Builder*) clearOptionalSint64; - (BOOL) hasOptionalFixed32; -- (uNSInteger) optionalFixed32; -- (TestAllTypes_Builder*) setOptionalFixed32:(uNSInteger) value; +- (ulong) optionalFixed32; +- (TestAllTypes_Builder*) setOptionalFixed32:(ulong) value; - (TestAllTypes_Builder*) clearOptionalFixed32; - (BOOL) hasOptionalFixed64; -- (uint64_t) optionalFixed64; -- (TestAllTypes_Builder*) setOptionalFixed64:(uint64_t) value; +- (ulong long) optionalFixed64; +- (TestAllTypes_Builder*) setOptionalFixed64:(ulong long) value; - (TestAllTypes_Builder*) clearOptionalFixed64; - (BOOL) hasOptionalSfixed32; -- (NSInteger) optionalSfixed32; -- (TestAllTypes_Builder*) setOptionalSfixed32:(NSInteger) value; +- (long) optionalSfixed32; +- (TestAllTypes_Builder*) setOptionalSfixed32:(long) value; - (TestAllTypes_Builder*) clearOptionalSfixed32; - (BOOL) hasOptionalSfixed64; -- (int64_t) optionalSfixed64; -- (TestAllTypes_Builder*) setOptionalSfixed64:(int64_t) value; +- (long long) optionalSfixed64; +- (TestAllTypes_Builder*) setOptionalSfixed64:(long long) value; - (TestAllTypes_Builder*) clearOptionalSfixed64; - (BOOL) hasOptionalFloat; @@ -798,221 +798,221 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestAllTypes_Builder*) clearOptionalCord; - (PBAppendableArray *)repeatedInt32; -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedInt32:(NSInteger)value; +- (long)repeatedInt32AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedInt32:(long)value; - (TestAllTypes_Builder *)setRepeatedInt32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedInt32Values:(const long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedInt32; - (PBAppendableArray *)repeatedInt64; -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedInt64:(int64_t)value; +- (long long)repeatedInt64AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedInt64:(long long)value; - (TestAllTypes_Builder *)setRepeatedInt64Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedInt64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedInt64Values:(const long long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedInt64; - (PBAppendableArray *)repeatedUint32; -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedUint32:(uNSInteger)value; +- (ulong)repeatedUint32AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedUint32:(ulong)value; - (TestAllTypes_Builder *)setRepeatedUint32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedUint32; - (PBAppendableArray *)repeatedUint64; -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedUint64:(uint64_t)value; +- (ulong long)repeatedUint64AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedUint64:(ulong long)value; - (TestAllTypes_Builder *)setRepeatedUint64Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedUint64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedUint64; - (PBAppendableArray *)repeatedSint32; -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedSint32:(NSInteger)value; +- (long)repeatedSint32AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedSint32:(long)value; - (TestAllTypes_Builder *)setRepeatedSint32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedSint32Values:(const long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedSint32; - (PBAppendableArray *)repeatedSint64; -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedSint64:(int64_t)value; +- (long long)repeatedSint64AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedSint64:(long long)value; - (TestAllTypes_Builder *)setRepeatedSint64Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedSint64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedSint64Values:(const long long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedSint64; - (PBAppendableArray *)repeatedFixed32; -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedFixed32:(uNSInteger)value; +- (ulong)repeatedFixed32AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedFixed32:(ulong)value; - (TestAllTypes_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedFixed64; -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedFixed64:(uint64_t)value; +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedFixed64:(ulong long)value; - (TestAllTypes_Builder *)setRepeatedFixed64Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedFixed64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedFixed64; - (PBAppendableArray *)repeatedSfixed32; -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedSfixed32:(NSInteger)value; +- (long)repeatedSfixed32AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedSfixed32:(long)value; - (TestAllTypes_Builder *)setRepeatedSfixed32Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedSfixed32; - (PBAppendableArray *)repeatedSfixed64; -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index; -- (TestAllTypes_Builder *)addRepeatedSfixed64:(int64_t)value; +- (long long)repeatedSfixed64AtIndex:(unsigned long)index; +- (TestAllTypes_Builder *)addRepeatedSfixed64:(long long)value; - (TestAllTypes_Builder *)setRepeatedSfixed64Array:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedSfixed64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedSfixed64Values:(const long long *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedSfixed64; - (PBAppendableArray *)repeatedFloat; -- (Float32)repeatedFloatAtIndex:(NSUInteger)index; +- (Float32)repeatedFloatAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedFloat:(Float32)value; - (TestAllTypes_Builder *)setRepeatedFloatArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedFloat; - (PBAppendableArray *)repeatedDouble; -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index; +- (Float64)repeatedDoubleAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedDouble:(Float64)value; - (TestAllTypes_Builder *)setRepeatedDoubleArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedDouble; - (PBAppendableArray *)repeatedBool; -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index; +- (BOOL)repeatedBoolAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedBool:(BOOL)value; - (TestAllTypes_Builder *)setRepeatedBoolArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedBool; - (PBAppendableArray *)repeatedString; -- (NSString*)repeatedStringAtIndex:(NSUInteger)index; +- (NSString*)repeatedStringAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedString:(NSString*)value; - (TestAllTypes_Builder *)setRepeatedStringArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedStringValues:(const NSString* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedStringValues:(const NSString* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedString; - (PBAppendableArray *)repeatedBytes; -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index; +- (NSData*)repeatedBytesAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedBytes:(NSData*)value; - (TestAllTypes_Builder *)setRepeatedBytesArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedBytes; - (PBAppendableArray *)repeatedGroup; -- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index; +- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedGroup:(TestAllTypes_RepeatedGroup*)value; - (TestAllTypes_Builder *)setRepeatedGroupArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedGroupValues:(const TestAllTypes_RepeatedGroup* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedGroupValues:(const TestAllTypes_RepeatedGroup* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedGroup; - (PBAppendableArray *)repeatedNestedMessage; -- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index; +- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedNestedMessage:(TestAllTypes_NestedMessage*)value; - (TestAllTypes_Builder *)setRepeatedNestedMessageArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedNestedMessageValues:(const TestAllTypes_NestedMessage* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedNestedMessageValues:(const TestAllTypes_NestedMessage* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedNestedMessage; - (PBAppendableArray *)repeatedForeignMessage; -- (ForeignMessage*)repeatedForeignMessageAtIndex:(NSUInteger)index; +- (ForeignMessage*)repeatedForeignMessageAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedForeignMessage:(ForeignMessage*)value; - (TestAllTypes_Builder *)setRepeatedForeignMessageArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedForeignMessageValues:(const ForeignMessage* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedForeignMessageValues:(const ForeignMessage* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedForeignMessage; - (PBAppendableArray *)repeatedImportMessage; -- (ImportMessage*)repeatedImportMessageAtIndex:(NSUInteger)index; +- (ImportMessage*)repeatedImportMessageAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedImportMessage:(ImportMessage*)value; - (TestAllTypes_Builder *)setRepeatedImportMessageArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedImportMessageValues:(const ImportMessage* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedImportMessageValues:(const ImportMessage* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedImportMessage; - (PBAppendableArray *)repeatedNestedEnum; -- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index; +- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedNestedEnum:(TestAllTypes_NestedEnum)value; - (TestAllTypes_Builder *)setRepeatedNestedEnumArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedNestedEnumValues:(const TestAllTypes_NestedEnum *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedNestedEnumValues:(const TestAllTypes_NestedEnum *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedNestedEnum; - (PBAppendableArray *)repeatedForeignEnum; -- (ForeignEnum)repeatedForeignEnumAtIndex:(NSUInteger)index; +- (ForeignEnum)repeatedForeignEnumAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedForeignEnum:(ForeignEnum)value; - (TestAllTypes_Builder *)setRepeatedForeignEnumArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedForeignEnumValues:(const ForeignEnum *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedForeignEnumValues:(const ForeignEnum *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedForeignEnum; - (PBAppendableArray *)repeatedImportEnum; -- (ImportEnum)repeatedImportEnumAtIndex:(NSUInteger)index; +- (ImportEnum)repeatedImportEnumAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedImportEnum:(ImportEnum)value; - (TestAllTypes_Builder *)setRepeatedImportEnumArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedImportEnumValues:(const ImportEnum *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedImportEnumValues:(const ImportEnum *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedImportEnum; - (PBAppendableArray *)repeatedStringPiece; -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index; +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedStringPiece:(NSString*)value; - (TestAllTypes_Builder *)setRepeatedStringPieceArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedStringPiece; - (PBAppendableArray *)repeatedCord; -- (NSString*)repeatedCordAtIndex:(NSUInteger)index; +- (NSString*)repeatedCordAtIndex:(unsigned long)index; - (TestAllTypes_Builder *)addRepeatedCord:(NSString*)value; - (TestAllTypes_Builder *)setRepeatedCordArray:(NSArray *)array; -- (TestAllTypes_Builder *)setRepeatedCordValues:(const NSString* *)values count:(NSUInteger)count; +- (TestAllTypes_Builder *)setRepeatedCordValues:(const NSString* *)values count:(unsigned long)count; - (TestAllTypes_Builder *)clearRepeatedCord; - (BOOL) hasDefaultInt32; -- (NSInteger) defaultInt32; -- (TestAllTypes_Builder*) setDefaultInt32:(NSInteger) value; +- (long) defaultInt32; +- (TestAllTypes_Builder*) setDefaultInt32:(long) value; - (TestAllTypes_Builder*) clearDefaultInt32; - (BOOL) hasDefaultInt64; -- (int64_t) defaultInt64; -- (TestAllTypes_Builder*) setDefaultInt64:(int64_t) value; +- (long long) defaultInt64; +- (TestAllTypes_Builder*) setDefaultInt64:(long long) value; - (TestAllTypes_Builder*) clearDefaultInt64; - (BOOL) hasDefaultUint32; -- (uNSInteger) defaultUint32; -- (TestAllTypes_Builder*) setDefaultUint32:(uNSInteger) value; +- (ulong) defaultUint32; +- (TestAllTypes_Builder*) setDefaultUint32:(ulong) value; - (TestAllTypes_Builder*) clearDefaultUint32; - (BOOL) hasDefaultUint64; -- (uint64_t) defaultUint64; -- (TestAllTypes_Builder*) setDefaultUint64:(uint64_t) value; +- (ulong long) defaultUint64; +- (TestAllTypes_Builder*) setDefaultUint64:(ulong long) value; - (TestAllTypes_Builder*) clearDefaultUint64; - (BOOL) hasDefaultSint32; -- (NSInteger) defaultSint32; -- (TestAllTypes_Builder*) setDefaultSint32:(NSInteger) value; +- (long) defaultSint32; +- (TestAllTypes_Builder*) setDefaultSint32:(long) value; - (TestAllTypes_Builder*) clearDefaultSint32; - (BOOL) hasDefaultSint64; -- (int64_t) defaultSint64; -- (TestAllTypes_Builder*) setDefaultSint64:(int64_t) value; +- (long long) defaultSint64; +- (TestAllTypes_Builder*) setDefaultSint64:(long long) value; - (TestAllTypes_Builder*) clearDefaultSint64; - (BOOL) hasDefaultFixed32; -- (uNSInteger) defaultFixed32; -- (TestAllTypes_Builder*) setDefaultFixed32:(uNSInteger) value; +- (ulong) defaultFixed32; +- (TestAllTypes_Builder*) setDefaultFixed32:(ulong) value; - (TestAllTypes_Builder*) clearDefaultFixed32; - (BOOL) hasDefaultFixed64; -- (uint64_t) defaultFixed64; -- (TestAllTypes_Builder*) setDefaultFixed64:(uint64_t) value; +- (ulong long) defaultFixed64; +- (TestAllTypes_Builder*) setDefaultFixed64:(ulong long) value; - (TestAllTypes_Builder*) clearDefaultFixed64; - (BOOL) hasDefaultSfixed32; -- (NSInteger) defaultSfixed32; -- (TestAllTypes_Builder*) setDefaultSfixed32:(NSInteger) value; +- (long) defaultSfixed32; +- (TestAllTypes_Builder*) setDefaultSfixed32:(long) value; - (TestAllTypes_Builder*) clearDefaultSfixed32; - (BOOL) hasDefaultSfixed64; -- (int64_t) defaultSfixed64; -- (TestAllTypes_Builder*) setDefaultSfixed64:(int64_t) value; +- (long long) defaultSfixed64; +- (TestAllTypes_Builder*) setDefaultSfixed64:(long long) value; - (TestAllTypes_Builder*) clearDefaultSfixed64; - (BOOL) hasDefaultFloat; @@ -1069,10 +1069,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestDeprecatedFields : PBGeneratedMessage { @private BOOL hasDeprecatedInt32_:1; - NSInteger deprecatedInt32; + long deprecatedInt32; } - (BOOL) hasDeprecatedInt32; -@property (readonly) NSInteger deprecatedInt32; +@property (readonly) long deprecatedInt32; + (TestDeprecatedFields*) defaultInstance; - (TestDeprecatedFields*) defaultInstance; @@ -1110,18 +1110,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDeprecatedInt32; -- (NSInteger) deprecatedInt32; -- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(NSInteger) value; +- (long) deprecatedInt32; +- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(long) value; - (TestDeprecatedFields_Builder*) clearDeprecatedInt32; @end @interface ForeignMessage : PBGeneratedMessage { @private BOOL hasC_:1; - NSInteger c; + long c; } - (BOOL) hasC; -@property (readonly) NSInteger c; +@property (readonly) long c; + (ForeignMessage*) defaultInstance; - (ForeignMessage*) defaultInstance; @@ -1159,8 +1159,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasC; -- (NSInteger) c; -- (ForeignMessage_Builder*) setC:(NSInteger) value; +- (long) c; +- (ForeignMessage_Builder*) setC:(long) value; - (ForeignMessage_Builder*) clearC; @end @@ -1207,10 +1207,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface OptionalGroup_extension : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (OptionalGroup_extension*) defaultInstance; - (OptionalGroup_extension*) defaultInstance; @@ -1248,18 +1248,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (OptionalGroup_extension_Builder*) setA:(NSInteger) value; +- (long) a; +- (OptionalGroup_extension_Builder*) setA:(long) value; - (OptionalGroup_extension_Builder*) clearA; @end @interface RepeatedGroup_extension : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (RepeatedGroup_extension*) defaultInstance; - (RepeatedGroup_extension*) defaultInstance; @@ -1297,8 +1297,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (RepeatedGroup_extension_Builder*) setA:(NSInteger) value; +- (long) a; +- (RepeatedGroup_extension_Builder*) setA:(long) value; - (RepeatedGroup_extension_Builder*) clearA; @end @@ -1378,39 +1378,39 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasDummy15_:1; BOOL hasDummy16_:1; BOOL hasDummy17_:1; - NSInteger c; - NSInteger dummy32; - NSInteger dummy31; - NSInteger dummy30; - NSInteger dummy29; - NSInteger dummy28; - NSInteger dummy27; - NSInteger dummy26; - NSInteger dummy25; - NSInteger dummy24; - NSInteger dummy23; - NSInteger dummy22; - NSInteger dummy21; - NSInteger dummy20; - NSInteger dummy19; - NSInteger dummy18; - NSInteger a; - NSInteger dummy2; - NSInteger b; - NSInteger dummy4; - NSInteger dummy5; - NSInteger dummy6; - NSInteger dummy7; - NSInteger dummy8; - NSInteger dummy9; - NSInteger dummy10; - NSInteger dummy11; - NSInteger dummy12; - NSInteger dummy13; - NSInteger dummy14; - NSInteger dummy15; - NSInteger dummy16; - NSInteger dummy17; + long c; + long dummy32; + long dummy31; + long dummy30; + long dummy29; + long dummy28; + long dummy27; + long dummy26; + long dummy25; + long dummy24; + long dummy23; + long dummy22; + long dummy21; + long dummy20; + long dummy19; + long dummy18; + long a; + long dummy2; + long b; + long dummy4; + long dummy5; + long dummy6; + long dummy7; + long dummy8; + long dummy9; + long dummy10; + long dummy11; + long dummy12; + long dummy13; + long dummy14; + long dummy15; + long dummy16; + long dummy17; } - (BOOL) hasA; - (BOOL) hasDummy2; @@ -1445,39 +1445,39 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasDummy31; - (BOOL) hasDummy32; - (BOOL) hasC; -@property (readonly) NSInteger a; -@property (readonly) NSInteger dummy2; -@property (readonly) NSInteger b; -@property (readonly) NSInteger dummy4; -@property (readonly) NSInteger dummy5; -@property (readonly) NSInteger dummy6; -@property (readonly) NSInteger dummy7; -@property (readonly) NSInteger dummy8; -@property (readonly) NSInteger dummy9; -@property (readonly) NSInteger dummy10; -@property (readonly) NSInteger dummy11; -@property (readonly) NSInteger dummy12; -@property (readonly) NSInteger dummy13; -@property (readonly) NSInteger dummy14; -@property (readonly) NSInteger dummy15; -@property (readonly) NSInteger dummy16; -@property (readonly) NSInteger dummy17; -@property (readonly) NSInteger dummy18; -@property (readonly) NSInteger dummy19; -@property (readonly) NSInteger dummy20; -@property (readonly) NSInteger dummy21; -@property (readonly) NSInteger dummy22; -@property (readonly) NSInteger dummy23; -@property (readonly) NSInteger dummy24; -@property (readonly) NSInteger dummy25; -@property (readonly) NSInteger dummy26; -@property (readonly) NSInteger dummy27; -@property (readonly) NSInteger dummy28; -@property (readonly) NSInteger dummy29; -@property (readonly) NSInteger dummy30; -@property (readonly) NSInteger dummy31; -@property (readonly) NSInteger dummy32; -@property (readonly) NSInteger c; +@property (readonly) long a; +@property (readonly) long dummy2; +@property (readonly) long b; +@property (readonly) long dummy4; +@property (readonly) long dummy5; +@property (readonly) long dummy6; +@property (readonly) long dummy7; +@property (readonly) long dummy8; +@property (readonly) long dummy9; +@property (readonly) long dummy10; +@property (readonly) long dummy11; +@property (readonly) long dummy12; +@property (readonly) long dummy13; +@property (readonly) long dummy14; +@property (readonly) long dummy15; +@property (readonly) long dummy16; +@property (readonly) long dummy17; +@property (readonly) long dummy18; +@property (readonly) long dummy19; +@property (readonly) long dummy20; +@property (readonly) long dummy21; +@property (readonly) long dummy22; +@property (readonly) long dummy23; +@property (readonly) long dummy24; +@property (readonly) long dummy25; +@property (readonly) long dummy26; +@property (readonly) long dummy27; +@property (readonly) long dummy28; +@property (readonly) long dummy29; +@property (readonly) long dummy30; +@property (readonly) long dummy31; +@property (readonly) long dummy32; +@property (readonly) long c; + (TestRequired*) defaultInstance; - (TestRequired*) defaultInstance; @@ -1517,168 +1517,168 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestRequired_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestRequired_Builder*) setA:(long) value; - (TestRequired_Builder*) clearA; - (BOOL) hasDummy2; -- (NSInteger) dummy2; -- (TestRequired_Builder*) setDummy2:(NSInteger) value; +- (long) dummy2; +- (TestRequired_Builder*) setDummy2:(long) value; - (TestRequired_Builder*) clearDummy2; - (BOOL) hasB; -- (NSInteger) b; -- (TestRequired_Builder*) setB:(NSInteger) value; +- (long) b; +- (TestRequired_Builder*) setB:(long) value; - (TestRequired_Builder*) clearB; - (BOOL) hasDummy4; -- (NSInteger) dummy4; -- (TestRequired_Builder*) setDummy4:(NSInteger) value; +- (long) dummy4; +- (TestRequired_Builder*) setDummy4:(long) value; - (TestRequired_Builder*) clearDummy4; - (BOOL) hasDummy5; -- (NSInteger) dummy5; -- (TestRequired_Builder*) setDummy5:(NSInteger) value; +- (long) dummy5; +- (TestRequired_Builder*) setDummy5:(long) value; - (TestRequired_Builder*) clearDummy5; - (BOOL) hasDummy6; -- (NSInteger) dummy6; -- (TestRequired_Builder*) setDummy6:(NSInteger) value; +- (long) dummy6; +- (TestRequired_Builder*) setDummy6:(long) value; - (TestRequired_Builder*) clearDummy6; - (BOOL) hasDummy7; -- (NSInteger) dummy7; -- (TestRequired_Builder*) setDummy7:(NSInteger) value; +- (long) dummy7; +- (TestRequired_Builder*) setDummy7:(long) value; - (TestRequired_Builder*) clearDummy7; - (BOOL) hasDummy8; -- (NSInteger) dummy8; -- (TestRequired_Builder*) setDummy8:(NSInteger) value; +- (long) dummy8; +- (TestRequired_Builder*) setDummy8:(long) value; - (TestRequired_Builder*) clearDummy8; - (BOOL) hasDummy9; -- (NSInteger) dummy9; -- (TestRequired_Builder*) setDummy9:(NSInteger) value; +- (long) dummy9; +- (TestRequired_Builder*) setDummy9:(long) value; - (TestRequired_Builder*) clearDummy9; - (BOOL) hasDummy10; -- (NSInteger) dummy10; -- (TestRequired_Builder*) setDummy10:(NSInteger) value; +- (long) dummy10; +- (TestRequired_Builder*) setDummy10:(long) value; - (TestRequired_Builder*) clearDummy10; - (BOOL) hasDummy11; -- (NSInteger) dummy11; -- (TestRequired_Builder*) setDummy11:(NSInteger) value; +- (long) dummy11; +- (TestRequired_Builder*) setDummy11:(long) value; - (TestRequired_Builder*) clearDummy11; - (BOOL) hasDummy12; -- (NSInteger) dummy12; -- (TestRequired_Builder*) setDummy12:(NSInteger) value; +- (long) dummy12; +- (TestRequired_Builder*) setDummy12:(long) value; - (TestRequired_Builder*) clearDummy12; - (BOOL) hasDummy13; -- (NSInteger) dummy13; -- (TestRequired_Builder*) setDummy13:(NSInteger) value; +- (long) dummy13; +- (TestRequired_Builder*) setDummy13:(long) value; - (TestRequired_Builder*) clearDummy13; - (BOOL) hasDummy14; -- (NSInteger) dummy14; -- (TestRequired_Builder*) setDummy14:(NSInteger) value; +- (long) dummy14; +- (TestRequired_Builder*) setDummy14:(long) value; - (TestRequired_Builder*) clearDummy14; - (BOOL) hasDummy15; -- (NSInteger) dummy15; -- (TestRequired_Builder*) setDummy15:(NSInteger) value; +- (long) dummy15; +- (TestRequired_Builder*) setDummy15:(long) value; - (TestRequired_Builder*) clearDummy15; - (BOOL) hasDummy16; -- (NSInteger) dummy16; -- (TestRequired_Builder*) setDummy16:(NSInteger) value; +- (long) dummy16; +- (TestRequired_Builder*) setDummy16:(long) value; - (TestRequired_Builder*) clearDummy16; - (BOOL) hasDummy17; -- (NSInteger) dummy17; -- (TestRequired_Builder*) setDummy17:(NSInteger) value; +- (long) dummy17; +- (TestRequired_Builder*) setDummy17:(long) value; - (TestRequired_Builder*) clearDummy17; - (BOOL) hasDummy18; -- (NSInteger) dummy18; -- (TestRequired_Builder*) setDummy18:(NSInteger) value; +- (long) dummy18; +- (TestRequired_Builder*) setDummy18:(long) value; - (TestRequired_Builder*) clearDummy18; - (BOOL) hasDummy19; -- (NSInteger) dummy19; -- (TestRequired_Builder*) setDummy19:(NSInteger) value; +- (long) dummy19; +- (TestRequired_Builder*) setDummy19:(long) value; - (TestRequired_Builder*) clearDummy19; - (BOOL) hasDummy20; -- (NSInteger) dummy20; -- (TestRequired_Builder*) setDummy20:(NSInteger) value; +- (long) dummy20; +- (TestRequired_Builder*) setDummy20:(long) value; - (TestRequired_Builder*) clearDummy20; - (BOOL) hasDummy21; -- (NSInteger) dummy21; -- (TestRequired_Builder*) setDummy21:(NSInteger) value; +- (long) dummy21; +- (TestRequired_Builder*) setDummy21:(long) value; - (TestRequired_Builder*) clearDummy21; - (BOOL) hasDummy22; -- (NSInteger) dummy22; -- (TestRequired_Builder*) setDummy22:(NSInteger) value; +- (long) dummy22; +- (TestRequired_Builder*) setDummy22:(long) value; - (TestRequired_Builder*) clearDummy22; - (BOOL) hasDummy23; -- (NSInteger) dummy23; -- (TestRequired_Builder*) setDummy23:(NSInteger) value; +- (long) dummy23; +- (TestRequired_Builder*) setDummy23:(long) value; - (TestRequired_Builder*) clearDummy23; - (BOOL) hasDummy24; -- (NSInteger) dummy24; -- (TestRequired_Builder*) setDummy24:(NSInteger) value; +- (long) dummy24; +- (TestRequired_Builder*) setDummy24:(long) value; - (TestRequired_Builder*) clearDummy24; - (BOOL) hasDummy25; -- (NSInteger) dummy25; -- (TestRequired_Builder*) setDummy25:(NSInteger) value; +- (long) dummy25; +- (TestRequired_Builder*) setDummy25:(long) value; - (TestRequired_Builder*) clearDummy25; - (BOOL) hasDummy26; -- (NSInteger) dummy26; -- (TestRequired_Builder*) setDummy26:(NSInteger) value; +- (long) dummy26; +- (TestRequired_Builder*) setDummy26:(long) value; - (TestRequired_Builder*) clearDummy26; - (BOOL) hasDummy27; -- (NSInteger) dummy27; -- (TestRequired_Builder*) setDummy27:(NSInteger) value; +- (long) dummy27; +- (TestRequired_Builder*) setDummy27:(long) value; - (TestRequired_Builder*) clearDummy27; - (BOOL) hasDummy28; -- (NSInteger) dummy28; -- (TestRequired_Builder*) setDummy28:(NSInteger) value; +- (long) dummy28; +- (TestRequired_Builder*) setDummy28:(long) value; - (TestRequired_Builder*) clearDummy28; - (BOOL) hasDummy29; -- (NSInteger) dummy29; -- (TestRequired_Builder*) setDummy29:(NSInteger) value; +- (long) dummy29; +- (TestRequired_Builder*) setDummy29:(long) value; - (TestRequired_Builder*) clearDummy29; - (BOOL) hasDummy30; -- (NSInteger) dummy30; -- (TestRequired_Builder*) setDummy30:(NSInteger) value; +- (long) dummy30; +- (TestRequired_Builder*) setDummy30:(long) value; - (TestRequired_Builder*) clearDummy30; - (BOOL) hasDummy31; -- (NSInteger) dummy31; -- (TestRequired_Builder*) setDummy31:(NSInteger) value; +- (long) dummy31; +- (TestRequired_Builder*) setDummy31:(long) value; - (TestRequired_Builder*) clearDummy31; - (BOOL) hasDummy32; -- (NSInteger) dummy32; -- (TestRequired_Builder*) setDummy32:(NSInteger) value; +- (long) dummy32; +- (TestRequired_Builder*) setDummy32:(long) value; - (TestRequired_Builder*) clearDummy32; - (BOOL) hasC; -- (NSInteger) c; -- (TestRequired_Builder*) setC:(NSInteger) value; +- (long) c; +- (TestRequired_Builder*) setC:(long) value; - (TestRequired_Builder*) clearC; @end @@ -1686,7 +1686,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasDummy_:1; BOOL hasOptionalMessage_:1; - NSInteger dummy; + long dummy; TestRequired* optionalMessage; PBAppendableArray * repeatedMessageArray; } @@ -1694,8 +1694,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasDummy; @property (readonly, retain) TestRequired* optionalMessage; @property (readonly, retain) PBArray * repeatedMessage; -@property (readonly) NSInteger dummy; -- (TestRequired*)repeatedMessageAtIndex:(NSUInteger)index; +@property (readonly) long dummy; +- (TestRequired*)repeatedMessageAtIndex:(unsigned long)index; + (TestRequiredForeign*) defaultInstance; - (TestRequiredForeign*) defaultInstance; @@ -1740,15 +1740,15 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRequiredForeign_Builder*) clearOptionalMessage; - (PBAppendableArray *)repeatedMessage; -- (TestRequired*)repeatedMessageAtIndex:(NSUInteger)index; +- (TestRequired*)repeatedMessageAtIndex:(unsigned long)index; - (TestRequiredForeign_Builder *)addRepeatedMessage:(TestRequired*)value; - (TestRequiredForeign_Builder *)setRepeatedMessageArray:(NSArray *)array; -- (TestRequiredForeign_Builder *)setRepeatedMessageValues:(const TestRequired* *)values count:(NSUInteger)count; +- (TestRequiredForeign_Builder *)setRepeatedMessageValues:(const TestRequired* *)values count:(unsigned long)count; - (TestRequiredForeign_Builder *)clearRepeatedMessage; - (BOOL) hasDummy; -- (NSInteger) dummy; -- (TestRequiredForeign_Builder*) setDummy:(NSInteger) value; +- (long) dummy; +- (TestRequiredForeign_Builder*) setDummy:(long) value; - (TestRequiredForeign_Builder*) clearDummy; @end @@ -1927,13 +1927,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasA_:1; BOOL hasBb_:1; - NSInteger a; - NSInteger bb; + long a; + long bb; } - (BOOL) hasA; - (BOOL) hasBb; -@property (readonly) NSInteger a; -@property (readonly) NSInteger bb; +@property (readonly) long a; +@property (readonly) long bb; + (TestReallyLargeTagNumber*) defaultInstance; - (TestReallyLargeTagNumber*) defaultInstance; @@ -1971,13 +1971,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestReallyLargeTagNumber_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestReallyLargeTagNumber_Builder*) setA:(long) value; - (TestReallyLargeTagNumber_Builder*) clearA; - (BOOL) hasBb; -- (NSInteger) bb; -- (TestReallyLargeTagNumber_Builder*) setBb:(NSInteger) value; +- (long) bb; +- (TestReallyLargeTagNumber_Builder*) setBb:(long) value; - (TestReallyLargeTagNumber_Builder*) clearBb; @end @@ -1985,13 +1985,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasI_:1; BOOL hasA_:1; - NSInteger i; + long i; TestRecursiveMessage* a; } - (BOOL) hasA; - (BOOL) hasI; @property (readonly, retain) TestRecursiveMessage* a; -@property (readonly) NSInteger i; +@property (readonly) long i; + (TestRecursiveMessage*) defaultInstance; - (TestRecursiveMessage*) defaultInstance; @@ -2036,8 +2036,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRecursiveMessage_Builder*) clearA; - (BOOL) hasI; -- (NSInteger) i; -- (TestRecursiveMessage_Builder*) setI:(NSInteger) value; +- (long) i; +- (TestRecursiveMessage_Builder*) setI:(long) value; - (TestRecursiveMessage_Builder*) clearI; @end @@ -2096,13 +2096,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @private BOOL hasOptionalInt32_:1; BOOL hasA_:1; - NSInteger optionalInt32; + long optionalInt32; TestMutualRecursionA* a; } - (BOOL) hasA; - (BOOL) hasOptionalInt32; @property (readonly, retain) TestMutualRecursionA* a; -@property (readonly) NSInteger optionalInt32; +@property (readonly) long optionalInt32; + (TestMutualRecursionB*) defaultInstance; - (TestMutualRecursionB*) defaultInstance; @@ -2147,8 +2147,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestMutualRecursionB_Builder*) clearA; - (BOOL) hasOptionalInt32; -- (NSInteger) optionalInt32; -- (TestMutualRecursionB_Builder*) setOptionalInt32:(NSInteger) value; +- (long) optionalInt32; +- (TestMutualRecursionB_Builder*) setOptionalInt32:(long) value; - (TestMutualRecursionB_Builder*) clearOptionalInt32; @end @@ -2157,14 +2157,14 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasA_:1; BOOL hasFoo_:1; BOOL hasBar_:1; - NSInteger a; + long a; TestDupFieldNumber_Foo* foo; TestDupFieldNumber_Bar* bar; } - (BOOL) hasA; - (BOOL) hasFoo; - (BOOL) hasBar; -@property (readonly) NSInteger a; +@property (readonly) long a; @property (readonly, retain) TestDupFieldNumber_Foo* foo; @property (readonly, retain) TestDupFieldNumber_Bar* bar; @@ -2189,10 +2189,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestDupFieldNumber_Foo : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestDupFieldNumber_Foo*) defaultInstance; - (TestDupFieldNumber_Foo*) defaultInstance; @@ -2230,18 +2230,18 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestDupFieldNumber_Foo_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestDupFieldNumber_Foo_Builder*) setA:(long) value; - (TestDupFieldNumber_Foo_Builder*) clearA; @end @interface TestDupFieldNumber_Bar : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestDupFieldNumber_Bar*) defaultInstance; - (TestDupFieldNumber_Bar*) defaultInstance; @@ -2279,8 +2279,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestDupFieldNumber_Bar_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestDupFieldNumber_Bar_Builder*) setA:(long) value; - (TestDupFieldNumber_Bar_Builder*) clearA; @end @@ -2302,8 +2302,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestDupFieldNumber_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestDupFieldNumber_Builder*) setA:(long) value; - (TestDupFieldNumber_Builder*) clearA; - (BOOL) hasFoo; @@ -2354,8 +2354,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn } @property (readonly, retain) PBArray * nestedmessageRepeatedInt32; @property (readonly, retain) PBArray * nestedmessageRepeatedForeignmessage; -- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index; -- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(NSUInteger)index; +- (long)nestedmessageRepeatedInt32AtIndex:(unsigned long)index; +- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(unsigned long)index; + (TestNestedMessageHasBits_NestedMessage*) defaultInstance; - (TestNestedMessageHasBits_NestedMessage*) defaultInstance; @@ -2393,17 +2393,17 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)nestedmessageRepeatedInt32; -- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index; -- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(NSInteger)value; +- (long)nestedmessageRepeatedInt32AtIndex:(unsigned long)index; +- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(long)value; - (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Array:(NSArray *)array; -- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const long *)values count:(unsigned long)count; - (TestNestedMessageHasBits_NestedMessage_Builder *)clearNestedmessageRepeatedInt32; - (PBAppendableArray *)nestedmessageRepeatedForeignmessage; -- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(NSUInteger)index; +- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(unsigned long)index; - (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedForeignmessage:(ForeignMessage*)value; - (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedForeignmessageArray:(NSArray *)array; -- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedForeignmessageValues:(const ForeignMessage* *)values count:(NSUInteger)count; +- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedForeignmessageValues:(const ForeignMessage* *)values count:(unsigned long)count; - (TestNestedMessageHasBits_NestedMessage_Builder *)clearNestedmessageRepeatedForeignmessage; @end @@ -2440,7 +2440,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasCordField_:1; BOOL hasMessageField_:1; BOOL hasEnumField_:1; - NSInteger primitiveField; + long primitiveField; NSString* stringField; NSString* stringPieceField; NSString* cordField; @@ -2459,7 +2459,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasMessageField; - (BOOL) hasStringPieceField; - (BOOL) hasCordField; -@property (readonly) NSInteger primitiveField; +@property (readonly) long primitiveField; @property (readonly, retain) NSString* stringField; @property (readonly) ForeignEnum enumField; @property (readonly, retain) ForeignMessage* messageField; @@ -2471,12 +2471,12 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedMessageField; @property (readonly, retain) PBArray * repeatedStringPieceField; @property (readonly, retain) PBArray * repeatedCordField; -- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index; -- (NSString*)repeatedStringFieldAtIndex:(NSUInteger)index; -- (ForeignEnum)repeatedEnumFieldAtIndex:(NSUInteger)index; -- (ForeignMessage*)repeatedMessageFieldAtIndex:(NSUInteger)index; -- (NSString*)repeatedStringPieceFieldAtIndex:(NSUInteger)index; -- (NSString*)repeatedCordFieldAtIndex:(NSUInteger)index; +- (long)repeatedPrimitiveFieldAtIndex:(unsigned long)index; +- (NSString*)repeatedStringFieldAtIndex:(unsigned long)index; +- (ForeignEnum)repeatedEnumFieldAtIndex:(unsigned long)index; +- (ForeignMessage*)repeatedMessageFieldAtIndex:(unsigned long)index; +- (NSString*)repeatedStringPieceFieldAtIndex:(unsigned long)index; +- (NSString*)repeatedCordFieldAtIndex:(unsigned long)index; + (TestCamelCaseFieldNames*) defaultInstance; - (TestCamelCaseFieldNames*) defaultInstance; @@ -2514,8 +2514,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasPrimitiveField; -- (NSInteger) primitiveField; -- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(NSInteger) value; +- (long) primitiveField; +- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(long) value; - (TestCamelCaseFieldNames_Builder*) clearPrimitiveField; - (BOOL) hasStringField; @@ -2546,45 +2546,45 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestCamelCaseFieldNames_Builder*) clearCordField; - (PBAppendableArray *)repeatedPrimitiveField; -- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index; -- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(NSInteger)value; +- (long)repeatedPrimitiveFieldAtIndex:(unsigned long)index; +- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(long)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const NSInteger *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const long *)values count:(unsigned long)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedPrimitiveField; - (PBAppendableArray *)repeatedStringField; -- (NSString*)repeatedStringFieldAtIndex:(NSUInteger)index; +- (NSString*)repeatedStringFieldAtIndex:(unsigned long)index; - (TestCamelCaseFieldNames_Builder *)addRepeatedStringField:(NSString*)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedStringFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedStringFieldValues:(const NSString* *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedStringFieldValues:(const NSString* *)values count:(unsigned long)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedStringField; - (PBAppendableArray *)repeatedEnumField; -- (ForeignEnum)repeatedEnumFieldAtIndex:(NSUInteger)index; +- (ForeignEnum)repeatedEnumFieldAtIndex:(unsigned long)index; - (TestCamelCaseFieldNames_Builder *)addRepeatedEnumField:(ForeignEnum)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedEnumFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedEnumFieldValues:(const ForeignEnum *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedEnumFieldValues:(const ForeignEnum *)values count:(unsigned long)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedEnumField; - (PBAppendableArray *)repeatedMessageField; -- (ForeignMessage*)repeatedMessageFieldAtIndex:(NSUInteger)index; +- (ForeignMessage*)repeatedMessageFieldAtIndex:(unsigned long)index; - (TestCamelCaseFieldNames_Builder *)addRepeatedMessageField:(ForeignMessage*)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedMessageFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedMessageFieldValues:(const ForeignMessage* *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedMessageFieldValues:(const ForeignMessage* *)values count:(unsigned long)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedMessageField; - (PBAppendableArray *)repeatedStringPieceField; -- (NSString*)repeatedStringPieceFieldAtIndex:(NSUInteger)index; +- (NSString*)repeatedStringPieceFieldAtIndex:(unsigned long)index; - (TestCamelCaseFieldNames_Builder *)addRepeatedStringPieceField:(NSString*)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedStringPieceFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedStringPieceFieldValues:(const NSString* *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedStringPieceFieldValues:(const NSString* *)values count:(unsigned long)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedStringPieceField; - (PBAppendableArray *)repeatedCordField; -- (NSString*)repeatedCordFieldAtIndex:(NSUInteger)index; +- (NSString*)repeatedCordFieldAtIndex:(unsigned long)index; - (TestCamelCaseFieldNames_Builder *)addRepeatedCordField:(NSString*)value; - (TestCamelCaseFieldNames_Builder *)setRepeatedCordFieldArray:(NSArray *)array; -- (TestCamelCaseFieldNames_Builder *)setRepeatedCordFieldValues:(const NSString* *)values count:(NSUInteger)count; +- (TestCamelCaseFieldNames_Builder *)setRepeatedCordFieldValues:(const NSString* *)values count:(unsigned long)count; - (TestCamelCaseFieldNames_Builder *)clearRepeatedCordField; @end @@ -2594,14 +2594,14 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasMyInt_:1; BOOL hasMyString_:1; Float32 myFloat; - int64_t myInt; + long long myInt; NSString* myString; } - (BOOL) hasMyString; - (BOOL) hasMyInt; - (BOOL) hasMyFloat; @property (readonly, retain) NSString* myString; -@property (readonly) int64_t myInt; +@property (readonly) long long myInt; @property (readonly) Float32 myFloat; + (TestFieldOrderings*) defaultInstance; @@ -2645,8 +2645,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestFieldOrderings_Builder*) clearMyString; - (BOOL) hasMyInt; -- (int64_t) myInt; -- (TestFieldOrderings_Builder*) setMyInt:(int64_t) value; +- (long long) myInt; +- (TestFieldOrderings_Builder*) setMyInt:(long long) value; - (TestFieldOrderings_Builder*) clearMyInt; - (BOOL) hasMyFloat; @@ -2690,13 +2690,13 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn Float32 zeroFloat; Float32 negInfFloat; Float32 nanFloat; - int64_t smallInt64; - uint64_t largeUint64; - NSInteger smallInt32; + long long smallInt64; + ulong long largeUint64; + long smallInt32; NSString* cppTrigraph; NSString* utf8String; NSData* escapedBytes; - uNSInteger largeUint32; + ulong largeUint32; } - (BOOL) hasEscapedBytes; - (BOOL) hasLargeUint32; @@ -2719,10 +2719,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (BOOL) hasNanFloat; - (BOOL) hasCppTrigraph; @property (readonly, retain) NSData* escapedBytes; -@property (readonly) uNSInteger largeUint32; -@property (readonly) uint64_t largeUint64; -@property (readonly) NSInteger smallInt32; -@property (readonly) int64_t smallInt64; +@property (readonly) ulong largeUint32; +@property (readonly) ulong long largeUint64; +@property (readonly) long smallInt32; +@property (readonly) long long smallInt64; @property (readonly, retain) NSString* utf8String; @property (readonly) Float32 zeroFloat; @property (readonly) Float32 oneFloat; @@ -2780,23 +2780,23 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestExtremeDefaultValues_Builder*) clearEscapedBytes; - (BOOL) hasLargeUint32; -- (uNSInteger) largeUint32; -- (TestExtremeDefaultValues_Builder*) setLargeUint32:(uNSInteger) value; +- (ulong) largeUint32; +- (TestExtremeDefaultValues_Builder*) setLargeUint32:(ulong) value; - (TestExtremeDefaultValues_Builder*) clearLargeUint32; - (BOOL) hasLargeUint64; -- (uint64_t) largeUint64; -- (TestExtremeDefaultValues_Builder*) setLargeUint64:(uint64_t) value; +- (ulong long) largeUint64; +- (TestExtremeDefaultValues_Builder*) setLargeUint64:(ulong long) value; - (TestExtremeDefaultValues_Builder*) clearLargeUint64; - (BOOL) hasSmallInt32; -- (NSInteger) smallInt32; -- (TestExtremeDefaultValues_Builder*) setSmallInt32:(NSInteger) value; +- (long) smallInt32; +- (TestExtremeDefaultValues_Builder*) setSmallInt32:(long) value; - (TestExtremeDefaultValues_Builder*) clearSmallInt32; - (BOOL) hasSmallInt64; -- (int64_t) smallInt64; -- (TestExtremeDefaultValues_Builder*) setSmallInt64:(int64_t) value; +- (long long) smallInt64; +- (TestExtremeDefaultValues_Builder*) setSmallInt64:(long long) value; - (TestExtremeDefaultValues_Builder*) clearSmallInt64; - (BOOL) hasUtf8String; @@ -3025,33 +3025,33 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestPackedTypes : PBGeneratedMessage { @private PBAppendableArray * packedBoolArray; - NSInteger packedBoolMemoizedSerializedSize; + long packedBoolMemoizedSerializedSize; PBAppendableArray * packedDoubleArray; - NSInteger packedDoubleMemoizedSerializedSize; + long packedDoubleMemoizedSerializedSize; PBAppendableArray * packedFloatArray; - NSInteger packedFloatMemoizedSerializedSize; + long packedFloatMemoizedSerializedSize; PBAppendableArray * packedInt64Array; - NSInteger packedInt64MemoizedSerializedSize; + long packedInt64MemoizedSerializedSize; PBAppendableArray * packedUint64Array; - NSInteger packedUint64MemoizedSerializedSize; + long packedUint64MemoizedSerializedSize; PBAppendableArray * packedInt32Array; - NSInteger packedInt32MemoizedSerializedSize; + long packedInt32MemoizedSerializedSize; PBAppendableArray * packedFixed64Array; - NSInteger packedFixed64MemoizedSerializedSize; + long packedFixed64MemoizedSerializedSize; PBAppendableArray * packedFixed32Array; - NSInteger packedFixed32MemoizedSerializedSize; + long packedFixed32MemoizedSerializedSize; PBAppendableArray * packedUint32Array; - NSInteger packedUint32MemoizedSerializedSize; + long packedUint32MemoizedSerializedSize; PBAppendableArray * packedEnumArray; - NSInteger packedEnumMemoizedSerializedSize; + long packedEnumMemoizedSerializedSize; PBAppendableArray * packedSfixed32Array; - NSInteger packedSfixed32MemoizedSerializedSize; + long packedSfixed32MemoizedSerializedSize; PBAppendableArray * packedSfixed64Array; - NSInteger packedSfixed64MemoizedSerializedSize; + long packedSfixed64MemoizedSerializedSize; PBAppendableArray * packedSint32Array; - NSInteger packedSint32MemoizedSerializedSize; + long packedSint32MemoizedSerializedSize; PBAppendableArray * packedSint64Array; - NSInteger packedSint64MemoizedSerializedSize; + long packedSint64MemoizedSerializedSize; } @property (readonly, retain) PBArray * packedInt32; @property (readonly, retain) PBArray * packedInt64; @@ -3067,20 +3067,20 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * packedDouble; @property (readonly, retain) PBArray * packedBool; @property (readonly, retain) PBArray * packedEnum; -- (NSInteger)packedInt32AtIndex:(NSUInteger)index; -- (int64_t)packedInt64AtIndex:(NSUInteger)index; -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; -- (uint64_t)packedUint64AtIndex:(NSUInteger)index; -- (NSInteger)packedSint32AtIndex:(NSUInteger)index; -- (int64_t)packedSint64AtIndex:(NSUInteger)index; -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index; -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index; -- (Float32)packedFloatAtIndex:(NSUInteger)index; -- (Float64)packedDoubleAtIndex:(NSUInteger)index; -- (BOOL)packedBoolAtIndex:(NSUInteger)index; -- (ForeignEnum)packedEnumAtIndex:(NSUInteger)index; +- (long)packedInt32AtIndex:(unsigned long)index; +- (long long)packedInt64AtIndex:(unsigned long)index; +- (ulong)packedUint32AtIndex:(unsigned long)index; +- (ulong long)packedUint64AtIndex:(unsigned long)index; +- (long)packedSint32AtIndex:(unsigned long)index; +- (long long)packedSint64AtIndex:(unsigned long)index; +- (ulong)packedFixed32AtIndex:(unsigned long)index; +- (ulong long)packedFixed64AtIndex:(unsigned long)index; +- (long)packedSfixed32AtIndex:(unsigned long)index; +- (long long)packedSfixed64AtIndex:(unsigned long)index; +- (Float32)packedFloatAtIndex:(unsigned long)index; +- (Float64)packedDoubleAtIndex:(unsigned long)index; +- (BOOL)packedBoolAtIndex:(unsigned long)index; +- (ForeignEnum)packedEnumAtIndex:(unsigned long)index; + (TestPackedTypes*) defaultInstance; - (TestPackedTypes*) defaultInstance; @@ -3118,101 +3118,101 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)packedInt32; -- (NSInteger)packedInt32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedInt32:(NSInteger)value; +- (long)packedInt32AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedInt32:(long)value; - (TestPackedTypes_Builder *)setPackedInt32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedInt32Values:(const long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedInt32; - (PBAppendableArray *)packedInt64; -- (int64_t)packedInt64AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedInt64:(int64_t)value; +- (long long)packedInt64AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedInt64:(long long)value; - (TestPackedTypes_Builder *)setPackedInt64Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedInt64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedInt64Values:(const long long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedInt64; - (PBAppendableArray *)packedUint32; -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedUint32:(uNSInteger)value; +- (ulong)packedUint32AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedUint32:(ulong)value; - (TestPackedTypes_Builder *)setPackedUint32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedUint32; - (PBAppendableArray *)packedUint64; -- (uint64_t)packedUint64AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedUint64:(uint64_t)value; +- (ulong long)packedUint64AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedUint64:(ulong long)value; - (TestPackedTypes_Builder *)setPackedUint64Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedUint64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedUint64; - (PBAppendableArray *)packedSint32; -- (NSInteger)packedSint32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedSint32:(NSInteger)value; +- (long)packedSint32AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedSint32:(long)value; - (TestPackedTypes_Builder *)setPackedSint32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedSint32Values:(const long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedSint32; - (PBAppendableArray *)packedSint64; -- (int64_t)packedSint64AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedSint64:(int64_t)value; +- (long long)packedSint64AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedSint64:(long long)value; - (TestPackedTypes_Builder *)setPackedSint64Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedSint64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedSint64Values:(const long long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedSint64; - (PBAppendableArray *)packedFixed32; -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedFixed32:(uNSInteger)value; +- (ulong)packedFixed32AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedFixed32:(ulong)value; - (TestPackedTypes_Builder *)setPackedFixed32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedFixed32; - (PBAppendableArray *)packedFixed64; -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedFixed64:(uint64_t)value; +- (ulong long)packedFixed64AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedFixed64:(ulong long)value; - (TestPackedTypes_Builder *)setPackedFixed64Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedFixed64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedFixed64; - (PBAppendableArray *)packedSfixed32; -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedSfixed32:(NSInteger)value; +- (long)packedSfixed32AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedSfixed32:(long)value; - (TestPackedTypes_Builder *)setPackedSfixed32Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedSfixed32; - (PBAppendableArray *)packedSfixed64; -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index; -- (TestPackedTypes_Builder *)addPackedSfixed64:(int64_t)value; +- (long long)packedSfixed64AtIndex:(unsigned long)index; +- (TestPackedTypes_Builder *)addPackedSfixed64:(long long)value; - (TestPackedTypes_Builder *)setPackedSfixed64Array:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedSfixed64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedSfixed64Values:(const long long *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedSfixed64; - (PBAppendableArray *)packedFloat; -- (Float32)packedFloatAtIndex:(NSUInteger)index; +- (Float32)packedFloatAtIndex:(unsigned long)index; - (TestPackedTypes_Builder *)addPackedFloat:(Float32)value; - (TestPackedTypes_Builder *)setPackedFloatArray:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedFloatValues:(const Float32 *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedFloatValues:(const Float32 *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedFloat; - (PBAppendableArray *)packedDouble; -- (Float64)packedDoubleAtIndex:(NSUInteger)index; +- (Float64)packedDoubleAtIndex:(unsigned long)index; - (TestPackedTypes_Builder *)addPackedDouble:(Float64)value; - (TestPackedTypes_Builder *)setPackedDoubleArray:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedDoubleValues:(const Float64 *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedDoubleValues:(const Float64 *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedDouble; - (PBAppendableArray *)packedBool; -- (BOOL)packedBoolAtIndex:(NSUInteger)index; +- (BOOL)packedBoolAtIndex:(unsigned long)index; - (TestPackedTypes_Builder *)addPackedBool:(BOOL)value; - (TestPackedTypes_Builder *)setPackedBoolArray:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedBoolValues:(const BOOL *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedBoolValues:(const BOOL *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedBool; - (PBAppendableArray *)packedEnum; -- (ForeignEnum)packedEnumAtIndex:(NSUInteger)index; +- (ForeignEnum)packedEnumAtIndex:(unsigned long)index; - (TestPackedTypes_Builder *)addPackedEnum:(ForeignEnum)value; - (TestPackedTypes_Builder *)setPackedEnumArray:(NSArray *)array; -- (TestPackedTypes_Builder *)setPackedEnumValues:(const ForeignEnum *)values count:(NSUInteger)count; +- (TestPackedTypes_Builder *)setPackedEnumValues:(const ForeignEnum *)values count:(unsigned long)count; - (TestPackedTypes_Builder *)clearPackedEnum; @end @@ -3247,20 +3247,20 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * unpackedDouble; @property (readonly, retain) PBArray * unpackedBool; @property (readonly, retain) PBArray * unpackedEnum; -- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index; -- (int64_t)unpackedInt64AtIndex:(NSUInteger)index; -- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index; -- (uint64_t)unpackedUint64AtIndex:(NSUInteger)index; -- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index; -- (int64_t)unpackedSint64AtIndex:(NSUInteger)index; -- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index; -- (uint64_t)unpackedFixed64AtIndex:(NSUInteger)index; -- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index; -- (int64_t)unpackedSfixed64AtIndex:(NSUInteger)index; -- (Float32)unpackedFloatAtIndex:(NSUInteger)index; -- (Float64)unpackedDoubleAtIndex:(NSUInteger)index; -- (BOOL)unpackedBoolAtIndex:(NSUInteger)index; -- (ForeignEnum)unpackedEnumAtIndex:(NSUInteger)index; +- (long)unpackedInt32AtIndex:(unsigned long)index; +- (long long)unpackedInt64AtIndex:(unsigned long)index; +- (ulong)unpackedUint32AtIndex:(unsigned long)index; +- (ulong long)unpackedUint64AtIndex:(unsigned long)index; +- (long)unpackedSint32AtIndex:(unsigned long)index; +- (long long)unpackedSint64AtIndex:(unsigned long)index; +- (ulong)unpackedFixed32AtIndex:(unsigned long)index; +- (ulong long)unpackedFixed64AtIndex:(unsigned long)index; +- (long)unpackedSfixed32AtIndex:(unsigned long)index; +- (long long)unpackedSfixed64AtIndex:(unsigned long)index; +- (Float32)unpackedFloatAtIndex:(unsigned long)index; +- (Float64)unpackedDoubleAtIndex:(unsigned long)index; +- (BOOL)unpackedBoolAtIndex:(unsigned long)index; +- (ForeignEnum)unpackedEnumAtIndex:(unsigned long)index; + (TestUnpackedTypes*) defaultInstance; - (TestUnpackedTypes*) defaultInstance; @@ -3298,101 +3298,101 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)unpackedInt32; -- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedInt32:(NSInteger)value; +- (long)unpackedInt32AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedInt32:(long)value; - (TestUnpackedTypes_Builder *)setUnpackedInt32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedInt32; - (PBAppendableArray *)unpackedInt64; -- (int64_t)unpackedInt64AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedInt64:(int64_t)value; +- (long long)unpackedInt64AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedInt64:(long long)value; - (TestUnpackedTypes_Builder *)setUnpackedInt64Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedInt64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedInt64Values:(const long long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedInt64; - (PBAppendableArray *)unpackedUint32; -- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedUint32:(uNSInteger)value; +- (ulong)unpackedUint32AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedUint32:(ulong)value; - (TestUnpackedTypes_Builder *)setUnpackedUint32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const ulong *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedUint32; - (PBAppendableArray *)unpackedUint64; -- (uint64_t)unpackedUint64AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedUint64:(uint64_t)value; +- (ulong long)unpackedUint64AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedUint64:(ulong long)value; - (TestUnpackedTypes_Builder *)setUnpackedUint64Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedUint64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedUint64Values:(const ulong long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedUint64; - (PBAppendableArray *)unpackedSint32; -- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedSint32:(NSInteger)value; +- (long)unpackedSint32AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedSint32:(long)value; - (TestUnpackedTypes_Builder *)setUnpackedSint32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedSint32; - (PBAppendableArray *)unpackedSint64; -- (int64_t)unpackedSint64AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedSint64:(int64_t)value; +- (long long)unpackedSint64AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedSint64:(long long)value; - (TestUnpackedTypes_Builder *)setUnpackedSint64Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedSint64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedSint64Values:(const long long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedSint64; - (PBAppendableArray *)unpackedFixed32; -- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(uNSInteger)value; +- (ulong)unpackedFixed32AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(ulong)value; - (TestUnpackedTypes_Builder *)setUnpackedFixed32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const ulong *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedFixed32; - (PBAppendableArray *)unpackedFixed64; -- (uint64_t)unpackedFixed64AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedFixed64:(uint64_t)value; +- (ulong long)unpackedFixed64AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedFixed64:(ulong long)value; - (TestUnpackedTypes_Builder *)setUnpackedFixed64Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedFixed64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedFixed64Values:(const ulong long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedFixed64; - (PBAppendableArray *)unpackedSfixed32; -- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(NSInteger)value; +- (long)unpackedSfixed32AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(long)value; - (TestUnpackedTypes_Builder *)setUnpackedSfixed32Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedSfixed32; - (PBAppendableArray *)unpackedSfixed64; -- (int64_t)unpackedSfixed64AtIndex:(NSUInteger)index; -- (TestUnpackedTypes_Builder *)addUnpackedSfixed64:(int64_t)value; +- (long long)unpackedSfixed64AtIndex:(unsigned long)index; +- (TestUnpackedTypes_Builder *)addUnpackedSfixed64:(long long)value; - (TestUnpackedTypes_Builder *)setUnpackedSfixed64Array:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedSfixed64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedSfixed64Values:(const long long *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedSfixed64; - (PBAppendableArray *)unpackedFloat; -- (Float32)unpackedFloatAtIndex:(NSUInteger)index; +- (Float32)unpackedFloatAtIndex:(unsigned long)index; - (TestUnpackedTypes_Builder *)addUnpackedFloat:(Float32)value; - (TestUnpackedTypes_Builder *)setUnpackedFloatArray:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedFloatValues:(const Float32 *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedFloatValues:(const Float32 *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedFloat; - (PBAppendableArray *)unpackedDouble; -- (Float64)unpackedDoubleAtIndex:(NSUInteger)index; +- (Float64)unpackedDoubleAtIndex:(unsigned long)index; - (TestUnpackedTypes_Builder *)addUnpackedDouble:(Float64)value; - (TestUnpackedTypes_Builder *)setUnpackedDoubleArray:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedDoubleValues:(const Float64 *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedDoubleValues:(const Float64 *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedDouble; - (PBAppendableArray *)unpackedBool; -- (BOOL)unpackedBoolAtIndex:(NSUInteger)index; +- (BOOL)unpackedBoolAtIndex:(unsigned long)index; - (TestUnpackedTypes_Builder *)addUnpackedBool:(BOOL)value; - (TestUnpackedTypes_Builder *)setUnpackedBoolArray:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedBoolValues:(const BOOL *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedBoolValues:(const BOOL *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedBool; - (PBAppendableArray *)unpackedEnum; -- (ForeignEnum)unpackedEnumAtIndex:(NSUInteger)index; +- (ForeignEnum)unpackedEnumAtIndex:(unsigned long)index; - (TestUnpackedTypes_Builder *)addUnpackedEnum:(ForeignEnum)value; - (TestUnpackedTypes_Builder *)setUnpackedEnumArray:(NSArray *)array; -- (TestUnpackedTypes_Builder *)setUnpackedEnumValues:(const ForeignEnum *)values count:(NSUInteger)count; +- (TestUnpackedTypes_Builder *)setUnpackedEnumValues:(const ForeignEnum *)values count:(unsigned long)count; - (TestUnpackedTypes_Builder *)clearUnpackedEnum; @end @@ -3443,29 +3443,29 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn BOOL hasDynamicMessageExtension_:1; BOOL hasEnumExtension_:1; BOOL hasDynamicEnumExtension_:1; - uNSInteger scalarExtension; + ulong scalarExtension; ForeignMessage* messageExtension; TestDynamicExtensions_DynamicMessageType* dynamicMessageExtension; ForeignEnum enumExtension; TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; PBAppendableArray * repeatedExtensionArray; PBAppendableArray * packedExtensionArray; - NSInteger packedExtensionMemoizedSerializedSize; + long packedExtensionMemoizedSerializedSize; } - (BOOL) hasScalarExtension; - (BOOL) hasEnumExtension; - (BOOL) hasDynamicEnumExtension; - (BOOL) hasMessageExtension; - (BOOL) hasDynamicMessageExtension; -@property (readonly) uNSInteger scalarExtension; +@property (readonly) ulong scalarExtension; @property (readonly) ForeignEnum enumExtension; @property (readonly) TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; @property (readonly, retain) ForeignMessage* messageExtension; @property (readonly, retain) TestDynamicExtensions_DynamicMessageType* dynamicMessageExtension; @property (readonly, retain) PBArray * repeatedExtension; @property (readonly, retain) PBArray * packedExtension; -- (NSString*)repeatedExtensionAtIndex:(NSUInteger)index; -- (NSInteger)packedExtensionAtIndex:(NSUInteger)index; +- (NSString*)repeatedExtensionAtIndex:(unsigned long)index; +- (long)packedExtensionAtIndex:(unsigned long)index; + (TestDynamicExtensions*) defaultInstance; - (TestDynamicExtensions*) defaultInstance; @@ -3488,10 +3488,10 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @interface TestDynamicExtensions_DynamicMessageType : PBGeneratedMessage { @private BOOL hasDynamicField_:1; - NSInteger dynamicField; + long dynamicField; } - (BOOL) hasDynamicField; -@property (readonly) NSInteger dynamicField; +@property (readonly) long dynamicField; + (TestDynamicExtensions_DynamicMessageType*) defaultInstance; - (TestDynamicExtensions_DynamicMessageType*) defaultInstance; @@ -3529,8 +3529,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDynamicField; -- (NSInteger) dynamicField; -- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(NSInteger) value; +- (long) dynamicField; +- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(long) value; - (TestDynamicExtensions_DynamicMessageType_Builder*) clearDynamicField; @end @@ -3552,8 +3552,8 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasScalarExtension; -- (uNSInteger) scalarExtension; -- (TestDynamicExtensions_Builder*) setScalarExtension:(uNSInteger) value; +- (ulong) scalarExtension; +- (TestDynamicExtensions_Builder*) setScalarExtension:(ulong) value; - (TestDynamicExtensions_Builder*) clearScalarExtension; - (BOOL) hasEnumExtension; @@ -3581,17 +3581,17 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestDynamicExtensions_Builder*) clearDynamicMessageExtension; - (PBAppendableArray *)repeatedExtension; -- (NSString*)repeatedExtensionAtIndex:(NSUInteger)index; +- (NSString*)repeatedExtensionAtIndex:(unsigned long)index; - (TestDynamicExtensions_Builder *)addRepeatedExtension:(NSString*)value; - (TestDynamicExtensions_Builder *)setRepeatedExtensionArray:(NSArray *)array; -- (TestDynamicExtensions_Builder *)setRepeatedExtensionValues:(const NSString* *)values count:(NSUInteger)count; +- (TestDynamicExtensions_Builder *)setRepeatedExtensionValues:(const NSString* *)values count:(unsigned long)count; - (TestDynamicExtensions_Builder *)clearRepeatedExtension; - (PBAppendableArray *)packedExtension; -- (NSInteger)packedExtensionAtIndex:(NSUInteger)index; -- (TestDynamicExtensions_Builder *)addPackedExtension:(NSInteger)value; +- (long)packedExtensionAtIndex:(unsigned long)index; +- (TestDynamicExtensions_Builder *)addPackedExtension:(long)value; - (TestDynamicExtensions_Builder *)setPackedExtensionArray:(NSArray *)array; -- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const NSInteger *)values count:(NSUInteger)count; +- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const long *)values count:(unsigned long)count; - (TestDynamicExtensions_Builder *)clearPackedExtension; @end @@ -3610,12 +3610,12 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn @property (readonly, retain) PBArray * repeatedInt64; @property (readonly, retain) PBArray * repeatedFloat; @property (readonly, retain) PBArray * repeatedUint64; -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (Float32)repeatedFloatAtIndex:(NSUInteger)index; -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; +- (ulong)repeatedFixed32AtIndex:(unsigned long)index; +- (long)repeatedInt32AtIndex:(unsigned long)index; +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (long long)repeatedInt64AtIndex:(unsigned long)index; +- (Float32)repeatedFloatAtIndex:(unsigned long)index; +- (ulong long)repeatedUint64AtIndex:(unsigned long)index; + (TestRepeatedScalarDifferentTagSizes*) defaultInstance; - (TestRepeatedScalarDifferentTagSizes*) defaultInstance; @@ -3653,45 +3653,45 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)repeatedFixed32; -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(uNSInteger)value; +- (ulong)repeatedFixed32AtIndex:(unsigned long)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(ulong)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedInt32; -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(NSInteger)value; +- (long)repeatedInt32AtIndex:(unsigned long)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(long)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const long *)values count:(unsigned long)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedInt32; - (PBAppendableArray *)repeatedFixed64; -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed64:(uint64_t)value; +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed64:(ulong long)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFixed64; - (PBAppendableArray *)repeatedInt64; -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt64:(int64_t)value; +- (long long)repeatedInt64AtIndex:(unsigned long)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt64:(long long)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt64Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt64Values:(const long long *)values count:(unsigned long)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedInt64; - (PBAppendableArray *)repeatedFloat; -- (Float32)repeatedFloatAtIndex:(NSUInteger)index; +- (Float32)repeatedFloatAtIndex:(unsigned long)index; - (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFloat:(Float32)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFloatArray:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(unsigned long)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFloat; - (PBAppendableArray *)repeatedUint64; -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedUint64:(uint64_t)value; +- (ulong long)repeatedUint64AtIndex:(unsigned long)index; +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedUint64:(ulong long)value; - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Array:(NSArray *)array; -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count; - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedUint64; @end diff --git a/src/runtime/Tests/Unittest.pb.m b/src/runtime/Tests/Unittest.pb.m index 599e033..47a0136 100644 --- a/src/runtime/Tests/Unittest.pb.m +++ b/src/runtime/Tests/Unittest.pb.m @@ -1264,16 +1264,16 @@ BOOL TestSparseEnumIsValidValue(TestSparseEnum value) { } } @interface TestAllTypes () -@property NSInteger optionalInt32; -@property int64_t optionalInt64; -@property uNSInteger optionalUint32; -@property uint64_t optionalUint64; -@property NSInteger optionalSint32; -@property int64_t optionalSint64; -@property uNSInteger optionalFixed32; -@property uint64_t optionalFixed64; -@property NSInteger optionalSfixed32; -@property int64_t optionalSfixed64; +@property long optionalInt32; +@property long long optionalInt64; +@property ulong optionalUint32; +@property ulong long optionalUint64; +@property long optionalSint32; +@property long long optionalSint64; +@property ulong optionalFixed32; +@property ulong long optionalFixed64; +@property long optionalSfixed32; +@property long long optionalSfixed64; @property Float32 optionalFloat; @property Float64 optionalDouble; @property BOOL optionalBool; @@ -1312,16 +1312,16 @@ @interface TestAllTypes () @property (retain) PBAppendableArray * repeatedImportEnumArray; @property (retain) PBAppendableArray * repeatedStringPieceArray; @property (retain) PBAppendableArray * repeatedCordArray; -@property NSInteger defaultInt32; -@property int64_t defaultInt64; -@property uNSInteger defaultUint32; -@property uint64_t defaultUint64; -@property NSInteger defaultSint32; -@property int64_t defaultSint64; -@property uNSInteger defaultFixed32; -@property uint64_t defaultFixed64; -@property NSInteger defaultSfixed32; -@property int64_t defaultSfixed64; +@property long defaultInt32; +@property long long defaultInt64; +@property ulong defaultUint32; +@property ulong long defaultUint64; +@property long defaultSint32; +@property long long defaultSint64; +@property ulong defaultFixed32; +@property ulong long defaultFixed64; +@property long defaultSfixed32; +@property long long defaultSfixed64; @property Float32 defaultFloat; @property Float64 defaultDouble; @property BOOL defaultBool; @@ -1805,145 +1805,145 @@ - (TestAllTypes*) defaultInstance { - (PBArray *)repeatedInt32 { return repeatedInt32Array; } -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { +- (long)repeatedInt32AtIndex:(unsigned long)index { return [repeatedInt32Array int32AtIndex:index]; } - (PBArray *)repeatedInt64 { return repeatedInt64Array; } -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index { +- (long long)repeatedInt64AtIndex:(unsigned long)index { return [repeatedInt64Array int64AtIndex:index]; } - (PBArray *)repeatedUint32 { return repeatedUint32Array; } -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { +- (ulong)repeatedUint32AtIndex:(unsigned long)index { return [repeatedUint32Array uint32AtIndex:index]; } - (PBArray *)repeatedUint64 { return repeatedUint64Array; } -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { +- (ulong long)repeatedUint64AtIndex:(unsigned long)index { return [repeatedUint64Array uint64AtIndex:index]; } - (PBArray *)repeatedSint32 { return repeatedSint32Array; } -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { +- (long)repeatedSint32AtIndex:(unsigned long)index { return [repeatedSint32Array int32AtIndex:index]; } - (PBArray *)repeatedSint64 { return repeatedSint64Array; } -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index { +- (long long)repeatedSint64AtIndex:(unsigned long)index { return [repeatedSint64Array int64AtIndex:index]; } - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { +- (ulong)repeatedFixed32AtIndex:(unsigned long)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedFixed64 { return repeatedFixed64Array; } -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { return [repeatedFixed64Array uint64AtIndex:index]; } - (PBArray *)repeatedSfixed32 { return repeatedSfixed32Array; } -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { +- (long)repeatedSfixed32AtIndex:(unsigned long)index { return [repeatedSfixed32Array int32AtIndex:index]; } - (PBArray *)repeatedSfixed64 { return repeatedSfixed64Array; } -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index { +- (long long)repeatedSfixed64AtIndex:(unsigned long)index { return [repeatedSfixed64Array int64AtIndex:index]; } - (PBArray *)repeatedFloat { return repeatedFloatArray; } -- (Float32)repeatedFloatAtIndex:(NSUInteger)index { +- (Float32)repeatedFloatAtIndex:(unsigned long)index { return [repeatedFloatArray floatAtIndex:index]; } - (PBArray *)repeatedDouble { return repeatedDoubleArray; } -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index { +- (Float64)repeatedDoubleAtIndex:(unsigned long)index { return [repeatedDoubleArray doubleAtIndex:index]; } - (PBArray *)repeatedBool { return repeatedBoolArray; } -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index { +- (BOOL)repeatedBoolAtIndex:(unsigned long)index { return [repeatedBoolArray boolAtIndex:index]; } - (PBArray *)repeatedString { return repeatedStringArray; } -- (NSString*)repeatedStringAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringAtIndex:(unsigned long)index { return [repeatedStringArray objectAtIndex:index]; } - (PBArray *)repeatedBytes { return repeatedBytesArray; } -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index { +- (NSData*)repeatedBytesAtIndex:(unsigned long)index { return [repeatedBytesArray objectAtIndex:index]; } - (PBArray *)repeatedGroup { return repeatedGroupArray; } -- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index { +- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index { return [repeatedGroupArray objectAtIndex:index]; } - (PBArray *)repeatedNestedMessage { return repeatedNestedMessageArray; } -- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index { +- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index { return [repeatedNestedMessageArray objectAtIndex:index]; } - (PBArray *)repeatedForeignMessage { return repeatedForeignMessageArray; } -- (ForeignMessage*)repeatedForeignMessageAtIndex:(NSUInteger)index { +- (ForeignMessage*)repeatedForeignMessageAtIndex:(unsigned long)index { return [repeatedForeignMessageArray objectAtIndex:index]; } - (PBArray *)repeatedImportMessage { return repeatedImportMessageArray; } -- (ImportMessage*)repeatedImportMessageAtIndex:(NSUInteger)index { +- (ImportMessage*)repeatedImportMessageAtIndex:(unsigned long)index { return [repeatedImportMessageArray objectAtIndex:index]; } - (PBArray *)repeatedNestedEnum { return repeatedNestedEnumArray; } -- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index { +- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index { return [repeatedNestedEnumArray int32AtIndex:index]; } - (PBArray *)repeatedForeignEnum { return repeatedForeignEnumArray; } -- (ForeignEnum)repeatedForeignEnumAtIndex:(NSUInteger)index { +- (ForeignEnum)repeatedForeignEnumAtIndex:(unsigned long)index { return [repeatedForeignEnumArray int32AtIndex:index]; } - (PBArray *)repeatedImportEnum { return repeatedImportEnumArray; } -- (ImportEnum)repeatedImportEnumAtIndex:(NSUInteger)index { +- (ImportEnum)repeatedImportEnumAtIndex:(unsigned long)index { return [repeatedImportEnumArray int32AtIndex:index]; } - (PBArray *)repeatedStringPiece { return repeatedStringPieceArray; } -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index { return [repeatedStringPieceArray objectAtIndex:index]; } - (PBArray *)repeatedCord { return repeatedCordArray; } -- (NSString*)repeatedCordAtIndex:(NSUInteger)index { +- (NSString*)repeatedCordAtIndex:(unsigned long)index { return [repeatedCordArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -2022,108 +2022,108 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasOptionalCord) { [output writeString:25 value:self.optionalCord]; } - const NSUInteger repeatedInt32ArrayCount = self.repeatedInt32Array.count; + const unsigned long repeatedInt32ArrayCount = self.repeatedInt32Array.count; if (repeatedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; - for (NSUInteger i = 0; i < repeatedInt32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedInt32Array.data; + for (unsigned long i = 0; i < repeatedInt32ArrayCount; ++i) { [output writeInt32:31 value:values[i]]; } } - const NSUInteger repeatedInt64ArrayCount = self.repeatedInt64Array.count; + const unsigned long repeatedInt64ArrayCount = self.repeatedInt64Array.count; if (repeatedInt64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; - for (NSUInteger i = 0; i < repeatedInt64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedInt64Array.data; + for (unsigned long i = 0; i < repeatedInt64ArrayCount; ++i) { [output writeInt64:32 value:values[i]]; } } - const NSUInteger repeatedUint32ArrayCount = self.repeatedUint32Array.count; + const unsigned long repeatedUint32ArrayCount = self.repeatedUint32Array.count; if (repeatedUint32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; - for (NSUInteger i = 0; i < repeatedUint32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.repeatedUint32Array.data; + for (unsigned long i = 0; i < repeatedUint32ArrayCount; ++i) { [output writeUInt32:33 value:values[i]]; } } - const NSUInteger repeatedUint64ArrayCount = self.repeatedUint64Array.count; + const unsigned long repeatedUint64ArrayCount = self.repeatedUint64Array.count; if (repeatedUint64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; - for (NSUInteger i = 0; i < repeatedUint64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + for (unsigned long i = 0; i < repeatedUint64ArrayCount; ++i) { [output writeUInt64:34 value:values[i]]; } } - const NSUInteger repeatedSint32ArrayCount = self.repeatedSint32Array.count; + const unsigned long repeatedSint32ArrayCount = self.repeatedSint32Array.count; if (repeatedSint32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; - for (NSUInteger i = 0; i < repeatedSint32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedSint32Array.data; + for (unsigned long i = 0; i < repeatedSint32ArrayCount; ++i) { [output writeSInt32:35 value:values[i]]; } } - const NSUInteger repeatedSint64ArrayCount = self.repeatedSint64Array.count; + const unsigned long repeatedSint64ArrayCount = self.repeatedSint64Array.count; if (repeatedSint64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedSint64Array.data; - for (NSUInteger i = 0; i < repeatedSint64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedSint64Array.data; + for (unsigned long i = 0; i < repeatedSint64ArrayCount; ++i) { [output writeSInt64:36 value:values[i]]; } } - const NSUInteger repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; + const unsigned long repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.repeatedFixed32Array.data; - for (NSUInteger i = 0; i < repeatedFixed32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.repeatedFixed32Array.data; + for (unsigned long i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:37 value:values[i]]; } } - const NSUInteger repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; + const unsigned long repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; if (repeatedFixed64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.repeatedFixed64Array.data; - for (NSUInteger i = 0; i < repeatedFixed64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.repeatedFixed64Array.data; + for (unsigned long i = 0; i < repeatedFixed64ArrayCount; ++i) { [output writeFixed64:38 value:values[i]]; } } - const NSUInteger repeatedSfixed32ArrayCount = self.repeatedSfixed32Array.count; + const unsigned long repeatedSfixed32ArrayCount = self.repeatedSfixed32Array.count; if (repeatedSfixed32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedSfixed32Array.data; - for (NSUInteger i = 0; i < repeatedSfixed32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedSfixed32Array.data; + for (unsigned long i = 0; i < repeatedSfixed32ArrayCount; ++i) { [output writeSFixed32:39 value:values[i]]; } } - const NSUInteger repeatedSfixed64ArrayCount = self.repeatedSfixed64Array.count; + const unsigned long repeatedSfixed64ArrayCount = self.repeatedSfixed64Array.count; if (repeatedSfixed64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedSfixed64Array.data; - for (NSUInteger i = 0; i < repeatedSfixed64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedSfixed64Array.data; + for (unsigned long i = 0; i < repeatedSfixed64ArrayCount; ++i) { [output writeSFixed64:40 value:values[i]]; } } - const NSUInteger repeatedFloatArrayCount = self.repeatedFloatArray.count; + const unsigned long repeatedFloatArrayCount = self.repeatedFloatArray.count; if (repeatedFloatArrayCount > 0) { const Float32 *values = (const Float32 *)self.repeatedFloatArray.data; - for (NSUInteger i = 0; i < repeatedFloatArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedFloatArrayCount; ++i) { [output writeFloat:41 value:values[i]]; } } - const NSUInteger repeatedDoubleArrayCount = self.repeatedDoubleArray.count; + const unsigned long repeatedDoubleArrayCount = self.repeatedDoubleArray.count; if (repeatedDoubleArrayCount > 0) { const Float64 *values = (const Float64 *)self.repeatedDoubleArray.data; - for (NSUInteger i = 0; i < repeatedDoubleArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedDoubleArrayCount; ++i) { [output writeDouble:42 value:values[i]]; } } - const NSUInteger repeatedBoolArrayCount = self.repeatedBoolArray.count; + const unsigned long repeatedBoolArrayCount = self.repeatedBoolArray.count; if (repeatedBoolArrayCount > 0) { const BOOL *values = (const BOOL *)self.repeatedBoolArray.data; - for (NSUInteger i = 0; i < repeatedBoolArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedBoolArrayCount; ++i) { [output writeBool:43 value:values[i]]; } } - const NSUInteger repeatedStringArrayCount = self.repeatedStringArray.count; + const unsigned long repeatedStringArrayCount = self.repeatedStringArray.count; if (repeatedStringArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedStringArray.data; - for (NSUInteger i = 0; i < repeatedStringArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedStringArrayCount; ++i) { [output writeString:44 value:values[i]]; } } - const NSUInteger repeatedBytesArrayCount = self.repeatedBytesArray.count; + const unsigned long repeatedBytesArrayCount = self.repeatedBytesArray.count; if (repeatedBytesArrayCount > 0) { const NSData* *values = (const NSData* *)self.repeatedBytesArray.data; - for (NSUInteger i = 0; i < repeatedBytesArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedBytesArrayCount; ++i) { [output writeData:45 value:values[i]]; } } @@ -2139,32 +2139,32 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { for (ImportMessage *element in self.repeatedImportMessageArray) { [output writeMessage:50 value:element]; } - const NSUInteger repeatedNestedEnumArrayCount = self.repeatedNestedEnumArray.count; + const unsigned long repeatedNestedEnumArrayCount = self.repeatedNestedEnumArray.count; const TestAllTypes_NestedEnum *repeatedNestedEnumArrayValues = (const TestAllTypes_NestedEnum *)self.repeatedNestedEnumArray.data; - for (NSUInteger i = 0; i < repeatedNestedEnumArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedNestedEnumArrayCount; ++i) { [output writeEnum:51 value:repeatedNestedEnumArrayValues[i]]; } - const NSUInteger repeatedForeignEnumArrayCount = self.repeatedForeignEnumArray.count; + const unsigned long repeatedForeignEnumArrayCount = self.repeatedForeignEnumArray.count; const ForeignEnum *repeatedForeignEnumArrayValues = (const ForeignEnum *)self.repeatedForeignEnumArray.data; - for (NSUInteger i = 0; i < repeatedForeignEnumArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedForeignEnumArrayCount; ++i) { [output writeEnum:52 value:repeatedForeignEnumArrayValues[i]]; } - const NSUInteger repeatedImportEnumArrayCount = self.repeatedImportEnumArray.count; + const unsigned long repeatedImportEnumArrayCount = self.repeatedImportEnumArray.count; const ImportEnum *repeatedImportEnumArrayValues = (const ImportEnum *)self.repeatedImportEnumArray.data; - for (NSUInteger i = 0; i < repeatedImportEnumArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedImportEnumArrayCount; ++i) { [output writeEnum:53 value:repeatedImportEnumArrayValues[i]]; } - const NSUInteger repeatedStringPieceArrayCount = self.repeatedStringPieceArray.count; + const unsigned long repeatedStringPieceArrayCount = self.repeatedStringPieceArray.count; if (repeatedStringPieceArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedStringPieceArray.data; - for (NSUInteger i = 0; i < repeatedStringPieceArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedStringPieceArrayCount; ++i) { [output writeString:54 value:values[i]]; } } - const NSUInteger repeatedCordArrayCount = self.repeatedCordArray.count; + const unsigned long repeatedCordArrayCount = self.repeatedCordArray.count; if (repeatedCordArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedCordArray.data; - for (NSUInteger i = 0; i < repeatedCordArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedCordArrayCount; ++i) { [output writeString:55 value:values[i]]; } } @@ -2230,8 +2230,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2310,129 +2310,129 @@ - (NSInteger) serializedSize { size += computeStringSize(25, self.optionalCord); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedInt32Array.count; + const long *values = (const long *)self.repeatedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedInt64Array.count; - const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedInt64Array.count; + const long long *values = (const long long *)self.repeatedInt64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedUint32Array.count; - const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedUint32Array.count; + const ulong *values = (const ulong *)self.repeatedUint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedUint64Array.count; - const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedUint64Array.count; + const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSint32Array.count; - const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedSint32Array.count; + const long *values = (const long *)self.repeatedSint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSint64Array.count; - const int64_t *values = (const int64_t *)self.repeatedSint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedSint64Array.count; + const long long *values = (const long long *)self.repeatedSint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFixed32Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFixed64Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSfixed32Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedSfixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSfixed64Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedSfixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFloatArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedDoubleArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedDoubleArray.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedBoolArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedBoolArray.count; dataSize = 1 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedStringArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedStringArray.count; const NSString* *values = (const NSString* *)self.repeatedStringArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedBytesArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedBytesArray.count; const NSData* *values = (const NSData* *)self.repeatedBytesArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeDataSizeNoTag(values[i]); } size += dataSize; @@ -2451,50 +2451,50 @@ - (NSInteger) serializedSize { size += computeMessageSize(50, element); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedNestedEnumArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedNestedEnumArray.count; const TestAllTypes_NestedEnum *values = (const TestAllTypes_NestedEnum *)self.repeatedNestedEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedForeignEnumArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedForeignEnumArray.count; const ForeignEnum *values = (const ForeignEnum *)self.repeatedForeignEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedImportEnumArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedImportEnumArray.count; const ImportEnum *values = (const ImportEnum *)self.repeatedImportEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedStringPieceArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedStringPieceArray.count; const NSString* *values = (const NSString* *)self.repeatedStringPieceArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedCordArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedCordArray.count; const NSString* *values = (const NSString* *)self.repeatedCordArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; @@ -3016,8 +3016,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasOptionalInt32) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.optionalInt32] hash]; } @@ -3238,7 +3238,7 @@ BOOL TestAllTypes_NestedEnumIsValidValue(TestAllTypes_NestedEnum value) { } } @interface TestAllTypes_NestedMessage () -@property NSInteger bb; +@property long bb; @end @implementation TestAllTypes_NestedMessage @@ -3280,8 +3280,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3344,8 +3344,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasBb) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.bb] hash]; } @@ -3408,7 +3408,7 @@ - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3430,10 +3430,10 @@ - (TestAllTypes_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (BOOL) hasBb { return result.hasBb; } -- (NSInteger) bb { +- (long) bb { return result.bb; } -- (TestAllTypes_NestedMessage_Builder*) setBb:(NSInteger) value { +- (TestAllTypes_NestedMessage_Builder*) setBb:(long) value { result.hasBb = YES; result.bb = value; return self; @@ -3446,7 +3446,7 @@ - (TestAllTypes_NestedMessage_Builder*) clearBb { @end @interface TestAllTypes_OptionalGroup () -@property NSInteger a; +@property long a; @end @implementation TestAllTypes_OptionalGroup @@ -3488,8 +3488,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3552,8 +3552,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -3616,7 +3616,7 @@ - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3638,10 +3638,10 @@ - (TestAllTypes_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestAllTypes_OptionalGroup_Builder*) setA:(NSInteger) value { +- (TestAllTypes_OptionalGroup_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -3654,7 +3654,7 @@ - (TestAllTypes_OptionalGroup_Builder*) clearA { @end @interface TestAllTypes_RepeatedGroup () -@property NSInteger a; +@property long a; @end @implementation TestAllTypes_RepeatedGroup @@ -3696,8 +3696,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3760,8 +3760,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -3824,7 +3824,7 @@ - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3846,10 +3846,10 @@ - (TestAllTypes_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestAllTypes_RepeatedGroup_Builder*) setA:(NSInteger) value { +- (TestAllTypes_RepeatedGroup_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -4212,7 +4212,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4321,7 +4321,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 168: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestAllTypes_NestedEnumIsValidValue(value)) { [self setOptionalNestedEnum:value]; } else { @@ -4330,7 +4330,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 176: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setOptionalForeignEnum:value]; } else { @@ -4339,7 +4339,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 184: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ImportEnumIsValidValue(value)) { [self setOptionalImportEnum:value]; } else { @@ -4440,7 +4440,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 408: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestAllTypes_NestedEnumIsValidValue(value)) { [self addRepeatedNestedEnum:value]; } else { @@ -4449,7 +4449,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 416: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addRepeatedForeignEnum:value]; } else { @@ -4458,7 +4458,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 424: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ImportEnumIsValidValue(value)) { [self addRepeatedImportEnum:value]; } else { @@ -4535,7 +4535,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 648: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestAllTypes_NestedEnumIsValidValue(value)) { [self setDefaultNestedEnum:value]; } else { @@ -4544,7 +4544,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 656: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setDefaultForeignEnum:value]; } else { @@ -4553,7 +4553,7 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 664: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ImportEnumIsValidValue(value)) { [self setDefaultImportEnum:value]; } else { @@ -4575,10 +4575,10 @@ - (TestAllTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (BOOL) hasOptionalInt32 { return result.hasOptionalInt32; } -- (NSInteger) optionalInt32 { +- (long) optionalInt32 { return result.optionalInt32; } -- (TestAllTypes_Builder*) setOptionalInt32:(NSInteger) value { +- (TestAllTypes_Builder*) setOptionalInt32:(long) value { result.hasOptionalInt32 = YES; result.optionalInt32 = value; return self; @@ -4591,10 +4591,10 @@ - (TestAllTypes_Builder*) clearOptionalInt32 { - (BOOL) hasOptionalInt64 { return result.hasOptionalInt64; } -- (int64_t) optionalInt64 { +- (long long) optionalInt64 { return result.optionalInt64; } -- (TestAllTypes_Builder*) setOptionalInt64:(int64_t) value { +- (TestAllTypes_Builder*) setOptionalInt64:(long long) value { result.hasOptionalInt64 = YES; result.optionalInt64 = value; return self; @@ -4607,10 +4607,10 @@ - (TestAllTypes_Builder*) clearOptionalInt64 { - (BOOL) hasOptionalUint32 { return result.hasOptionalUint32; } -- (uNSInteger) optionalUint32 { +- (ulong) optionalUint32 { return result.optionalUint32; } -- (TestAllTypes_Builder*) setOptionalUint32:(uNSInteger) value { +- (TestAllTypes_Builder*) setOptionalUint32:(ulong) value { result.hasOptionalUint32 = YES; result.optionalUint32 = value; return self; @@ -4623,10 +4623,10 @@ - (TestAllTypes_Builder*) clearOptionalUint32 { - (BOOL) hasOptionalUint64 { return result.hasOptionalUint64; } -- (uint64_t) optionalUint64 { +- (ulong long) optionalUint64 { return result.optionalUint64; } -- (TestAllTypes_Builder*) setOptionalUint64:(uint64_t) value { +- (TestAllTypes_Builder*) setOptionalUint64:(ulong long) value { result.hasOptionalUint64 = YES; result.optionalUint64 = value; return self; @@ -4639,10 +4639,10 @@ - (TestAllTypes_Builder*) clearOptionalUint64 { - (BOOL) hasOptionalSint32 { return result.hasOptionalSint32; } -- (NSInteger) optionalSint32 { +- (long) optionalSint32 { return result.optionalSint32; } -- (TestAllTypes_Builder*) setOptionalSint32:(NSInteger) value { +- (TestAllTypes_Builder*) setOptionalSint32:(long) value { result.hasOptionalSint32 = YES; result.optionalSint32 = value; return self; @@ -4655,10 +4655,10 @@ - (TestAllTypes_Builder*) clearOptionalSint32 { - (BOOL) hasOptionalSint64 { return result.hasOptionalSint64; } -- (int64_t) optionalSint64 { +- (long long) optionalSint64 { return result.optionalSint64; } -- (TestAllTypes_Builder*) setOptionalSint64:(int64_t) value { +- (TestAllTypes_Builder*) setOptionalSint64:(long long) value { result.hasOptionalSint64 = YES; result.optionalSint64 = value; return self; @@ -4671,10 +4671,10 @@ - (TestAllTypes_Builder*) clearOptionalSint64 { - (BOOL) hasOptionalFixed32 { return result.hasOptionalFixed32; } -- (uNSInteger) optionalFixed32 { +- (ulong) optionalFixed32 { return result.optionalFixed32; } -- (TestAllTypes_Builder*) setOptionalFixed32:(uNSInteger) value { +- (TestAllTypes_Builder*) setOptionalFixed32:(ulong) value { result.hasOptionalFixed32 = YES; result.optionalFixed32 = value; return self; @@ -4687,10 +4687,10 @@ - (TestAllTypes_Builder*) clearOptionalFixed32 { - (BOOL) hasOptionalFixed64 { return result.hasOptionalFixed64; } -- (uint64_t) optionalFixed64 { +- (ulong long) optionalFixed64 { return result.optionalFixed64; } -- (TestAllTypes_Builder*) setOptionalFixed64:(uint64_t) value { +- (TestAllTypes_Builder*) setOptionalFixed64:(ulong long) value { result.hasOptionalFixed64 = YES; result.optionalFixed64 = value; return self; @@ -4703,10 +4703,10 @@ - (TestAllTypes_Builder*) clearOptionalFixed64 { - (BOOL) hasOptionalSfixed32 { return result.hasOptionalSfixed32; } -- (NSInteger) optionalSfixed32 { +- (long) optionalSfixed32 { return result.optionalSfixed32; } -- (TestAllTypes_Builder*) setOptionalSfixed32:(NSInteger) value { +- (TestAllTypes_Builder*) setOptionalSfixed32:(long) value { result.hasOptionalSfixed32 = YES; result.optionalSfixed32 = value; return self; @@ -4719,10 +4719,10 @@ - (TestAllTypes_Builder*) clearOptionalSfixed32 { - (BOOL) hasOptionalSfixed64 { return result.hasOptionalSfixed64; } -- (int64_t) optionalSfixed64 { +- (long long) optionalSfixed64 { return result.optionalSfixed64; } -- (TestAllTypes_Builder*) setOptionalSfixed64:(int64_t) value { +- (TestAllTypes_Builder*) setOptionalSfixed64:(long long) value { result.hasOptionalSfixed64 = YES; result.optionalSfixed64 = value; return self; @@ -5015,10 +5015,10 @@ - (TestAllTypes_Builder*) clearOptionalCord { - (PBAppendableArray *)repeatedInt32 { return result.repeatedInt32Array; } -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { +- (long)repeatedInt32AtIndex:(unsigned long)index { return [result repeatedInt32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedInt32:(NSInteger)value { +- (TestAllTypes_Builder *)addRepeatedInt32:(long)value { if (result.repeatedInt32Array == nil) { result.repeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5029,7 +5029,7 @@ - (TestAllTypes_Builder *)setRepeatedInt32Array:(NSArray *)array { result.repeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedInt32Values:(const long *)values count:(unsigned long)count { result.repeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5040,10 +5040,10 @@ - (TestAllTypes_Builder *)clearRepeatedInt32 { - (PBAppendableArray *)repeatedInt64 { return result.repeatedInt64Array; } -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index { +- (long long)repeatedInt64AtIndex:(unsigned long)index { return [result repeatedInt64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedInt64:(int64_t)value { +- (TestAllTypes_Builder *)addRepeatedInt64:(long long)value { if (result.repeatedInt64Array == nil) { result.repeatedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -5054,7 +5054,7 @@ - (TestAllTypes_Builder *)setRepeatedInt64Array:(NSArray *)array { result.repeatedInt64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedInt64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedInt64Values:(const long long *)values count:(unsigned long)count { result.repeatedInt64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -5065,10 +5065,10 @@ - (TestAllTypes_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedUint32 { return result.repeatedUint32Array; } -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { +- (ulong)repeatedUint32AtIndex:(unsigned long)index { return [result repeatedUint32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedUint32:(uNSInteger)value { +- (TestAllTypes_Builder *)addRepeatedUint32:(ulong)value { if (result.repeatedUint32Array == nil) { result.repeatedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5079,7 +5079,7 @@ - (TestAllTypes_Builder *)setRepeatedUint32Array:(NSArray *)array { result.repeatedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count { result.repeatedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5090,10 +5090,10 @@ - (TestAllTypes_Builder *)clearRepeatedUint32 { - (PBAppendableArray *)repeatedUint64 { return result.repeatedUint64Array; } -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { +- (ulong long)repeatedUint64AtIndex:(unsigned long)index { return [result repeatedUint64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedUint64:(uint64_t)value { +- (TestAllTypes_Builder *)addRepeatedUint64:(ulong long)value { if (result.repeatedUint64Array == nil) { result.repeatedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5104,7 +5104,7 @@ - (TestAllTypes_Builder *)setRepeatedUint64Array:(NSArray *)array { result.repeatedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedUint64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count { result.repeatedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5115,10 +5115,10 @@ - (TestAllTypes_Builder *)clearRepeatedUint64 { - (PBAppendableArray *)repeatedSint32 { return result.repeatedSint32Array; } -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { +- (long)repeatedSint32AtIndex:(unsigned long)index { return [result repeatedSint32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedSint32:(NSInteger)value { +- (TestAllTypes_Builder *)addRepeatedSint32:(long)value { if (result.repeatedSint32Array == nil) { result.repeatedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5129,7 +5129,7 @@ - (TestAllTypes_Builder *)setRepeatedSint32Array:(NSArray *)array { result.repeatedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedSint32Values:(const long *)values count:(unsigned long)count { result.repeatedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5140,10 +5140,10 @@ - (TestAllTypes_Builder *)clearRepeatedSint32 { - (PBAppendableArray *)repeatedSint64 { return result.repeatedSint64Array; } -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index { +- (long long)repeatedSint64AtIndex:(unsigned long)index { return [result repeatedSint64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedSint64:(int64_t)value { +- (TestAllTypes_Builder *)addRepeatedSint64:(long long)value { if (result.repeatedSint64Array == nil) { result.repeatedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -5154,7 +5154,7 @@ - (TestAllTypes_Builder *)setRepeatedSint64Array:(NSArray *)array { result.repeatedSint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedSint64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedSint64Values:(const long long *)values count:(unsigned long)count { result.repeatedSint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -5165,10 +5165,10 @@ - (TestAllTypes_Builder *)clearRepeatedSint64 { - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { +- (ulong)repeatedFixed32AtIndex:(unsigned long)index { return [result repeatedFixed32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedFixed32:(uNSInteger)value { +- (TestAllTypes_Builder *)addRepeatedFixed32:(ulong)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5179,7 +5179,7 @@ - (TestAllTypes_Builder *)setRepeatedFixed32Array:(NSArray *)array { result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5190,10 +5190,10 @@ - (TestAllTypes_Builder *)clearRepeatedFixed32 { - (PBAppendableArray *)repeatedFixed64 { return result.repeatedFixed64Array; } -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { return [result repeatedFixed64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedFixed64:(uint64_t)value { +- (TestAllTypes_Builder *)addRepeatedFixed64:(ulong long)value { if (result.repeatedFixed64Array == nil) { result.repeatedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5204,7 +5204,7 @@ - (TestAllTypes_Builder *)setRepeatedFixed64Array:(NSArray *)array { result.repeatedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedFixed64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count { result.repeatedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5215,10 +5215,10 @@ - (TestAllTypes_Builder *)clearRepeatedFixed64 { - (PBAppendableArray *)repeatedSfixed32 { return result.repeatedSfixed32Array; } -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { +- (long)repeatedSfixed32AtIndex:(unsigned long)index { return [result repeatedSfixed32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedSfixed32:(NSInteger)value { +- (TestAllTypes_Builder *)addRepeatedSfixed32:(long)value { if (result.repeatedSfixed32Array == nil) { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5229,7 +5229,7 @@ - (TestAllTypes_Builder *)setRepeatedSfixed32Array:(NSArray *)array { result.repeatedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedSfixed32Values:(const long *)values count:(unsigned long)count { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5240,10 +5240,10 @@ - (TestAllTypes_Builder *)clearRepeatedSfixed32 { - (PBAppendableArray *)repeatedSfixed64 { return result.repeatedSfixed64Array; } -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index { +- (long long)repeatedSfixed64AtIndex:(unsigned long)index { return [result repeatedSfixed64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedSfixed64:(int64_t)value { +- (TestAllTypes_Builder *)addRepeatedSfixed64:(long long)value { if (result.repeatedSfixed64Array == nil) { result.repeatedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -5254,7 +5254,7 @@ - (TestAllTypes_Builder *)setRepeatedSfixed64Array:(NSArray *)array { result.repeatedSfixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedSfixed64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedSfixed64Values:(const long long *)values count:(unsigned long)count { result.repeatedSfixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -5265,7 +5265,7 @@ - (TestAllTypes_Builder *)clearRepeatedSfixed64 { - (PBAppendableArray *)repeatedFloat { return result.repeatedFloatArray; } -- (Float32)repeatedFloatAtIndex:(NSUInteger)index { +- (Float32)repeatedFloatAtIndex:(unsigned long)index { return [result repeatedFloatAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedFloat:(Float32)value { @@ -5279,7 +5279,7 @@ - (TestAllTypes_Builder *)setRepeatedFloatArray:(NSArray *)array { result.repeatedFloatArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeFloat]; return self; } -- (TestAllTypes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(unsigned long)count { result.repeatedFloatArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeFloat]; return self; } @@ -5290,7 +5290,7 @@ - (TestAllTypes_Builder *)clearRepeatedFloat { - (PBAppendableArray *)repeatedDouble { return result.repeatedDoubleArray; } -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index { +- (Float64)repeatedDoubleAtIndex:(unsigned long)index { return [result repeatedDoubleAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedDouble:(Float64)value { @@ -5304,7 +5304,7 @@ - (TestAllTypes_Builder *)setRepeatedDoubleArray:(NSArray *)array { result.repeatedDoubleArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeDouble]; return self; } -- (TestAllTypes_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(unsigned long)count { result.repeatedDoubleArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeDouble]; return self; } @@ -5315,7 +5315,7 @@ - (TestAllTypes_Builder *)clearRepeatedDouble { - (PBAppendableArray *)repeatedBool { return result.repeatedBoolArray; } -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index { +- (BOOL)repeatedBoolAtIndex:(unsigned long)index { return [result repeatedBoolAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedBool:(BOOL)value { @@ -5329,7 +5329,7 @@ - (TestAllTypes_Builder *)setRepeatedBoolArray:(NSArray *)array { result.repeatedBoolArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeBool]; return self; } -- (TestAllTypes_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(unsigned long)count { result.repeatedBoolArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeBool]; return self; } @@ -5340,7 +5340,7 @@ - (TestAllTypes_Builder *)clearRepeatedBool { - (PBAppendableArray *)repeatedString { return result.repeatedStringArray; } -- (NSString*)repeatedStringAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringAtIndex:(unsigned long)index { return [result repeatedStringAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedString:(NSString*)value { @@ -5354,7 +5354,7 @@ - (TestAllTypes_Builder *)setRepeatedStringArray:(NSArray *)array { result.repeatedStringArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedStringValues:(const NSString* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedStringValues:(const NSString* *)values count:(unsigned long)count { result.repeatedStringArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5365,7 +5365,7 @@ - (TestAllTypes_Builder *)clearRepeatedString { - (PBAppendableArray *)repeatedBytes { return result.repeatedBytesArray; } -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index { +- (NSData*)repeatedBytesAtIndex:(unsigned long)index { return [result repeatedBytesAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedBytes:(NSData*)value { @@ -5379,7 +5379,7 @@ - (TestAllTypes_Builder *)setRepeatedBytesArray:(NSArray *)array { result.repeatedBytesArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(unsigned long)count { result.repeatedBytesArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5390,7 +5390,7 @@ - (TestAllTypes_Builder *)clearRepeatedBytes { - (PBAppendableArray *)repeatedGroup { return result.repeatedGroupArray; } -- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index { +- (TestAllTypes_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index { return [result repeatedGroupAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedGroup:(TestAllTypes_RepeatedGroup*)value { @@ -5404,7 +5404,7 @@ - (TestAllTypes_Builder *)setRepeatedGroupArray:(NSArray *)array { result.repeatedGroupArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedGroupValues:(const TestAllTypes_RepeatedGroup* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedGroupValues:(const TestAllTypes_RepeatedGroup* *)values count:(unsigned long)count { result.repeatedGroupArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5415,7 +5415,7 @@ - (TestAllTypes_Builder *)clearRepeatedGroup { - (PBAppendableArray *)repeatedNestedMessage { return result.repeatedNestedMessageArray; } -- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index { +- (TestAllTypes_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index { return [result repeatedNestedMessageAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedNestedMessage:(TestAllTypes_NestedMessage*)value { @@ -5429,7 +5429,7 @@ - (TestAllTypes_Builder *)setRepeatedNestedMessageArray:(NSArray *)array { result.repeatedNestedMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedNestedMessageValues:(const TestAllTypes_NestedMessage* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedNestedMessageValues:(const TestAllTypes_NestedMessage* *)values count:(unsigned long)count { result.repeatedNestedMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5440,7 +5440,7 @@ - (TestAllTypes_Builder *)clearRepeatedNestedMessage { - (PBAppendableArray *)repeatedForeignMessage { return result.repeatedForeignMessageArray; } -- (ForeignMessage*)repeatedForeignMessageAtIndex:(NSUInteger)index { +- (ForeignMessage*)repeatedForeignMessageAtIndex:(unsigned long)index { return [result repeatedForeignMessageAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedForeignMessage:(ForeignMessage*)value { @@ -5454,7 +5454,7 @@ - (TestAllTypes_Builder *)setRepeatedForeignMessageArray:(NSArray *)array { result.repeatedForeignMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedForeignMessageValues:(const ForeignMessage* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedForeignMessageValues:(const ForeignMessage* *)values count:(unsigned long)count { result.repeatedForeignMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5465,7 +5465,7 @@ - (TestAllTypes_Builder *)clearRepeatedForeignMessage { - (PBAppendableArray *)repeatedImportMessage { return result.repeatedImportMessageArray; } -- (ImportMessage*)repeatedImportMessageAtIndex:(NSUInteger)index { +- (ImportMessage*)repeatedImportMessageAtIndex:(unsigned long)index { return [result repeatedImportMessageAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedImportMessage:(ImportMessage*)value { @@ -5479,7 +5479,7 @@ - (TestAllTypes_Builder *)setRepeatedImportMessageArray:(NSArray *)array { result.repeatedImportMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedImportMessageValues:(const ImportMessage* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedImportMessageValues:(const ImportMessage* *)values count:(unsigned long)count { result.repeatedImportMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5490,7 +5490,7 @@ - (TestAllTypes_Builder *)clearRepeatedImportMessage { - (PBAppendableArray *)repeatedNestedEnum { return result.repeatedNestedEnumArray; } -- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index { +- (TestAllTypes_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index { return [result repeatedNestedEnumAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedNestedEnum:(TestAllTypes_NestedEnum)value { @@ -5504,7 +5504,7 @@ - (TestAllTypes_Builder *)setRepeatedNestedEnumArray:(NSArray *)array { result.repeatedNestedEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedNestedEnumValues:(const TestAllTypes_NestedEnum *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedNestedEnumValues:(const TestAllTypes_NestedEnum *)values count:(unsigned long)count { result.repeatedNestedEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5515,7 +5515,7 @@ - (TestAllTypes_Builder *)clearRepeatedNestedEnum { - (PBAppendableArray *)repeatedForeignEnum { return result.repeatedForeignEnumArray; } -- (ForeignEnum)repeatedForeignEnumAtIndex:(NSUInteger)index { +- (ForeignEnum)repeatedForeignEnumAtIndex:(unsigned long)index { return [result repeatedForeignEnumAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedForeignEnum:(ForeignEnum)value { @@ -5529,7 +5529,7 @@ - (TestAllTypes_Builder *)setRepeatedForeignEnumArray:(NSArray *)array { result.repeatedForeignEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedForeignEnumValues:(const ForeignEnum *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedForeignEnumValues:(const ForeignEnum *)values count:(unsigned long)count { result.repeatedForeignEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5540,7 +5540,7 @@ - (TestAllTypes_Builder *)clearRepeatedForeignEnum { - (PBAppendableArray *)repeatedImportEnum { return result.repeatedImportEnumArray; } -- (ImportEnum)repeatedImportEnumAtIndex:(NSUInteger)index { +- (ImportEnum)repeatedImportEnumAtIndex:(unsigned long)index { return [result repeatedImportEnumAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedImportEnum:(ImportEnum)value { @@ -5554,7 +5554,7 @@ - (TestAllTypes_Builder *)setRepeatedImportEnumArray:(NSArray *)array { result.repeatedImportEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedImportEnumValues:(const ImportEnum *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedImportEnumValues:(const ImportEnum *)values count:(unsigned long)count { result.repeatedImportEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5565,7 +5565,7 @@ - (TestAllTypes_Builder *)clearRepeatedImportEnum { - (PBAppendableArray *)repeatedStringPiece { return result.repeatedStringPieceArray; } -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index { return [result repeatedStringPieceAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedStringPiece:(NSString*)value { @@ -5579,7 +5579,7 @@ - (TestAllTypes_Builder *)setRepeatedStringPieceArray:(NSArray *)array { result.repeatedStringPieceArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(unsigned long)count { result.repeatedStringPieceArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5590,7 +5590,7 @@ - (TestAllTypes_Builder *)clearRepeatedStringPiece { - (PBAppendableArray *)repeatedCord { return result.repeatedCordArray; } -- (NSString*)repeatedCordAtIndex:(NSUInteger)index { +- (NSString*)repeatedCordAtIndex:(unsigned long)index { return [result repeatedCordAtIndex:index]; } - (TestAllTypes_Builder *)addRepeatedCord:(NSString*)value { @@ -5604,7 +5604,7 @@ - (TestAllTypes_Builder *)setRepeatedCordArray:(NSArray *)array { result.repeatedCordArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypes_Builder *)setRepeatedCordValues:(const NSString* *)values count:(NSUInteger)count { +- (TestAllTypes_Builder *)setRepeatedCordValues:(const NSString* *)values count:(unsigned long)count { result.repeatedCordArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5615,10 +5615,10 @@ - (TestAllTypes_Builder *)clearRepeatedCord { - (BOOL) hasDefaultInt32 { return result.hasDefaultInt32; } -- (NSInteger) defaultInt32 { +- (long) defaultInt32 { return result.defaultInt32; } -- (TestAllTypes_Builder*) setDefaultInt32:(NSInteger) value { +- (TestAllTypes_Builder*) setDefaultInt32:(long) value { result.hasDefaultInt32 = YES; result.defaultInt32 = value; return self; @@ -5631,10 +5631,10 @@ - (TestAllTypes_Builder*) clearDefaultInt32 { - (BOOL) hasDefaultInt64 { return result.hasDefaultInt64; } -- (int64_t) defaultInt64 { +- (long long) defaultInt64 { return result.defaultInt64; } -- (TestAllTypes_Builder*) setDefaultInt64:(int64_t) value { +- (TestAllTypes_Builder*) setDefaultInt64:(long long) value { result.hasDefaultInt64 = YES; result.defaultInt64 = value; return self; @@ -5647,10 +5647,10 @@ - (TestAllTypes_Builder*) clearDefaultInt64 { - (BOOL) hasDefaultUint32 { return result.hasDefaultUint32; } -- (uNSInteger) defaultUint32 { +- (ulong) defaultUint32 { return result.defaultUint32; } -- (TestAllTypes_Builder*) setDefaultUint32:(uNSInteger) value { +- (TestAllTypes_Builder*) setDefaultUint32:(ulong) value { result.hasDefaultUint32 = YES; result.defaultUint32 = value; return self; @@ -5663,10 +5663,10 @@ - (TestAllTypes_Builder*) clearDefaultUint32 { - (BOOL) hasDefaultUint64 { return result.hasDefaultUint64; } -- (uint64_t) defaultUint64 { +- (ulong long) defaultUint64 { return result.defaultUint64; } -- (TestAllTypes_Builder*) setDefaultUint64:(uint64_t) value { +- (TestAllTypes_Builder*) setDefaultUint64:(ulong long) value { result.hasDefaultUint64 = YES; result.defaultUint64 = value; return self; @@ -5679,10 +5679,10 @@ - (TestAllTypes_Builder*) clearDefaultUint64 { - (BOOL) hasDefaultSint32 { return result.hasDefaultSint32; } -- (NSInteger) defaultSint32 { +- (long) defaultSint32 { return result.defaultSint32; } -- (TestAllTypes_Builder*) setDefaultSint32:(NSInteger) value { +- (TestAllTypes_Builder*) setDefaultSint32:(long) value { result.hasDefaultSint32 = YES; result.defaultSint32 = value; return self; @@ -5695,10 +5695,10 @@ - (TestAllTypes_Builder*) clearDefaultSint32 { - (BOOL) hasDefaultSint64 { return result.hasDefaultSint64; } -- (int64_t) defaultSint64 { +- (long long) defaultSint64 { return result.defaultSint64; } -- (TestAllTypes_Builder*) setDefaultSint64:(int64_t) value { +- (TestAllTypes_Builder*) setDefaultSint64:(long long) value { result.hasDefaultSint64 = YES; result.defaultSint64 = value; return self; @@ -5711,10 +5711,10 @@ - (TestAllTypes_Builder*) clearDefaultSint64 { - (BOOL) hasDefaultFixed32 { return result.hasDefaultFixed32; } -- (uNSInteger) defaultFixed32 { +- (ulong) defaultFixed32 { return result.defaultFixed32; } -- (TestAllTypes_Builder*) setDefaultFixed32:(uNSInteger) value { +- (TestAllTypes_Builder*) setDefaultFixed32:(ulong) value { result.hasDefaultFixed32 = YES; result.defaultFixed32 = value; return self; @@ -5727,10 +5727,10 @@ - (TestAllTypes_Builder*) clearDefaultFixed32 { - (BOOL) hasDefaultFixed64 { return result.hasDefaultFixed64; } -- (uint64_t) defaultFixed64 { +- (ulong long) defaultFixed64 { return result.defaultFixed64; } -- (TestAllTypes_Builder*) setDefaultFixed64:(uint64_t) value { +- (TestAllTypes_Builder*) setDefaultFixed64:(ulong long) value { result.hasDefaultFixed64 = YES; result.defaultFixed64 = value; return self; @@ -5743,10 +5743,10 @@ - (TestAllTypes_Builder*) clearDefaultFixed64 { - (BOOL) hasDefaultSfixed32 { return result.hasDefaultSfixed32; } -- (NSInteger) defaultSfixed32 { +- (long) defaultSfixed32 { return result.defaultSfixed32; } -- (TestAllTypes_Builder*) setDefaultSfixed32:(NSInteger) value { +- (TestAllTypes_Builder*) setDefaultSfixed32:(long) value { result.hasDefaultSfixed32 = YES; result.defaultSfixed32 = value; return self; @@ -5759,10 +5759,10 @@ - (TestAllTypes_Builder*) clearDefaultSfixed32 { - (BOOL) hasDefaultSfixed64 { return result.hasDefaultSfixed64; } -- (int64_t) defaultSfixed64 { +- (long long) defaultSfixed64 { return result.defaultSfixed64; } -- (TestAllTypes_Builder*) setDefaultSfixed64:(int64_t) value { +- (TestAllTypes_Builder*) setDefaultSfixed64:(long long) value { result.hasDefaultSfixed64 = YES; result.defaultSfixed64 = value; return self; @@ -5935,7 +5935,7 @@ - (TestAllTypes_Builder*) clearDefaultCord { @end @interface TestDeprecatedFields () -@property NSInteger deprecatedInt32; +@property long deprecatedInt32; @end @implementation TestDeprecatedFields @@ -5977,8 +5977,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6041,8 +6041,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasDeprecatedInt32) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.deprecatedInt32] hash]; } @@ -6105,7 +6105,7 @@ - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6127,10 +6127,10 @@ - (TestDeprecatedFields_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (BOOL) hasDeprecatedInt32 { return result.hasDeprecatedInt32; } -- (NSInteger) deprecatedInt32 { +- (long) deprecatedInt32 { return result.deprecatedInt32; } -- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(NSInteger) value { +- (TestDeprecatedFields_Builder*) setDeprecatedInt32:(long) value { result.hasDeprecatedInt32 = YES; result.deprecatedInt32 = value; return self; @@ -6143,7 +6143,7 @@ - (TestDeprecatedFields_Builder*) clearDeprecatedInt32 { @end @interface ForeignMessage () -@property NSInteger c; +@property long c; @end @implementation ForeignMessage @@ -6185,8 +6185,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6249,8 +6249,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasC) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.c] hash]; } @@ -6313,7 +6313,7 @@ - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6335,10 +6335,10 @@ - (ForeignMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (BOOL) hasC { return result.hasC; } -- (NSInteger) c { +- (long) c { return result.c; } -- (ForeignMessage_Builder*) setC:(NSInteger) value { +- (ForeignMessage_Builder*) setC:(long) value { result.hasC = YES; result.c = value; return self; @@ -6387,8 +6387,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6449,8 +6449,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:1 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -6509,7 +6509,7 @@ - (TestAllExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (TestAllExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6527,7 +6527,7 @@ - (TestAllExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i @end @interface OptionalGroup_extension () -@property NSInteger a; +@property long a; @end @implementation OptionalGroup_extension @@ -6569,8 +6569,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6633,8 +6633,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -6697,7 +6697,7 @@ - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6719,10 +6719,10 @@ - (OptionalGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (OptionalGroup_extension_Builder*) setA:(NSInteger) value { +- (OptionalGroup_extension_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -6735,7 +6735,7 @@ - (OptionalGroup_extension_Builder*) clearA { @end @interface RepeatedGroup_extension () -@property NSInteger a; +@property long a; @end @implementation RepeatedGroup_extension @@ -6777,8 +6777,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -6841,8 +6841,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -6905,7 +6905,7 @@ - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6927,10 +6927,10 @@ - (RepeatedGroup_extension_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (RepeatedGroup_extension_Builder*) setA:(NSInteger) value { +- (RepeatedGroup_extension_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -6976,8 +6976,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7031,8 +7031,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -7089,7 +7089,7 @@ - (TestNestedExtension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestNestedExtension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7107,39 +7107,39 @@ - (TestNestedExtension_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) @end @interface TestRequired () -@property NSInteger a; -@property NSInteger dummy2; -@property NSInteger b; -@property NSInteger dummy4; -@property NSInteger dummy5; -@property NSInteger dummy6; -@property NSInteger dummy7; -@property NSInteger dummy8; -@property NSInteger dummy9; -@property NSInteger dummy10; -@property NSInteger dummy11; -@property NSInteger dummy12; -@property NSInteger dummy13; -@property NSInteger dummy14; -@property NSInteger dummy15; -@property NSInteger dummy16; -@property NSInteger dummy17; -@property NSInteger dummy18; -@property NSInteger dummy19; -@property NSInteger dummy20; -@property NSInteger dummy21; -@property NSInteger dummy22; -@property NSInteger dummy23; -@property NSInteger dummy24; -@property NSInteger dummy25; -@property NSInteger dummy26; -@property NSInteger dummy27; -@property NSInteger dummy28; -@property NSInteger dummy29; -@property NSInteger dummy30; -@property NSInteger dummy31; -@property NSInteger dummy32; -@property NSInteger c; +@property long a; +@property long dummy2; +@property long b; +@property long dummy4; +@property long dummy5; +@property long dummy6; +@property long dummy7; +@property long dummy8; +@property long dummy9; +@property long dummy10; +@property long dummy11; +@property long dummy12; +@property long dummy13; +@property long dummy14; +@property long dummy15; +@property long dummy16; +@property long dummy17; +@property long dummy18; +@property long dummy19; +@property long dummy20; +@property long dummy21; +@property long dummy22; +@property long dummy23; +@property long dummy24; +@property long dummy25; +@property long dummy26; +@property long dummy27; +@property long dummy28; +@property long dummy29; +@property long dummy30; +@property long dummy31; +@property long dummy32; +@property long c; @end @implementation TestRequired @@ -7548,8 +7548,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7900,8 +7900,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -8156,7 +8156,7 @@ - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8306,10 +8306,10 @@ - (TestRequired_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestRequired_Builder*) setA:(NSInteger) value { +- (TestRequired_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -8322,10 +8322,10 @@ - (TestRequired_Builder*) clearA { - (BOOL) hasDummy2 { return result.hasDummy2; } -- (NSInteger) dummy2 { +- (long) dummy2 { return result.dummy2; } -- (TestRequired_Builder*) setDummy2:(NSInteger) value { +- (TestRequired_Builder*) setDummy2:(long) value { result.hasDummy2 = YES; result.dummy2 = value; return self; @@ -8338,10 +8338,10 @@ - (TestRequired_Builder*) clearDummy2 { - (BOOL) hasB { return result.hasB; } -- (NSInteger) b { +- (long) b { return result.b; } -- (TestRequired_Builder*) setB:(NSInteger) value { +- (TestRequired_Builder*) setB:(long) value { result.hasB = YES; result.b = value; return self; @@ -8354,10 +8354,10 @@ - (TestRequired_Builder*) clearB { - (BOOL) hasDummy4 { return result.hasDummy4; } -- (NSInteger) dummy4 { +- (long) dummy4 { return result.dummy4; } -- (TestRequired_Builder*) setDummy4:(NSInteger) value { +- (TestRequired_Builder*) setDummy4:(long) value { result.hasDummy4 = YES; result.dummy4 = value; return self; @@ -8370,10 +8370,10 @@ - (TestRequired_Builder*) clearDummy4 { - (BOOL) hasDummy5 { return result.hasDummy5; } -- (NSInteger) dummy5 { +- (long) dummy5 { return result.dummy5; } -- (TestRequired_Builder*) setDummy5:(NSInteger) value { +- (TestRequired_Builder*) setDummy5:(long) value { result.hasDummy5 = YES; result.dummy5 = value; return self; @@ -8386,10 +8386,10 @@ - (TestRequired_Builder*) clearDummy5 { - (BOOL) hasDummy6 { return result.hasDummy6; } -- (NSInteger) dummy6 { +- (long) dummy6 { return result.dummy6; } -- (TestRequired_Builder*) setDummy6:(NSInteger) value { +- (TestRequired_Builder*) setDummy6:(long) value { result.hasDummy6 = YES; result.dummy6 = value; return self; @@ -8402,10 +8402,10 @@ - (TestRequired_Builder*) clearDummy6 { - (BOOL) hasDummy7 { return result.hasDummy7; } -- (NSInteger) dummy7 { +- (long) dummy7 { return result.dummy7; } -- (TestRequired_Builder*) setDummy7:(NSInteger) value { +- (TestRequired_Builder*) setDummy7:(long) value { result.hasDummy7 = YES; result.dummy7 = value; return self; @@ -8418,10 +8418,10 @@ - (TestRequired_Builder*) clearDummy7 { - (BOOL) hasDummy8 { return result.hasDummy8; } -- (NSInteger) dummy8 { +- (long) dummy8 { return result.dummy8; } -- (TestRequired_Builder*) setDummy8:(NSInteger) value { +- (TestRequired_Builder*) setDummy8:(long) value { result.hasDummy8 = YES; result.dummy8 = value; return self; @@ -8434,10 +8434,10 @@ - (TestRequired_Builder*) clearDummy8 { - (BOOL) hasDummy9 { return result.hasDummy9; } -- (NSInteger) dummy9 { +- (long) dummy9 { return result.dummy9; } -- (TestRequired_Builder*) setDummy9:(NSInteger) value { +- (TestRequired_Builder*) setDummy9:(long) value { result.hasDummy9 = YES; result.dummy9 = value; return self; @@ -8450,10 +8450,10 @@ - (TestRequired_Builder*) clearDummy9 { - (BOOL) hasDummy10 { return result.hasDummy10; } -- (NSInteger) dummy10 { +- (long) dummy10 { return result.dummy10; } -- (TestRequired_Builder*) setDummy10:(NSInteger) value { +- (TestRequired_Builder*) setDummy10:(long) value { result.hasDummy10 = YES; result.dummy10 = value; return self; @@ -8466,10 +8466,10 @@ - (TestRequired_Builder*) clearDummy10 { - (BOOL) hasDummy11 { return result.hasDummy11; } -- (NSInteger) dummy11 { +- (long) dummy11 { return result.dummy11; } -- (TestRequired_Builder*) setDummy11:(NSInteger) value { +- (TestRequired_Builder*) setDummy11:(long) value { result.hasDummy11 = YES; result.dummy11 = value; return self; @@ -8482,10 +8482,10 @@ - (TestRequired_Builder*) clearDummy11 { - (BOOL) hasDummy12 { return result.hasDummy12; } -- (NSInteger) dummy12 { +- (long) dummy12 { return result.dummy12; } -- (TestRequired_Builder*) setDummy12:(NSInteger) value { +- (TestRequired_Builder*) setDummy12:(long) value { result.hasDummy12 = YES; result.dummy12 = value; return self; @@ -8498,10 +8498,10 @@ - (TestRequired_Builder*) clearDummy12 { - (BOOL) hasDummy13 { return result.hasDummy13; } -- (NSInteger) dummy13 { +- (long) dummy13 { return result.dummy13; } -- (TestRequired_Builder*) setDummy13:(NSInteger) value { +- (TestRequired_Builder*) setDummy13:(long) value { result.hasDummy13 = YES; result.dummy13 = value; return self; @@ -8514,10 +8514,10 @@ - (TestRequired_Builder*) clearDummy13 { - (BOOL) hasDummy14 { return result.hasDummy14; } -- (NSInteger) dummy14 { +- (long) dummy14 { return result.dummy14; } -- (TestRequired_Builder*) setDummy14:(NSInteger) value { +- (TestRequired_Builder*) setDummy14:(long) value { result.hasDummy14 = YES; result.dummy14 = value; return self; @@ -8530,10 +8530,10 @@ - (TestRequired_Builder*) clearDummy14 { - (BOOL) hasDummy15 { return result.hasDummy15; } -- (NSInteger) dummy15 { +- (long) dummy15 { return result.dummy15; } -- (TestRequired_Builder*) setDummy15:(NSInteger) value { +- (TestRequired_Builder*) setDummy15:(long) value { result.hasDummy15 = YES; result.dummy15 = value; return self; @@ -8546,10 +8546,10 @@ - (TestRequired_Builder*) clearDummy15 { - (BOOL) hasDummy16 { return result.hasDummy16; } -- (NSInteger) dummy16 { +- (long) dummy16 { return result.dummy16; } -- (TestRequired_Builder*) setDummy16:(NSInteger) value { +- (TestRequired_Builder*) setDummy16:(long) value { result.hasDummy16 = YES; result.dummy16 = value; return self; @@ -8562,10 +8562,10 @@ - (TestRequired_Builder*) clearDummy16 { - (BOOL) hasDummy17 { return result.hasDummy17; } -- (NSInteger) dummy17 { +- (long) dummy17 { return result.dummy17; } -- (TestRequired_Builder*) setDummy17:(NSInteger) value { +- (TestRequired_Builder*) setDummy17:(long) value { result.hasDummy17 = YES; result.dummy17 = value; return self; @@ -8578,10 +8578,10 @@ - (TestRequired_Builder*) clearDummy17 { - (BOOL) hasDummy18 { return result.hasDummy18; } -- (NSInteger) dummy18 { +- (long) dummy18 { return result.dummy18; } -- (TestRequired_Builder*) setDummy18:(NSInteger) value { +- (TestRequired_Builder*) setDummy18:(long) value { result.hasDummy18 = YES; result.dummy18 = value; return self; @@ -8594,10 +8594,10 @@ - (TestRequired_Builder*) clearDummy18 { - (BOOL) hasDummy19 { return result.hasDummy19; } -- (NSInteger) dummy19 { +- (long) dummy19 { return result.dummy19; } -- (TestRequired_Builder*) setDummy19:(NSInteger) value { +- (TestRequired_Builder*) setDummy19:(long) value { result.hasDummy19 = YES; result.dummy19 = value; return self; @@ -8610,10 +8610,10 @@ - (TestRequired_Builder*) clearDummy19 { - (BOOL) hasDummy20 { return result.hasDummy20; } -- (NSInteger) dummy20 { +- (long) dummy20 { return result.dummy20; } -- (TestRequired_Builder*) setDummy20:(NSInteger) value { +- (TestRequired_Builder*) setDummy20:(long) value { result.hasDummy20 = YES; result.dummy20 = value; return self; @@ -8626,10 +8626,10 @@ - (TestRequired_Builder*) clearDummy20 { - (BOOL) hasDummy21 { return result.hasDummy21; } -- (NSInteger) dummy21 { +- (long) dummy21 { return result.dummy21; } -- (TestRequired_Builder*) setDummy21:(NSInteger) value { +- (TestRequired_Builder*) setDummy21:(long) value { result.hasDummy21 = YES; result.dummy21 = value; return self; @@ -8642,10 +8642,10 @@ - (TestRequired_Builder*) clearDummy21 { - (BOOL) hasDummy22 { return result.hasDummy22; } -- (NSInteger) dummy22 { +- (long) dummy22 { return result.dummy22; } -- (TestRequired_Builder*) setDummy22:(NSInteger) value { +- (TestRequired_Builder*) setDummy22:(long) value { result.hasDummy22 = YES; result.dummy22 = value; return self; @@ -8658,10 +8658,10 @@ - (TestRequired_Builder*) clearDummy22 { - (BOOL) hasDummy23 { return result.hasDummy23; } -- (NSInteger) dummy23 { +- (long) dummy23 { return result.dummy23; } -- (TestRequired_Builder*) setDummy23:(NSInteger) value { +- (TestRequired_Builder*) setDummy23:(long) value { result.hasDummy23 = YES; result.dummy23 = value; return self; @@ -8674,10 +8674,10 @@ - (TestRequired_Builder*) clearDummy23 { - (BOOL) hasDummy24 { return result.hasDummy24; } -- (NSInteger) dummy24 { +- (long) dummy24 { return result.dummy24; } -- (TestRequired_Builder*) setDummy24:(NSInteger) value { +- (TestRequired_Builder*) setDummy24:(long) value { result.hasDummy24 = YES; result.dummy24 = value; return self; @@ -8690,10 +8690,10 @@ - (TestRequired_Builder*) clearDummy24 { - (BOOL) hasDummy25 { return result.hasDummy25; } -- (NSInteger) dummy25 { +- (long) dummy25 { return result.dummy25; } -- (TestRequired_Builder*) setDummy25:(NSInteger) value { +- (TestRequired_Builder*) setDummy25:(long) value { result.hasDummy25 = YES; result.dummy25 = value; return self; @@ -8706,10 +8706,10 @@ - (TestRequired_Builder*) clearDummy25 { - (BOOL) hasDummy26 { return result.hasDummy26; } -- (NSInteger) dummy26 { +- (long) dummy26 { return result.dummy26; } -- (TestRequired_Builder*) setDummy26:(NSInteger) value { +- (TestRequired_Builder*) setDummy26:(long) value { result.hasDummy26 = YES; result.dummy26 = value; return self; @@ -8722,10 +8722,10 @@ - (TestRequired_Builder*) clearDummy26 { - (BOOL) hasDummy27 { return result.hasDummy27; } -- (NSInteger) dummy27 { +- (long) dummy27 { return result.dummy27; } -- (TestRequired_Builder*) setDummy27:(NSInteger) value { +- (TestRequired_Builder*) setDummy27:(long) value { result.hasDummy27 = YES; result.dummy27 = value; return self; @@ -8738,10 +8738,10 @@ - (TestRequired_Builder*) clearDummy27 { - (BOOL) hasDummy28 { return result.hasDummy28; } -- (NSInteger) dummy28 { +- (long) dummy28 { return result.dummy28; } -- (TestRequired_Builder*) setDummy28:(NSInteger) value { +- (TestRequired_Builder*) setDummy28:(long) value { result.hasDummy28 = YES; result.dummy28 = value; return self; @@ -8754,10 +8754,10 @@ - (TestRequired_Builder*) clearDummy28 { - (BOOL) hasDummy29 { return result.hasDummy29; } -- (NSInteger) dummy29 { +- (long) dummy29 { return result.dummy29; } -- (TestRequired_Builder*) setDummy29:(NSInteger) value { +- (TestRequired_Builder*) setDummy29:(long) value { result.hasDummy29 = YES; result.dummy29 = value; return self; @@ -8770,10 +8770,10 @@ - (TestRequired_Builder*) clearDummy29 { - (BOOL) hasDummy30 { return result.hasDummy30; } -- (NSInteger) dummy30 { +- (long) dummy30 { return result.dummy30; } -- (TestRequired_Builder*) setDummy30:(NSInteger) value { +- (TestRequired_Builder*) setDummy30:(long) value { result.hasDummy30 = YES; result.dummy30 = value; return self; @@ -8786,10 +8786,10 @@ - (TestRequired_Builder*) clearDummy30 { - (BOOL) hasDummy31 { return result.hasDummy31; } -- (NSInteger) dummy31 { +- (long) dummy31 { return result.dummy31; } -- (TestRequired_Builder*) setDummy31:(NSInteger) value { +- (TestRequired_Builder*) setDummy31:(long) value { result.hasDummy31 = YES; result.dummy31 = value; return self; @@ -8802,10 +8802,10 @@ - (TestRequired_Builder*) clearDummy31 { - (BOOL) hasDummy32 { return result.hasDummy32; } -- (NSInteger) dummy32 { +- (long) dummy32 { return result.dummy32; } -- (TestRequired_Builder*) setDummy32:(NSInteger) value { +- (TestRequired_Builder*) setDummy32:(long) value { result.hasDummy32 = YES; result.dummy32 = value; return self; @@ -8818,10 +8818,10 @@ - (TestRequired_Builder*) clearDummy32 { - (BOOL) hasC { return result.hasC; } -- (NSInteger) c { +- (long) c { return result.c; } -- (TestRequired_Builder*) setC:(NSInteger) value { +- (TestRequired_Builder*) setC:(long) value { result.hasC = YES; result.c = value; return self; @@ -8836,7 +8836,7 @@ - (TestRequired_Builder*) clearC { @interface TestRequiredForeign () @property (retain) TestRequired* optionalMessage; @property (retain) PBAppendableArray * repeatedMessageArray; -@property NSInteger dummy; +@property long dummy; @end @implementation TestRequiredForeign @@ -8884,7 +8884,7 @@ - (TestRequiredForeign*) defaultInstance { - (PBArray *)repeatedMessage { return repeatedMessageArray; } -- (TestRequired*)repeatedMessageAtIndex:(NSUInteger)index { +- (TestRequired*)repeatedMessageAtIndex:(unsigned long)index { return [repeatedMessageArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -8912,8 +8912,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8999,8 +8999,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasOptionalMessage) { hashCode = hashCode * 31 + [self.optionalMessage hash]; } @@ -9079,7 +9079,7 @@ - (TestRequiredForeign_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestRequiredForeign_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9146,7 +9146,7 @@ - (TestRequiredForeign_Builder*) clearOptionalMessage { - (PBAppendableArray *)repeatedMessage { return result.repeatedMessageArray; } -- (TestRequired*)repeatedMessageAtIndex:(NSUInteger)index { +- (TestRequired*)repeatedMessageAtIndex:(unsigned long)index { return [result repeatedMessageAtIndex:index]; } - (TestRequiredForeign_Builder *)addRepeatedMessage:(TestRequired*)value { @@ -9160,7 +9160,7 @@ - (TestRequiredForeign_Builder *)setRepeatedMessageArray:(NSArray *)array { result.repeatedMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestRequiredForeign_Builder *)setRepeatedMessageValues:(const TestRequired* *)values count:(NSUInteger)count { +- (TestRequiredForeign_Builder *)setRepeatedMessageValues:(const TestRequired* *)values count:(unsigned long)count { result.repeatedMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -9171,10 +9171,10 @@ - (TestRequiredForeign_Builder *)clearRepeatedMessage { - (BOOL) hasDummy { return result.hasDummy; } -- (NSInteger) dummy { +- (long) dummy { return result.dummy; } -- (TestRequiredForeign_Builder*) setDummy:(NSInteger) value { +- (TestRequiredForeign_Builder*) setDummy:(long) value { result.hasDummy = YES; result.dummy = value; return self; @@ -9230,8 +9230,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9297,8 +9297,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasForeignNested) { hashCode = hashCode * 31 + [self.foreignNested hash]; } @@ -9361,7 +9361,7 @@ - (TestForeignNested_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (TestForeignNested_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9448,8 +9448,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9503,8 +9503,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -9561,7 +9561,7 @@ - (TestEmptyMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (TestEmptyMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9615,8 +9615,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9677,8 +9677,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:1 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -9737,7 +9737,7 @@ - (TestEmptyMessageWithExtensions_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestEmptyMessageWithExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9797,8 +9797,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -9871,8 +9871,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:42 to:43]; hashCode = hashCode * 31 + [self hashExtensionsFrom:4143 to:4244]; hashCode = hashCode * 31 + [self hashExtensionsFrom:65536 to:536870912]; @@ -9933,7 +9933,7 @@ - (TestMultipleExtensionRanges_Builder*) mergeFromCodedInputStream:(PBCodedInput - (TestMultipleExtensionRanges_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -9951,8 +9951,8 @@ - (TestMultipleExtensionRanges_Builder*) mergeFromCodedInputStream:(PBCodedInput @end @interface TestReallyLargeTagNumber () -@property NSInteger a; -@property NSInteger bb; +@property long a; +@property long bb; @end @implementation TestReallyLargeTagNumber @@ -10005,8 +10005,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10078,8 +10078,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -10148,7 +10148,7 @@ - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10174,10 +10174,10 @@ - (TestReallyLargeTagNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestReallyLargeTagNumber_Builder*) setA:(NSInteger) value { +- (TestReallyLargeTagNumber_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -10190,10 +10190,10 @@ - (TestReallyLargeTagNumber_Builder*) clearA { - (BOOL) hasBb { return result.hasBb; } -- (NSInteger) bb { +- (long) bb { return result.bb; } -- (TestReallyLargeTagNumber_Builder*) setBb:(NSInteger) value { +- (TestReallyLargeTagNumber_Builder*) setBb:(long) value { result.hasBb = YES; result.bb = value; return self; @@ -10207,7 +10207,7 @@ - (TestReallyLargeTagNumber_Builder*) clearBb { @interface TestRecursiveMessage () @property (retain) TestRecursiveMessage* a; -@property NSInteger i; +@property long i; @end @implementation TestRecursiveMessage @@ -10261,8 +10261,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10337,8 +10337,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [self.a hash]; } @@ -10407,7 +10407,7 @@ - (TestRecursiveMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestRecursiveMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10468,10 +10468,10 @@ - (TestRecursiveMessage_Builder*) clearA { - (BOOL) hasI { return result.hasI; } -- (NSInteger) i { +- (long) i { return result.i; } -- (TestRecursiveMessage_Builder*) setI:(NSInteger) value { +- (TestRecursiveMessage_Builder*) setI:(long) value { result.hasI = YES; result.i = value; return self; @@ -10527,8 +10527,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10594,8 +10594,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasBb) { hashCode = hashCode * 31 + [self.bb hash]; } @@ -10658,7 +10658,7 @@ - (TestMutualRecursionA_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestMutualRecursionA_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10716,7 +10716,7 @@ - (TestMutualRecursionA_Builder*) clearBb { @interface TestMutualRecursionB () @property (retain) TestMutualRecursionA* a; -@property NSInteger optionalInt32; +@property long optionalInt32; @end @implementation TestMutualRecursionB @@ -10770,8 +10770,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -10846,8 +10846,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [self.a hash]; } @@ -10916,7 +10916,7 @@ - (TestMutualRecursionB_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestMutualRecursionB_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -10977,10 +10977,10 @@ - (TestMutualRecursionB_Builder*) clearA { - (BOOL) hasOptionalInt32 { return result.hasOptionalInt32; } -- (NSInteger) optionalInt32 { +- (long) optionalInt32 { return result.optionalInt32; } -- (TestMutualRecursionB_Builder*) setOptionalInt32:(NSInteger) value { +- (TestMutualRecursionB_Builder*) setOptionalInt32:(long) value { result.hasOptionalInt32 = YES; result.optionalInt32 = value; return self; @@ -10993,7 +10993,7 @@ - (TestMutualRecursionB_Builder*) clearOptionalInt32 { @end @interface TestDupFieldNumber () -@property NSInteger a; +@property long a; @property (retain) TestDupFieldNumber_Foo* foo; @property (retain) TestDupFieldNumber_Bar* bar; @end @@ -11061,8 +11061,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11149,8 +11149,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -11166,7 +11166,7 @@ - (NSUInteger) hash { @end @interface TestDupFieldNumber_Foo () -@property NSInteger a; +@property long a; @end @implementation TestDupFieldNumber_Foo @@ -11208,8 +11208,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11272,8 +11272,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -11336,7 +11336,7 @@ - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -11358,10 +11358,10 @@ - (TestDupFieldNumber_Foo_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestDupFieldNumber_Foo_Builder*) setA:(NSInteger) value { +- (TestDupFieldNumber_Foo_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -11374,7 +11374,7 @@ - (TestDupFieldNumber_Foo_Builder*) clearA { @end @interface TestDupFieldNumber_Bar () -@property NSInteger a; +@property long a; @end @implementation TestDupFieldNumber_Bar @@ -11416,8 +11416,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11480,8 +11480,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -11544,7 +11544,7 @@ - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -11566,10 +11566,10 @@ - (TestDupFieldNumber_Bar_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestDupFieldNumber_Bar_Builder*) setA:(NSInteger) value { +- (TestDupFieldNumber_Bar_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -11641,7 +11641,7 @@ - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -11681,10 +11681,10 @@ - (TestDupFieldNumber_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestDupFieldNumber_Builder*) setA:(NSInteger) value { +- (TestDupFieldNumber_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -11800,8 +11800,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -11867,8 +11867,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasOptionalNestedMessage) { hashCode = hashCode * 31 + [self.optionalNestedMessage hash]; } @@ -11913,23 +11913,23 @@ - (TestNestedMessageHasBits_NestedMessage*) defaultInstance { - (PBArray *)nestedmessageRepeatedInt32 { return nestedmessageRepeatedInt32Array; } -- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index { +- (long)nestedmessageRepeatedInt32AtIndex:(unsigned long)index { return [nestedmessageRepeatedInt32Array int32AtIndex:index]; } - (PBArray *)nestedmessageRepeatedForeignmessage { return nestedmessageRepeatedForeignmessageArray; } -- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(NSUInteger)index { +- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(unsigned long)index { return [nestedmessageRepeatedForeignmessageArray objectAtIndex:index]; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - const NSUInteger nestedmessageRepeatedInt32ArrayCount = self.nestedmessageRepeatedInt32Array.count; + const unsigned long nestedmessageRepeatedInt32ArrayCount = self.nestedmessageRepeatedInt32Array.count; if (nestedmessageRepeatedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.nestedmessageRepeatedInt32Array.data; - for (NSUInteger i = 0; i < nestedmessageRepeatedInt32ArrayCount; ++i) { + const long *values = (const long *)self.nestedmessageRepeatedInt32Array.data; + for (unsigned long i = 0; i < nestedmessageRepeatedInt32ArrayCount; ++i) { [output writeInt32:1 value:values[i]]; } } @@ -11938,18 +11938,18 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - NSInteger dataSize = 0; - const NSUInteger count = self.nestedmessageRepeatedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.nestedmessageRepeatedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.nestedmessageRepeatedInt32Array.count; + const long *values = (const long *)self.nestedmessageRepeatedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; @@ -12019,8 +12019,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; for (NSNumber* value in self.nestedmessageRepeatedInt32Array) { hashCode = hashCode * 31 + [value intValue]; } @@ -12097,7 +12097,7 @@ - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(P - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -12125,10 +12125,10 @@ - (TestNestedMessageHasBits_NestedMessage_Builder*) mergeFromCodedInputStream:(P - (PBAppendableArray *)nestedmessageRepeatedInt32 { return result.nestedmessageRepeatedInt32Array; } -- (NSInteger)nestedmessageRepeatedInt32AtIndex:(NSUInteger)index { +- (long)nestedmessageRepeatedInt32AtIndex:(unsigned long)index { return [result nestedmessageRepeatedInt32AtIndex:index]; } -- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(NSInteger)value { +- (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedInt32:(long)value { if (result.nestedmessageRepeatedInt32Array == nil) { result.nestedmessageRepeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -12139,7 +12139,7 @@ - (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt3 result.nestedmessageRepeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedInt32Values:(const long *)values count:(unsigned long)count { result.nestedmessageRepeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -12150,7 +12150,7 @@ - (TestNestedMessageHasBits_NestedMessage_Builder *)clearNestedmessageRepeatedIn - (PBAppendableArray *)nestedmessageRepeatedForeignmessage { return result.nestedmessageRepeatedForeignmessageArray; } -- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(NSUInteger)index { +- (ForeignMessage*)nestedmessageRepeatedForeignmessageAtIndex:(unsigned long)index { return [result nestedmessageRepeatedForeignmessageAtIndex:index]; } - (TestNestedMessageHasBits_NestedMessage_Builder *)addNestedmessageRepeatedForeignmessage:(ForeignMessage*)value { @@ -12164,7 +12164,7 @@ - (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedFore result.nestedmessageRepeatedForeignmessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedForeignmessageValues:(const ForeignMessage* *)values count:(NSUInteger)count { +- (TestNestedMessageHasBits_NestedMessage_Builder *)setNestedmessageRepeatedForeignmessageValues:(const ForeignMessage* *)values count:(unsigned long)count { result.nestedmessageRepeatedForeignmessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -12228,7 +12228,7 @@ - (TestNestedMessageHasBits_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestNestedMessageHasBits_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -12285,7 +12285,7 @@ - (TestNestedMessageHasBits_Builder*) clearOptionalNestedMessage { @end @interface TestCamelCaseFieldNames () -@property NSInteger primitiveField; +@property long primitiveField; @property (retain) NSString* stringField; @property ForeignEnum enumField; @property (retain) ForeignMessage* messageField; @@ -12394,37 +12394,37 @@ - (TestCamelCaseFieldNames*) defaultInstance { - (PBArray *)repeatedPrimitiveField { return repeatedPrimitiveFieldArray; } -- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index { +- (long)repeatedPrimitiveFieldAtIndex:(unsigned long)index { return [repeatedPrimitiveFieldArray int32AtIndex:index]; } - (PBArray *)repeatedStringField { return repeatedStringFieldArray; } -- (NSString*)repeatedStringFieldAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringFieldAtIndex:(unsigned long)index { return [repeatedStringFieldArray objectAtIndex:index]; } - (PBArray *)repeatedEnumField { return repeatedEnumFieldArray; } -- (ForeignEnum)repeatedEnumFieldAtIndex:(NSUInteger)index { +- (ForeignEnum)repeatedEnumFieldAtIndex:(unsigned long)index { return [repeatedEnumFieldArray int32AtIndex:index]; } - (PBArray *)repeatedMessageField { return repeatedMessageFieldArray; } -- (ForeignMessage*)repeatedMessageFieldAtIndex:(NSUInteger)index { +- (ForeignMessage*)repeatedMessageFieldAtIndex:(unsigned long)index { return [repeatedMessageFieldArray objectAtIndex:index]; } - (PBArray *)repeatedStringPieceField { return repeatedStringPieceFieldArray; } -- (NSString*)repeatedStringPieceFieldAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringPieceFieldAtIndex:(unsigned long)index { return [repeatedStringPieceFieldArray objectAtIndex:index]; } - (PBArray *)repeatedCordField { return repeatedCordFieldArray; } -- (NSString*)repeatedCordFieldAtIndex:(NSUInteger)index { +- (NSString*)repeatedCordFieldAtIndex:(unsigned long)index { return [repeatedCordFieldArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -12449,46 +12449,46 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasCordField) { [output writeString:6 value:self.cordField]; } - const NSUInteger repeatedPrimitiveFieldArrayCount = self.repeatedPrimitiveFieldArray.count; + const unsigned long repeatedPrimitiveFieldArrayCount = self.repeatedPrimitiveFieldArray.count; if (repeatedPrimitiveFieldArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedPrimitiveFieldArray.data; - for (NSUInteger i = 0; i < repeatedPrimitiveFieldArrayCount; ++i) { + const long *values = (const long *)self.repeatedPrimitiveFieldArray.data; + for (unsigned long i = 0; i < repeatedPrimitiveFieldArrayCount; ++i) { [output writeInt32:7 value:values[i]]; } } - const NSUInteger repeatedStringFieldArrayCount = self.repeatedStringFieldArray.count; + const unsigned long repeatedStringFieldArrayCount = self.repeatedStringFieldArray.count; if (repeatedStringFieldArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedStringFieldArray.data; - for (NSUInteger i = 0; i < repeatedStringFieldArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedStringFieldArrayCount; ++i) { [output writeString:8 value:values[i]]; } } - const NSUInteger repeatedEnumFieldArrayCount = self.repeatedEnumFieldArray.count; + const unsigned long repeatedEnumFieldArrayCount = self.repeatedEnumFieldArray.count; const ForeignEnum *repeatedEnumFieldArrayValues = (const ForeignEnum *)self.repeatedEnumFieldArray.data; - for (NSUInteger i = 0; i < repeatedEnumFieldArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedEnumFieldArrayCount; ++i) { [output writeEnum:9 value:repeatedEnumFieldArrayValues[i]]; } for (ForeignMessage *element in self.repeatedMessageFieldArray) { [output writeMessage:10 value:element]; } - const NSUInteger repeatedStringPieceFieldArrayCount = self.repeatedStringPieceFieldArray.count; + const unsigned long repeatedStringPieceFieldArrayCount = self.repeatedStringPieceFieldArray.count; if (repeatedStringPieceFieldArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedStringPieceFieldArray.data; - for (NSUInteger i = 0; i < repeatedStringPieceFieldArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedStringPieceFieldArrayCount; ++i) { [output writeString:11 value:values[i]]; } } - const NSUInteger repeatedCordFieldArrayCount = self.repeatedCordFieldArray.count; + const unsigned long repeatedCordFieldArrayCount = self.repeatedCordFieldArray.count; if (repeatedCordFieldArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedCordFieldArray.data; - for (NSUInteger i = 0; i < repeatedCordFieldArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedCordFieldArrayCount; ++i) { [output writeString:12 value:values[i]]; } } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -12513,30 +12513,30 @@ - (NSInteger) serializedSize { size += computeStringSize(6, self.cordField); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedPrimitiveFieldArray.count; - const NSInteger *values = (const NSInteger *)self.repeatedPrimitiveFieldArray.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedPrimitiveFieldArray.count; + const long *values = (const long *)self.repeatedPrimitiveFieldArray.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; size += 1 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedStringFieldArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedStringFieldArray.count; const NSString* *values = (const NSString* *)self.repeatedStringFieldArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 1 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedEnumFieldArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedEnumFieldArray.count; const ForeignEnum *values = (const ForeignEnum *)self.repeatedEnumFieldArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; @@ -12546,20 +12546,20 @@ - (NSInteger) serializedSize { size += computeMessageSize(10, element); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedStringPieceFieldArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedStringPieceFieldArray.count; const NSString* *values = (const NSString* *)self.repeatedStringPieceFieldArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 1 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedCordFieldArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedCordFieldArray.count; const NSString* *values = (const NSString* *)self.repeatedCordFieldArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; @@ -12685,8 +12685,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasPrimitiveField) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.primitiveField] hash]; } @@ -12839,7 +12839,7 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -12860,7 +12860,7 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre break; } case 24: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setEnumField:value]; } else { @@ -12894,7 +12894,7 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre break; } case 72: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addRepeatedEnumField:value]; } else { @@ -12922,10 +12922,10 @@ - (TestCamelCaseFieldNames_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (BOOL) hasPrimitiveField { return result.hasPrimitiveField; } -- (NSInteger) primitiveField { +- (long) primitiveField { return result.primitiveField; } -- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(NSInteger) value { +- (TestCamelCaseFieldNames_Builder*) setPrimitiveField:(long) value { result.hasPrimitiveField = YES; result.primitiveField = value; return self; @@ -13032,10 +13032,10 @@ - (TestCamelCaseFieldNames_Builder*) clearCordField { - (PBAppendableArray *)repeatedPrimitiveField { return result.repeatedPrimitiveFieldArray; } -- (NSInteger)repeatedPrimitiveFieldAtIndex:(NSUInteger)index { +- (long)repeatedPrimitiveFieldAtIndex:(unsigned long)index { return [result repeatedPrimitiveFieldAtIndex:index]; } -- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(NSInteger)value { +- (TestCamelCaseFieldNames_Builder *)addRepeatedPrimitiveField:(long)value { if (result.repeatedPrimitiveFieldArray == nil) { result.repeatedPrimitiveFieldArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -13046,7 +13046,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldArray:(NSArray *)a result.repeatedPrimitiveFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const NSInteger *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedPrimitiveFieldValues:(const long *)values count:(unsigned long)count { result.repeatedPrimitiveFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -13057,7 +13057,7 @@ - (TestCamelCaseFieldNames_Builder *)clearRepeatedPrimitiveField { - (PBAppendableArray *)repeatedStringField { return result.repeatedStringFieldArray; } -- (NSString*)repeatedStringFieldAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringFieldAtIndex:(unsigned long)index { return [result repeatedStringFieldAtIndex:index]; } - (TestCamelCaseFieldNames_Builder *)addRepeatedStringField:(NSString*)value { @@ -13071,7 +13071,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedStringFieldArray:(NSArray *)arra result.repeatedStringFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedStringFieldValues:(const NSString* *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedStringFieldValues:(const NSString* *)values count:(unsigned long)count { result.repeatedStringFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -13082,7 +13082,7 @@ - (TestCamelCaseFieldNames_Builder *)clearRepeatedStringField { - (PBAppendableArray *)repeatedEnumField { return result.repeatedEnumFieldArray; } -- (ForeignEnum)repeatedEnumFieldAtIndex:(NSUInteger)index { +- (ForeignEnum)repeatedEnumFieldAtIndex:(unsigned long)index { return [result repeatedEnumFieldAtIndex:index]; } - (TestCamelCaseFieldNames_Builder *)addRepeatedEnumField:(ForeignEnum)value { @@ -13096,7 +13096,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedEnumFieldArray:(NSArray *)array result.repeatedEnumFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedEnumFieldValues:(const ForeignEnum *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedEnumFieldValues:(const ForeignEnum *)values count:(unsigned long)count { result.repeatedEnumFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -13107,7 +13107,7 @@ - (TestCamelCaseFieldNames_Builder *)clearRepeatedEnumField { - (PBAppendableArray *)repeatedMessageField { return result.repeatedMessageFieldArray; } -- (ForeignMessage*)repeatedMessageFieldAtIndex:(NSUInteger)index { +- (ForeignMessage*)repeatedMessageFieldAtIndex:(unsigned long)index { return [result repeatedMessageFieldAtIndex:index]; } - (TestCamelCaseFieldNames_Builder *)addRepeatedMessageField:(ForeignMessage*)value { @@ -13121,7 +13121,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedMessageFieldArray:(NSArray *)arr result.repeatedMessageFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedMessageFieldValues:(const ForeignMessage* *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedMessageFieldValues:(const ForeignMessage* *)values count:(unsigned long)count { result.repeatedMessageFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -13132,7 +13132,7 @@ - (TestCamelCaseFieldNames_Builder *)clearRepeatedMessageField { - (PBAppendableArray *)repeatedStringPieceField { return result.repeatedStringPieceFieldArray; } -- (NSString*)repeatedStringPieceFieldAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringPieceFieldAtIndex:(unsigned long)index { return [result repeatedStringPieceFieldAtIndex:index]; } - (TestCamelCaseFieldNames_Builder *)addRepeatedStringPieceField:(NSString*)value { @@ -13146,7 +13146,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedStringPieceFieldArray:(NSArray * result.repeatedStringPieceFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedStringPieceFieldValues:(const NSString* *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedStringPieceFieldValues:(const NSString* *)values count:(unsigned long)count { result.repeatedStringPieceFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -13157,7 +13157,7 @@ - (TestCamelCaseFieldNames_Builder *)clearRepeatedStringPieceField { - (PBAppendableArray *)repeatedCordField { return result.repeatedCordFieldArray; } -- (NSString*)repeatedCordFieldAtIndex:(NSUInteger)index { +- (NSString*)repeatedCordFieldAtIndex:(unsigned long)index { return [result repeatedCordFieldAtIndex:index]; } - (TestCamelCaseFieldNames_Builder *)addRepeatedCordField:(NSString*)value { @@ -13171,7 +13171,7 @@ - (TestCamelCaseFieldNames_Builder *)setRepeatedCordFieldArray:(NSArray *)array result.repeatedCordFieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestCamelCaseFieldNames_Builder *)setRepeatedCordFieldValues:(const NSString* *)values count:(NSUInteger)count { +- (TestCamelCaseFieldNames_Builder *)setRepeatedCordFieldValues:(const NSString* *)values count:(unsigned long)count { result.repeatedCordFieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -13183,7 +13183,7 @@ - (TestCamelCaseFieldNames_Builder *)clearRepeatedCordField { @interface TestFieldOrderings () @property (retain) NSString* myString; -@property int64_t myInt; +@property long long myInt; @property Float32 myFloat; @end @@ -13258,8 +13258,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -13353,8 +13353,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasMyInt) { hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.myInt] hash]; } @@ -13432,7 +13432,7 @@ - (TestFieldOrderings_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestFieldOrderings_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -13478,10 +13478,10 @@ - (TestFieldOrderings_Builder*) clearMyString { - (BOOL) hasMyInt { return result.hasMyInt; } -- (int64_t) myInt { +- (long long) myInt { return result.myInt; } -- (TestFieldOrderings_Builder*) setMyInt:(int64_t) value { +- (TestFieldOrderings_Builder*) setMyInt:(long long) value { result.hasMyInt = YES; result.myInt = value; return self; @@ -13511,10 +13511,10 @@ - (TestFieldOrderings_Builder*) clearMyFloat { @interface TestExtremeDefaultValues () @property (retain) NSData* escapedBytes; -@property uNSInteger largeUint32; -@property uint64_t largeUint64; -@property NSInteger smallInt32; -@property int64_t smallInt64; +@property ulong largeUint32; +@property ulong long largeUint64; +@property long smallInt32; +@property long long smallInt64; @property (retain) NSString* utf8String; @property Float32 zeroFloat; @property Float32 oneFloat; @@ -13783,8 +13783,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -14018,8 +14018,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasEscapedBytes) { hashCode = hashCode * 31 + [self.escapedBytes hash]; } @@ -14196,7 +14196,7 @@ - (TestExtremeDefaultValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestExtremeDefaultValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -14310,10 +14310,10 @@ - (TestExtremeDefaultValues_Builder*) clearEscapedBytes { - (BOOL) hasLargeUint32 { return result.hasLargeUint32; } -- (uNSInteger) largeUint32 { +- (ulong) largeUint32 { return result.largeUint32; } -- (TestExtremeDefaultValues_Builder*) setLargeUint32:(uNSInteger) value { +- (TestExtremeDefaultValues_Builder*) setLargeUint32:(ulong) value { result.hasLargeUint32 = YES; result.largeUint32 = value; return self; @@ -14326,10 +14326,10 @@ - (TestExtremeDefaultValues_Builder*) clearLargeUint32 { - (BOOL) hasLargeUint64 { return result.hasLargeUint64; } -- (uint64_t) largeUint64 { +- (ulong long) largeUint64 { return result.largeUint64; } -- (TestExtremeDefaultValues_Builder*) setLargeUint64:(uint64_t) value { +- (TestExtremeDefaultValues_Builder*) setLargeUint64:(ulong long) value { result.hasLargeUint64 = YES; result.largeUint64 = value; return self; @@ -14342,10 +14342,10 @@ - (TestExtremeDefaultValues_Builder*) clearLargeUint64 { - (BOOL) hasSmallInt32 { return result.hasSmallInt32; } -- (NSInteger) smallInt32 { +- (long) smallInt32 { return result.smallInt32; } -- (TestExtremeDefaultValues_Builder*) setSmallInt32:(NSInteger) value { +- (TestExtremeDefaultValues_Builder*) setSmallInt32:(long) value { result.hasSmallInt32 = YES; result.smallInt32 = value; return self; @@ -14358,10 +14358,10 @@ - (TestExtremeDefaultValues_Builder*) clearSmallInt32 { - (BOOL) hasSmallInt64 { return result.hasSmallInt64; } -- (int64_t) smallInt64 { +- (long long) smallInt64 { return result.smallInt64; } -- (TestExtremeDefaultValues_Builder*) setSmallInt64:(int64_t) value { +- (TestExtremeDefaultValues_Builder*) setSmallInt64:(long long) value { result.hasSmallInt64 = YES; result.smallInt64 = value; return self; @@ -14656,8 +14656,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -14720,8 +14720,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasSparseEnum) { hashCode = hashCode * 31 + self.sparseEnum; } @@ -14784,7 +14784,7 @@ - (SparseEnumMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (SparseEnumMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -14797,7 +14797,7 @@ - (SparseEnumMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i break; } case 8: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestSparseEnumIsValidValue(value)) { [self setSparseEnum:value]; } else { @@ -14870,8 +14870,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -14934,8 +14934,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasData) { hashCode = hashCode * 31 + [self.data hash]; } @@ -14998,7 +14998,7 @@ - (OneString_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (OneString_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -15079,8 +15079,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -15143,8 +15143,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasData) { hashCode = hashCode * 31 + [self.data hash]; } @@ -15207,7 +15207,7 @@ - (OneBytes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (OneBytes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -15328,231 +15328,231 @@ - (TestPackedTypes*) defaultInstance { - (PBArray *)packedInt32 { return packedInt32Array; } -- (NSInteger)packedInt32AtIndex:(NSUInteger)index { +- (long)packedInt32AtIndex:(unsigned long)index { return [packedInt32Array int32AtIndex:index]; } - (PBArray *)packedInt64 { return packedInt64Array; } -- (int64_t)packedInt64AtIndex:(NSUInteger)index { +- (long long)packedInt64AtIndex:(unsigned long)index { return [packedInt64Array int64AtIndex:index]; } - (PBArray *)packedUint32 { return packedUint32Array; } -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { +- (ulong)packedUint32AtIndex:(unsigned long)index { return [packedUint32Array uint32AtIndex:index]; } - (PBArray *)packedUint64 { return packedUint64Array; } -- (uint64_t)packedUint64AtIndex:(NSUInteger)index { +- (ulong long)packedUint64AtIndex:(unsigned long)index { return [packedUint64Array uint64AtIndex:index]; } - (PBArray *)packedSint32 { return packedSint32Array; } -- (NSInteger)packedSint32AtIndex:(NSUInteger)index { +- (long)packedSint32AtIndex:(unsigned long)index { return [packedSint32Array int32AtIndex:index]; } - (PBArray *)packedSint64 { return packedSint64Array; } -- (int64_t)packedSint64AtIndex:(NSUInteger)index { +- (long long)packedSint64AtIndex:(unsigned long)index { return [packedSint64Array int64AtIndex:index]; } - (PBArray *)packedFixed32 { return packedFixed32Array; } -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { +- (ulong)packedFixed32AtIndex:(unsigned long)index { return [packedFixed32Array uint32AtIndex:index]; } - (PBArray *)packedFixed64 { return packedFixed64Array; } -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index { +- (ulong long)packedFixed64AtIndex:(unsigned long)index { return [packedFixed64Array uint64AtIndex:index]; } - (PBArray *)packedSfixed32 { return packedSfixed32Array; } -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { +- (long)packedSfixed32AtIndex:(unsigned long)index { return [packedSfixed32Array int32AtIndex:index]; } - (PBArray *)packedSfixed64 { return packedSfixed64Array; } -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index { +- (long long)packedSfixed64AtIndex:(unsigned long)index { return [packedSfixed64Array int64AtIndex:index]; } - (PBArray *)packedFloat { return packedFloatArray; } -- (Float32)packedFloatAtIndex:(NSUInteger)index { +- (Float32)packedFloatAtIndex:(unsigned long)index { return [packedFloatArray floatAtIndex:index]; } - (PBArray *)packedDouble { return packedDoubleArray; } -- (Float64)packedDoubleAtIndex:(NSUInteger)index { +- (Float64)packedDoubleAtIndex:(unsigned long)index { return [packedDoubleArray doubleAtIndex:index]; } - (PBArray *)packedBool { return packedBoolArray; } -- (BOOL)packedBoolAtIndex:(NSUInteger)index { +- (BOOL)packedBoolAtIndex:(unsigned long)index { return [packedBoolArray boolAtIndex:index]; } - (PBArray *)packedEnum { return packedEnumArray; } -- (ForeignEnum)packedEnumAtIndex:(NSUInteger)index { +- (ForeignEnum)packedEnumAtIndex:(unsigned long)index { return [packedEnumArray int32AtIndex:index]; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - const NSUInteger packedInt32ArrayCount = self.packedInt32Array.count; + const unsigned long packedInt32ArrayCount = self.packedInt32Array.count; if (packedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; + const long *values = (const long *)self.packedInt32Array.data; [output writeRawVarint32:722]; [output writeRawVarint32:packedInt32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedInt32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedInt32ArrayCount; ++i) { [output writeInt32NoTag:values[i]]; } } - const NSUInteger packedInt64ArrayCount = self.packedInt64Array.count; + const unsigned long packedInt64ArrayCount = self.packedInt64Array.count; if (packedInt64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.packedInt64Array.data; + const long long *values = (const long long *)self.packedInt64Array.data; [output writeRawVarint32:730]; [output writeRawVarint32:packedInt64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedInt64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedInt64ArrayCount; ++i) { [output writeInt64NoTag:values[i]]; } } - const NSUInteger packedUint32ArrayCount = self.packedUint32Array.count; + const unsigned long packedUint32ArrayCount = self.packedUint32Array.count; if (packedUint32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; + const ulong *values = (const ulong *)self.packedUint32Array.data; [output writeRawVarint32:738]; [output writeRawVarint32:packedUint32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedUint32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedUint32ArrayCount; ++i) { [output writeUInt32NoTag:values[i]]; } } - const NSUInteger packedUint64ArrayCount = self.packedUint64Array.count; + const unsigned long packedUint64ArrayCount = self.packedUint64Array.count; if (packedUint64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.packedUint64Array.data; + const ulong long *values = (const ulong long *)self.packedUint64Array.data; [output writeRawVarint32:746]; [output writeRawVarint32:packedUint64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedUint64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedUint64ArrayCount; ++i) { [output writeUInt64NoTag:values[i]]; } } - const NSUInteger packedSint32ArrayCount = self.packedSint32Array.count; + const unsigned long packedSint32ArrayCount = self.packedSint32Array.count; if (packedSint32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; + const long *values = (const long *)self.packedSint32Array.data; [output writeRawVarint32:754]; [output writeRawVarint32:packedSint32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSint32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSint32ArrayCount; ++i) { [output writeSInt32NoTag:values[i]]; } } - const NSUInteger packedSint64ArrayCount = self.packedSint64Array.count; + const unsigned long packedSint64ArrayCount = self.packedSint64Array.count; if (packedSint64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.packedSint64Array.data; + const long long *values = (const long long *)self.packedSint64Array.data; [output writeRawVarint32:762]; [output writeRawVarint32:packedSint64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSint64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSint64ArrayCount; ++i) { [output writeSInt64NoTag:values[i]]; } } - const NSUInteger packedFixed32ArrayCount = self.packedFixed32Array.count; + const unsigned long packedFixed32ArrayCount = self.packedFixed32Array.count; if (packedFixed32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.packedFixed32Array.data; + const ulong *values = (const ulong *)self.packedFixed32Array.data; [output writeRawVarint32:770]; [output writeRawVarint32:packedFixed32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedFixed32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedFixed32ArrayCount; ++i) { [output writeFixed32NoTag:values[i]]; } } - const NSUInteger packedFixed64ArrayCount = self.packedFixed64Array.count; + const unsigned long packedFixed64ArrayCount = self.packedFixed64Array.count; if (packedFixed64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.packedFixed64Array.data; + const ulong long *values = (const ulong long *)self.packedFixed64Array.data; [output writeRawVarint32:778]; [output writeRawVarint32:packedFixed64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedFixed64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedFixed64ArrayCount; ++i) { [output writeFixed64NoTag:values[i]]; } } - const NSUInteger packedSfixed32ArrayCount = self.packedSfixed32Array.count; + const unsigned long packedSfixed32ArrayCount = self.packedSfixed32Array.count; if (packedSfixed32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedSfixed32Array.data; + const long *values = (const long *)self.packedSfixed32Array.data; [output writeRawVarint32:786]; [output writeRawVarint32:packedSfixed32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSfixed32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSfixed32ArrayCount; ++i) { [output writeSFixed32NoTag:values[i]]; } } - const NSUInteger packedSfixed64ArrayCount = self.packedSfixed64Array.count; + const unsigned long packedSfixed64ArrayCount = self.packedSfixed64Array.count; if (packedSfixed64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.packedSfixed64Array.data; + const long long *values = (const long long *)self.packedSfixed64Array.data; [output writeRawVarint32:794]; [output writeRawVarint32:packedSfixed64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSfixed64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSfixed64ArrayCount; ++i) { [output writeSFixed64NoTag:values[i]]; } } - const NSUInteger packedFloatArrayCount = self.packedFloatArray.count; + const unsigned long packedFloatArrayCount = self.packedFloatArray.count; if (packedFloatArrayCount > 0) { const Float32 *values = (const Float32 *)self.packedFloatArray.data; [output writeRawVarint32:802]; [output writeRawVarint32:packedFloatMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedFloatArrayCount; ++i) { + for (unsigned long i = 0; i < packedFloatArrayCount; ++i) { [output writeFloatNoTag:values[i]]; } } - const NSUInteger packedDoubleArrayCount = self.packedDoubleArray.count; + const unsigned long packedDoubleArrayCount = self.packedDoubleArray.count; if (packedDoubleArrayCount > 0) { const Float64 *values = (const Float64 *)self.packedDoubleArray.data; [output writeRawVarint32:810]; [output writeRawVarint32:packedDoubleMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedDoubleArrayCount; ++i) { + for (unsigned long i = 0; i < packedDoubleArrayCount; ++i) { [output writeDoubleNoTag:values[i]]; } } - const NSUInteger packedBoolArrayCount = self.packedBoolArray.count; + const unsigned long packedBoolArrayCount = self.packedBoolArray.count; if (packedBoolArrayCount > 0) { const BOOL *values = (const BOOL *)self.packedBoolArray.data; [output writeRawVarint32:818]; [output writeRawVarint32:packedBoolMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedBoolArrayCount; ++i) { + for (unsigned long i = 0; i < packedBoolArrayCount; ++i) { [output writeBoolNoTag:values[i]]; } } - const NSUInteger packedEnumArrayCount = self.packedEnumArray.count; + const unsigned long packedEnumArrayCount = self.packedEnumArray.count; const ForeignEnum *packedEnumArrayValues = (const ForeignEnum *)self.packedEnumArray.data; if (self.packedEnumArray.count > 0) { [output writeRawVarint32:826]; [output writeRawVarint32:packedEnumMemoizedSerializedSize]; } - for (NSUInteger i = 0; i < packedEnumArrayCount; ++i) { + for (unsigned long i = 0; i < packedEnumArrayCount; ++i) { [output writeEnumNoTag:packedEnumArrayValues[i]]; } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - NSInteger dataSize = 0; - const NSUInteger count = self.packedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedInt32Array.count; + const long *values = (const long *)self.packedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; @@ -15563,10 +15563,10 @@ - (NSInteger) serializedSize { packedInt32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedInt64Array.count; - const int64_t *values = (const int64_t *)self.packedInt64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedInt64Array.count; + const long long *values = (const long long *)self.packedInt64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt64SizeNoTag(values[i]); } size += dataSize; @@ -15577,10 +15577,10 @@ - (NSInteger) serializedSize { packedInt64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedUint32Array.count; - const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedUint32Array.count; + const ulong *values = (const ulong *)self.packedUint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } size += dataSize; @@ -15591,10 +15591,10 @@ - (NSInteger) serializedSize { packedUint32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedUint64Array.count; - const uint64_t *values = (const uint64_t *)self.packedUint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedUint64Array.count; + const ulong long *values = (const ulong long *)self.packedUint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } size += dataSize; @@ -15605,10 +15605,10 @@ - (NSInteger) serializedSize { packedUint64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSint32Array.count; - const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedSint32Array.count; + const long *values = (const long *)self.packedSint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } size += dataSize; @@ -15619,10 +15619,10 @@ - (NSInteger) serializedSize { packedSint32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSint64Array.count; - const int64_t *values = (const int64_t *)self.packedSint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedSint64Array.count; + const long long *values = (const long long *)self.packedSint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt64SizeNoTag(values[i]); } size += dataSize; @@ -15633,8 +15633,8 @@ - (NSInteger) serializedSize { packedSint64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedFixed32Array.count; + long dataSize = 0; + const unsigned long count = self.packedFixed32Array.count; dataSize = 4 * count; size += dataSize; if (count > 0) { @@ -15644,8 +15644,8 @@ - (NSInteger) serializedSize { packedFixed32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedFixed64Array.count; + long dataSize = 0; + const unsigned long count = self.packedFixed64Array.count; dataSize = 8 * count; size += dataSize; if (count > 0) { @@ -15655,8 +15655,8 @@ - (NSInteger) serializedSize { packedFixed64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSfixed32Array.count; + long dataSize = 0; + const unsigned long count = self.packedSfixed32Array.count; dataSize = 4 * count; size += dataSize; if (count > 0) { @@ -15666,8 +15666,8 @@ - (NSInteger) serializedSize { packedSfixed32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSfixed64Array.count; + long dataSize = 0; + const unsigned long count = self.packedSfixed64Array.count; dataSize = 8 * count; size += dataSize; if (count > 0) { @@ -15677,8 +15677,8 @@ - (NSInteger) serializedSize { packedSfixed64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedFloatArray.count; + long dataSize = 0; + const unsigned long count = self.packedFloatArray.count; dataSize = 4 * count; size += dataSize; if (count > 0) { @@ -15688,8 +15688,8 @@ - (NSInteger) serializedSize { packedFloatMemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedDoubleArray.count; + long dataSize = 0; + const unsigned long count = self.packedDoubleArray.count; dataSize = 8 * count; size += dataSize; if (count > 0) { @@ -15699,8 +15699,8 @@ - (NSInteger) serializedSize { packedDoubleMemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedBoolArray.count; + long dataSize = 0; + const unsigned long count = self.packedBoolArray.count; dataSize = 1 * count; size += dataSize; if (count > 0) { @@ -15710,10 +15710,10 @@ - (NSInteger) serializedSize { packedBoolMemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedEnumArray.count; + long dataSize = 0; + const unsigned long count = self.packedEnumArray.count; const ForeignEnum *values = (const ForeignEnum *)self.packedEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; @@ -15841,8 +15841,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; for (NSNumber* value in self.packedInt32Array) { hashCode = hashCode * 31 + [value intValue]; } @@ -16039,7 +16039,7 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -16052,8 +16052,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 722: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16064,8 +16064,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 730: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedInt64Array == nil) { result.packedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16076,8 +16076,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 738: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16088,8 +16088,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 746: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16100,8 +16100,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 754: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16112,8 +16112,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 762: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSint64Array == nil) { result.packedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16124,8 +16124,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 770: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16136,8 +16136,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 778: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16148,8 +16148,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 786: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16160,8 +16160,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 794: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSfixed64Array == nil) { result.packedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16172,8 +16172,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 802: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedFloatArray == nil) { result.packedFloatArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeFloat]; } @@ -16184,8 +16184,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 810: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedDoubleArray == nil) { result.packedDoubleArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeDouble]; } @@ -16196,8 +16196,8 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 818: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedBoolArray == nil) { result.packedBoolArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeBool]; } @@ -16208,10 +16208,10 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 826: { - NSInteger length = [input readRawVarint32]; - NSInteger oldLimit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long oldLimit = [input pushLimit:length]; while (input.bytesUntilLimit > 0) { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addPackedEnum:value]; } else { @@ -16227,10 +16227,10 @@ - (TestPackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp - (PBAppendableArray *)packedInt32 { return result.packedInt32Array; } -- (NSInteger)packedInt32AtIndex:(NSUInteger)index { +- (long)packedInt32AtIndex:(unsigned long)index { return [result packedInt32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedInt32:(NSInteger)value { +- (TestPackedTypes_Builder *)addPackedInt32:(long)value { if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16241,7 +16241,7 @@ - (TestPackedTypes_Builder *)setPackedInt32Array:(NSArray *)array { result.packedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedInt32Values:(const long *)values count:(unsigned long)count { result.packedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16252,10 +16252,10 @@ - (TestPackedTypes_Builder *)clearPackedInt32 { - (PBAppendableArray *)packedInt64 { return result.packedInt64Array; } -- (int64_t)packedInt64AtIndex:(NSUInteger)index { +- (long long)packedInt64AtIndex:(unsigned long)index { return [result packedInt64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedInt64:(int64_t)value { +- (TestPackedTypes_Builder *)addPackedInt64:(long long)value { if (result.packedInt64Array == nil) { result.packedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16266,7 +16266,7 @@ - (TestPackedTypes_Builder *)setPackedInt64Array:(NSArray *)array { result.packedInt64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedInt64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedInt64Values:(const long long *)values count:(unsigned long)count { result.packedInt64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -16277,10 +16277,10 @@ - (TestPackedTypes_Builder *)clearPackedInt64 { - (PBAppendableArray *)packedUint32 { return result.packedUint32Array; } -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { +- (ulong)packedUint32AtIndex:(unsigned long)index { return [result packedUint32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedUint32:(uNSInteger)value { +- (TestPackedTypes_Builder *)addPackedUint32:(ulong)value { if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16291,7 +16291,7 @@ - (TestPackedTypes_Builder *)setPackedUint32Array:(NSArray *)array { result.packedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count { result.packedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -16302,10 +16302,10 @@ - (TestPackedTypes_Builder *)clearPackedUint32 { - (PBAppendableArray *)packedUint64 { return result.packedUint64Array; } -- (uint64_t)packedUint64AtIndex:(NSUInteger)index { +- (ulong long)packedUint64AtIndex:(unsigned long)index { return [result packedUint64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedUint64:(uint64_t)value { +- (TestPackedTypes_Builder *)addPackedUint64:(ulong long)value { if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16316,7 +16316,7 @@ - (TestPackedTypes_Builder *)setPackedUint64Array:(NSArray *)array { result.packedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedUint64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count { result.packedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -16327,10 +16327,10 @@ - (TestPackedTypes_Builder *)clearPackedUint64 { - (PBAppendableArray *)packedSint32 { return result.packedSint32Array; } -- (NSInteger)packedSint32AtIndex:(NSUInteger)index { +- (long)packedSint32AtIndex:(unsigned long)index { return [result packedSint32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedSint32:(NSInteger)value { +- (TestPackedTypes_Builder *)addPackedSint32:(long)value { if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16341,7 +16341,7 @@ - (TestPackedTypes_Builder *)setPackedSint32Array:(NSArray *)array { result.packedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedSint32Values:(const long *)values count:(unsigned long)count { result.packedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16352,10 +16352,10 @@ - (TestPackedTypes_Builder *)clearPackedSint32 { - (PBAppendableArray *)packedSint64 { return result.packedSint64Array; } -- (int64_t)packedSint64AtIndex:(NSUInteger)index { +- (long long)packedSint64AtIndex:(unsigned long)index { return [result packedSint64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedSint64:(int64_t)value { +- (TestPackedTypes_Builder *)addPackedSint64:(long long)value { if (result.packedSint64Array == nil) { result.packedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16366,7 +16366,7 @@ - (TestPackedTypes_Builder *)setPackedSint64Array:(NSArray *)array { result.packedSint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedSint64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedSint64Values:(const long long *)values count:(unsigned long)count { result.packedSint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -16377,10 +16377,10 @@ - (TestPackedTypes_Builder *)clearPackedSint64 { - (PBAppendableArray *)packedFixed32 { return result.packedFixed32Array; } -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { +- (ulong)packedFixed32AtIndex:(unsigned long)index { return [result packedFixed32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedFixed32:(uNSInteger)value { +- (TestPackedTypes_Builder *)addPackedFixed32:(ulong)value { if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16391,7 +16391,7 @@ - (TestPackedTypes_Builder *)setPackedFixed32Array:(NSArray *)array { result.packedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count { result.packedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -16402,10 +16402,10 @@ - (TestPackedTypes_Builder *)clearPackedFixed32 { - (PBAppendableArray *)packedFixed64 { return result.packedFixed64Array; } -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index { +- (ulong long)packedFixed64AtIndex:(unsigned long)index { return [result packedFixed64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedFixed64:(uint64_t)value { +- (TestPackedTypes_Builder *)addPackedFixed64:(ulong long)value { if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16416,7 +16416,7 @@ - (TestPackedTypes_Builder *)setPackedFixed64Array:(NSArray *)array { result.packedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedFixed64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count { result.packedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -16427,10 +16427,10 @@ - (TestPackedTypes_Builder *)clearPackedFixed64 { - (PBAppendableArray *)packedSfixed32 { return result.packedSfixed32Array; } -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { +- (long)packedSfixed32AtIndex:(unsigned long)index { return [result packedSfixed32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedSfixed32:(NSInteger)value { +- (TestPackedTypes_Builder *)addPackedSfixed32:(long)value { if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -16441,7 +16441,7 @@ - (TestPackedTypes_Builder *)setPackedSfixed32Array:(NSArray *)array { result.packedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedSfixed32Values:(const long *)values count:(unsigned long)count { result.packedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16452,10 +16452,10 @@ - (TestPackedTypes_Builder *)clearPackedSfixed32 { - (PBAppendableArray *)packedSfixed64 { return result.packedSfixed64Array; } -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index { +- (long long)packedSfixed64AtIndex:(unsigned long)index { return [result packedSfixed64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedSfixed64:(int64_t)value { +- (TestPackedTypes_Builder *)addPackedSfixed64:(long long)value { if (result.packedSfixed64Array == nil) { result.packedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -16466,7 +16466,7 @@ - (TestPackedTypes_Builder *)setPackedSfixed64Array:(NSArray *)array { result.packedSfixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedSfixed64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedSfixed64Values:(const long long *)values count:(unsigned long)count { result.packedSfixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -16477,7 +16477,7 @@ - (TestPackedTypes_Builder *)clearPackedSfixed64 { - (PBAppendableArray *)packedFloat { return result.packedFloatArray; } -- (Float32)packedFloatAtIndex:(NSUInteger)index { +- (Float32)packedFloatAtIndex:(unsigned long)index { return [result packedFloatAtIndex:index]; } - (TestPackedTypes_Builder *)addPackedFloat:(Float32)value { @@ -16491,7 +16491,7 @@ - (TestPackedTypes_Builder *)setPackedFloatArray:(NSArray *)array { result.packedFloatArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeFloat]; return self; } -- (TestPackedTypes_Builder *)setPackedFloatValues:(const Float32 *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedFloatValues:(const Float32 *)values count:(unsigned long)count { result.packedFloatArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeFloat]; return self; } @@ -16502,7 +16502,7 @@ - (TestPackedTypes_Builder *)clearPackedFloat { - (PBAppendableArray *)packedDouble { return result.packedDoubleArray; } -- (Float64)packedDoubleAtIndex:(NSUInteger)index { +- (Float64)packedDoubleAtIndex:(unsigned long)index { return [result packedDoubleAtIndex:index]; } - (TestPackedTypes_Builder *)addPackedDouble:(Float64)value { @@ -16516,7 +16516,7 @@ - (TestPackedTypes_Builder *)setPackedDoubleArray:(NSArray *)array { result.packedDoubleArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeDouble]; return self; } -- (TestPackedTypes_Builder *)setPackedDoubleValues:(const Float64 *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedDoubleValues:(const Float64 *)values count:(unsigned long)count { result.packedDoubleArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeDouble]; return self; } @@ -16527,7 +16527,7 @@ - (TestPackedTypes_Builder *)clearPackedDouble { - (PBAppendableArray *)packedBool { return result.packedBoolArray; } -- (BOOL)packedBoolAtIndex:(NSUInteger)index { +- (BOOL)packedBoolAtIndex:(unsigned long)index { return [result packedBoolAtIndex:index]; } - (TestPackedTypes_Builder *)addPackedBool:(BOOL)value { @@ -16541,7 +16541,7 @@ - (TestPackedTypes_Builder *)setPackedBoolArray:(NSArray *)array { result.packedBoolArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeBool]; return self; } -- (TestPackedTypes_Builder *)setPackedBoolValues:(const BOOL *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedBoolValues:(const BOOL *)values count:(unsigned long)count { result.packedBoolArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeBool]; return self; } @@ -16552,7 +16552,7 @@ - (TestPackedTypes_Builder *)clearPackedBool { - (PBAppendableArray *)packedEnum { return result.packedEnumArray; } -- (ForeignEnum)packedEnumAtIndex:(NSUInteger)index { +- (ForeignEnum)packedEnumAtIndex:(unsigned long)index { return [result packedEnumAtIndex:index]; } - (TestPackedTypes_Builder *)addPackedEnum:(ForeignEnum)value { @@ -16566,7 +16566,7 @@ - (TestPackedTypes_Builder *)setPackedEnumArray:(NSArray *)array { result.packedEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedEnumValues:(const ForeignEnum *)values count:(NSUInteger)count { +- (TestPackedTypes_Builder *)setPackedEnumValues:(const ForeignEnum *)values count:(unsigned long)count { result.packedEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -16660,310 +16660,310 @@ - (TestUnpackedTypes*) defaultInstance { - (PBArray *)unpackedInt32 { return unpackedInt32Array; } -- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index { +- (long)unpackedInt32AtIndex:(unsigned long)index { return [unpackedInt32Array int32AtIndex:index]; } - (PBArray *)unpackedInt64 { return unpackedInt64Array; } -- (int64_t)unpackedInt64AtIndex:(NSUInteger)index { +- (long long)unpackedInt64AtIndex:(unsigned long)index { return [unpackedInt64Array int64AtIndex:index]; } - (PBArray *)unpackedUint32 { return unpackedUint32Array; } -- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index { +- (ulong)unpackedUint32AtIndex:(unsigned long)index { return [unpackedUint32Array uint32AtIndex:index]; } - (PBArray *)unpackedUint64 { return unpackedUint64Array; } -- (uint64_t)unpackedUint64AtIndex:(NSUInteger)index { +- (ulong long)unpackedUint64AtIndex:(unsigned long)index { return [unpackedUint64Array uint64AtIndex:index]; } - (PBArray *)unpackedSint32 { return unpackedSint32Array; } -- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index { +- (long)unpackedSint32AtIndex:(unsigned long)index { return [unpackedSint32Array int32AtIndex:index]; } - (PBArray *)unpackedSint64 { return unpackedSint64Array; } -- (int64_t)unpackedSint64AtIndex:(NSUInteger)index { +- (long long)unpackedSint64AtIndex:(unsigned long)index { return [unpackedSint64Array int64AtIndex:index]; } - (PBArray *)unpackedFixed32 { return unpackedFixed32Array; } -- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index { +- (ulong)unpackedFixed32AtIndex:(unsigned long)index { return [unpackedFixed32Array uint32AtIndex:index]; } - (PBArray *)unpackedFixed64 { return unpackedFixed64Array; } -- (uint64_t)unpackedFixed64AtIndex:(NSUInteger)index { +- (ulong long)unpackedFixed64AtIndex:(unsigned long)index { return [unpackedFixed64Array uint64AtIndex:index]; } - (PBArray *)unpackedSfixed32 { return unpackedSfixed32Array; } -- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index { +- (long)unpackedSfixed32AtIndex:(unsigned long)index { return [unpackedSfixed32Array int32AtIndex:index]; } - (PBArray *)unpackedSfixed64 { return unpackedSfixed64Array; } -- (int64_t)unpackedSfixed64AtIndex:(NSUInteger)index { +- (long long)unpackedSfixed64AtIndex:(unsigned long)index { return [unpackedSfixed64Array int64AtIndex:index]; } - (PBArray *)unpackedFloat { return unpackedFloatArray; } -- (Float32)unpackedFloatAtIndex:(NSUInteger)index { +- (Float32)unpackedFloatAtIndex:(unsigned long)index { return [unpackedFloatArray floatAtIndex:index]; } - (PBArray *)unpackedDouble { return unpackedDoubleArray; } -- (Float64)unpackedDoubleAtIndex:(NSUInteger)index { +- (Float64)unpackedDoubleAtIndex:(unsigned long)index { return [unpackedDoubleArray doubleAtIndex:index]; } - (PBArray *)unpackedBool { return unpackedBoolArray; } -- (BOOL)unpackedBoolAtIndex:(NSUInteger)index { +- (BOOL)unpackedBoolAtIndex:(unsigned long)index { return [unpackedBoolArray boolAtIndex:index]; } - (PBArray *)unpackedEnum { return unpackedEnumArray; } -- (ForeignEnum)unpackedEnumAtIndex:(NSUInteger)index { +- (ForeignEnum)unpackedEnumAtIndex:(unsigned long)index { return [unpackedEnumArray int32AtIndex:index]; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - const NSUInteger unpackedInt32ArrayCount = self.unpackedInt32Array.count; + const unsigned long unpackedInt32ArrayCount = self.unpackedInt32Array.count; if (unpackedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.unpackedInt32Array.data; - for (NSUInteger i = 0; i < unpackedInt32ArrayCount; ++i) { + const long *values = (const long *)self.unpackedInt32Array.data; + for (unsigned long i = 0; i < unpackedInt32ArrayCount; ++i) { [output writeInt32:90 value:values[i]]; } } - const NSUInteger unpackedInt64ArrayCount = self.unpackedInt64Array.count; + const unsigned long unpackedInt64ArrayCount = self.unpackedInt64Array.count; if (unpackedInt64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.unpackedInt64Array.data; - for (NSUInteger i = 0; i < unpackedInt64ArrayCount; ++i) { + const long long *values = (const long long *)self.unpackedInt64Array.data; + for (unsigned long i = 0; i < unpackedInt64ArrayCount; ++i) { [output writeInt64:91 value:values[i]]; } } - const NSUInteger unpackedUint32ArrayCount = self.unpackedUint32Array.count; + const unsigned long unpackedUint32ArrayCount = self.unpackedUint32Array.count; if (unpackedUint32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.unpackedUint32Array.data; - for (NSUInteger i = 0; i < unpackedUint32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.unpackedUint32Array.data; + for (unsigned long i = 0; i < unpackedUint32ArrayCount; ++i) { [output writeUInt32:92 value:values[i]]; } } - const NSUInteger unpackedUint64ArrayCount = self.unpackedUint64Array.count; + const unsigned long unpackedUint64ArrayCount = self.unpackedUint64Array.count; if (unpackedUint64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.unpackedUint64Array.data; - for (NSUInteger i = 0; i < unpackedUint64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.unpackedUint64Array.data; + for (unsigned long i = 0; i < unpackedUint64ArrayCount; ++i) { [output writeUInt64:93 value:values[i]]; } } - const NSUInteger unpackedSint32ArrayCount = self.unpackedSint32Array.count; + const unsigned long unpackedSint32ArrayCount = self.unpackedSint32Array.count; if (unpackedSint32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.unpackedSint32Array.data; - for (NSUInteger i = 0; i < unpackedSint32ArrayCount; ++i) { + const long *values = (const long *)self.unpackedSint32Array.data; + for (unsigned long i = 0; i < unpackedSint32ArrayCount; ++i) { [output writeSInt32:94 value:values[i]]; } } - const NSUInteger unpackedSint64ArrayCount = self.unpackedSint64Array.count; + const unsigned long unpackedSint64ArrayCount = self.unpackedSint64Array.count; if (unpackedSint64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.unpackedSint64Array.data; - for (NSUInteger i = 0; i < unpackedSint64ArrayCount; ++i) { + const long long *values = (const long long *)self.unpackedSint64Array.data; + for (unsigned long i = 0; i < unpackedSint64ArrayCount; ++i) { [output writeSInt64:95 value:values[i]]; } } - const NSUInteger unpackedFixed32ArrayCount = self.unpackedFixed32Array.count; + const unsigned long unpackedFixed32ArrayCount = self.unpackedFixed32Array.count; if (unpackedFixed32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.unpackedFixed32Array.data; - for (NSUInteger i = 0; i < unpackedFixed32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.unpackedFixed32Array.data; + for (unsigned long i = 0; i < unpackedFixed32ArrayCount; ++i) { [output writeFixed32:96 value:values[i]]; } } - const NSUInteger unpackedFixed64ArrayCount = self.unpackedFixed64Array.count; + const unsigned long unpackedFixed64ArrayCount = self.unpackedFixed64Array.count; if (unpackedFixed64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.unpackedFixed64Array.data; - for (NSUInteger i = 0; i < unpackedFixed64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.unpackedFixed64Array.data; + for (unsigned long i = 0; i < unpackedFixed64ArrayCount; ++i) { [output writeFixed64:97 value:values[i]]; } } - const NSUInteger unpackedSfixed32ArrayCount = self.unpackedSfixed32Array.count; + const unsigned long unpackedSfixed32ArrayCount = self.unpackedSfixed32Array.count; if (unpackedSfixed32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.unpackedSfixed32Array.data; - for (NSUInteger i = 0; i < unpackedSfixed32ArrayCount; ++i) { + const long *values = (const long *)self.unpackedSfixed32Array.data; + for (unsigned long i = 0; i < unpackedSfixed32ArrayCount; ++i) { [output writeSFixed32:98 value:values[i]]; } } - const NSUInteger unpackedSfixed64ArrayCount = self.unpackedSfixed64Array.count; + const unsigned long unpackedSfixed64ArrayCount = self.unpackedSfixed64Array.count; if (unpackedSfixed64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.unpackedSfixed64Array.data; - for (NSUInteger i = 0; i < unpackedSfixed64ArrayCount; ++i) { + const long long *values = (const long long *)self.unpackedSfixed64Array.data; + for (unsigned long i = 0; i < unpackedSfixed64ArrayCount; ++i) { [output writeSFixed64:99 value:values[i]]; } } - const NSUInteger unpackedFloatArrayCount = self.unpackedFloatArray.count; + const unsigned long unpackedFloatArrayCount = self.unpackedFloatArray.count; if (unpackedFloatArrayCount > 0) { const Float32 *values = (const Float32 *)self.unpackedFloatArray.data; - for (NSUInteger i = 0; i < unpackedFloatArrayCount; ++i) { + for (unsigned long i = 0; i < unpackedFloatArrayCount; ++i) { [output writeFloat:100 value:values[i]]; } } - const NSUInteger unpackedDoubleArrayCount = self.unpackedDoubleArray.count; + const unsigned long unpackedDoubleArrayCount = self.unpackedDoubleArray.count; if (unpackedDoubleArrayCount > 0) { const Float64 *values = (const Float64 *)self.unpackedDoubleArray.data; - for (NSUInteger i = 0; i < unpackedDoubleArrayCount; ++i) { + for (unsigned long i = 0; i < unpackedDoubleArrayCount; ++i) { [output writeDouble:101 value:values[i]]; } } - const NSUInteger unpackedBoolArrayCount = self.unpackedBoolArray.count; + const unsigned long unpackedBoolArrayCount = self.unpackedBoolArray.count; if (unpackedBoolArrayCount > 0) { const BOOL *values = (const BOOL *)self.unpackedBoolArray.data; - for (NSUInteger i = 0; i < unpackedBoolArrayCount; ++i) { + for (unsigned long i = 0; i < unpackedBoolArrayCount; ++i) { [output writeBool:102 value:values[i]]; } } - const NSUInteger unpackedEnumArrayCount = self.unpackedEnumArray.count; + const unsigned long unpackedEnumArrayCount = self.unpackedEnumArray.count; const ForeignEnum *unpackedEnumArrayValues = (const ForeignEnum *)self.unpackedEnumArray.data; - for (NSUInteger i = 0; i < unpackedEnumArrayCount; ++i) { + for (unsigned long i = 0; i < unpackedEnumArrayCount; ++i) { [output writeEnum:103 value:unpackedEnumArrayValues[i]]; } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.unpackedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.unpackedInt32Array.count; + const long *values = (const long *)self.unpackedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedInt64Array.count; - const int64_t *values = (const int64_t *)self.unpackedInt64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.unpackedInt64Array.count; + const long long *values = (const long long *)self.unpackedInt64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedUint32Array.count; - const uNSInteger *values = (const uNSInteger *)self.unpackedUint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.unpackedUint32Array.count; + const ulong *values = (const ulong *)self.unpackedUint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedUint64Array.count; - const uint64_t *values = (const uint64_t *)self.unpackedUint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.unpackedUint64Array.count; + const ulong long *values = (const ulong long *)self.unpackedUint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedSint32Array.count; - const NSInteger *values = (const NSInteger *)self.unpackedSint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.unpackedSint32Array.count; + const long *values = (const long *)self.unpackedSint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedSint64Array.count; - const int64_t *values = (const int64_t *)self.unpackedSint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.unpackedSint64Array.count; + const long long *values = (const long long *)self.unpackedSint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedFixed32Array.count; + long dataSize = 0; + const unsigned long count = self.unpackedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedFixed64Array.count; + long dataSize = 0; + const unsigned long count = self.unpackedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedSfixed32Array.count; + long dataSize = 0; + const unsigned long count = self.unpackedSfixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedSfixed64Array.count; + long dataSize = 0; + const unsigned long count = self.unpackedSfixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedFloatArray.count; + long dataSize = 0; + const unsigned long count = self.unpackedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedDoubleArray.count; + long dataSize = 0; + const unsigned long count = self.unpackedDoubleArray.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedBoolArray.count; + long dataSize = 0; + const unsigned long count = self.unpackedBoolArray.count; dataSize = 1 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.unpackedEnumArray.count; + long dataSize = 0; + const unsigned long count = self.unpackedEnumArray.count; const ForeignEnum *values = (const ForeignEnum *)self.unpackedEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; @@ -17087,8 +17087,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; for (NSNumber* value in self.unpackedInt32Array) { hashCode = hashCode * 31 + [value intValue]; } @@ -17285,7 +17285,7 @@ - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -17350,7 +17350,7 @@ - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i break; } case 824: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self addUnpackedEnum:value]; } else { @@ -17364,10 +17364,10 @@ - (TestUnpackedTypes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (PBAppendableArray *)unpackedInt32 { return result.unpackedInt32Array; } -- (NSInteger)unpackedInt32AtIndex:(NSUInteger)index { +- (long)unpackedInt32AtIndex:(unsigned long)index { return [result unpackedInt32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedInt32:(NSInteger)value { +- (TestUnpackedTypes_Builder *)addUnpackedInt32:(long)value { if (result.unpackedInt32Array == nil) { result.unpackedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -17378,7 +17378,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedInt32Array:(NSArray *)array { result.unpackedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedInt32Values:(const long *)values count:(unsigned long)count { result.unpackedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17389,10 +17389,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedInt32 { - (PBAppendableArray *)unpackedInt64 { return result.unpackedInt64Array; } -- (int64_t)unpackedInt64AtIndex:(NSUInteger)index { +- (long long)unpackedInt64AtIndex:(unsigned long)index { return [result unpackedInt64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedInt64:(int64_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedInt64:(long long)value { if (result.unpackedInt64Array == nil) { result.unpackedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -17403,7 +17403,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedInt64Array:(NSArray *)array { result.unpackedInt64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedInt64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedInt64Values:(const long long *)values count:(unsigned long)count { result.unpackedInt64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -17414,10 +17414,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedInt64 { - (PBAppendableArray *)unpackedUint32 { return result.unpackedUint32Array; } -- (uNSInteger)unpackedUint32AtIndex:(NSUInteger)index { +- (ulong)unpackedUint32AtIndex:(unsigned long)index { return [result unpackedUint32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedUint32:(uNSInteger)value { +- (TestUnpackedTypes_Builder *)addUnpackedUint32:(ulong)value { if (result.unpackedUint32Array == nil) { result.unpackedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -17428,7 +17428,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedUint32Array:(NSArray *)array { result.unpackedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const ulong *)values count:(unsigned long)count { result.unpackedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -17439,10 +17439,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedUint32 { - (PBAppendableArray *)unpackedUint64 { return result.unpackedUint64Array; } -- (uint64_t)unpackedUint64AtIndex:(NSUInteger)index { +- (ulong long)unpackedUint64AtIndex:(unsigned long)index { return [result unpackedUint64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedUint64:(uint64_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedUint64:(ulong long)value { if (result.unpackedUint64Array == nil) { result.unpackedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -17453,7 +17453,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedUint64Array:(NSArray *)array { result.unpackedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedUint64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedUint64Values:(const ulong long *)values count:(unsigned long)count { result.unpackedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -17464,10 +17464,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedUint64 { - (PBAppendableArray *)unpackedSint32 { return result.unpackedSint32Array; } -- (NSInteger)unpackedSint32AtIndex:(NSUInteger)index { +- (long)unpackedSint32AtIndex:(unsigned long)index { return [result unpackedSint32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedSint32:(NSInteger)value { +- (TestUnpackedTypes_Builder *)addUnpackedSint32:(long)value { if (result.unpackedSint32Array == nil) { result.unpackedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -17478,7 +17478,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedSint32Array:(NSArray *)array { result.unpackedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedSint32Values:(const long *)values count:(unsigned long)count { result.unpackedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17489,10 +17489,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedSint32 { - (PBAppendableArray *)unpackedSint64 { return result.unpackedSint64Array; } -- (int64_t)unpackedSint64AtIndex:(NSUInteger)index { +- (long long)unpackedSint64AtIndex:(unsigned long)index { return [result unpackedSint64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedSint64:(int64_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedSint64:(long long)value { if (result.unpackedSint64Array == nil) { result.unpackedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -17503,7 +17503,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedSint64Array:(NSArray *)array { result.unpackedSint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedSint64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedSint64Values:(const long long *)values count:(unsigned long)count { result.unpackedSint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -17514,10 +17514,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedSint64 { - (PBAppendableArray *)unpackedFixed32 { return result.unpackedFixed32Array; } -- (uNSInteger)unpackedFixed32AtIndex:(NSUInteger)index { +- (ulong)unpackedFixed32AtIndex:(unsigned long)index { return [result unpackedFixed32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(uNSInteger)value { +- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(ulong)value { if (result.unpackedFixed32Array == nil) { result.unpackedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -17528,7 +17528,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedFixed32Array:(NSArray *)array { result.unpackedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const ulong *)values count:(unsigned long)count { result.unpackedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -17539,10 +17539,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedFixed32 { - (PBAppendableArray *)unpackedFixed64 { return result.unpackedFixed64Array; } -- (uint64_t)unpackedFixed64AtIndex:(NSUInteger)index { +- (ulong long)unpackedFixed64AtIndex:(unsigned long)index { return [result unpackedFixed64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedFixed64:(uint64_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedFixed64:(ulong long)value { if (result.unpackedFixed64Array == nil) { result.unpackedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -17553,7 +17553,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedFixed64Array:(NSArray *)array { result.unpackedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedFixed64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedFixed64Values:(const ulong long *)values count:(unsigned long)count { result.unpackedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -17564,10 +17564,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedFixed64 { - (PBAppendableArray *)unpackedSfixed32 { return result.unpackedSfixed32Array; } -- (NSInteger)unpackedSfixed32AtIndex:(NSUInteger)index { +- (long)unpackedSfixed32AtIndex:(unsigned long)index { return [result unpackedSfixed32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(NSInteger)value { +- (TestUnpackedTypes_Builder *)addUnpackedSfixed32:(long)value { if (result.unpackedSfixed32Array == nil) { result.unpackedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -17578,7 +17578,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedSfixed32Array:(NSArray *)array { result.unpackedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedSfixed32Values:(const long *)values count:(unsigned long)count { result.unpackedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17589,10 +17589,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedSfixed32 { - (PBAppendableArray *)unpackedSfixed64 { return result.unpackedSfixed64Array; } -- (int64_t)unpackedSfixed64AtIndex:(NSUInteger)index { +- (long long)unpackedSfixed64AtIndex:(unsigned long)index { return [result unpackedSfixed64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedSfixed64:(int64_t)value { +- (TestUnpackedTypes_Builder *)addUnpackedSfixed64:(long long)value { if (result.unpackedSfixed64Array == nil) { result.unpackedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -17603,7 +17603,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedSfixed64Array:(NSArray *)array { result.unpackedSfixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedSfixed64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedSfixed64Values:(const long long *)values count:(unsigned long)count { result.unpackedSfixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -17614,7 +17614,7 @@ - (TestUnpackedTypes_Builder *)clearUnpackedSfixed64 { - (PBAppendableArray *)unpackedFloat { return result.unpackedFloatArray; } -- (Float32)unpackedFloatAtIndex:(NSUInteger)index { +- (Float32)unpackedFloatAtIndex:(unsigned long)index { return [result unpackedFloatAtIndex:index]; } - (TestUnpackedTypes_Builder *)addUnpackedFloat:(Float32)value { @@ -17628,7 +17628,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedFloatArray:(NSArray *)array { result.unpackedFloatArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeFloat]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedFloatValues:(const Float32 *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedFloatValues:(const Float32 *)values count:(unsigned long)count { result.unpackedFloatArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeFloat]; return self; } @@ -17639,7 +17639,7 @@ - (TestUnpackedTypes_Builder *)clearUnpackedFloat { - (PBAppendableArray *)unpackedDouble { return result.unpackedDoubleArray; } -- (Float64)unpackedDoubleAtIndex:(NSUInteger)index { +- (Float64)unpackedDoubleAtIndex:(unsigned long)index { return [result unpackedDoubleAtIndex:index]; } - (TestUnpackedTypes_Builder *)addUnpackedDouble:(Float64)value { @@ -17653,7 +17653,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedDoubleArray:(NSArray *)array { result.unpackedDoubleArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeDouble]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedDoubleValues:(const Float64 *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedDoubleValues:(const Float64 *)values count:(unsigned long)count { result.unpackedDoubleArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeDouble]; return self; } @@ -17664,7 +17664,7 @@ - (TestUnpackedTypes_Builder *)clearUnpackedDouble { - (PBAppendableArray *)unpackedBool { return result.unpackedBoolArray; } -- (BOOL)unpackedBoolAtIndex:(NSUInteger)index { +- (BOOL)unpackedBoolAtIndex:(unsigned long)index { return [result unpackedBoolAtIndex:index]; } - (TestUnpackedTypes_Builder *)addUnpackedBool:(BOOL)value { @@ -17678,7 +17678,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedBoolArray:(NSArray *)array { result.unpackedBoolArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeBool]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedBoolValues:(const BOOL *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedBoolValues:(const BOOL *)values count:(unsigned long)count { result.unpackedBoolArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeBool]; return self; } @@ -17689,7 +17689,7 @@ - (TestUnpackedTypes_Builder *)clearUnpackedBool { - (PBAppendableArray *)unpackedEnum { return result.unpackedEnumArray; } -- (ForeignEnum)unpackedEnumAtIndex:(NSUInteger)index { +- (ForeignEnum)unpackedEnumAtIndex:(unsigned long)index { return [result unpackedEnumAtIndex:index]; } - (TestUnpackedTypes_Builder *)addUnpackedEnum:(ForeignEnum)value { @@ -17703,7 +17703,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedEnumArray:(NSArray *)array { result.unpackedEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedEnumValues:(const ForeignEnum *)values count:(NSUInteger)count { +- (TestUnpackedTypes_Builder *)setUnpackedEnumValues:(const ForeignEnum *)values count:(unsigned long)count { result.unpackedEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -17750,8 +17750,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -17812,8 +17812,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:1 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -17872,7 +17872,7 @@ - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -17890,7 +17890,7 @@ - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* @end @interface TestDynamicExtensions () -@property uNSInteger scalarExtension; +@property ulong scalarExtension; @property ForeignEnum enumExtension; @property TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; @property (retain) ForeignMessage* messageExtension; @@ -17972,13 +17972,13 @@ - (TestDynamicExtensions*) defaultInstance { - (PBArray *)repeatedExtension { return repeatedExtensionArray; } -- (NSString*)repeatedExtensionAtIndex:(NSUInteger)index { +- (NSString*)repeatedExtensionAtIndex:(unsigned long)index { return [repeatedExtensionArray objectAtIndex:index]; } - (PBArray *)packedExtension { return packedExtensionArray; } -- (NSInteger)packedExtensionAtIndex:(NSUInteger)index { +- (long)packedExtensionAtIndex:(unsigned long)index { return [packedExtensionArray int32AtIndex:index]; } - (BOOL) isInitialized { @@ -18000,26 +18000,26 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasDynamicMessageExtension) { [output writeMessage:2004 value:self.dynamicMessageExtension]; } - const NSUInteger repeatedExtensionArrayCount = self.repeatedExtensionArray.count; + const unsigned long repeatedExtensionArrayCount = self.repeatedExtensionArray.count; if (repeatedExtensionArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedExtensionArray.data; - for (NSUInteger i = 0; i < repeatedExtensionArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedExtensionArrayCount; ++i) { [output writeString:2005 value:values[i]]; } } - const NSUInteger packedExtensionArrayCount = self.packedExtensionArray.count; + const unsigned long packedExtensionArrayCount = self.packedExtensionArray.count; if (packedExtensionArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedExtensionArray.data; + const long *values = (const long *)self.packedExtensionArray.data; [output writeRawVarint32:16050]; [output writeRawVarint32:packedExtensionMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedExtensionArrayCount; ++i) { + for (unsigned long i = 0; i < packedExtensionArrayCount; ++i) { [output writeSInt32NoTag:values[i]]; } } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -18041,20 +18041,20 @@ - (NSInteger) serializedSize { size += computeMessageSize(2004, self.dynamicMessageExtension); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedExtensionArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedExtensionArray.count; const NSString* *values = (const NSString* *)self.repeatedExtensionArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedExtensionArray.count; - const NSInteger *values = (const NSInteger *)self.packedExtensionArray.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedExtensionArray.count; + const long *values = (const long *)self.packedExtensionArray.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } size += dataSize; @@ -18158,8 +18158,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasScalarExtension) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.scalarExtension] hash]; } @@ -18197,7 +18197,7 @@ BOOL TestDynamicExtensions_DynamicEnumTypeIsValidValue(TestDynamicExtensions_Dyn } } @interface TestDynamicExtensions_DynamicMessageType () -@property NSInteger dynamicField; +@property long dynamicField; @end @implementation TestDynamicExtensions_DynamicMessageType @@ -18239,8 +18239,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -18303,8 +18303,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasDynamicField) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.dynamicField] hash]; } @@ -18367,7 +18367,7 @@ - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream: - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -18389,10 +18389,10 @@ - (TestDynamicExtensions_DynamicMessageType_Builder*) mergeFromCodedInputStream: - (BOOL) hasDynamicField { return result.hasDynamicField; } -- (NSInteger) dynamicField { +- (long) dynamicField { return result.dynamicField; } -- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(NSInteger) value { +- (TestDynamicExtensions_DynamicMessageType_Builder*) setDynamicField:(long) value { result.hasDynamicField = YES; result.dynamicField = value; return self; @@ -18484,7 +18484,7 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -18501,7 +18501,7 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 16008: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumIsValidValue(value)) { [self setEnumExtension:value]; } else { @@ -18510,7 +18510,7 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 16016: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestDynamicExtensions_DynamicEnumTypeIsValidValue(value)) { [self setDynamicEnumExtension:value]; } else { @@ -18541,8 +18541,8 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 16050: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedExtensionArray == nil) { result.packedExtensionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -18558,10 +18558,10 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (BOOL) hasScalarExtension { return result.hasScalarExtension; } -- (uNSInteger) scalarExtension { +- (ulong) scalarExtension { return result.scalarExtension; } -- (TestDynamicExtensions_Builder*) setScalarExtension:(uNSInteger) value { +- (TestDynamicExtensions_Builder*) setScalarExtension:(ulong) value { result.hasScalarExtension = YES; result.scalarExtension = value; return self; @@ -18666,7 +18666,7 @@ - (TestDynamicExtensions_Builder*) clearDynamicMessageExtension { - (PBAppendableArray *)repeatedExtension { return result.repeatedExtensionArray; } -- (NSString*)repeatedExtensionAtIndex:(NSUInteger)index { +- (NSString*)repeatedExtensionAtIndex:(unsigned long)index { return [result repeatedExtensionAtIndex:index]; } - (TestDynamicExtensions_Builder *)addRepeatedExtension:(NSString*)value { @@ -18680,7 +18680,7 @@ - (TestDynamicExtensions_Builder *)setRepeatedExtensionArray:(NSArray *)array { result.repeatedExtensionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestDynamicExtensions_Builder *)setRepeatedExtensionValues:(const NSString* *)values count:(NSUInteger)count { +- (TestDynamicExtensions_Builder *)setRepeatedExtensionValues:(const NSString* *)values count:(unsigned long)count { result.repeatedExtensionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -18691,10 +18691,10 @@ - (TestDynamicExtensions_Builder *)clearRepeatedExtension { - (PBAppendableArray *)packedExtension { return result.packedExtensionArray; } -- (NSInteger)packedExtensionAtIndex:(NSUInteger)index { +- (long)packedExtensionAtIndex:(unsigned long)index { return [result packedExtensionAtIndex:index]; } -- (TestDynamicExtensions_Builder *)addPackedExtension:(NSInteger)value { +- (TestDynamicExtensions_Builder *)addPackedExtension:(long)value { if (result.packedExtensionArray == nil) { result.packedExtensionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -18705,7 +18705,7 @@ - (TestDynamicExtensions_Builder *)setPackedExtensionArray:(NSArray *)array { result.packedExtensionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const NSInteger *)values count:(NSUInteger)count { +- (TestDynamicExtensions_Builder *)setPackedExtensionValues:(const long *)values count:(unsigned long)count { result.packedExtensionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -18767,140 +18767,140 @@ - (TestRepeatedScalarDifferentTagSizes*) defaultInstance { - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { +- (ulong)repeatedFixed32AtIndex:(unsigned long)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedInt32 { return repeatedInt32Array; } -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { +- (long)repeatedInt32AtIndex:(unsigned long)index { return [repeatedInt32Array int32AtIndex:index]; } - (PBArray *)repeatedFixed64 { return repeatedFixed64Array; } -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { return [repeatedFixed64Array uint64AtIndex:index]; } - (PBArray *)repeatedInt64 { return repeatedInt64Array; } -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index { +- (long long)repeatedInt64AtIndex:(unsigned long)index { return [repeatedInt64Array int64AtIndex:index]; } - (PBArray *)repeatedFloat { return repeatedFloatArray; } -- (Float32)repeatedFloatAtIndex:(NSUInteger)index { +- (Float32)repeatedFloatAtIndex:(unsigned long)index { return [repeatedFloatArray floatAtIndex:index]; } - (PBArray *)repeatedUint64 { return repeatedUint64Array; } -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { +- (ulong long)repeatedUint64AtIndex:(unsigned long)index { return [repeatedUint64Array uint64AtIndex:index]; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - const NSUInteger repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; + const unsigned long repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.repeatedFixed32Array.data; - for (NSUInteger i = 0; i < repeatedFixed32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.repeatedFixed32Array.data; + for (unsigned long i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:12 value:values[i]]; } } - const NSUInteger repeatedInt32ArrayCount = self.repeatedInt32Array.count; + const unsigned long repeatedInt32ArrayCount = self.repeatedInt32Array.count; if (repeatedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; - for (NSUInteger i = 0; i < repeatedInt32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedInt32Array.data; + for (unsigned long i = 0; i < repeatedInt32ArrayCount; ++i) { [output writeInt32:13 value:values[i]]; } } - const NSUInteger repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; + const unsigned long repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; if (repeatedFixed64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.repeatedFixed64Array.data; - for (NSUInteger i = 0; i < repeatedFixed64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.repeatedFixed64Array.data; + for (unsigned long i = 0; i < repeatedFixed64ArrayCount; ++i) { [output writeFixed64:2046 value:values[i]]; } } - const NSUInteger repeatedInt64ArrayCount = self.repeatedInt64Array.count; + const unsigned long repeatedInt64ArrayCount = self.repeatedInt64Array.count; if (repeatedInt64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; - for (NSUInteger i = 0; i < repeatedInt64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedInt64Array.data; + for (unsigned long i = 0; i < repeatedInt64ArrayCount; ++i) { [output writeInt64:2047 value:values[i]]; } } - const NSUInteger repeatedFloatArrayCount = self.repeatedFloatArray.count; + const unsigned long repeatedFloatArrayCount = self.repeatedFloatArray.count; if (repeatedFloatArrayCount > 0) { const Float32 *values = (const Float32 *)self.repeatedFloatArray.data; - for (NSUInteger i = 0; i < repeatedFloatArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedFloatArrayCount; ++i) { [output writeFloat:262142 value:values[i]]; } } - const NSUInteger repeatedUint64ArrayCount = self.repeatedUint64Array.count; + const unsigned long repeatedUint64ArrayCount = self.repeatedUint64Array.count; if (repeatedUint64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; - for (NSUInteger i = 0; i < repeatedUint64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + for (unsigned long i = 0; i < repeatedUint64ArrayCount; ++i) { [output writeUInt64:262143 value:values[i]]; } } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFixed32Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 1 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedInt32Array.count; + const long *values = (const long *)self.repeatedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; size += 1 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFixed64Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedInt64Array.count; - const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedInt64Array.count; + const long long *values = (const long long *)self.repeatedInt64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFloatArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 3 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedUint64Array.count; - const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedUint64Array.count; + const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } size += dataSize; @@ -18984,8 +18984,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; for (NSNumber* value in self.repeatedFixed32Array) { hashCode = hashCode * 31 + [value intValue]; } @@ -19102,7 +19102,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCo - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19144,10 +19144,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCo - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { +- (ulong)repeatedFixed32AtIndex:(unsigned long)index { return [result repeatedFixed32AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(uNSInteger)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(ulong)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -19158,7 +19158,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Array:(NSArra result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -19169,10 +19169,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFixed32 { - (PBAppendableArray *)repeatedInt32 { return result.repeatedInt32Array; } -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { +- (long)repeatedInt32AtIndex:(unsigned long)index { return [result repeatedInt32AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(NSInteger)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt32:(long)value { if (result.repeatedInt32Array == nil) { result.repeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -19183,7 +19183,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Array:(NSArray result.repeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt32Values:(const long *)values count:(unsigned long)count { result.repeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -19194,10 +19194,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedInt32 { - (PBAppendableArray *)repeatedFixed64 { return result.repeatedFixed64Array; } -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { return [result repeatedFixed64AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed64:(uint64_t)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed64:(ulong long)value { if (result.repeatedFixed64Array == nil) { result.repeatedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -19208,7 +19208,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Array:(NSArra result.repeatedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count { result.repeatedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -19219,10 +19219,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFixed64 { - (PBAppendableArray *)repeatedInt64 { return result.repeatedInt64Array; } -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index { +- (long long)repeatedInt64AtIndex:(unsigned long)index { return [result repeatedInt64AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt64:(int64_t)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedInt64:(long long)value { if (result.repeatedInt64Array == nil) { result.repeatedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -19233,7 +19233,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt64Array:(NSArray result.repeatedInt64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedInt64Values:(const long long *)values count:(unsigned long)count { result.repeatedInt64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -19244,7 +19244,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedFloat { return result.repeatedFloatArray; } -- (Float32)repeatedFloatAtIndex:(NSUInteger)index { +- (Float32)repeatedFloatAtIndex:(unsigned long)index { return [result repeatedFloatAtIndex:index]; } - (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFloat:(Float32)value { @@ -19258,7 +19258,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFloatArray:(NSArray result.repeatedFloatArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeFloat]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(unsigned long)count { result.repeatedFloatArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeFloat]; return self; } @@ -19269,10 +19269,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFloat { - (PBAppendableArray *)repeatedUint64 { return result.repeatedUint64Array; } -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { +- (ulong long)repeatedUint64AtIndex:(unsigned long)index { return [result repeatedUint64AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedUint64:(uint64_t)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedUint64:(ulong long)value { if (result.repeatedUint64Array == nil) { result.repeatedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -19283,7 +19283,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Array:(NSArray result.repeatedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count { result.repeatedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -19324,8 +19324,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19379,8 +19379,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -19437,7 +19437,7 @@ - (FooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (FooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19485,8 +19485,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19540,8 +19540,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -19598,7 +19598,7 @@ - (FooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (FooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19646,8 +19646,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19701,8 +19701,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -19759,7 +19759,7 @@ - (BarRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (BarRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -19807,8 +19807,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -19862,8 +19862,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -19920,7 +19920,7 @@ - (BarResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (BarResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestCustomOptions.pb.h b/src/runtime/Tests/UnittestCustomOptions.pb.h index d00709a..3e004a2 100644 --- a/src/runtime/Tests/UnittestCustomOptions.pb.h +++ b/src/runtime/Tests/UnittestCustomOptions.pb.h @@ -586,16 +586,16 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE BOOL hasFoo_:1; BOOL hasFoo2_:1; BOOL hasFoo3_:1; - NSInteger foo; - NSInteger foo2; - NSInteger foo3; + long foo; + long foo2; + long foo3; } - (BOOL) hasFoo; - (BOOL) hasFoo2; - (BOOL) hasFoo3; -@property (readonly) NSInteger foo; -@property (readonly) NSInteger foo2; -@property (readonly) NSInteger foo3; +@property (readonly) long foo; +@property (readonly) long foo2; +@property (readonly) long foo3; + (ComplexOptionType1*) defaultInstance; - (ComplexOptionType1*) defaultInstance; @@ -633,18 +633,18 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasFoo; -- (NSInteger) foo; -- (ComplexOptionType1_Builder*) setFoo:(NSInteger) value; +- (long) foo; +- (ComplexOptionType1_Builder*) setFoo:(long) value; - (ComplexOptionType1_Builder*) clearFoo; - (BOOL) hasFoo2; -- (NSInteger) foo2; -- (ComplexOptionType1_Builder*) setFoo2:(NSInteger) value; +- (long) foo2; +- (ComplexOptionType1_Builder*) setFoo2:(long) value; - (ComplexOptionType1_Builder*) clearFoo2; - (BOOL) hasFoo3; -- (NSInteger) foo3; -- (ComplexOptionType1_Builder*) setFoo3:(NSInteger) value; +- (long) foo3; +- (ComplexOptionType1_Builder*) setFoo3:(long) value; - (ComplexOptionType1_Builder*) clearFoo3; @end @@ -653,7 +653,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE BOOL hasBaz_:1; BOOL hasBar_:1; BOOL hasFred_:1; - NSInteger baz; + long baz; ComplexOptionType1* bar; ComplexOptionType2_ComplexOptionType4* fred; } @@ -661,7 +661,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (BOOL) hasBaz; - (BOOL) hasFred; @property (readonly, retain) ComplexOptionType1* bar; -@property (readonly) NSInteger baz; +@property (readonly) long baz; @property (readonly, retain) ComplexOptionType2_ComplexOptionType4* fred; + (ComplexOptionType2*) defaultInstance; @@ -685,10 +685,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface ComplexOptionType2_ComplexOptionType4 : PBGeneratedMessage { @private BOOL hasWaldo_:1; - NSInteger waldo; + long waldo; } - (BOOL) hasWaldo; -@property (readonly) NSInteger waldo; +@property (readonly) long waldo; + (ComplexOptionType2_ComplexOptionType4*) defaultInstance; - (ComplexOptionType2_ComplexOptionType4*) defaultInstance; @@ -727,8 +727,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasWaldo; -- (NSInteger) waldo; -- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(NSInteger) value; +- (long) waldo; +- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(long) value; - (ComplexOptionType2_ComplexOptionType4_Builder*) clearWaldo; @end @@ -757,8 +757,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType2_Builder*) clearBar; - (BOOL) hasBaz; -- (NSInteger) baz; -- (ComplexOptionType2_Builder*) setBaz:(NSInteger) value; +- (long) baz; +- (ComplexOptionType2_Builder*) setBaz:(long) value; - (ComplexOptionType2_Builder*) clearBaz; - (BOOL) hasFred; @@ -773,12 +773,12 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @private BOOL hasQux_:1; BOOL hasComplexOptionType5_:1; - NSInteger qux; + long qux; ComplexOptionType3_ComplexOptionType5* complexOptionType5; } - (BOOL) hasQux; - (BOOL) hasComplexOptionType5; -@property (readonly) NSInteger qux; +@property (readonly) long qux; @property (readonly, retain) ComplexOptionType3_ComplexOptionType5* complexOptionType5; + (ComplexOptionType3*) defaultInstance; @@ -802,10 +802,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface ComplexOptionType3_ComplexOptionType5 : PBGeneratedMessage { @private BOOL hasPlugh_:1; - NSInteger plugh; + long plugh; } - (BOOL) hasPlugh; -@property (readonly) NSInteger plugh; +@property (readonly) long plugh; + (ComplexOptionType3_ComplexOptionType5*) defaultInstance; - (ComplexOptionType3_ComplexOptionType5*) defaultInstance; @@ -843,8 +843,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasPlugh; -- (NSInteger) plugh; -- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(NSInteger) value; +- (long) plugh; +- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(long) value; - (ComplexOptionType3_ComplexOptionType5_Builder*) clearPlugh; @end @@ -866,8 +866,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasQux; -- (NSInteger) qux; -- (ComplexOptionType3_Builder*) setQux:(NSInteger) value; +- (long) qux; +- (ComplexOptionType3_Builder*) setQux:(long) value; - (ComplexOptionType3_Builder*) clearQux; - (BOOL) hasComplexOptionType5; @@ -881,10 +881,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface ComplexOpt6 : PBGeneratedMessage { @private BOOL hasXyzzy_:1; - NSInteger xyzzy; + long xyzzy; } - (BOOL) hasXyzzy; -@property (readonly) NSInteger xyzzy; +@property (readonly) long xyzzy; + (ComplexOpt6*) defaultInstance; - (ComplexOpt6*) defaultInstance; @@ -922,8 +922,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasXyzzy; -- (NSInteger) xyzzy; -- (ComplexOpt6_Builder*) setXyzzy:(NSInteger) value; +- (long) xyzzy; +- (ComplexOpt6_Builder*) setXyzzy:(long) value; - (ComplexOpt6_Builder*) clearXyzzy; @end @@ -1064,7 +1064,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE BOOL hasSub_:1; BOOL hasFile_:1; BOOL hasMset_:1; - NSInteger i; + long i; NSString* s; Aggregate* sub; PBFileOptions* file; @@ -1075,7 +1075,7 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (BOOL) hasSub; - (BOOL) hasFile; - (BOOL) hasMset; -@property (readonly) NSInteger i; +@property (readonly) long i; @property (readonly, retain) NSString* s; @property (readonly, retain) Aggregate* sub; @property (readonly, retain) PBFileOptions* file; @@ -1118,8 +1118,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasI; -- (NSInteger) i; -- (Aggregate_Builder*) setI:(NSInteger) value; +- (long) i; +- (Aggregate_Builder*) setI:(long) value; - (Aggregate_Builder*) clearI; - (BOOL) hasS; @@ -1152,10 +1152,10 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE @interface AggregateMessage : PBGeneratedMessage { @private BOOL hasFieldname_:1; - NSInteger fieldname; + long fieldname; } - (BOOL) hasFieldname; -@property (readonly) NSInteger fieldname; +@property (readonly) long fieldname; + (AggregateMessage*) defaultInstance; - (AggregateMessage*) defaultInstance; @@ -1193,8 +1193,8 @@ BOOL DummyMessageContainingEnum_TestEnumTypeIsValidValue(DummyMessageContainingE - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasFieldname; -- (NSInteger) fieldname; -- (AggregateMessage_Builder*) setFieldname:(NSInteger) value; +- (long) fieldname; +- (AggregateMessage_Builder*) setFieldname:(long) value; - (AggregateMessage_Builder*) clearFieldname; @end diff --git a/src/runtime/Tests/UnittestCustomOptions.pb.m b/src/runtime/Tests/UnittestCustomOptions.pb.m index e287ba2..30486af 100644 --- a/src/runtime/Tests/UnittestCustomOptions.pb.m +++ b/src/runtime/Tests/UnittestCustomOptions.pb.m @@ -674,8 +674,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -738,8 +738,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasField1) { hashCode = hashCode * 31 + [self.field1 hash]; } @@ -811,7 +811,7 @@ - (TestMessageWithCustomOptions_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (TestMessageWithCustomOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -879,8 +879,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -934,8 +934,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -992,7 +992,7 @@ - (CustomOptionFooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (CustomOptionFooRequest_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1040,8 +1040,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1095,8 +1095,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -1153,7 +1153,7 @@ - (CustomOptionFooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (CustomOptionFooResponse_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1201,8 +1201,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1256,8 +1256,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -1323,7 +1323,7 @@ - (DummyMessageContainingEnum_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (DummyMessageContainingEnum_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1371,8 +1371,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1426,8 +1426,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -1484,7 +1484,7 @@ - (DummyMessageInvalidAsOptionType_Builder*) mergeFromCodedInputStream:(PBCodedI - (DummyMessageInvalidAsOptionType_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1532,8 +1532,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1587,8 +1587,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -1645,7 +1645,7 @@ - (CustomOptionMinIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (CustomOptionMinIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1693,8 +1693,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1748,8 +1748,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -1806,7 +1806,7 @@ - (CustomOptionMaxIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (CustomOptionMaxIntegerValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1854,8 +1854,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1909,8 +1909,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -1967,7 +1967,7 @@ - (CustomOptionOtherValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (CustomOptionOtherValues_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2015,8 +2015,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2070,8 +2070,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -2128,7 +2128,7 @@ - (SettingRealsFromPositiveInts_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (SettingRealsFromPositiveInts_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2176,8 +2176,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2231,8 +2231,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -2289,7 +2289,7 @@ - (SettingRealsFromNegativeInts_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (SettingRealsFromNegativeInts_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2307,9 +2307,9 @@ - (SettingRealsFromNegativeInts_Builder*) mergeFromCodedInputStream:(PBCodedInpu @end @interface ComplexOptionType1 () -@property NSInteger foo; -@property NSInteger foo2; -@property NSInteger foo3; +@property long foo; +@property long foo2; +@property long foo3; @end @implementation ComplexOptionType1 @@ -2379,8 +2379,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2468,8 +2468,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasFoo) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.foo] hash]; } @@ -2546,7 +2546,7 @@ - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2576,10 +2576,10 @@ - (ComplexOptionType1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasFoo { return result.hasFoo; } -- (NSInteger) foo { +- (long) foo { return result.foo; } -- (ComplexOptionType1_Builder*) setFoo:(NSInteger) value { +- (ComplexOptionType1_Builder*) setFoo:(long) value { result.hasFoo = YES; result.foo = value; return self; @@ -2592,10 +2592,10 @@ - (ComplexOptionType1_Builder*) clearFoo { - (BOOL) hasFoo2 { return result.hasFoo2; } -- (NSInteger) foo2 { +- (long) foo2 { return result.foo2; } -- (ComplexOptionType1_Builder*) setFoo2:(NSInteger) value { +- (ComplexOptionType1_Builder*) setFoo2:(long) value { result.hasFoo2 = YES; result.foo2 = value; return self; @@ -2608,10 +2608,10 @@ - (ComplexOptionType1_Builder*) clearFoo2 { - (BOOL) hasFoo3 { return result.hasFoo3; } -- (NSInteger) foo3 { +- (long) foo3 { return result.foo3; } -- (ComplexOptionType1_Builder*) setFoo3:(NSInteger) value { +- (ComplexOptionType1_Builder*) setFoo3:(long) value { result.hasFoo3 = YES; result.foo3 = value; return self; @@ -2625,7 +2625,7 @@ - (ComplexOptionType1_Builder*) clearFoo3 { @interface ComplexOptionType2 () @property (retain) ComplexOptionType1* bar; -@property NSInteger baz; +@property long baz; @property (retain) ComplexOptionType2_ComplexOptionType4* fred; @end @@ -2703,8 +2703,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2798,8 +2798,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasBar) { hashCode = hashCode * 31 + [self.bar hash]; } @@ -2816,7 +2816,7 @@ - (NSUInteger) hash { @end @interface ComplexOptionType2_ComplexOptionType4 () -@property NSInteger waldo; +@property long waldo; @end @implementation ComplexOptionType2_ComplexOptionType4 @@ -2861,8 +2861,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2925,8 +2925,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasWaldo) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.waldo] hash]; } @@ -2989,7 +2989,7 @@ - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PB - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3011,10 +3011,10 @@ - (ComplexOptionType2_ComplexOptionType4_Builder*) mergeFromCodedInputStream:(PB - (BOOL) hasWaldo { return result.hasWaldo; } -- (NSInteger) waldo { +- (long) waldo { return result.waldo; } -- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(NSInteger) value { +- (ComplexOptionType2_ComplexOptionType4_Builder*) setWaldo:(long) value { result.hasWaldo = YES; result.waldo = value; return self; @@ -3087,7 +3087,7 @@ - (ComplexOptionType2_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ComplexOptionType2_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3157,10 +3157,10 @@ - (ComplexOptionType2_Builder*) clearBar { - (BOOL) hasBaz { return result.hasBaz; } -- (NSInteger) baz { +- (long) baz { return result.baz; } -- (ComplexOptionType2_Builder*) setBaz:(NSInteger) value { +- (ComplexOptionType2_Builder*) setBaz:(long) value { result.hasBaz = YES; result.baz = value; return self; @@ -3203,7 +3203,7 @@ - (ComplexOptionType2_Builder*) clearFred { @end @interface ComplexOptionType3 () -@property NSInteger qux; +@property long qux; @property (retain) ComplexOptionType3_ComplexOptionType5* complexOptionType5; @end @@ -3258,8 +3258,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3334,8 +3334,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasQux) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.qux] hash]; } @@ -3348,7 +3348,7 @@ - (NSUInteger) hash { @end @interface ComplexOptionType3_ComplexOptionType5 () -@property NSInteger plugh; +@property long plugh; @end @implementation ComplexOptionType3_ComplexOptionType5 @@ -3390,8 +3390,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3454,8 +3454,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasPlugh) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.plugh] hash]; } @@ -3518,7 +3518,7 @@ - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PB - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3540,10 +3540,10 @@ - (ComplexOptionType3_ComplexOptionType5_Builder*) mergeFromCodedInputStream:(PB - (BOOL) hasPlugh { return result.hasPlugh; } -- (NSInteger) plugh { +- (long) plugh { return result.plugh; } -- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(NSInteger) value { +- (ComplexOptionType3_ComplexOptionType5_Builder*) setPlugh:(long) value { result.hasPlugh = YES; result.plugh = value; return self; @@ -3612,7 +3612,7 @@ - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3643,10 +3643,10 @@ - (ComplexOptionType3_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasQux { return result.hasQux; } -- (NSInteger) qux { +- (long) qux { return result.qux; } -- (ComplexOptionType3_Builder*) setQux:(NSInteger) value { +- (ComplexOptionType3_Builder*) setQux:(long) value { result.hasQux = YES; result.qux = value; return self; @@ -3689,7 +3689,7 @@ - (ComplexOptionType3_Builder*) clearComplexOptionType5 { @end @interface ComplexOpt6 () -@property NSInteger xyzzy; +@property long xyzzy; @end @implementation ComplexOpt6 @@ -3731,8 +3731,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3795,8 +3795,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasXyzzy) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.xyzzy] hash]; } @@ -3859,7 +3859,7 @@ - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3881,10 +3881,10 @@ - (ComplexOpt6_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input e - (BOOL) hasXyzzy { return result.hasXyzzy; } -- (NSInteger) xyzzy { +- (long) xyzzy { return result.xyzzy; } -- (ComplexOpt6_Builder*) setXyzzy:(NSInteger) value { +- (ComplexOpt6_Builder*) setXyzzy:(long) value { result.hasXyzzy = YES; result.xyzzy = value; return self; @@ -3927,8 +3927,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3982,8 +3982,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -4040,7 +4040,7 @@ - (VariousComplexOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (VariousComplexOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4094,8 +4094,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeAsMessageSetTo:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4156,8 +4156,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:4 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -4216,7 +4216,7 @@ - (AggregateMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (AggregateMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4280,8 +4280,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4344,8 +4344,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasS) { hashCode = hashCode * 31 + [self.s hash]; } @@ -4408,7 +4408,7 @@ - (AggregateMessageSetElement_Builder*) mergeFromCodedInputStream:(PBCodedInputS - (AggregateMessageSetElement_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4446,7 +4446,7 @@ - (AggregateMessageSetElement_Builder*) clearS { @end @interface Aggregate () -@property NSInteger i; +@property long i; @property (retain) NSString* s; @property (retain) Aggregate* sub; @property (retain) PBFileOptions* file; @@ -4558,8 +4558,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -4667,8 +4667,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasI) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.i] hash]; } @@ -4755,7 +4755,7 @@ - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4808,10 +4808,10 @@ - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input ext - (BOOL) hasI { return result.hasI; } -- (NSInteger) i { +- (long) i { return result.i; } -- (Aggregate_Builder*) setI:(NSInteger) value { +- (Aggregate_Builder*) setI:(long) value { result.hasI = YES; result.i = value; return self; @@ -4930,7 +4930,7 @@ - (Aggregate_Builder*) clearMset { @end @interface AggregateMessage () -@property NSInteger fieldname; +@property long fieldname; @end @implementation AggregateMessage @@ -4972,8 +4972,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5036,8 +5036,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasFieldname) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.fieldname] hash]; } @@ -5100,7 +5100,7 @@ - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5122,10 +5122,10 @@ - (AggregateMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (BOOL) hasFieldname { return result.hasFieldname; } -- (NSInteger) fieldname { +- (long) fieldname { return result.fieldname; } -- (AggregateMessage_Builder*) setFieldname:(NSInteger) value { +- (AggregateMessage_Builder*) setFieldname:(long) value { result.hasFieldname = YES; result.fieldname = value; return self; diff --git a/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.h b/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.h index 2af09c6..b02545d 100644 --- a/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.h +++ b/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.h @@ -124,7 +124,7 @@ - (BOOL) hasOptionalMessage; @property (readonly, retain) TestOptimizedForSize* optionalMessage; @property (readonly, retain) PBArray * repeatedMessage; -- (TestOptimizedForSize*)repeatedMessageAtIndex:(NSUInteger)index; +- (TestOptimizedForSize*)repeatedMessageAtIndex:(unsigned long)index; + (TestEmbedOptimizedForSize*) defaultInstance; - (TestEmbedOptimizedForSize*) defaultInstance; @@ -169,10 +169,10 @@ - (TestEmbedOptimizedForSize_Builder*) clearOptionalMessage; - (PBAppendableArray *)repeatedMessage; -- (TestOptimizedForSize*)repeatedMessageAtIndex:(NSUInteger)index; +- (TestOptimizedForSize*)repeatedMessageAtIndex:(unsigned long)index; - (TestEmbedOptimizedForSize_Builder *)addRepeatedMessage:(TestOptimizedForSize*)value; - (TestEmbedOptimizedForSize_Builder *)setRepeatedMessageArray:(NSArray *)array; -- (TestEmbedOptimizedForSize_Builder *)setRepeatedMessageValues:(const TestOptimizedForSize* *)values count:(NSUInteger)count; +- (TestEmbedOptimizedForSize_Builder *)setRepeatedMessageValues:(const TestOptimizedForSize* *)values count:(unsigned long)count; - (TestEmbedOptimizedForSize_Builder *)clearRepeatedMessage; @end diff --git a/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m b/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m index c97d4f2..3900d11 100644 --- a/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m +++ b/src/runtime/Tests/UnittestEmbedOptimizeFor.pb.m @@ -62,7 +62,7 @@ - (TestEmbedOptimizedForSize*) defaultInstance { - (PBArray *)repeatedMessage { return repeatedMessageArray; } -- (TestOptimizedForSize*)repeatedMessageAtIndex:(NSUInteger)index { +- (TestOptimizedForSize*)repeatedMessageAtIndex:(unsigned long)index { return [repeatedMessageArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -87,8 +87,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -165,8 +165,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasOptionalMessage) { hashCode = hashCode * 31 + [self.optionalMessage hash]; } @@ -239,7 +239,7 @@ - (TestEmbedOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputSt - (TestEmbedOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -302,7 +302,7 @@ - (TestEmbedOptimizedForSize_Builder*) clearOptionalMessage { - (PBAppendableArray *)repeatedMessage { return result.repeatedMessageArray; } -- (TestOptimizedForSize*)repeatedMessageAtIndex:(NSUInteger)index { +- (TestOptimizedForSize*)repeatedMessageAtIndex:(unsigned long)index { return [result repeatedMessageAtIndex:index]; } - (TestEmbedOptimizedForSize_Builder *)addRepeatedMessage:(TestOptimizedForSize*)value { @@ -316,7 +316,7 @@ - (TestEmbedOptimizedForSize_Builder *)setRepeatedMessageArray:(NSArray *)array result.repeatedMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestEmbedOptimizedForSize_Builder *)setRepeatedMessageValues:(const TestOptimizedForSize* *)values count:(NSUInteger)count { +- (TestEmbedOptimizedForSize_Builder *)setRepeatedMessageValues:(const TestOptimizedForSize* *)values count:(unsigned long)count { result.repeatedMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } diff --git a/src/runtime/Tests/UnittestEnormousDescriptor.pb.m b/src/runtime/Tests/UnittestEnormousDescriptor.pb.m index 7de8fbf..b04598c 100644 --- a/src/runtime/Tests/UnittestEnormousDescriptor.pb.m +++ b/src/runtime/Tests/UnittestEnormousDescriptor.pb.m @@ -13050,8 +13050,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -22105,8 +22105,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasLongFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1) { hashCode = hashCode * 31 + [self.longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1 hash]; } @@ -28163,7 +28163,7 @@ - (TestEnormousDescriptor_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestEnormousDescriptor_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestImport.pb.h b/src/runtime/Tests/UnittestImport.pb.h index 3287ab1..1242083 100644 --- a/src/runtime/Tests/UnittestImport.pb.h +++ b/src/runtime/Tests/UnittestImport.pb.h @@ -34,10 +34,10 @@ BOOL ImportEnumIsValidValue(ImportEnum value); @interface ImportMessage : PBGeneratedMessage { @private BOOL hasD_:1; - NSInteger d; + long d; } - (BOOL) hasD; -@property (readonly) NSInteger d; +@property (readonly) long d; + (ImportMessage*) defaultInstance; - (ImportMessage*) defaultInstance; @@ -75,8 +75,8 @@ BOOL ImportEnumIsValidValue(ImportEnum value); - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasD; -- (NSInteger) d; -- (ImportMessage_Builder*) setD:(NSInteger) value; +- (long) d; +- (ImportMessage_Builder*) setD:(long) value; - (ImportMessage_Builder*) clearD; @end diff --git a/src/runtime/Tests/UnittestImport.pb.m b/src/runtime/Tests/UnittestImport.pb.m index d5c6158..b65ea69 100644 --- a/src/runtime/Tests/UnittestImport.pb.m +++ b/src/runtime/Tests/UnittestImport.pb.m @@ -30,7 +30,7 @@ BOOL ImportEnumIsValidValue(ImportEnum value) { } } @interface ImportMessage () -@property NSInteger d; +@property long d; @end @implementation ImportMessage @@ -72,8 +72,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -136,8 +136,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasD) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.d] hash]; } @@ -200,7 +200,7 @@ - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -222,10 +222,10 @@ - (ImportMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (BOOL) hasD { return result.hasD; } -- (NSInteger) d { +- (long) d { return result.d; } -- (ImportMessage_Builder*) setD:(NSInteger) value { +- (ImportMessage_Builder*) setD:(long) value { result.hasD = YES; result.d = value; return self; diff --git a/src/runtime/Tests/UnittestImportLite.pb.h b/src/runtime/Tests/UnittestImportLite.pb.h index 77467ce..3828b28 100644 --- a/src/runtime/Tests/UnittestImportLite.pb.h +++ b/src/runtime/Tests/UnittestImportLite.pb.h @@ -34,10 +34,10 @@ BOOL ImportEnumLiteIsValidValue(ImportEnumLite value); @interface ImportMessageLite : PBGeneratedMessage { @private BOOL hasD_:1; - NSInteger d; + long d; } - (BOOL) hasD; -@property (readonly) NSInteger d; +@property (readonly) long d; + (ImportMessageLite*) defaultInstance; - (ImportMessageLite*) defaultInstance; @@ -75,8 +75,8 @@ BOOL ImportEnumLiteIsValidValue(ImportEnumLite value); - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasD; -- (NSInteger) d; -- (ImportMessageLite_Builder*) setD:(NSInteger) value; +- (long) d; +- (ImportMessageLite_Builder*) setD:(long) value; - (ImportMessageLite_Builder*) clearD; @end diff --git a/src/runtime/Tests/UnittestImportLite.pb.m b/src/runtime/Tests/UnittestImportLite.pb.m index 3a2207c..7a78a53 100644 --- a/src/runtime/Tests/UnittestImportLite.pb.m +++ b/src/runtime/Tests/UnittestImportLite.pb.m @@ -30,7 +30,7 @@ BOOL ImportEnumLiteIsValidValue(ImportEnumLite value) { } } @interface ImportMessageLite () -@property NSInteger d; +@property long d; @end @implementation ImportMessageLite @@ -72,8 +72,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -136,8 +136,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasD) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.d] hash]; } @@ -200,7 +200,7 @@ - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -222,10 +222,10 @@ - (ImportMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i - (BOOL) hasD { return result.hasD; } -- (NSInteger) d { +- (long) d { return result.d; } -- (ImportMessageLite_Builder*) setD:(NSInteger) value { +- (ImportMessageLite_Builder*) setD:(long) value { result.hasD = YES; result.d = value; return self; diff --git a/src/runtime/Tests/UnittestLite.pb.h b/src/runtime/Tests/UnittestLite.pb.h index 4467007..cfeb768 100644 --- a/src/runtime/Tests/UnittestLite.pb.h +++ b/src/runtime/Tests/UnittestLite.pb.h @@ -199,16 +199,16 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); Float64 defaultDouble; Float32 defaultFloat; Float32 optionalFloat; - int64_t optionalInt64; - int64_t defaultInt64; - uint64_t optionalUint64; - uint64_t defaultUint64; - NSInteger defaultInt32; - NSInteger optionalInt32; - uint64_t optionalFixed64; - uint64_t defaultFixed64; - uNSInteger optionalFixed32; - uNSInteger defaultFixed32; + long long optionalInt64; + long long defaultInt64; + ulong long optionalUint64; + ulong long defaultUint64; + long defaultInt32; + long optionalInt32; + ulong long optionalFixed64; + ulong long defaultFixed64; + ulong optionalFixed32; + ulong defaultFixed32; NSString* defaultString; NSString* defaultStringPiece; NSString* defaultCord; @@ -221,22 +221,22 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); ImportMessageLite* optionalImportMessage; NSData* defaultBytes; NSData* optionalBytes; - uNSInteger optionalUint32; - uNSInteger defaultUint32; + ulong optionalUint32; + ulong defaultUint32; ImportEnumLite defaultImportEnum; ForeignEnumLite defaultForeignEnum; TestAllTypesLite_NestedEnum defaultNestedEnum; ImportEnumLite optionalImportEnum; ForeignEnumLite optionalForeignEnum; TestAllTypesLite_NestedEnum optionalNestedEnum; - NSInteger defaultSfixed32; - NSInteger optionalSfixed32; - int64_t defaultSfixed64; - int64_t optionalSfixed64; - NSInteger defaultSint32; - NSInteger optionalSint32; - int64_t optionalSint64; - int64_t defaultSint64; + long defaultSfixed32; + long optionalSfixed32; + long long defaultSfixed64; + long long optionalSfixed64; + long defaultSint32; + long optionalSint32; + long long optionalSint64; + long long defaultSint64; PBAppendableArray * repeatedBoolArray; PBAppendableArray * repeatedDoubleArray; PBAppendableArray * repeatedFloatArray; @@ -306,16 +306,16 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (BOOL) hasDefaultImportEnum; - (BOOL) hasDefaultStringPiece; - (BOOL) hasDefaultCord; -@property (readonly) NSInteger optionalInt32; -@property (readonly) int64_t optionalInt64; -@property (readonly) uNSInteger optionalUint32; -@property (readonly) uint64_t optionalUint64; -@property (readonly) NSInteger optionalSint32; -@property (readonly) int64_t optionalSint64; -@property (readonly) uNSInteger optionalFixed32; -@property (readonly) uint64_t optionalFixed64; -@property (readonly) NSInteger optionalSfixed32; -@property (readonly) int64_t optionalSfixed64; +@property (readonly) long optionalInt32; +@property (readonly) long long optionalInt64; +@property (readonly) ulong optionalUint32; +@property (readonly) ulong long optionalUint64; +@property (readonly) long optionalSint32; +@property (readonly) long long optionalSint64; +@property (readonly) ulong optionalFixed32; +@property (readonly) ulong long optionalFixed64; +@property (readonly) long optionalSfixed32; +@property (readonly) long long optionalSfixed64; @property (readonly) Float32 optionalFloat; @property (readonly) Float64 optionalDouble; - (BOOL) optionalBool; @@ -354,16 +354,16 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) PBArray * repeatedImportEnum; @property (readonly, retain) PBArray * repeatedStringPiece; @property (readonly, retain) PBArray * repeatedCord; -@property (readonly) NSInteger defaultInt32; -@property (readonly) int64_t defaultInt64; -@property (readonly) uNSInteger defaultUint32; -@property (readonly) uint64_t defaultUint64; -@property (readonly) NSInteger defaultSint32; -@property (readonly) int64_t defaultSint64; -@property (readonly) uNSInteger defaultFixed32; -@property (readonly) uint64_t defaultFixed64; -@property (readonly) NSInteger defaultSfixed32; -@property (readonly) int64_t defaultSfixed64; +@property (readonly) long defaultInt32; +@property (readonly) long long defaultInt64; +@property (readonly) ulong defaultUint32; +@property (readonly) ulong long defaultUint64; +@property (readonly) long defaultSint32; +@property (readonly) long long defaultSint64; +@property (readonly) ulong defaultFixed32; +@property (readonly) ulong long defaultFixed64; +@property (readonly) long defaultSfixed32; +@property (readonly) long long defaultSfixed64; @property (readonly) Float32 defaultFloat; @property (readonly) Float64 defaultDouble; - (BOOL) defaultBool; @@ -374,30 +374,30 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly) ImportEnumLite defaultImportEnum; @property (readonly, retain) NSString* defaultStringPiece; @property (readonly, retain) NSString* defaultCord; -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index; -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index; -- (Float32)repeatedFloatAtIndex:(NSUInteger)index; -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index; -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index; -- (NSString*)repeatedStringAtIndex:(NSUInteger)index; -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index; -- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index; -- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index; -- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(NSUInteger)index; -- (ImportMessageLite*)repeatedImportMessageAtIndex:(NSUInteger)index; -- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index; -- (ForeignEnumLite)repeatedForeignEnumAtIndex:(NSUInteger)index; -- (ImportEnumLite)repeatedImportEnumAtIndex:(NSUInteger)index; -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index; -- (NSString*)repeatedCordAtIndex:(NSUInteger)index; +- (long)repeatedInt32AtIndex:(unsigned long)index; +- (long long)repeatedInt64AtIndex:(unsigned long)index; +- (ulong)repeatedUint32AtIndex:(unsigned long)index; +- (ulong long)repeatedUint64AtIndex:(unsigned long)index; +- (long)repeatedSint32AtIndex:(unsigned long)index; +- (long long)repeatedSint64AtIndex:(unsigned long)index; +- (ulong)repeatedFixed32AtIndex:(unsigned long)index; +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (long)repeatedSfixed32AtIndex:(unsigned long)index; +- (long long)repeatedSfixed64AtIndex:(unsigned long)index; +- (Float32)repeatedFloatAtIndex:(unsigned long)index; +- (Float64)repeatedDoubleAtIndex:(unsigned long)index; +- (BOOL)repeatedBoolAtIndex:(unsigned long)index; +- (NSString*)repeatedStringAtIndex:(unsigned long)index; +- (NSData*)repeatedBytesAtIndex:(unsigned long)index; +- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index; +- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index; +- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(unsigned long)index; +- (ImportMessageLite*)repeatedImportMessageAtIndex:(unsigned long)index; +- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index; +- (ForeignEnumLite)repeatedForeignEnumAtIndex:(unsigned long)index; +- (ImportEnumLite)repeatedImportEnumAtIndex:(unsigned long)index; +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index; +- (NSString*)repeatedCordAtIndex:(unsigned long)index; + (TestAllTypesLite*) defaultInstance; - (TestAllTypesLite*) defaultInstance; @@ -420,10 +420,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface TestAllTypesLite_NestedMessage : PBGeneratedMessage { @private BOOL hasBb_:1; - NSInteger bb; + long bb; } - (BOOL) hasBb; -@property (readonly) NSInteger bb; +@property (readonly) long bb; + (TestAllTypesLite_NestedMessage*) defaultInstance; - (TestAllTypesLite_NestedMessage*) defaultInstance; @@ -461,18 +461,18 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBb; -- (NSInteger) bb; -- (TestAllTypesLite_NestedMessage_Builder*) setBb:(NSInteger) value; +- (long) bb; +- (TestAllTypesLite_NestedMessage_Builder*) setBb:(long) value; - (TestAllTypesLite_NestedMessage_Builder*) clearBb; @end @interface TestAllTypesLite_OptionalGroup : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestAllTypesLite_OptionalGroup*) defaultInstance; - (TestAllTypesLite_OptionalGroup*) defaultInstance; @@ -510,18 +510,18 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestAllTypesLite_OptionalGroup_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestAllTypesLite_OptionalGroup_Builder*) setA:(long) value; - (TestAllTypesLite_OptionalGroup_Builder*) clearA; @end @interface TestAllTypesLite_RepeatedGroup : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestAllTypesLite_RepeatedGroup*) defaultInstance; - (TestAllTypesLite_RepeatedGroup*) defaultInstance; @@ -559,8 +559,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(long) value; - (TestAllTypesLite_RepeatedGroup_Builder*) clearA; @end @@ -582,53 +582,53 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasOptionalInt32; -- (NSInteger) optionalInt32; -- (TestAllTypesLite_Builder*) setOptionalInt32:(NSInteger) value; +- (long) optionalInt32; +- (TestAllTypesLite_Builder*) setOptionalInt32:(long) value; - (TestAllTypesLite_Builder*) clearOptionalInt32; - (BOOL) hasOptionalInt64; -- (int64_t) optionalInt64; -- (TestAllTypesLite_Builder*) setOptionalInt64:(int64_t) value; +- (long long) optionalInt64; +- (TestAllTypesLite_Builder*) setOptionalInt64:(long long) value; - (TestAllTypesLite_Builder*) clearOptionalInt64; - (BOOL) hasOptionalUint32; -- (uNSInteger) optionalUint32; -- (TestAllTypesLite_Builder*) setOptionalUint32:(uNSInteger) value; +- (ulong) optionalUint32; +- (TestAllTypesLite_Builder*) setOptionalUint32:(ulong) value; - (TestAllTypesLite_Builder*) clearOptionalUint32; - (BOOL) hasOptionalUint64; -- (uint64_t) optionalUint64; -- (TestAllTypesLite_Builder*) setOptionalUint64:(uint64_t) value; +- (ulong long) optionalUint64; +- (TestAllTypesLite_Builder*) setOptionalUint64:(ulong long) value; - (TestAllTypesLite_Builder*) clearOptionalUint64; - (BOOL) hasOptionalSint32; -- (NSInteger) optionalSint32; -- (TestAllTypesLite_Builder*) setOptionalSint32:(NSInteger) value; +- (long) optionalSint32; +- (TestAllTypesLite_Builder*) setOptionalSint32:(long) value; - (TestAllTypesLite_Builder*) clearOptionalSint32; - (BOOL) hasOptionalSint64; -- (int64_t) optionalSint64; -- (TestAllTypesLite_Builder*) setOptionalSint64:(int64_t) value; +- (long long) optionalSint64; +- (TestAllTypesLite_Builder*) setOptionalSint64:(long long) value; - (TestAllTypesLite_Builder*) clearOptionalSint64; - (BOOL) hasOptionalFixed32; -- (uNSInteger) optionalFixed32; -- (TestAllTypesLite_Builder*) setOptionalFixed32:(uNSInteger) value; +- (ulong) optionalFixed32; +- (TestAllTypesLite_Builder*) setOptionalFixed32:(ulong) value; - (TestAllTypesLite_Builder*) clearOptionalFixed32; - (BOOL) hasOptionalFixed64; -- (uint64_t) optionalFixed64; -- (TestAllTypesLite_Builder*) setOptionalFixed64:(uint64_t) value; +- (ulong long) optionalFixed64; +- (TestAllTypesLite_Builder*) setOptionalFixed64:(ulong long) value; - (TestAllTypesLite_Builder*) clearOptionalFixed64; - (BOOL) hasOptionalSfixed32; -- (NSInteger) optionalSfixed32; -- (TestAllTypesLite_Builder*) setOptionalSfixed32:(NSInteger) value; +- (long) optionalSfixed32; +- (TestAllTypesLite_Builder*) setOptionalSfixed32:(long) value; - (TestAllTypesLite_Builder*) clearOptionalSfixed32; - (BOOL) hasOptionalSfixed64; -- (int64_t) optionalSfixed64; -- (TestAllTypesLite_Builder*) setOptionalSfixed64:(int64_t) value; +- (long long) optionalSfixed64; +- (TestAllTypesLite_Builder*) setOptionalSfixed64:(long long) value; - (TestAllTypesLite_Builder*) clearOptionalSfixed64; - (BOOL) hasOptionalFloat; @@ -710,221 +710,221 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalCord; - (PBAppendableArray *)repeatedInt32; -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedInt32:(NSInteger)value; +- (long)repeatedInt32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedInt32:(long)value; - (TestAllTypesLite_Builder *)setRepeatedInt32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedInt32; - (PBAppendableArray *)repeatedInt64; -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedInt64:(int64_t)value; +- (long long)repeatedInt64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedInt64:(long long)value; - (TestAllTypesLite_Builder *)setRepeatedInt64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedInt64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedInt64Values:(const long long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedInt64; - (PBAppendableArray *)repeatedUint32; -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedUint32:(uNSInteger)value; +- (ulong)repeatedUint32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedUint32:(ulong)value; - (TestAllTypesLite_Builder *)setRepeatedUint32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedUint32; - (PBAppendableArray *)repeatedUint64; -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedUint64:(uint64_t)value; +- (ulong long)repeatedUint64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedUint64:(ulong long)value; - (TestAllTypesLite_Builder *)setRepeatedUint64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedUint64; - (PBAppendableArray *)repeatedSint32; -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedSint32:(NSInteger)value; +- (long)repeatedSint32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedSint32:(long)value; - (TestAllTypesLite_Builder *)setRepeatedSint32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedSint32; - (PBAppendableArray *)repeatedSint64; -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedSint64:(int64_t)value; +- (long long)repeatedSint64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedSint64:(long long)value; - (TestAllTypesLite_Builder *)setRepeatedSint64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedSint64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedSint64Values:(const long long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedSint64; - (PBAppendableArray *)repeatedFixed32; -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedFixed32:(uNSInteger)value; +- (ulong)repeatedFixed32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedFixed32:(ulong)value; - (TestAllTypesLite_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedFixed64; -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedFixed64:(uint64_t)value; +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedFixed64:(ulong long)value; - (TestAllTypesLite_Builder *)setRepeatedFixed64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedFixed64; - (PBAppendableArray *)repeatedSfixed32; -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(NSInteger)value; +- (long)repeatedSfixed32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(long)value; - (TestAllTypesLite_Builder *)setRepeatedSfixed32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedSfixed32; - (PBAppendableArray *)repeatedSfixed64; -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index; -- (TestAllTypesLite_Builder *)addRepeatedSfixed64:(int64_t)value; +- (long long)repeatedSfixed64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedSfixed64:(long long)value; - (TestAllTypesLite_Builder *)setRepeatedSfixed64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedSfixed64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedSfixed64Values:(const long long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedSfixed64; - (PBAppendableArray *)repeatedFloat; -- (Float32)repeatedFloatAtIndex:(NSUInteger)index; +- (Float32)repeatedFloatAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedFloat:(Float32)value; - (TestAllTypesLite_Builder *)setRepeatedFloatArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedFloat; - (PBAppendableArray *)repeatedDouble; -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index; +- (Float64)repeatedDoubleAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedDouble:(Float64)value; - (TestAllTypesLite_Builder *)setRepeatedDoubleArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedDouble; - (PBAppendableArray *)repeatedBool; -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index; +- (BOOL)repeatedBoolAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedBool:(BOOL)value; - (TestAllTypesLite_Builder *)setRepeatedBoolArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedBool; - (PBAppendableArray *)repeatedString; -- (NSString*)repeatedStringAtIndex:(NSUInteger)index; +- (NSString*)repeatedStringAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedString:(NSString*)value; - (TestAllTypesLite_Builder *)setRepeatedStringArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedStringValues:(const NSString* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedStringValues:(const NSString* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedString; - (PBAppendableArray *)repeatedBytes; -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index; +- (NSData*)repeatedBytesAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedBytes:(NSData*)value; - (TestAllTypesLite_Builder *)setRepeatedBytesArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedBytes; - (PBAppendableArray *)repeatedGroup; -- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index; +- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedGroup:(TestAllTypesLite_RepeatedGroup*)value; - (TestAllTypesLite_Builder *)setRepeatedGroupArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedGroupValues:(const TestAllTypesLite_RepeatedGroup* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedGroupValues:(const TestAllTypesLite_RepeatedGroup* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedGroup; - (PBAppendableArray *)repeatedNestedMessage; -- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index; +- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedNestedMessage:(TestAllTypesLite_NestedMessage*)value; - (TestAllTypesLite_Builder *)setRepeatedNestedMessageArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedNestedMessageValues:(const TestAllTypesLite_NestedMessage* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedNestedMessageValues:(const TestAllTypesLite_NestedMessage* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedNestedMessage; - (PBAppendableArray *)repeatedForeignMessage; -- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(NSUInteger)index; +- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedForeignMessage:(ForeignMessageLite*)value; - (TestAllTypesLite_Builder *)setRepeatedForeignMessageArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedForeignMessageValues:(const ForeignMessageLite* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedForeignMessageValues:(const ForeignMessageLite* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedForeignMessage; - (PBAppendableArray *)repeatedImportMessage; -- (ImportMessageLite*)repeatedImportMessageAtIndex:(NSUInteger)index; +- (ImportMessageLite*)repeatedImportMessageAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedImportMessage:(ImportMessageLite*)value; - (TestAllTypesLite_Builder *)setRepeatedImportMessageArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedImportMessageValues:(const ImportMessageLite* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedImportMessageValues:(const ImportMessageLite* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedImportMessage; - (PBAppendableArray *)repeatedNestedEnum; -- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index; +- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedNestedEnum:(TestAllTypesLite_NestedEnum)value; - (TestAllTypesLite_Builder *)setRepeatedNestedEnumArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedNestedEnumValues:(const TestAllTypesLite_NestedEnum *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedNestedEnumValues:(const TestAllTypesLite_NestedEnum *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedNestedEnum; - (PBAppendableArray *)repeatedForeignEnum; -- (ForeignEnumLite)repeatedForeignEnumAtIndex:(NSUInteger)index; +- (ForeignEnumLite)repeatedForeignEnumAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedForeignEnum:(ForeignEnumLite)value; - (TestAllTypesLite_Builder *)setRepeatedForeignEnumArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedForeignEnumValues:(const ForeignEnumLite *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedForeignEnumValues:(const ForeignEnumLite *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedForeignEnum; - (PBAppendableArray *)repeatedImportEnum; -- (ImportEnumLite)repeatedImportEnumAtIndex:(NSUInteger)index; +- (ImportEnumLite)repeatedImportEnumAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedImportEnum:(ImportEnumLite)value; - (TestAllTypesLite_Builder *)setRepeatedImportEnumArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedImportEnumValues:(const ImportEnumLite *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedImportEnumValues:(const ImportEnumLite *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedImportEnum; - (PBAppendableArray *)repeatedStringPiece; -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index; +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedStringPiece:(NSString*)value; - (TestAllTypesLite_Builder *)setRepeatedStringPieceArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedStringPiece; - (PBAppendableArray *)repeatedCord; -- (NSString*)repeatedCordAtIndex:(NSUInteger)index; +- (NSString*)repeatedCordAtIndex:(unsigned long)index; - (TestAllTypesLite_Builder *)addRepeatedCord:(NSString*)value; - (TestAllTypesLite_Builder *)setRepeatedCordArray:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedCordValues:(const NSString* *)values count:(NSUInteger)count; +- (TestAllTypesLite_Builder *)setRepeatedCordValues:(const NSString* *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedCord; - (BOOL) hasDefaultInt32; -- (NSInteger) defaultInt32; -- (TestAllTypesLite_Builder*) setDefaultInt32:(NSInteger) value; +- (long) defaultInt32; +- (TestAllTypesLite_Builder*) setDefaultInt32:(long) value; - (TestAllTypesLite_Builder*) clearDefaultInt32; - (BOOL) hasDefaultInt64; -- (int64_t) defaultInt64; -- (TestAllTypesLite_Builder*) setDefaultInt64:(int64_t) value; +- (long long) defaultInt64; +- (TestAllTypesLite_Builder*) setDefaultInt64:(long long) value; - (TestAllTypesLite_Builder*) clearDefaultInt64; - (BOOL) hasDefaultUint32; -- (uNSInteger) defaultUint32; -- (TestAllTypesLite_Builder*) setDefaultUint32:(uNSInteger) value; +- (ulong) defaultUint32; +- (TestAllTypesLite_Builder*) setDefaultUint32:(ulong) value; - (TestAllTypesLite_Builder*) clearDefaultUint32; - (BOOL) hasDefaultUint64; -- (uint64_t) defaultUint64; -- (TestAllTypesLite_Builder*) setDefaultUint64:(uint64_t) value; +- (ulong long) defaultUint64; +- (TestAllTypesLite_Builder*) setDefaultUint64:(ulong long) value; - (TestAllTypesLite_Builder*) clearDefaultUint64; - (BOOL) hasDefaultSint32; -- (NSInteger) defaultSint32; -- (TestAllTypesLite_Builder*) setDefaultSint32:(NSInteger) value; +- (long) defaultSint32; +- (TestAllTypesLite_Builder*) setDefaultSint32:(long) value; - (TestAllTypesLite_Builder*) clearDefaultSint32; - (BOOL) hasDefaultSint64; -- (int64_t) defaultSint64; -- (TestAllTypesLite_Builder*) setDefaultSint64:(int64_t) value; +- (long long) defaultSint64; +- (TestAllTypesLite_Builder*) setDefaultSint64:(long long) value; - (TestAllTypesLite_Builder*) clearDefaultSint64; - (BOOL) hasDefaultFixed32; -- (uNSInteger) defaultFixed32; -- (TestAllTypesLite_Builder*) setDefaultFixed32:(uNSInteger) value; +- (ulong) defaultFixed32; +- (TestAllTypesLite_Builder*) setDefaultFixed32:(ulong) value; - (TestAllTypesLite_Builder*) clearDefaultFixed32; - (BOOL) hasDefaultFixed64; -- (uint64_t) defaultFixed64; -- (TestAllTypesLite_Builder*) setDefaultFixed64:(uint64_t) value; +- (ulong long) defaultFixed64; +- (TestAllTypesLite_Builder*) setDefaultFixed64:(ulong long) value; - (TestAllTypesLite_Builder*) clearDefaultFixed64; - (BOOL) hasDefaultSfixed32; -- (NSInteger) defaultSfixed32; -- (TestAllTypesLite_Builder*) setDefaultSfixed32:(NSInteger) value; +- (long) defaultSfixed32; +- (TestAllTypesLite_Builder*) setDefaultSfixed32:(long) value; - (TestAllTypesLite_Builder*) clearDefaultSfixed32; - (BOOL) hasDefaultSfixed64; -- (int64_t) defaultSfixed64; -- (TestAllTypesLite_Builder*) setDefaultSfixed64:(int64_t) value; +- (long long) defaultSfixed64; +- (TestAllTypesLite_Builder*) setDefaultSfixed64:(long long) value; - (TestAllTypesLite_Builder*) clearDefaultSfixed64; - (BOOL) hasDefaultFloat; @@ -981,10 +981,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface ForeignMessageLite : PBGeneratedMessage { @private BOOL hasC_:1; - NSInteger c; + long c; } - (BOOL) hasC; -@property (readonly) NSInteger c; +@property (readonly) long c; + (ForeignMessageLite*) defaultInstance; - (ForeignMessageLite*) defaultInstance; @@ -1022,41 +1022,41 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasC; -- (NSInteger) c; -- (ForeignMessageLite_Builder*) setC:(NSInteger) value; +- (long) c; +- (ForeignMessageLite_Builder*) setC:(long) value; - (ForeignMessageLite_Builder*) clearC; @end @interface TestPackedTypesLite : PBGeneratedMessage { @private PBAppendableArray * packedBoolArray; - NSInteger packedBoolMemoizedSerializedSize; + long packedBoolMemoizedSerializedSize; PBAppendableArray * packedDoubleArray; - NSInteger packedDoubleMemoizedSerializedSize; + long packedDoubleMemoizedSerializedSize; PBAppendableArray * packedFloatArray; - NSInteger packedFloatMemoizedSerializedSize; + long packedFloatMemoizedSerializedSize; PBAppendableArray * packedInt64Array; - NSInteger packedInt64MemoizedSerializedSize; + long packedInt64MemoizedSerializedSize; PBAppendableArray * packedUint64Array; - NSInteger packedUint64MemoizedSerializedSize; + long packedUint64MemoizedSerializedSize; PBAppendableArray * packedInt32Array; - NSInteger packedInt32MemoizedSerializedSize; + long packedInt32MemoizedSerializedSize; PBAppendableArray * packedFixed64Array; - NSInteger packedFixed64MemoizedSerializedSize; + long packedFixed64MemoizedSerializedSize; PBAppendableArray * packedFixed32Array; - NSInteger packedFixed32MemoizedSerializedSize; + long packedFixed32MemoizedSerializedSize; PBAppendableArray * packedUint32Array; - NSInteger packedUint32MemoizedSerializedSize; + long packedUint32MemoizedSerializedSize; PBAppendableArray * packedEnumArray; - NSInteger packedEnumMemoizedSerializedSize; + long packedEnumMemoizedSerializedSize; PBAppendableArray * packedSfixed32Array; - NSInteger packedSfixed32MemoizedSerializedSize; + long packedSfixed32MemoizedSerializedSize; PBAppendableArray * packedSfixed64Array; - NSInteger packedSfixed64MemoizedSerializedSize; + long packedSfixed64MemoizedSerializedSize; PBAppendableArray * packedSint32Array; - NSInteger packedSint32MemoizedSerializedSize; + long packedSint32MemoizedSerializedSize; PBAppendableArray * packedSint64Array; - NSInteger packedSint64MemoizedSerializedSize; + long packedSint64MemoizedSerializedSize; } @property (readonly, retain) PBArray * packedInt32; @property (readonly, retain) PBArray * packedInt64; @@ -1072,20 +1072,20 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) PBArray * packedDouble; @property (readonly, retain) PBArray * packedBool; @property (readonly, retain) PBArray * packedEnum; -- (NSInteger)packedInt32AtIndex:(NSUInteger)index; -- (int64_t)packedInt64AtIndex:(NSUInteger)index; -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; -- (uint64_t)packedUint64AtIndex:(NSUInteger)index; -- (NSInteger)packedSint32AtIndex:(NSUInteger)index; -- (int64_t)packedSint64AtIndex:(NSUInteger)index; -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index; -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index; -- (Float32)packedFloatAtIndex:(NSUInteger)index; -- (Float64)packedDoubleAtIndex:(NSUInteger)index; -- (BOOL)packedBoolAtIndex:(NSUInteger)index; -- (ForeignEnumLite)packedEnumAtIndex:(NSUInteger)index; +- (long)packedInt32AtIndex:(unsigned long)index; +- (long long)packedInt64AtIndex:(unsigned long)index; +- (ulong)packedUint32AtIndex:(unsigned long)index; +- (ulong long)packedUint64AtIndex:(unsigned long)index; +- (long)packedSint32AtIndex:(unsigned long)index; +- (long long)packedSint64AtIndex:(unsigned long)index; +- (ulong)packedFixed32AtIndex:(unsigned long)index; +- (ulong long)packedFixed64AtIndex:(unsigned long)index; +- (long)packedSfixed32AtIndex:(unsigned long)index; +- (long long)packedSfixed64AtIndex:(unsigned long)index; +- (Float32)packedFloatAtIndex:(unsigned long)index; +- (Float64)packedDoubleAtIndex:(unsigned long)index; +- (BOOL)packedBoolAtIndex:(unsigned long)index; +- (ForeignEnumLite)packedEnumAtIndex:(unsigned long)index; + (TestPackedTypesLite*) defaultInstance; - (TestPackedTypesLite*) defaultInstance; @@ -1123,101 +1123,101 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)packedInt32; -- (NSInteger)packedInt32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedInt32:(NSInteger)value; +- (long)packedInt32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedInt32:(long)value; - (TestPackedTypesLite_Builder *)setPackedInt32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedInt32; - (PBAppendableArray *)packedInt64; -- (int64_t)packedInt64AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedInt64:(int64_t)value; +- (long long)packedInt64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedInt64:(long long)value; - (TestPackedTypesLite_Builder *)setPackedInt64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedInt64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedInt64Values:(const long long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedInt64; - (PBAppendableArray *)packedUint32; -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedUint32:(uNSInteger)value; +- (ulong)packedUint32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedUint32:(ulong)value; - (TestPackedTypesLite_Builder *)setPackedUint32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedUint32; - (PBAppendableArray *)packedUint64; -- (uint64_t)packedUint64AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedUint64:(uint64_t)value; +- (ulong long)packedUint64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedUint64:(ulong long)value; - (TestPackedTypesLite_Builder *)setPackedUint64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedUint64; - (PBAppendableArray *)packedSint32; -- (NSInteger)packedSint32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedSint32:(NSInteger)value; +- (long)packedSint32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedSint32:(long)value; - (TestPackedTypesLite_Builder *)setPackedSint32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedSint32; - (PBAppendableArray *)packedSint64; -- (int64_t)packedSint64AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedSint64:(int64_t)value; +- (long long)packedSint64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedSint64:(long long)value; - (TestPackedTypesLite_Builder *)setPackedSint64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedSint64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedSint64Values:(const long long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedSint64; - (PBAppendableArray *)packedFixed32; -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedFixed32:(uNSInteger)value; +- (ulong)packedFixed32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedFixed32:(ulong)value; - (TestPackedTypesLite_Builder *)setPackedFixed32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedFixed32; - (PBAppendableArray *)packedFixed64; -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedFixed64:(uint64_t)value; +- (ulong long)packedFixed64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedFixed64:(ulong long)value; - (TestPackedTypesLite_Builder *)setPackedFixed64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const uint64_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedFixed64; - (PBAppendableArray *)packedSfixed32; -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedSfixed32:(NSInteger)value; +- (long)packedSfixed32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedSfixed32:(long)value; - (TestPackedTypesLite_Builder *)setPackedSfixed32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedSfixed32; - (PBAppendableArray *)packedSfixed64; -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index; -- (TestPackedTypesLite_Builder *)addPackedSfixed64:(int64_t)value; +- (long long)packedSfixed64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedSfixed64:(long long)value; - (TestPackedTypesLite_Builder *)setPackedSfixed64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedSfixed64Values:(const int64_t *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedSfixed64Values:(const long long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedSfixed64; - (PBAppendableArray *)packedFloat; -- (Float32)packedFloatAtIndex:(NSUInteger)index; +- (Float32)packedFloatAtIndex:(unsigned long)index; - (TestPackedTypesLite_Builder *)addPackedFloat:(Float32)value; - (TestPackedTypesLite_Builder *)setPackedFloatArray:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedFloatValues:(const Float32 *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedFloatValues:(const Float32 *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedFloat; - (PBAppendableArray *)packedDouble; -- (Float64)packedDoubleAtIndex:(NSUInteger)index; +- (Float64)packedDoubleAtIndex:(unsigned long)index; - (TestPackedTypesLite_Builder *)addPackedDouble:(Float64)value; - (TestPackedTypesLite_Builder *)setPackedDoubleArray:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedDoubleValues:(const Float64 *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedDoubleValues:(const Float64 *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedDouble; - (PBAppendableArray *)packedBool; -- (BOOL)packedBoolAtIndex:(NSUInteger)index; +- (BOOL)packedBoolAtIndex:(unsigned long)index; - (TestPackedTypesLite_Builder *)addPackedBool:(BOOL)value; - (TestPackedTypesLite_Builder *)setPackedBoolArray:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedBoolValues:(const BOOL *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedBoolValues:(const BOOL *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedBool; - (PBAppendableArray *)packedEnum; -- (ForeignEnumLite)packedEnumAtIndex:(NSUInteger)index; +- (ForeignEnumLite)packedEnumAtIndex:(unsigned long)index; - (TestPackedTypesLite_Builder *)addPackedEnum:(ForeignEnumLite)value; - (TestPackedTypesLite_Builder *)setPackedEnumArray:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedEnumValues:(const ForeignEnumLite *)values count:(NSUInteger)count; +- (TestPackedTypesLite_Builder *)setPackedEnumValues:(const ForeignEnumLite *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedEnum; @end @@ -1264,10 +1264,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface OptionalGroup_extension_lite : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (OptionalGroup_extension_lite*) defaultInstance; - (OptionalGroup_extension_lite*) defaultInstance; @@ -1305,18 +1305,18 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (OptionalGroup_extension_lite_Builder*) setA:(NSInteger) value; +- (long) a; +- (OptionalGroup_extension_lite_Builder*) setA:(long) value; - (OptionalGroup_extension_lite_Builder*) clearA; @end @interface RepeatedGroup_extension_lite : PBGeneratedMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (RepeatedGroup_extension_lite*) defaultInstance; - (RepeatedGroup_extension_lite*) defaultInstance; @@ -1354,8 +1354,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (RepeatedGroup_extension_lite_Builder*) setA:(NSInteger) value; +- (long) a; +- (RepeatedGroup_extension_lite_Builder*) setA:(long) value; - (RepeatedGroup_extension_lite_Builder*) clearA; @end @@ -1443,10 +1443,10 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @interface TestDeprecatedLite : PBGeneratedMessage { @private BOOL hasDeprecatedField_:1; - NSInteger deprecatedField; + long deprecatedField; } - (BOOL) hasDeprecatedField; -@property (readonly) NSInteger deprecatedField; +@property (readonly) long deprecatedField; + (TestDeprecatedLite*) defaultInstance; - (TestDeprecatedLite*) defaultInstance; @@ -1484,8 +1484,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDeprecatedField; -- (NSInteger) deprecatedField; -- (TestDeprecatedLite_Builder*) setDeprecatedField:(NSInteger) value; +- (long) deprecatedField; +- (TestDeprecatedLite_Builder*) setDeprecatedField:(long) value; - (TestDeprecatedLite_Builder*) clearDeprecatedField; @end diff --git a/src/runtime/Tests/UnittestLite.pb.m b/src/runtime/Tests/UnittestLite.pb.m index f0e1134..255ef9d 100644 --- a/src/runtime/Tests/UnittestLite.pb.m +++ b/src/runtime/Tests/UnittestLite.pb.m @@ -1190,16 +1190,16 @@ BOOL ForeignEnumLiteIsValidValue(ForeignEnumLite value) { } } @interface TestAllTypesLite () -@property NSInteger optionalInt32; -@property int64_t optionalInt64; -@property uNSInteger optionalUint32; -@property uint64_t optionalUint64; -@property NSInteger optionalSint32; -@property int64_t optionalSint64; -@property uNSInteger optionalFixed32; -@property uint64_t optionalFixed64; -@property NSInteger optionalSfixed32; -@property int64_t optionalSfixed64; +@property long optionalInt32; +@property long long optionalInt64; +@property ulong optionalUint32; +@property ulong long optionalUint64; +@property long optionalSint32; +@property long long optionalSint64; +@property ulong optionalFixed32; +@property ulong long optionalFixed64; +@property long optionalSfixed32; +@property long long optionalSfixed64; @property Float32 optionalFloat; @property Float64 optionalDouble; @property BOOL optionalBool; @@ -1238,16 +1238,16 @@ @interface TestAllTypesLite () @property (retain) PBAppendableArray * repeatedImportEnumArray; @property (retain) PBAppendableArray * repeatedStringPieceArray; @property (retain) PBAppendableArray * repeatedCordArray; -@property NSInteger defaultInt32; -@property int64_t defaultInt64; -@property uNSInteger defaultUint32; -@property uint64_t defaultUint64; -@property NSInteger defaultSint32; -@property int64_t defaultSint64; -@property uNSInteger defaultFixed32; -@property uint64_t defaultFixed64; -@property NSInteger defaultSfixed32; -@property int64_t defaultSfixed64; +@property long defaultInt32; +@property long long defaultInt64; +@property ulong defaultUint32; +@property ulong long defaultUint64; +@property long defaultSint32; +@property long long defaultSint64; +@property ulong defaultFixed32; +@property ulong long defaultFixed64; +@property long defaultSfixed32; +@property long long defaultSfixed64; @property Float32 defaultFloat; @property Float64 defaultDouble; @property BOOL defaultBool; @@ -1731,145 +1731,145 @@ - (TestAllTypesLite*) defaultInstance { - (PBArray *)repeatedInt32 { return repeatedInt32Array; } -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { +- (long)repeatedInt32AtIndex:(unsigned long)index { return [repeatedInt32Array int32AtIndex:index]; } - (PBArray *)repeatedInt64 { return repeatedInt64Array; } -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index { +- (long long)repeatedInt64AtIndex:(unsigned long)index { return [repeatedInt64Array int64AtIndex:index]; } - (PBArray *)repeatedUint32 { return repeatedUint32Array; } -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { +- (ulong)repeatedUint32AtIndex:(unsigned long)index { return [repeatedUint32Array uint32AtIndex:index]; } - (PBArray *)repeatedUint64 { return repeatedUint64Array; } -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { +- (ulong long)repeatedUint64AtIndex:(unsigned long)index { return [repeatedUint64Array uint64AtIndex:index]; } - (PBArray *)repeatedSint32 { return repeatedSint32Array; } -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { +- (long)repeatedSint32AtIndex:(unsigned long)index { return [repeatedSint32Array int32AtIndex:index]; } - (PBArray *)repeatedSint64 { return repeatedSint64Array; } -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index { +- (long long)repeatedSint64AtIndex:(unsigned long)index { return [repeatedSint64Array int64AtIndex:index]; } - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { +- (ulong)repeatedFixed32AtIndex:(unsigned long)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedFixed64 { return repeatedFixed64Array; } -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { return [repeatedFixed64Array uint64AtIndex:index]; } - (PBArray *)repeatedSfixed32 { return repeatedSfixed32Array; } -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { +- (long)repeatedSfixed32AtIndex:(unsigned long)index { return [repeatedSfixed32Array int32AtIndex:index]; } - (PBArray *)repeatedSfixed64 { return repeatedSfixed64Array; } -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index { +- (long long)repeatedSfixed64AtIndex:(unsigned long)index { return [repeatedSfixed64Array int64AtIndex:index]; } - (PBArray *)repeatedFloat { return repeatedFloatArray; } -- (Float32)repeatedFloatAtIndex:(NSUInteger)index { +- (Float32)repeatedFloatAtIndex:(unsigned long)index { return [repeatedFloatArray floatAtIndex:index]; } - (PBArray *)repeatedDouble { return repeatedDoubleArray; } -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index { +- (Float64)repeatedDoubleAtIndex:(unsigned long)index { return [repeatedDoubleArray doubleAtIndex:index]; } - (PBArray *)repeatedBool { return repeatedBoolArray; } -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index { +- (BOOL)repeatedBoolAtIndex:(unsigned long)index { return [repeatedBoolArray boolAtIndex:index]; } - (PBArray *)repeatedString { return repeatedStringArray; } -- (NSString*)repeatedStringAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringAtIndex:(unsigned long)index { return [repeatedStringArray objectAtIndex:index]; } - (PBArray *)repeatedBytes { return repeatedBytesArray; } -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index { +- (NSData*)repeatedBytesAtIndex:(unsigned long)index { return [repeatedBytesArray objectAtIndex:index]; } - (PBArray *)repeatedGroup { return repeatedGroupArray; } -- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index { +- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index { return [repeatedGroupArray objectAtIndex:index]; } - (PBArray *)repeatedNestedMessage { return repeatedNestedMessageArray; } -- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index { +- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index { return [repeatedNestedMessageArray objectAtIndex:index]; } - (PBArray *)repeatedForeignMessage { return repeatedForeignMessageArray; } -- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(NSUInteger)index { +- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(unsigned long)index { return [repeatedForeignMessageArray objectAtIndex:index]; } - (PBArray *)repeatedImportMessage { return repeatedImportMessageArray; } -- (ImportMessageLite*)repeatedImportMessageAtIndex:(NSUInteger)index { +- (ImportMessageLite*)repeatedImportMessageAtIndex:(unsigned long)index { return [repeatedImportMessageArray objectAtIndex:index]; } - (PBArray *)repeatedNestedEnum { return repeatedNestedEnumArray; } -- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index { +- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index { return [repeatedNestedEnumArray int32AtIndex:index]; } - (PBArray *)repeatedForeignEnum { return repeatedForeignEnumArray; } -- (ForeignEnumLite)repeatedForeignEnumAtIndex:(NSUInteger)index { +- (ForeignEnumLite)repeatedForeignEnumAtIndex:(unsigned long)index { return [repeatedForeignEnumArray int32AtIndex:index]; } - (PBArray *)repeatedImportEnum { return repeatedImportEnumArray; } -- (ImportEnumLite)repeatedImportEnumAtIndex:(NSUInteger)index { +- (ImportEnumLite)repeatedImportEnumAtIndex:(unsigned long)index { return [repeatedImportEnumArray int32AtIndex:index]; } - (PBArray *)repeatedStringPiece { return repeatedStringPieceArray; } -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index { return [repeatedStringPieceArray objectAtIndex:index]; } - (PBArray *)repeatedCord { return repeatedCordArray; } -- (NSString*)repeatedCordAtIndex:(NSUInteger)index { +- (NSString*)repeatedCordAtIndex:(unsigned long)index { return [repeatedCordArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -1948,108 +1948,108 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasOptionalCord) { [output writeString:25 value:self.optionalCord]; } - const NSUInteger repeatedInt32ArrayCount = self.repeatedInt32Array.count; + const unsigned long repeatedInt32ArrayCount = self.repeatedInt32Array.count; if (repeatedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; - for (NSUInteger i = 0; i < repeatedInt32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedInt32Array.data; + for (unsigned long i = 0; i < repeatedInt32ArrayCount; ++i) { [output writeInt32:31 value:values[i]]; } } - const NSUInteger repeatedInt64ArrayCount = self.repeatedInt64Array.count; + const unsigned long repeatedInt64ArrayCount = self.repeatedInt64Array.count; if (repeatedInt64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; - for (NSUInteger i = 0; i < repeatedInt64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedInt64Array.data; + for (unsigned long i = 0; i < repeatedInt64ArrayCount; ++i) { [output writeInt64:32 value:values[i]]; } } - const NSUInteger repeatedUint32ArrayCount = self.repeatedUint32Array.count; + const unsigned long repeatedUint32ArrayCount = self.repeatedUint32Array.count; if (repeatedUint32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; - for (NSUInteger i = 0; i < repeatedUint32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.repeatedUint32Array.data; + for (unsigned long i = 0; i < repeatedUint32ArrayCount; ++i) { [output writeUInt32:33 value:values[i]]; } } - const NSUInteger repeatedUint64ArrayCount = self.repeatedUint64Array.count; + const unsigned long repeatedUint64ArrayCount = self.repeatedUint64Array.count; if (repeatedUint64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; - for (NSUInteger i = 0; i < repeatedUint64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + for (unsigned long i = 0; i < repeatedUint64ArrayCount; ++i) { [output writeUInt64:34 value:values[i]]; } } - const NSUInteger repeatedSint32ArrayCount = self.repeatedSint32Array.count; + const unsigned long repeatedSint32ArrayCount = self.repeatedSint32Array.count; if (repeatedSint32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; - for (NSUInteger i = 0; i < repeatedSint32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedSint32Array.data; + for (unsigned long i = 0; i < repeatedSint32ArrayCount; ++i) { [output writeSInt32:35 value:values[i]]; } } - const NSUInteger repeatedSint64ArrayCount = self.repeatedSint64Array.count; + const unsigned long repeatedSint64ArrayCount = self.repeatedSint64Array.count; if (repeatedSint64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedSint64Array.data; - for (NSUInteger i = 0; i < repeatedSint64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedSint64Array.data; + for (unsigned long i = 0; i < repeatedSint64ArrayCount; ++i) { [output writeSInt64:36 value:values[i]]; } } - const NSUInteger repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; + const unsigned long repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.repeatedFixed32Array.data; - for (NSUInteger i = 0; i < repeatedFixed32ArrayCount; ++i) { + const ulong *values = (const ulong *)self.repeatedFixed32Array.data; + for (unsigned long i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:37 value:values[i]]; } } - const NSUInteger repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; + const unsigned long repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; if (repeatedFixed64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.repeatedFixed64Array.data; - for (NSUInteger i = 0; i < repeatedFixed64ArrayCount; ++i) { + const ulong long *values = (const ulong long *)self.repeatedFixed64Array.data; + for (unsigned long i = 0; i < repeatedFixed64ArrayCount; ++i) { [output writeFixed64:38 value:values[i]]; } } - const NSUInteger repeatedSfixed32ArrayCount = self.repeatedSfixed32Array.count; + const unsigned long repeatedSfixed32ArrayCount = self.repeatedSfixed32Array.count; if (repeatedSfixed32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.repeatedSfixed32Array.data; - for (NSUInteger i = 0; i < repeatedSfixed32ArrayCount; ++i) { + const long *values = (const long *)self.repeatedSfixed32Array.data; + for (unsigned long i = 0; i < repeatedSfixed32ArrayCount; ++i) { [output writeSFixed32:39 value:values[i]]; } } - const NSUInteger repeatedSfixed64ArrayCount = self.repeatedSfixed64Array.count; + const unsigned long repeatedSfixed64ArrayCount = self.repeatedSfixed64Array.count; if (repeatedSfixed64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.repeatedSfixed64Array.data; - for (NSUInteger i = 0; i < repeatedSfixed64ArrayCount; ++i) { + const long long *values = (const long long *)self.repeatedSfixed64Array.data; + for (unsigned long i = 0; i < repeatedSfixed64ArrayCount; ++i) { [output writeSFixed64:40 value:values[i]]; } } - const NSUInteger repeatedFloatArrayCount = self.repeatedFloatArray.count; + const unsigned long repeatedFloatArrayCount = self.repeatedFloatArray.count; if (repeatedFloatArrayCount > 0) { const Float32 *values = (const Float32 *)self.repeatedFloatArray.data; - for (NSUInteger i = 0; i < repeatedFloatArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedFloatArrayCount; ++i) { [output writeFloat:41 value:values[i]]; } } - const NSUInteger repeatedDoubleArrayCount = self.repeatedDoubleArray.count; + const unsigned long repeatedDoubleArrayCount = self.repeatedDoubleArray.count; if (repeatedDoubleArrayCount > 0) { const Float64 *values = (const Float64 *)self.repeatedDoubleArray.data; - for (NSUInteger i = 0; i < repeatedDoubleArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedDoubleArrayCount; ++i) { [output writeDouble:42 value:values[i]]; } } - const NSUInteger repeatedBoolArrayCount = self.repeatedBoolArray.count; + const unsigned long repeatedBoolArrayCount = self.repeatedBoolArray.count; if (repeatedBoolArrayCount > 0) { const BOOL *values = (const BOOL *)self.repeatedBoolArray.data; - for (NSUInteger i = 0; i < repeatedBoolArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedBoolArrayCount; ++i) { [output writeBool:43 value:values[i]]; } } - const NSUInteger repeatedStringArrayCount = self.repeatedStringArray.count; + const unsigned long repeatedStringArrayCount = self.repeatedStringArray.count; if (repeatedStringArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedStringArray.data; - for (NSUInteger i = 0; i < repeatedStringArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedStringArrayCount; ++i) { [output writeString:44 value:values[i]]; } } - const NSUInteger repeatedBytesArrayCount = self.repeatedBytesArray.count; + const unsigned long repeatedBytesArrayCount = self.repeatedBytesArray.count; if (repeatedBytesArrayCount > 0) { const NSData* *values = (const NSData* *)self.repeatedBytesArray.data; - for (NSUInteger i = 0; i < repeatedBytesArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedBytesArrayCount; ++i) { [output writeData:45 value:values[i]]; } } @@ -2065,32 +2065,32 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { for (ImportMessageLite *element in self.repeatedImportMessageArray) { [output writeMessage:50 value:element]; } - const NSUInteger repeatedNestedEnumArrayCount = self.repeatedNestedEnumArray.count; + const unsigned long repeatedNestedEnumArrayCount = self.repeatedNestedEnumArray.count; const TestAllTypesLite_NestedEnum *repeatedNestedEnumArrayValues = (const TestAllTypesLite_NestedEnum *)self.repeatedNestedEnumArray.data; - for (NSUInteger i = 0; i < repeatedNestedEnumArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedNestedEnumArrayCount; ++i) { [output writeEnum:51 value:repeatedNestedEnumArrayValues[i]]; } - const NSUInteger repeatedForeignEnumArrayCount = self.repeatedForeignEnumArray.count; + const unsigned long repeatedForeignEnumArrayCount = self.repeatedForeignEnumArray.count; const ForeignEnumLite *repeatedForeignEnumArrayValues = (const ForeignEnumLite *)self.repeatedForeignEnumArray.data; - for (NSUInteger i = 0; i < repeatedForeignEnumArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedForeignEnumArrayCount; ++i) { [output writeEnum:52 value:repeatedForeignEnumArrayValues[i]]; } - const NSUInteger repeatedImportEnumArrayCount = self.repeatedImportEnumArray.count; + const unsigned long repeatedImportEnumArrayCount = self.repeatedImportEnumArray.count; const ImportEnumLite *repeatedImportEnumArrayValues = (const ImportEnumLite *)self.repeatedImportEnumArray.data; - for (NSUInteger i = 0; i < repeatedImportEnumArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedImportEnumArrayCount; ++i) { [output writeEnum:53 value:repeatedImportEnumArrayValues[i]]; } - const NSUInteger repeatedStringPieceArrayCount = self.repeatedStringPieceArray.count; + const unsigned long repeatedStringPieceArrayCount = self.repeatedStringPieceArray.count; if (repeatedStringPieceArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedStringPieceArray.data; - for (NSUInteger i = 0; i < repeatedStringPieceArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedStringPieceArrayCount; ++i) { [output writeString:54 value:values[i]]; } } - const NSUInteger repeatedCordArrayCount = self.repeatedCordArray.count; + const unsigned long repeatedCordArrayCount = self.repeatedCordArray.count; if (repeatedCordArrayCount > 0) { const NSString* *values = (const NSString* *)self.repeatedCordArray.data; - for (NSUInteger i = 0; i < repeatedCordArrayCount; ++i) { + for (unsigned long i = 0; i < repeatedCordArrayCount; ++i) { [output writeString:55 value:values[i]]; } } @@ -2156,8 +2156,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -2236,129 +2236,129 @@ - (NSInteger) serializedSize { size += computeStringSize(25, self.optionalCord); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.repeatedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedInt32Array.count; + const long *values = (const long *)self.repeatedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedInt64Array.count; - const int64_t *values = (const int64_t *)self.repeatedInt64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedInt64Array.count; + const long long *values = (const long long *)self.repeatedInt64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedUint32Array.count; - const uNSInteger *values = (const uNSInteger *)self.repeatedUint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedUint32Array.count; + const ulong *values = (const ulong *)self.repeatedUint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedUint64Array.count; - const uint64_t *values = (const uint64_t *)self.repeatedUint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedUint64Array.count; + const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSint32Array.count; - const NSInteger *values = (const NSInteger *)self.repeatedSint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedSint32Array.count; + const long *values = (const long *)self.repeatedSint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSint64Array.count; - const int64_t *values = (const int64_t *)self.repeatedSint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.repeatedSint64Array.count; + const long long *values = (const long long *)self.repeatedSint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt64SizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFixed32Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedFixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFixed64Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedFixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSfixed32Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedSfixed32Array.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedSfixed64Array.count; + long dataSize = 0; + const unsigned long count = self.repeatedSfixed64Array.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedFloatArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedFloatArray.count; dataSize = 4 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedDoubleArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedDoubleArray.count; dataSize = 8 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedBoolArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedBoolArray.count; dataSize = 1 * count; size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedStringArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedStringArray.count; const NSString* *values = (const NSString* *)self.repeatedStringArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedBytesArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedBytesArray.count; const NSData* *values = (const NSData* *)self.repeatedBytesArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeDataSizeNoTag(values[i]); } size += dataSize; @@ -2377,50 +2377,50 @@ - (NSInteger) serializedSize { size += computeMessageSize(50, element); } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedNestedEnumArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedNestedEnumArray.count; const TestAllTypesLite_NestedEnum *values = (const TestAllTypesLite_NestedEnum *)self.repeatedNestedEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedForeignEnumArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedForeignEnumArray.count; const ForeignEnumLite *values = (const ForeignEnumLite *)self.repeatedForeignEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedImportEnumArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedImportEnumArray.count; const ImportEnumLite *values = (const ImportEnumLite *)self.repeatedImportEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedStringPieceArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedStringPieceArray.count; const NSString* *values = (const NSString* *)self.repeatedStringPieceArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; size += 2 * count; } { - NSInteger dataSize = 0; - const NSUInteger count = self.repeatedCordArray.count; + long dataSize = 0; + const unsigned long count = self.repeatedCordArray.count; const NSString* *values = (const NSString* *)self.repeatedCordArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeStringSizeNoTag(values[i]); } size += dataSize; @@ -2942,8 +2942,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasOptionalInt32) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.optionalInt32] hash]; } @@ -3164,7 +3164,7 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value) } } @interface TestAllTypesLite_NestedMessage () -@property NSInteger bb; +@property long bb; @end @implementation TestAllTypesLite_NestedMessage @@ -3206,8 +3206,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3270,8 +3270,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasBb) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.bb] hash]; } @@ -3334,7 +3334,7 @@ - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3356,10 +3356,10 @@ - (TestAllTypesLite_NestedMessage_Builder*) mergeFromCodedInputStream:(PBCodedIn - (BOOL) hasBb { return result.hasBb; } -- (NSInteger) bb { +- (long) bb { return result.bb; } -- (TestAllTypesLite_NestedMessage_Builder*) setBb:(NSInteger) value { +- (TestAllTypesLite_NestedMessage_Builder*) setBb:(long) value { result.hasBb = YES; result.bb = value; return self; @@ -3372,7 +3372,7 @@ - (TestAllTypesLite_NestedMessage_Builder*) clearBb { @end @interface TestAllTypesLite_OptionalGroup () -@property NSInteger a; +@property long a; @end @implementation TestAllTypesLite_OptionalGroup @@ -3414,8 +3414,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3478,8 +3478,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -3542,7 +3542,7 @@ - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3564,10 +3564,10 @@ - (TestAllTypesLite_OptionalGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestAllTypesLite_OptionalGroup_Builder*) setA:(NSInteger) value { +- (TestAllTypesLite_OptionalGroup_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -3580,7 +3580,7 @@ - (TestAllTypesLite_OptionalGroup_Builder*) clearA { @end @interface TestAllTypesLite_RepeatedGroup () -@property NSInteger a; +@property long a; @end @implementation TestAllTypesLite_RepeatedGroup @@ -3622,8 +3622,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -3686,8 +3686,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -3750,7 +3750,7 @@ - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3772,10 +3772,10 @@ - (TestAllTypesLite_RepeatedGroup_Builder*) mergeFromCodedInputStream:(PBCodedIn - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(NSInteger) value { +- (TestAllTypesLite_RepeatedGroup_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -4138,7 +4138,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4247,7 +4247,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 168: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestAllTypesLite_NestedEnumIsValidValue(value)) { [self setOptionalNestedEnum:value]; } else { @@ -4256,7 +4256,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 176: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self setOptionalForeignEnum:value]; } else { @@ -4265,7 +4265,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 184: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ImportEnumLiteIsValidValue(value)) { [self setOptionalImportEnum:value]; } else { @@ -4366,7 +4366,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 408: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestAllTypesLite_NestedEnumIsValidValue(value)) { [self addRepeatedNestedEnum:value]; } else { @@ -4375,7 +4375,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 416: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self addRepeatedForeignEnum:value]; } else { @@ -4384,7 +4384,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 424: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ImportEnumLiteIsValidValue(value)) { [self addRepeatedImportEnum:value]; } else { @@ -4461,7 +4461,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 648: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (TestAllTypesLite_NestedEnumIsValidValue(value)) { [self setDefaultNestedEnum:value]; } else { @@ -4470,7 +4470,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 656: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self setDefaultForeignEnum:value]; } else { @@ -4479,7 +4479,7 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 664: { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ImportEnumLiteIsValidValue(value)) { [self setDefaultImportEnum:value]; } else { @@ -4501,10 +4501,10 @@ - (TestAllTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in - (BOOL) hasOptionalInt32 { return result.hasOptionalInt32; } -- (NSInteger) optionalInt32 { +- (long) optionalInt32 { return result.optionalInt32; } -- (TestAllTypesLite_Builder*) setOptionalInt32:(NSInteger) value { +- (TestAllTypesLite_Builder*) setOptionalInt32:(long) value { result.hasOptionalInt32 = YES; result.optionalInt32 = value; return self; @@ -4517,10 +4517,10 @@ - (TestAllTypesLite_Builder*) clearOptionalInt32 { - (BOOL) hasOptionalInt64 { return result.hasOptionalInt64; } -- (int64_t) optionalInt64 { +- (long long) optionalInt64 { return result.optionalInt64; } -- (TestAllTypesLite_Builder*) setOptionalInt64:(int64_t) value { +- (TestAllTypesLite_Builder*) setOptionalInt64:(long long) value { result.hasOptionalInt64 = YES; result.optionalInt64 = value; return self; @@ -4533,10 +4533,10 @@ - (TestAllTypesLite_Builder*) clearOptionalInt64 { - (BOOL) hasOptionalUint32 { return result.hasOptionalUint32; } -- (uNSInteger) optionalUint32 { +- (ulong) optionalUint32 { return result.optionalUint32; } -- (TestAllTypesLite_Builder*) setOptionalUint32:(uNSInteger) value { +- (TestAllTypesLite_Builder*) setOptionalUint32:(ulong) value { result.hasOptionalUint32 = YES; result.optionalUint32 = value; return self; @@ -4549,10 +4549,10 @@ - (TestAllTypesLite_Builder*) clearOptionalUint32 { - (BOOL) hasOptionalUint64 { return result.hasOptionalUint64; } -- (uint64_t) optionalUint64 { +- (ulong long) optionalUint64 { return result.optionalUint64; } -- (TestAllTypesLite_Builder*) setOptionalUint64:(uint64_t) value { +- (TestAllTypesLite_Builder*) setOptionalUint64:(ulong long) value { result.hasOptionalUint64 = YES; result.optionalUint64 = value; return self; @@ -4565,10 +4565,10 @@ - (TestAllTypesLite_Builder*) clearOptionalUint64 { - (BOOL) hasOptionalSint32 { return result.hasOptionalSint32; } -- (NSInteger) optionalSint32 { +- (long) optionalSint32 { return result.optionalSint32; } -- (TestAllTypesLite_Builder*) setOptionalSint32:(NSInteger) value { +- (TestAllTypesLite_Builder*) setOptionalSint32:(long) value { result.hasOptionalSint32 = YES; result.optionalSint32 = value; return self; @@ -4581,10 +4581,10 @@ - (TestAllTypesLite_Builder*) clearOptionalSint32 { - (BOOL) hasOptionalSint64 { return result.hasOptionalSint64; } -- (int64_t) optionalSint64 { +- (long long) optionalSint64 { return result.optionalSint64; } -- (TestAllTypesLite_Builder*) setOptionalSint64:(int64_t) value { +- (TestAllTypesLite_Builder*) setOptionalSint64:(long long) value { result.hasOptionalSint64 = YES; result.optionalSint64 = value; return self; @@ -4597,10 +4597,10 @@ - (TestAllTypesLite_Builder*) clearOptionalSint64 { - (BOOL) hasOptionalFixed32 { return result.hasOptionalFixed32; } -- (uNSInteger) optionalFixed32 { +- (ulong) optionalFixed32 { return result.optionalFixed32; } -- (TestAllTypesLite_Builder*) setOptionalFixed32:(uNSInteger) value { +- (TestAllTypesLite_Builder*) setOptionalFixed32:(ulong) value { result.hasOptionalFixed32 = YES; result.optionalFixed32 = value; return self; @@ -4613,10 +4613,10 @@ - (TestAllTypesLite_Builder*) clearOptionalFixed32 { - (BOOL) hasOptionalFixed64 { return result.hasOptionalFixed64; } -- (uint64_t) optionalFixed64 { +- (ulong long) optionalFixed64 { return result.optionalFixed64; } -- (TestAllTypesLite_Builder*) setOptionalFixed64:(uint64_t) value { +- (TestAllTypesLite_Builder*) setOptionalFixed64:(ulong long) value { result.hasOptionalFixed64 = YES; result.optionalFixed64 = value; return self; @@ -4629,10 +4629,10 @@ - (TestAllTypesLite_Builder*) clearOptionalFixed64 { - (BOOL) hasOptionalSfixed32 { return result.hasOptionalSfixed32; } -- (NSInteger) optionalSfixed32 { +- (long) optionalSfixed32 { return result.optionalSfixed32; } -- (TestAllTypesLite_Builder*) setOptionalSfixed32:(NSInteger) value { +- (TestAllTypesLite_Builder*) setOptionalSfixed32:(long) value { result.hasOptionalSfixed32 = YES; result.optionalSfixed32 = value; return self; @@ -4645,10 +4645,10 @@ - (TestAllTypesLite_Builder*) clearOptionalSfixed32 { - (BOOL) hasOptionalSfixed64 { return result.hasOptionalSfixed64; } -- (int64_t) optionalSfixed64 { +- (long long) optionalSfixed64 { return result.optionalSfixed64; } -- (TestAllTypesLite_Builder*) setOptionalSfixed64:(int64_t) value { +- (TestAllTypesLite_Builder*) setOptionalSfixed64:(long long) value { result.hasOptionalSfixed64 = YES; result.optionalSfixed64 = value; return self; @@ -4941,10 +4941,10 @@ - (TestAllTypesLite_Builder*) clearOptionalCord { - (PBAppendableArray *)repeatedInt32 { return result.repeatedInt32Array; } -- (NSInteger)repeatedInt32AtIndex:(NSUInteger)index { +- (long)repeatedInt32AtIndex:(unsigned long)index { return [result repeatedInt32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedInt32:(NSInteger)value { +- (TestAllTypesLite_Builder *)addRepeatedInt32:(long)value { if (result.repeatedInt32Array == nil) { result.repeatedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -4955,7 +4955,7 @@ - (TestAllTypesLite_Builder *)setRepeatedInt32Array:(NSArray *)array { result.repeatedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedInt32Values:(const long *)values count:(unsigned long)count { result.repeatedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -4966,10 +4966,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedInt32 { - (PBAppendableArray *)repeatedInt64 { return result.repeatedInt64Array; } -- (int64_t)repeatedInt64AtIndex:(NSUInteger)index { +- (long long)repeatedInt64AtIndex:(unsigned long)index { return [result repeatedInt64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedInt64:(int64_t)value { +- (TestAllTypesLite_Builder *)addRepeatedInt64:(long long)value { if (result.repeatedInt64Array == nil) { result.repeatedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -4980,7 +4980,7 @@ - (TestAllTypesLite_Builder *)setRepeatedInt64Array:(NSArray *)array { result.repeatedInt64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedInt64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedInt64Values:(const long long *)values count:(unsigned long)count { result.repeatedInt64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -4991,10 +4991,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedUint32 { return result.repeatedUint32Array; } -- (uNSInteger)repeatedUint32AtIndex:(NSUInteger)index { +- (ulong)repeatedUint32AtIndex:(unsigned long)index { return [result repeatedUint32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedUint32:(uNSInteger)value { +- (TestAllTypesLite_Builder *)addRepeatedUint32:(ulong)value { if (result.repeatedUint32Array == nil) { result.repeatedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5005,7 +5005,7 @@ - (TestAllTypesLite_Builder *)setRepeatedUint32Array:(NSArray *)array { result.repeatedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count { result.repeatedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5016,10 +5016,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedUint32 { - (PBAppendableArray *)repeatedUint64 { return result.repeatedUint64Array; } -- (uint64_t)repeatedUint64AtIndex:(NSUInteger)index { +- (ulong long)repeatedUint64AtIndex:(unsigned long)index { return [result repeatedUint64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedUint64:(uint64_t)value { +- (TestAllTypesLite_Builder *)addRepeatedUint64:(ulong long)value { if (result.repeatedUint64Array == nil) { result.repeatedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5030,7 +5030,7 @@ - (TestAllTypesLite_Builder *)setRepeatedUint64Array:(NSArray *)array { result.repeatedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count { result.repeatedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5041,10 +5041,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedUint64 { - (PBAppendableArray *)repeatedSint32 { return result.repeatedSint32Array; } -- (NSInteger)repeatedSint32AtIndex:(NSUInteger)index { +- (long)repeatedSint32AtIndex:(unsigned long)index { return [result repeatedSint32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedSint32:(NSInteger)value { +- (TestAllTypesLite_Builder *)addRepeatedSint32:(long)value { if (result.repeatedSint32Array == nil) { result.repeatedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5055,7 +5055,7 @@ - (TestAllTypesLite_Builder *)setRepeatedSint32Array:(NSArray *)array { result.repeatedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedSint32Values:(const long *)values count:(unsigned long)count { result.repeatedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5066,10 +5066,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedSint32 { - (PBAppendableArray *)repeatedSint64 { return result.repeatedSint64Array; } -- (int64_t)repeatedSint64AtIndex:(NSUInteger)index { +- (long long)repeatedSint64AtIndex:(unsigned long)index { return [result repeatedSint64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedSint64:(int64_t)value { +- (TestAllTypesLite_Builder *)addRepeatedSint64:(long long)value { if (result.repeatedSint64Array == nil) { result.repeatedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -5080,7 +5080,7 @@ - (TestAllTypesLite_Builder *)setRepeatedSint64Array:(NSArray *)array { result.repeatedSint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedSint64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedSint64Values:(const long long *)values count:(unsigned long)count { result.repeatedSint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -5091,10 +5091,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedSint64 { - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (uNSInteger)repeatedFixed32AtIndex:(NSUInteger)index { +- (ulong)repeatedFixed32AtIndex:(unsigned long)index { return [result repeatedFixed32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedFixed32:(uNSInteger)value { +- (TestAllTypesLite_Builder *)addRepeatedFixed32:(ulong)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5105,7 +5105,7 @@ - (TestAllTypesLite_Builder *)setRepeatedFixed32Array:(NSArray *)array { result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5116,10 +5116,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedFixed32 { - (PBAppendableArray *)repeatedFixed64 { return result.repeatedFixed64Array; } -- (uint64_t)repeatedFixed64AtIndex:(NSUInteger)index { +- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { return [result repeatedFixed64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedFixed64:(uint64_t)value { +- (TestAllTypesLite_Builder *)addRepeatedFixed64:(ulong long)value { if (result.repeatedFixed64Array == nil) { result.repeatedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5130,7 +5130,7 @@ - (TestAllTypesLite_Builder *)setRepeatedFixed64Array:(NSArray *)array { result.repeatedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count { result.repeatedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5141,10 +5141,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedFixed64 { - (PBAppendableArray *)repeatedSfixed32 { return result.repeatedSfixed32Array; } -- (NSInteger)repeatedSfixed32AtIndex:(NSUInteger)index { +- (long)repeatedSfixed32AtIndex:(unsigned long)index { return [result repeatedSfixed32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(NSInteger)value { +- (TestAllTypesLite_Builder *)addRepeatedSfixed32:(long)value { if (result.repeatedSfixed32Array == nil) { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -5155,7 +5155,7 @@ - (TestAllTypesLite_Builder *)setRepeatedSfixed32Array:(NSArray *)array { result.repeatedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedSfixed32Values:(const long *)values count:(unsigned long)count { result.repeatedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5166,10 +5166,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedSfixed32 { - (PBAppendableArray *)repeatedSfixed64 { return result.repeatedSfixed64Array; } -- (int64_t)repeatedSfixed64AtIndex:(NSUInteger)index { +- (long long)repeatedSfixed64AtIndex:(unsigned long)index { return [result repeatedSfixed64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedSfixed64:(int64_t)value { +- (TestAllTypesLite_Builder *)addRepeatedSfixed64:(long long)value { if (result.repeatedSfixed64Array == nil) { result.repeatedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -5180,7 +5180,7 @@ - (TestAllTypesLite_Builder *)setRepeatedSfixed64Array:(NSArray *)array { result.repeatedSfixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedSfixed64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedSfixed64Values:(const long long *)values count:(unsigned long)count { result.repeatedSfixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -5191,7 +5191,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedSfixed64 { - (PBAppendableArray *)repeatedFloat { return result.repeatedFloatArray; } -- (Float32)repeatedFloatAtIndex:(NSUInteger)index { +- (Float32)repeatedFloatAtIndex:(unsigned long)index { return [result repeatedFloatAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedFloat:(Float32)value { @@ -5205,7 +5205,7 @@ - (TestAllTypesLite_Builder *)setRepeatedFloatArray:(NSArray *)array { result.repeatedFloatArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeFloat]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedFloatValues:(const Float32 *)values count:(unsigned long)count { result.repeatedFloatArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeFloat]; return self; } @@ -5216,7 +5216,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedFloat { - (PBAppendableArray *)repeatedDouble { return result.repeatedDoubleArray; } -- (Float64)repeatedDoubleAtIndex:(NSUInteger)index { +- (Float64)repeatedDoubleAtIndex:(unsigned long)index { return [result repeatedDoubleAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedDouble:(Float64)value { @@ -5230,7 +5230,7 @@ - (TestAllTypesLite_Builder *)setRepeatedDoubleArray:(NSArray *)array { result.repeatedDoubleArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeDouble]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedDoubleValues:(const Float64 *)values count:(unsigned long)count { result.repeatedDoubleArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeDouble]; return self; } @@ -5241,7 +5241,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedDouble { - (PBAppendableArray *)repeatedBool { return result.repeatedBoolArray; } -- (BOOL)repeatedBoolAtIndex:(NSUInteger)index { +- (BOOL)repeatedBoolAtIndex:(unsigned long)index { return [result repeatedBoolAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedBool:(BOOL)value { @@ -5255,7 +5255,7 @@ - (TestAllTypesLite_Builder *)setRepeatedBoolArray:(NSArray *)array { result.repeatedBoolArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeBool]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedBoolValues:(const BOOL *)values count:(unsigned long)count { result.repeatedBoolArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeBool]; return self; } @@ -5266,7 +5266,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedBool { - (PBAppendableArray *)repeatedString { return result.repeatedStringArray; } -- (NSString*)repeatedStringAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringAtIndex:(unsigned long)index { return [result repeatedStringAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedString:(NSString*)value { @@ -5280,7 +5280,7 @@ - (TestAllTypesLite_Builder *)setRepeatedStringArray:(NSArray *)array { result.repeatedStringArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedStringValues:(const NSString* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedStringValues:(const NSString* *)values count:(unsigned long)count { result.repeatedStringArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5291,7 +5291,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedString { - (PBAppendableArray *)repeatedBytes { return result.repeatedBytesArray; } -- (NSData*)repeatedBytesAtIndex:(NSUInteger)index { +- (NSData*)repeatedBytesAtIndex:(unsigned long)index { return [result repeatedBytesAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedBytes:(NSData*)value { @@ -5305,7 +5305,7 @@ - (TestAllTypesLite_Builder *)setRepeatedBytesArray:(NSArray *)array { result.repeatedBytesArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedBytesValues:(const NSData* *)values count:(unsigned long)count { result.repeatedBytesArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5316,7 +5316,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedBytes { - (PBAppendableArray *)repeatedGroup { return result.repeatedGroupArray; } -- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(NSUInteger)index { +- (TestAllTypesLite_RepeatedGroup*)repeatedGroupAtIndex:(unsigned long)index { return [result repeatedGroupAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedGroup:(TestAllTypesLite_RepeatedGroup*)value { @@ -5330,7 +5330,7 @@ - (TestAllTypesLite_Builder *)setRepeatedGroupArray:(NSArray *)array { result.repeatedGroupArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedGroupValues:(const TestAllTypesLite_RepeatedGroup* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedGroupValues:(const TestAllTypesLite_RepeatedGroup* *)values count:(unsigned long)count { result.repeatedGroupArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5341,7 +5341,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedGroup { - (PBAppendableArray *)repeatedNestedMessage { return result.repeatedNestedMessageArray; } -- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(NSUInteger)index { +- (TestAllTypesLite_NestedMessage*)repeatedNestedMessageAtIndex:(unsigned long)index { return [result repeatedNestedMessageAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedNestedMessage:(TestAllTypesLite_NestedMessage*)value { @@ -5355,7 +5355,7 @@ - (TestAllTypesLite_Builder *)setRepeatedNestedMessageArray:(NSArray *)array { result.repeatedNestedMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedNestedMessageValues:(const TestAllTypesLite_NestedMessage* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedNestedMessageValues:(const TestAllTypesLite_NestedMessage* *)values count:(unsigned long)count { result.repeatedNestedMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5366,7 +5366,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedNestedMessage { - (PBAppendableArray *)repeatedForeignMessage { return result.repeatedForeignMessageArray; } -- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(NSUInteger)index { +- (ForeignMessageLite*)repeatedForeignMessageAtIndex:(unsigned long)index { return [result repeatedForeignMessageAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedForeignMessage:(ForeignMessageLite*)value { @@ -5380,7 +5380,7 @@ - (TestAllTypesLite_Builder *)setRepeatedForeignMessageArray:(NSArray *)array { result.repeatedForeignMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedForeignMessageValues:(const ForeignMessageLite* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedForeignMessageValues:(const ForeignMessageLite* *)values count:(unsigned long)count { result.repeatedForeignMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5391,7 +5391,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedForeignMessage { - (PBAppendableArray *)repeatedImportMessage { return result.repeatedImportMessageArray; } -- (ImportMessageLite*)repeatedImportMessageAtIndex:(NSUInteger)index { +- (ImportMessageLite*)repeatedImportMessageAtIndex:(unsigned long)index { return [result repeatedImportMessageAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedImportMessage:(ImportMessageLite*)value { @@ -5405,7 +5405,7 @@ - (TestAllTypesLite_Builder *)setRepeatedImportMessageArray:(NSArray *)array { result.repeatedImportMessageArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedImportMessageValues:(const ImportMessageLite* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedImportMessageValues:(const ImportMessageLite* *)values count:(unsigned long)count { result.repeatedImportMessageArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5416,7 +5416,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedImportMessage { - (PBAppendableArray *)repeatedNestedEnum { return result.repeatedNestedEnumArray; } -- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(NSUInteger)index { +- (TestAllTypesLite_NestedEnum)repeatedNestedEnumAtIndex:(unsigned long)index { return [result repeatedNestedEnumAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedNestedEnum:(TestAllTypesLite_NestedEnum)value { @@ -5430,7 +5430,7 @@ - (TestAllTypesLite_Builder *)setRepeatedNestedEnumArray:(NSArray *)array { result.repeatedNestedEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedNestedEnumValues:(const TestAllTypesLite_NestedEnum *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedNestedEnumValues:(const TestAllTypesLite_NestedEnum *)values count:(unsigned long)count { result.repeatedNestedEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5441,7 +5441,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedNestedEnum { - (PBAppendableArray *)repeatedForeignEnum { return result.repeatedForeignEnumArray; } -- (ForeignEnumLite)repeatedForeignEnumAtIndex:(NSUInteger)index { +- (ForeignEnumLite)repeatedForeignEnumAtIndex:(unsigned long)index { return [result repeatedForeignEnumAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedForeignEnum:(ForeignEnumLite)value { @@ -5455,7 +5455,7 @@ - (TestAllTypesLite_Builder *)setRepeatedForeignEnumArray:(NSArray *)array { result.repeatedForeignEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedForeignEnumValues:(const ForeignEnumLite *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedForeignEnumValues:(const ForeignEnumLite *)values count:(unsigned long)count { result.repeatedForeignEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5466,7 +5466,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedForeignEnum { - (PBAppendableArray *)repeatedImportEnum { return result.repeatedImportEnumArray; } -- (ImportEnumLite)repeatedImportEnumAtIndex:(NSUInteger)index { +- (ImportEnumLite)repeatedImportEnumAtIndex:(unsigned long)index { return [result repeatedImportEnumAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedImportEnum:(ImportEnumLite)value { @@ -5480,7 +5480,7 @@ - (TestAllTypesLite_Builder *)setRepeatedImportEnumArray:(NSArray *)array { result.repeatedImportEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedImportEnumValues:(const ImportEnumLite *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedImportEnumValues:(const ImportEnumLite *)values count:(unsigned long)count { result.repeatedImportEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -5491,7 +5491,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedImportEnum { - (PBAppendableArray *)repeatedStringPiece { return result.repeatedStringPieceArray; } -- (NSString*)repeatedStringPieceAtIndex:(NSUInteger)index { +- (NSString*)repeatedStringPieceAtIndex:(unsigned long)index { return [result repeatedStringPieceAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedStringPiece:(NSString*)value { @@ -5505,7 +5505,7 @@ - (TestAllTypesLite_Builder *)setRepeatedStringPieceArray:(NSArray *)array { result.repeatedStringPieceArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedStringPieceValues:(const NSString* *)values count:(unsigned long)count { result.repeatedStringPieceArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5516,7 +5516,7 @@ - (TestAllTypesLite_Builder *)clearRepeatedStringPiece { - (PBAppendableArray *)repeatedCord { return result.repeatedCordArray; } -- (NSString*)repeatedCordAtIndex:(NSUInteger)index { +- (NSString*)repeatedCordAtIndex:(unsigned long)index { return [result repeatedCordAtIndex:index]; } - (TestAllTypesLite_Builder *)addRepeatedCord:(NSString*)value { @@ -5530,7 +5530,7 @@ - (TestAllTypesLite_Builder *)setRepeatedCordArray:(NSArray *)array { result.repeatedCordArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedCordValues:(const NSString* *)values count:(NSUInteger)count { +- (TestAllTypesLite_Builder *)setRepeatedCordValues:(const NSString* *)values count:(unsigned long)count { result.repeatedCordArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } @@ -5541,10 +5541,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedCord { - (BOOL) hasDefaultInt32 { return result.hasDefaultInt32; } -- (NSInteger) defaultInt32 { +- (long) defaultInt32 { return result.defaultInt32; } -- (TestAllTypesLite_Builder*) setDefaultInt32:(NSInteger) value { +- (TestAllTypesLite_Builder*) setDefaultInt32:(long) value { result.hasDefaultInt32 = YES; result.defaultInt32 = value; return self; @@ -5557,10 +5557,10 @@ - (TestAllTypesLite_Builder*) clearDefaultInt32 { - (BOOL) hasDefaultInt64 { return result.hasDefaultInt64; } -- (int64_t) defaultInt64 { +- (long long) defaultInt64 { return result.defaultInt64; } -- (TestAllTypesLite_Builder*) setDefaultInt64:(int64_t) value { +- (TestAllTypesLite_Builder*) setDefaultInt64:(long long) value { result.hasDefaultInt64 = YES; result.defaultInt64 = value; return self; @@ -5573,10 +5573,10 @@ - (TestAllTypesLite_Builder*) clearDefaultInt64 { - (BOOL) hasDefaultUint32 { return result.hasDefaultUint32; } -- (uNSInteger) defaultUint32 { +- (ulong) defaultUint32 { return result.defaultUint32; } -- (TestAllTypesLite_Builder*) setDefaultUint32:(uNSInteger) value { +- (TestAllTypesLite_Builder*) setDefaultUint32:(ulong) value { result.hasDefaultUint32 = YES; result.defaultUint32 = value; return self; @@ -5589,10 +5589,10 @@ - (TestAllTypesLite_Builder*) clearDefaultUint32 { - (BOOL) hasDefaultUint64 { return result.hasDefaultUint64; } -- (uint64_t) defaultUint64 { +- (ulong long) defaultUint64 { return result.defaultUint64; } -- (TestAllTypesLite_Builder*) setDefaultUint64:(uint64_t) value { +- (TestAllTypesLite_Builder*) setDefaultUint64:(ulong long) value { result.hasDefaultUint64 = YES; result.defaultUint64 = value; return self; @@ -5605,10 +5605,10 @@ - (TestAllTypesLite_Builder*) clearDefaultUint64 { - (BOOL) hasDefaultSint32 { return result.hasDefaultSint32; } -- (NSInteger) defaultSint32 { +- (long) defaultSint32 { return result.defaultSint32; } -- (TestAllTypesLite_Builder*) setDefaultSint32:(NSInteger) value { +- (TestAllTypesLite_Builder*) setDefaultSint32:(long) value { result.hasDefaultSint32 = YES; result.defaultSint32 = value; return self; @@ -5621,10 +5621,10 @@ - (TestAllTypesLite_Builder*) clearDefaultSint32 { - (BOOL) hasDefaultSint64 { return result.hasDefaultSint64; } -- (int64_t) defaultSint64 { +- (long long) defaultSint64 { return result.defaultSint64; } -- (TestAllTypesLite_Builder*) setDefaultSint64:(int64_t) value { +- (TestAllTypesLite_Builder*) setDefaultSint64:(long long) value { result.hasDefaultSint64 = YES; result.defaultSint64 = value; return self; @@ -5637,10 +5637,10 @@ - (TestAllTypesLite_Builder*) clearDefaultSint64 { - (BOOL) hasDefaultFixed32 { return result.hasDefaultFixed32; } -- (uNSInteger) defaultFixed32 { +- (ulong) defaultFixed32 { return result.defaultFixed32; } -- (TestAllTypesLite_Builder*) setDefaultFixed32:(uNSInteger) value { +- (TestAllTypesLite_Builder*) setDefaultFixed32:(ulong) value { result.hasDefaultFixed32 = YES; result.defaultFixed32 = value; return self; @@ -5653,10 +5653,10 @@ - (TestAllTypesLite_Builder*) clearDefaultFixed32 { - (BOOL) hasDefaultFixed64 { return result.hasDefaultFixed64; } -- (uint64_t) defaultFixed64 { +- (ulong long) defaultFixed64 { return result.defaultFixed64; } -- (TestAllTypesLite_Builder*) setDefaultFixed64:(uint64_t) value { +- (TestAllTypesLite_Builder*) setDefaultFixed64:(ulong long) value { result.hasDefaultFixed64 = YES; result.defaultFixed64 = value; return self; @@ -5669,10 +5669,10 @@ - (TestAllTypesLite_Builder*) clearDefaultFixed64 { - (BOOL) hasDefaultSfixed32 { return result.hasDefaultSfixed32; } -- (NSInteger) defaultSfixed32 { +- (long) defaultSfixed32 { return result.defaultSfixed32; } -- (TestAllTypesLite_Builder*) setDefaultSfixed32:(NSInteger) value { +- (TestAllTypesLite_Builder*) setDefaultSfixed32:(long) value { result.hasDefaultSfixed32 = YES; result.defaultSfixed32 = value; return self; @@ -5685,10 +5685,10 @@ - (TestAllTypesLite_Builder*) clearDefaultSfixed32 { - (BOOL) hasDefaultSfixed64 { return result.hasDefaultSfixed64; } -- (int64_t) defaultSfixed64 { +- (long long) defaultSfixed64 { return result.defaultSfixed64; } -- (TestAllTypesLite_Builder*) setDefaultSfixed64:(int64_t) value { +- (TestAllTypesLite_Builder*) setDefaultSfixed64:(long long) value { result.hasDefaultSfixed64 = YES; result.defaultSfixed64 = value; return self; @@ -5861,7 +5861,7 @@ - (TestAllTypesLite_Builder*) clearDefaultCord { @end @interface ForeignMessageLite () -@property NSInteger c; +@property long c; @end @implementation ForeignMessageLite @@ -5903,8 +5903,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -5967,8 +5967,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasC) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.c] hash]; } @@ -6031,7 +6031,7 @@ - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6053,10 +6053,10 @@ - (ForeignMessageLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasC { return result.hasC; } -- (NSInteger) c { +- (long) c { return result.c; } -- (ForeignMessageLite_Builder*) setC:(NSInteger) value { +- (ForeignMessageLite_Builder*) setC:(long) value { result.hasC = YES; result.c = value; return self; @@ -6152,231 +6152,231 @@ - (TestPackedTypesLite*) defaultInstance { - (PBArray *)packedInt32 { return packedInt32Array; } -- (NSInteger)packedInt32AtIndex:(NSUInteger)index { +- (long)packedInt32AtIndex:(unsigned long)index { return [packedInt32Array int32AtIndex:index]; } - (PBArray *)packedInt64 { return packedInt64Array; } -- (int64_t)packedInt64AtIndex:(NSUInteger)index { +- (long long)packedInt64AtIndex:(unsigned long)index { return [packedInt64Array int64AtIndex:index]; } - (PBArray *)packedUint32 { return packedUint32Array; } -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { +- (ulong)packedUint32AtIndex:(unsigned long)index { return [packedUint32Array uint32AtIndex:index]; } - (PBArray *)packedUint64 { return packedUint64Array; } -- (uint64_t)packedUint64AtIndex:(NSUInteger)index { +- (ulong long)packedUint64AtIndex:(unsigned long)index { return [packedUint64Array uint64AtIndex:index]; } - (PBArray *)packedSint32 { return packedSint32Array; } -- (NSInteger)packedSint32AtIndex:(NSUInteger)index { +- (long)packedSint32AtIndex:(unsigned long)index { return [packedSint32Array int32AtIndex:index]; } - (PBArray *)packedSint64 { return packedSint64Array; } -- (int64_t)packedSint64AtIndex:(NSUInteger)index { +- (long long)packedSint64AtIndex:(unsigned long)index { return [packedSint64Array int64AtIndex:index]; } - (PBArray *)packedFixed32 { return packedFixed32Array; } -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { +- (ulong)packedFixed32AtIndex:(unsigned long)index { return [packedFixed32Array uint32AtIndex:index]; } - (PBArray *)packedFixed64 { return packedFixed64Array; } -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index { +- (ulong long)packedFixed64AtIndex:(unsigned long)index { return [packedFixed64Array uint64AtIndex:index]; } - (PBArray *)packedSfixed32 { return packedSfixed32Array; } -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { +- (long)packedSfixed32AtIndex:(unsigned long)index { return [packedSfixed32Array int32AtIndex:index]; } - (PBArray *)packedSfixed64 { return packedSfixed64Array; } -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index { +- (long long)packedSfixed64AtIndex:(unsigned long)index { return [packedSfixed64Array int64AtIndex:index]; } - (PBArray *)packedFloat { return packedFloatArray; } -- (Float32)packedFloatAtIndex:(NSUInteger)index { +- (Float32)packedFloatAtIndex:(unsigned long)index { return [packedFloatArray floatAtIndex:index]; } - (PBArray *)packedDouble { return packedDoubleArray; } -- (Float64)packedDoubleAtIndex:(NSUInteger)index { +- (Float64)packedDoubleAtIndex:(unsigned long)index { return [packedDoubleArray doubleAtIndex:index]; } - (PBArray *)packedBool { return packedBoolArray; } -- (BOOL)packedBoolAtIndex:(NSUInteger)index { +- (BOOL)packedBoolAtIndex:(unsigned long)index { return [packedBoolArray boolAtIndex:index]; } - (PBArray *)packedEnum { return packedEnumArray; } -- (ForeignEnumLite)packedEnumAtIndex:(NSUInteger)index { +- (ForeignEnumLite)packedEnumAtIndex:(unsigned long)index { return [packedEnumArray int32AtIndex:index]; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - const NSUInteger packedInt32ArrayCount = self.packedInt32Array.count; + const unsigned long packedInt32ArrayCount = self.packedInt32Array.count; if (packedInt32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; + const long *values = (const long *)self.packedInt32Array.data; [output writeRawVarint32:722]; [output writeRawVarint32:packedInt32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedInt32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedInt32ArrayCount; ++i) { [output writeInt32NoTag:values[i]]; } } - const NSUInteger packedInt64ArrayCount = self.packedInt64Array.count; + const unsigned long packedInt64ArrayCount = self.packedInt64Array.count; if (packedInt64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.packedInt64Array.data; + const long long *values = (const long long *)self.packedInt64Array.data; [output writeRawVarint32:730]; [output writeRawVarint32:packedInt64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedInt64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedInt64ArrayCount; ++i) { [output writeInt64NoTag:values[i]]; } } - const NSUInteger packedUint32ArrayCount = self.packedUint32Array.count; + const unsigned long packedUint32ArrayCount = self.packedUint32Array.count; if (packedUint32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; + const ulong *values = (const ulong *)self.packedUint32Array.data; [output writeRawVarint32:738]; [output writeRawVarint32:packedUint32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedUint32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedUint32ArrayCount; ++i) { [output writeUInt32NoTag:values[i]]; } } - const NSUInteger packedUint64ArrayCount = self.packedUint64Array.count; + const unsigned long packedUint64ArrayCount = self.packedUint64Array.count; if (packedUint64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.packedUint64Array.data; + const ulong long *values = (const ulong long *)self.packedUint64Array.data; [output writeRawVarint32:746]; [output writeRawVarint32:packedUint64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedUint64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedUint64ArrayCount; ++i) { [output writeUInt64NoTag:values[i]]; } } - const NSUInteger packedSint32ArrayCount = self.packedSint32Array.count; + const unsigned long packedSint32ArrayCount = self.packedSint32Array.count; if (packedSint32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; + const long *values = (const long *)self.packedSint32Array.data; [output writeRawVarint32:754]; [output writeRawVarint32:packedSint32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSint32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSint32ArrayCount; ++i) { [output writeSInt32NoTag:values[i]]; } } - const NSUInteger packedSint64ArrayCount = self.packedSint64Array.count; + const unsigned long packedSint64ArrayCount = self.packedSint64Array.count; if (packedSint64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.packedSint64Array.data; + const long long *values = (const long long *)self.packedSint64Array.data; [output writeRawVarint32:762]; [output writeRawVarint32:packedSint64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSint64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSint64ArrayCount; ++i) { [output writeSInt64NoTag:values[i]]; } } - const NSUInteger packedFixed32ArrayCount = self.packedFixed32Array.count; + const unsigned long packedFixed32ArrayCount = self.packedFixed32Array.count; if (packedFixed32ArrayCount > 0) { - const uNSInteger *values = (const uNSInteger *)self.packedFixed32Array.data; + const ulong *values = (const ulong *)self.packedFixed32Array.data; [output writeRawVarint32:770]; [output writeRawVarint32:packedFixed32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedFixed32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedFixed32ArrayCount; ++i) { [output writeFixed32NoTag:values[i]]; } } - const NSUInteger packedFixed64ArrayCount = self.packedFixed64Array.count; + const unsigned long packedFixed64ArrayCount = self.packedFixed64Array.count; if (packedFixed64ArrayCount > 0) { - const uint64_t *values = (const uint64_t *)self.packedFixed64Array.data; + const ulong long *values = (const ulong long *)self.packedFixed64Array.data; [output writeRawVarint32:778]; [output writeRawVarint32:packedFixed64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedFixed64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedFixed64ArrayCount; ++i) { [output writeFixed64NoTag:values[i]]; } } - const NSUInteger packedSfixed32ArrayCount = self.packedSfixed32Array.count; + const unsigned long packedSfixed32ArrayCount = self.packedSfixed32Array.count; if (packedSfixed32ArrayCount > 0) { - const NSInteger *values = (const NSInteger *)self.packedSfixed32Array.data; + const long *values = (const long *)self.packedSfixed32Array.data; [output writeRawVarint32:786]; [output writeRawVarint32:packedSfixed32MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSfixed32ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSfixed32ArrayCount; ++i) { [output writeSFixed32NoTag:values[i]]; } } - const NSUInteger packedSfixed64ArrayCount = self.packedSfixed64Array.count; + const unsigned long packedSfixed64ArrayCount = self.packedSfixed64Array.count; if (packedSfixed64ArrayCount > 0) { - const int64_t *values = (const int64_t *)self.packedSfixed64Array.data; + const long long *values = (const long long *)self.packedSfixed64Array.data; [output writeRawVarint32:794]; [output writeRawVarint32:packedSfixed64MemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedSfixed64ArrayCount; ++i) { + for (unsigned long i = 0; i < packedSfixed64ArrayCount; ++i) { [output writeSFixed64NoTag:values[i]]; } } - const NSUInteger packedFloatArrayCount = self.packedFloatArray.count; + const unsigned long packedFloatArrayCount = self.packedFloatArray.count; if (packedFloatArrayCount > 0) { const Float32 *values = (const Float32 *)self.packedFloatArray.data; [output writeRawVarint32:802]; [output writeRawVarint32:packedFloatMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedFloatArrayCount; ++i) { + for (unsigned long i = 0; i < packedFloatArrayCount; ++i) { [output writeFloatNoTag:values[i]]; } } - const NSUInteger packedDoubleArrayCount = self.packedDoubleArray.count; + const unsigned long packedDoubleArrayCount = self.packedDoubleArray.count; if (packedDoubleArrayCount > 0) { const Float64 *values = (const Float64 *)self.packedDoubleArray.data; [output writeRawVarint32:810]; [output writeRawVarint32:packedDoubleMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedDoubleArrayCount; ++i) { + for (unsigned long i = 0; i < packedDoubleArrayCount; ++i) { [output writeDoubleNoTag:values[i]]; } } - const NSUInteger packedBoolArrayCount = self.packedBoolArray.count; + const unsigned long packedBoolArrayCount = self.packedBoolArray.count; if (packedBoolArrayCount > 0) { const BOOL *values = (const BOOL *)self.packedBoolArray.data; [output writeRawVarint32:818]; [output writeRawVarint32:packedBoolMemoizedSerializedSize]; - for (NSUInteger i = 0; i < packedBoolArrayCount; ++i) { + for (unsigned long i = 0; i < packedBoolArrayCount; ++i) { [output writeBoolNoTag:values[i]]; } } - const NSUInteger packedEnumArrayCount = self.packedEnumArray.count; + const unsigned long packedEnumArrayCount = self.packedEnumArray.count; const ForeignEnumLite *packedEnumArrayValues = (const ForeignEnumLite *)self.packedEnumArray.data; if (self.packedEnumArray.count > 0) { [output writeRawVarint32:826]; [output writeRawVarint32:packedEnumMemoizedSerializedSize]; } - for (NSUInteger i = 0; i < packedEnumArrayCount; ++i) { + for (unsigned long i = 0; i < packedEnumArrayCount; ++i) { [output writeEnumNoTag:packedEnumArrayValues[i]]; } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } size = 0; { - NSInteger dataSize = 0; - const NSUInteger count = self.packedInt32Array.count; - const NSInteger *values = (const NSInteger *)self.packedInt32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedInt32Array.count; + const long *values = (const long *)self.packedInt32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt32SizeNoTag(values[i]); } size += dataSize; @@ -6387,10 +6387,10 @@ - (NSInteger) serializedSize { packedInt32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedInt64Array.count; - const int64_t *values = (const int64_t *)self.packedInt64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedInt64Array.count; + const long long *values = (const long long *)self.packedInt64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeInt64SizeNoTag(values[i]); } size += dataSize; @@ -6401,10 +6401,10 @@ - (NSInteger) serializedSize { packedInt64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedUint32Array.count; - const uNSInteger *values = (const uNSInteger *)self.packedUint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedUint32Array.count; + const ulong *values = (const ulong *)self.packedUint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } size += dataSize; @@ -6415,10 +6415,10 @@ - (NSInteger) serializedSize { packedUint32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedUint64Array.count; - const uint64_t *values = (const uint64_t *)self.packedUint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedUint64Array.count; + const ulong long *values = (const ulong long *)self.packedUint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } size += dataSize; @@ -6429,10 +6429,10 @@ - (NSInteger) serializedSize { packedUint64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSint32Array.count; - const NSInteger *values = (const NSInteger *)self.packedSint32Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedSint32Array.count; + const long *values = (const long *)self.packedSint32Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt32SizeNoTag(values[i]); } size += dataSize; @@ -6443,10 +6443,10 @@ - (NSInteger) serializedSize { packedSint32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSint64Array.count; - const int64_t *values = (const int64_t *)self.packedSint64Array.data; - for (NSUInteger i = 0; i < count; ++i) { + long dataSize = 0; + const unsigned long count = self.packedSint64Array.count; + const long long *values = (const long long *)self.packedSint64Array.data; + for (unsigned long i = 0; i < count; ++i) { dataSize += computeSInt64SizeNoTag(values[i]); } size += dataSize; @@ -6457,8 +6457,8 @@ - (NSInteger) serializedSize { packedSint64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedFixed32Array.count; + long dataSize = 0; + const unsigned long count = self.packedFixed32Array.count; dataSize = 4 * count; size += dataSize; if (count > 0) { @@ -6468,8 +6468,8 @@ - (NSInteger) serializedSize { packedFixed32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedFixed64Array.count; + long dataSize = 0; + const unsigned long count = self.packedFixed64Array.count; dataSize = 8 * count; size += dataSize; if (count > 0) { @@ -6479,8 +6479,8 @@ - (NSInteger) serializedSize { packedFixed64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSfixed32Array.count; + long dataSize = 0; + const unsigned long count = self.packedSfixed32Array.count; dataSize = 4 * count; size += dataSize; if (count > 0) { @@ -6490,8 +6490,8 @@ - (NSInteger) serializedSize { packedSfixed32MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedSfixed64Array.count; + long dataSize = 0; + const unsigned long count = self.packedSfixed64Array.count; dataSize = 8 * count; size += dataSize; if (count > 0) { @@ -6501,8 +6501,8 @@ - (NSInteger) serializedSize { packedSfixed64MemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedFloatArray.count; + long dataSize = 0; + const unsigned long count = self.packedFloatArray.count; dataSize = 4 * count; size += dataSize; if (count > 0) { @@ -6512,8 +6512,8 @@ - (NSInteger) serializedSize { packedFloatMemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedDoubleArray.count; + long dataSize = 0; + const unsigned long count = self.packedDoubleArray.count; dataSize = 8 * count; size += dataSize; if (count > 0) { @@ -6523,8 +6523,8 @@ - (NSInteger) serializedSize { packedDoubleMemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedBoolArray.count; + long dataSize = 0; + const unsigned long count = self.packedBoolArray.count; dataSize = 1 * count; size += dataSize; if (count > 0) { @@ -6534,10 +6534,10 @@ - (NSInteger) serializedSize { packedBoolMemoizedSerializedSize = dataSize; } { - NSInteger dataSize = 0; - const NSUInteger count = self.packedEnumArray.count; + long dataSize = 0; + const unsigned long count = self.packedEnumArray.count; const ForeignEnumLite *values = (const ForeignEnumLite *)self.packedEnumArray.data; - for (NSUInteger i = 0; i < count; ++i) { + for (unsigned long i = 0; i < count; ++i) { dataSize += computeEnumSizeNoTag(values[i]); } size += dataSize; @@ -6665,8 +6665,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; for (NSNumber* value in self.packedInt32Array) { hashCode = hashCode * 31 + [value intValue]; } @@ -6863,7 +6863,7 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -6876,8 +6876,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 722: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -6888,8 +6888,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 730: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedInt64Array == nil) { result.packedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -6900,8 +6900,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 738: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -6912,8 +6912,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 746: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -6924,8 +6924,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 754: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -6936,8 +6936,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 762: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSint64Array == nil) { result.packedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -6948,8 +6948,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 770: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -6960,8 +6960,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 778: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -6972,8 +6972,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 786: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -6984,8 +6984,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 794: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedSfixed64Array == nil) { result.packedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -6996,8 +6996,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 802: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedFloatArray == nil) { result.packedFloatArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeFloat]; } @@ -7008,8 +7008,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 810: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedDoubleArray == nil) { result.packedDoubleArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeDouble]; } @@ -7020,8 +7020,8 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 818: { - NSInteger length = [input readRawVarint32]; - NSInteger limit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long limit = [input pushLimit:length]; if (result.packedBoolArray == nil) { result.packedBoolArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeBool]; } @@ -7032,10 +7032,10 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 826: { - NSInteger length = [input readRawVarint32]; - NSInteger oldLimit = [input pushLimit:length]; + long length = [input readRawVarint32]; + long oldLimit = [input pushLimit:length]; while (input.bytesUntilLimit > 0) { - NSInteger value = [input readEnum]; + long value = [input readEnum]; if (ForeignEnumLiteIsValidValue(value)) { [self addPackedEnum:value]; } else { @@ -7051,10 +7051,10 @@ - (TestPackedTypesLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (PBAppendableArray *)packedInt32 { return result.packedInt32Array; } -- (NSInteger)packedInt32AtIndex:(NSUInteger)index { +- (long)packedInt32AtIndex:(unsigned long)index { return [result packedInt32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedInt32:(NSInteger)value { +- (TestPackedTypesLite_Builder *)addPackedInt32:(long)value { if (result.packedInt32Array == nil) { result.packedInt32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -7065,7 +7065,7 @@ - (TestPackedTypesLite_Builder *)setPackedInt32Array:(NSArray *)array { result.packedInt32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedInt32Values:(const long *)values count:(unsigned long)count { result.packedInt32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7076,10 +7076,10 @@ - (TestPackedTypesLite_Builder *)clearPackedInt32 { - (PBAppendableArray *)packedInt64 { return result.packedInt64Array; } -- (int64_t)packedInt64AtIndex:(NSUInteger)index { +- (long long)packedInt64AtIndex:(unsigned long)index { return [result packedInt64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedInt64:(int64_t)value { +- (TestPackedTypesLite_Builder *)addPackedInt64:(long long)value { if (result.packedInt64Array == nil) { result.packedInt64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -7090,7 +7090,7 @@ - (TestPackedTypesLite_Builder *)setPackedInt64Array:(NSArray *)array { result.packedInt64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedInt64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedInt64Values:(const long long *)values count:(unsigned long)count { result.packedInt64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -7101,10 +7101,10 @@ - (TestPackedTypesLite_Builder *)clearPackedInt64 { - (PBAppendableArray *)packedUint32 { return result.packedUint32Array; } -- (uNSInteger)packedUint32AtIndex:(NSUInteger)index { +- (ulong)packedUint32AtIndex:(unsigned long)index { return [result packedUint32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedUint32:(uNSInteger)value { +- (TestPackedTypesLite_Builder *)addPackedUint32:(ulong)value { if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -7115,7 +7115,7 @@ - (TestPackedTypesLite_Builder *)setPackedUint32Array:(NSArray *)array { result.packedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count { result.packedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -7126,10 +7126,10 @@ - (TestPackedTypesLite_Builder *)clearPackedUint32 { - (PBAppendableArray *)packedUint64 { return result.packedUint64Array; } -- (uint64_t)packedUint64AtIndex:(NSUInteger)index { +- (ulong long)packedUint64AtIndex:(unsigned long)index { return [result packedUint64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedUint64:(uint64_t)value { +- (TestPackedTypesLite_Builder *)addPackedUint64:(ulong long)value { if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -7140,7 +7140,7 @@ - (TestPackedTypesLite_Builder *)setPackedUint64Array:(NSArray *)array { result.packedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count { result.packedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -7151,10 +7151,10 @@ - (TestPackedTypesLite_Builder *)clearPackedUint64 { - (PBAppendableArray *)packedSint32 { return result.packedSint32Array; } -- (NSInteger)packedSint32AtIndex:(NSUInteger)index { +- (long)packedSint32AtIndex:(unsigned long)index { return [result packedSint32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedSint32:(NSInteger)value { +- (TestPackedTypesLite_Builder *)addPackedSint32:(long)value { if (result.packedSint32Array == nil) { result.packedSint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -7165,7 +7165,7 @@ - (TestPackedTypesLite_Builder *)setPackedSint32Array:(NSArray *)array { result.packedSint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedSint32Values:(const long *)values count:(unsigned long)count { result.packedSint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7176,10 +7176,10 @@ - (TestPackedTypesLite_Builder *)clearPackedSint32 { - (PBAppendableArray *)packedSint64 { return result.packedSint64Array; } -- (int64_t)packedSint64AtIndex:(NSUInteger)index { +- (long long)packedSint64AtIndex:(unsigned long)index { return [result packedSint64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedSint64:(int64_t)value { +- (TestPackedTypesLite_Builder *)addPackedSint64:(long long)value { if (result.packedSint64Array == nil) { result.packedSint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -7190,7 +7190,7 @@ - (TestPackedTypesLite_Builder *)setPackedSint64Array:(NSArray *)array { result.packedSint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedSint64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedSint64Values:(const long long *)values count:(unsigned long)count { result.packedSint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -7201,10 +7201,10 @@ - (TestPackedTypesLite_Builder *)clearPackedSint64 { - (PBAppendableArray *)packedFixed32 { return result.packedFixed32Array; } -- (uNSInteger)packedFixed32AtIndex:(NSUInteger)index { +- (ulong)packedFixed32AtIndex:(unsigned long)index { return [result packedFixed32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedFixed32:(uNSInteger)value { +- (TestPackedTypesLite_Builder *)addPackedFixed32:(ulong)value { if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -7215,7 +7215,7 @@ - (TestPackedTypesLite_Builder *)setPackedFixed32Array:(NSArray *)array { result.packedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const uNSInteger *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count { result.packedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -7226,10 +7226,10 @@ - (TestPackedTypesLite_Builder *)clearPackedFixed32 { - (PBAppendableArray *)packedFixed64 { return result.packedFixed64Array; } -- (uint64_t)packedFixed64AtIndex:(NSUInteger)index { +- (ulong long)packedFixed64AtIndex:(unsigned long)index { return [result packedFixed64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedFixed64:(uint64_t)value { +- (TestPackedTypesLite_Builder *)addPackedFixed64:(ulong long)value { if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -7240,7 +7240,7 @@ - (TestPackedTypesLite_Builder *)setPackedFixed64Array:(NSArray *)array { result.packedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const uint64_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count { result.packedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -7251,10 +7251,10 @@ - (TestPackedTypesLite_Builder *)clearPackedFixed64 { - (PBAppendableArray *)packedSfixed32 { return result.packedSfixed32Array; } -- (NSInteger)packedSfixed32AtIndex:(NSUInteger)index { +- (long)packedSfixed32AtIndex:(unsigned long)index { return [result packedSfixed32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedSfixed32:(NSInteger)value { +- (TestPackedTypesLite_Builder *)addPackedSfixed32:(long)value { if (result.packedSfixed32Array == nil) { result.packedSfixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; } @@ -7265,7 +7265,7 @@ - (TestPackedTypesLite_Builder *)setPackedSfixed32Array:(NSArray *)array { result.packedSfixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const NSInteger *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedSfixed32Values:(const long *)values count:(unsigned long)count { result.packedSfixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7276,10 +7276,10 @@ - (TestPackedTypesLite_Builder *)clearPackedSfixed32 { - (PBAppendableArray *)packedSfixed64 { return result.packedSfixed64Array; } -- (int64_t)packedSfixed64AtIndex:(NSUInteger)index { +- (long long)packedSfixed64AtIndex:(unsigned long)index { return [result packedSfixed64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedSfixed64:(int64_t)value { +- (TestPackedTypesLite_Builder *)addPackedSfixed64:(long long)value { if (result.packedSfixed64Array == nil) { result.packedSfixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; } @@ -7290,7 +7290,7 @@ - (TestPackedTypesLite_Builder *)setPackedSfixed64Array:(NSArray *)array { result.packedSfixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedSfixed64Values:(const int64_t *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedSfixed64Values:(const long long *)values count:(unsigned long)count { result.packedSfixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; return self; } @@ -7301,7 +7301,7 @@ - (TestPackedTypesLite_Builder *)clearPackedSfixed64 { - (PBAppendableArray *)packedFloat { return result.packedFloatArray; } -- (Float32)packedFloatAtIndex:(NSUInteger)index { +- (Float32)packedFloatAtIndex:(unsigned long)index { return [result packedFloatAtIndex:index]; } - (TestPackedTypesLite_Builder *)addPackedFloat:(Float32)value { @@ -7315,7 +7315,7 @@ - (TestPackedTypesLite_Builder *)setPackedFloatArray:(NSArray *)array { result.packedFloatArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeFloat]; return self; } -- (TestPackedTypesLite_Builder *)setPackedFloatValues:(const Float32 *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedFloatValues:(const Float32 *)values count:(unsigned long)count { result.packedFloatArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeFloat]; return self; } @@ -7326,7 +7326,7 @@ - (TestPackedTypesLite_Builder *)clearPackedFloat { - (PBAppendableArray *)packedDouble { return result.packedDoubleArray; } -- (Float64)packedDoubleAtIndex:(NSUInteger)index { +- (Float64)packedDoubleAtIndex:(unsigned long)index { return [result packedDoubleAtIndex:index]; } - (TestPackedTypesLite_Builder *)addPackedDouble:(Float64)value { @@ -7340,7 +7340,7 @@ - (TestPackedTypesLite_Builder *)setPackedDoubleArray:(NSArray *)array { result.packedDoubleArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeDouble]; return self; } -- (TestPackedTypesLite_Builder *)setPackedDoubleValues:(const Float64 *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedDoubleValues:(const Float64 *)values count:(unsigned long)count { result.packedDoubleArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeDouble]; return self; } @@ -7351,7 +7351,7 @@ - (TestPackedTypesLite_Builder *)clearPackedDouble { - (PBAppendableArray *)packedBool { return result.packedBoolArray; } -- (BOOL)packedBoolAtIndex:(NSUInteger)index { +- (BOOL)packedBoolAtIndex:(unsigned long)index { return [result packedBoolAtIndex:index]; } - (TestPackedTypesLite_Builder *)addPackedBool:(BOOL)value { @@ -7365,7 +7365,7 @@ - (TestPackedTypesLite_Builder *)setPackedBoolArray:(NSArray *)array { result.packedBoolArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeBool]; return self; } -- (TestPackedTypesLite_Builder *)setPackedBoolValues:(const BOOL *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedBoolValues:(const BOOL *)values count:(unsigned long)count { result.packedBoolArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeBool]; return self; } @@ -7376,7 +7376,7 @@ - (TestPackedTypesLite_Builder *)clearPackedBool { - (PBAppendableArray *)packedEnum { return result.packedEnumArray; } -- (ForeignEnumLite)packedEnumAtIndex:(NSUInteger)index { +- (ForeignEnumLite)packedEnumAtIndex:(unsigned long)index { return [result packedEnumAtIndex:index]; } - (TestPackedTypesLite_Builder *)addPackedEnum:(ForeignEnumLite)value { @@ -7390,7 +7390,7 @@ - (TestPackedTypesLite_Builder *)setPackedEnumArray:(NSArray *)array { result.packedEnumArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedEnumValues:(const ForeignEnumLite *)values count:(NSUInteger)count { +- (TestPackedTypesLite_Builder *)setPackedEnumValues:(const ForeignEnumLite *)values count:(unsigned long)count { result.packedEnumArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; return self; } @@ -7437,8 +7437,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7499,8 +7499,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:1 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -7559,7 +7559,7 @@ - (TestAllExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (TestAllExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7577,7 +7577,7 @@ - (TestAllExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream @end @interface OptionalGroup_extension_lite () -@property NSInteger a; +@property long a; @end @implementation OptionalGroup_extension_lite @@ -7619,8 +7619,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7683,8 +7683,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -7747,7 +7747,7 @@ - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7769,10 +7769,10 @@ - (OptionalGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (OptionalGroup_extension_lite_Builder*) setA:(NSInteger) value { +- (OptionalGroup_extension_lite_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -7785,7 +7785,7 @@ - (OptionalGroup_extension_lite_Builder*) clearA { @end @interface RepeatedGroup_extension_lite () -@property NSInteger a; +@property long a; @end @implementation RepeatedGroup_extension_lite @@ -7827,8 +7827,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -7891,8 +7891,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -7955,7 +7955,7 @@ - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -7977,10 +7977,10 @@ - (RepeatedGroup_extension_lite_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (RepeatedGroup_extension_lite_Builder*) setA:(NSInteger) value { +- (RepeatedGroup_extension_lite_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; @@ -8029,8 +8029,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8091,8 +8091,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:1 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -8151,7 +8151,7 @@ - (TestPackedExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestPackedExtensionsLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8202,8 +8202,8 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8257,8 +8257,8 @@ - (BOOL) isEqual:(id)other { return (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -8315,7 +8315,7 @@ - (TestNestedExtensionLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (TestNestedExtensionLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8333,7 +8333,7 @@ - (TestNestedExtensionLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStre @end @interface TestDeprecatedLite () -@property NSInteger deprecatedField; +@property long deprecatedField; @end @implementation TestDeprecatedLite @@ -8375,8 +8375,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -8439,8 +8439,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasDeprecatedField) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.deprecatedField] hash]; } @@ -8503,7 +8503,7 @@ - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -8525,10 +8525,10 @@ - (TestDeprecatedLite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasDeprecatedField { return result.hasDeprecatedField; } -- (NSInteger) deprecatedField { +- (long) deprecatedField { return result.deprecatedField; } -- (TestDeprecatedLite_Builder*) setDeprecatedField:(NSInteger) value { +- (TestDeprecatedLite_Builder*) setDeprecatedField:(long) value { result.hasDeprecatedField = YES; result.deprecatedField = value; return self; diff --git a/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m b/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m index 003fb2a..7d15ca1 100644 --- a/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m +++ b/src/runtime/Tests/UnittestLiteImportsNonlite.pb.m @@ -64,8 +64,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -131,8 +131,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasMessage) { hashCode = hashCode * 31 + [self.message hash]; } @@ -195,7 +195,7 @@ - (TestLiteImportsNonlite_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea - (TestLiteImportsNonlite_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnittestMset.pb.h b/src/runtime/Tests/UnittestMset.pb.h index f1d9bf6..d6af99c 100644 --- a/src/runtime/Tests/UnittestMset.pb.h +++ b/src/runtime/Tests/UnittestMset.pb.h @@ -127,10 +127,10 @@ @interface TestMessageSetExtension1 : PBGeneratedMessage { @private BOOL hasI_:1; - NSInteger i; + long i; } - (BOOL) hasI; -@property (readonly) NSInteger i; +@property (readonly) long i; + (TestMessageSetExtension1*) defaultInstance; - (TestMessageSetExtension1*) defaultInstance; @@ -169,8 +169,8 @@ - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasI; -- (NSInteger) i; -- (TestMessageSetExtension1_Builder*) setI:(NSInteger) value; +- (long) i; +- (TestMessageSetExtension1_Builder*) setI:(long) value; - (TestMessageSetExtension1_Builder*) clearI; @end @@ -229,7 +229,7 @@ PBAppendableArray * itemArray; } @property (readonly, retain) PBArray * item; -- (RawMessageSet_Item*)itemAtIndex:(NSUInteger)index; +- (RawMessageSet_Item*)itemAtIndex:(unsigned long)index; + (RawMessageSet*) defaultInstance; - (RawMessageSet*) defaultInstance; @@ -253,12 +253,12 @@ @private BOOL hasTypeId_:1; BOOL hasMessage_:1; - NSInteger typeId; + long typeId; NSData* message; } - (BOOL) hasTypeId; - (BOOL) hasMessage; -@property (readonly) NSInteger typeId; +@property (readonly) long typeId; @property (readonly, retain) NSData* message; + (RawMessageSet_Item*) defaultInstance; @@ -297,8 +297,8 @@ - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasTypeId; -- (NSInteger) typeId; -- (RawMessageSet_Item_Builder*) setTypeId:(NSInteger) value; +- (long) typeId; +- (RawMessageSet_Item_Builder*) setTypeId:(long) value; - (RawMessageSet_Item_Builder*) clearTypeId; - (BOOL) hasMessage; @@ -325,10 +325,10 @@ - (RawMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (PBAppendableArray *)item; -- (RawMessageSet_Item*)itemAtIndex:(NSUInteger)index; +- (RawMessageSet_Item*)itemAtIndex:(unsigned long)index; - (RawMessageSet_Builder *)addItem:(RawMessageSet_Item*)value; - (RawMessageSet_Builder *)setItemArray:(NSArray *)array; -- (RawMessageSet_Builder *)setItemValues:(const RawMessageSet_Item* *)values count:(NSUInteger)count; +- (RawMessageSet_Builder *)setItemValues:(const RawMessageSet_Item* *)values count:(unsigned long)count; - (RawMessageSet_Builder *)clearItem; @end diff --git a/src/runtime/Tests/UnittestMset.pb.m b/src/runtime/Tests/UnittestMset.pb.m index 192302c..d84886a 100644 --- a/src/runtime/Tests/UnittestMset.pb.m +++ b/src/runtime/Tests/UnittestMset.pb.m @@ -78,8 +78,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeAsMessageSetTo:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -140,8 +140,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; hashCode = hashCode * 31 + [self hashExtensionsFrom:4 to:536870912]; hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -200,7 +200,7 @@ - (TestMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (TestMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -266,8 +266,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -333,8 +333,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasMessageSet) { hashCode = hashCode * 31 + [self.messageSet hash]; } @@ -397,7 +397,7 @@ - (TestMessageSetContainer_Builder*) mergeFromCodedInputStream:(PBCodedInputStre - (TestMessageSetContainer_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -454,7 +454,7 @@ - (TestMessageSetContainer_Builder*) clearMessageSet { @end @interface TestMessageSetExtension1 () -@property NSInteger i; +@property long i; @end @implementation TestMessageSetExtension1 @@ -499,8 +499,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -563,8 +563,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasI) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.i] hash]; } @@ -627,7 +627,7 @@ - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -649,10 +649,10 @@ - (TestMessageSetExtension1_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (BOOL) hasI { return result.hasI; } -- (NSInteger) i { +- (long) i { return result.i; } -- (TestMessageSetExtension1_Builder*) setI:(NSInteger) value { +- (TestMessageSetExtension1_Builder*) setI:(long) value { result.hasI = YES; result.i = value; return self; @@ -711,8 +711,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -775,8 +775,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasStr) { hashCode = hashCode * 31 + [self.str hash]; } @@ -839,7 +839,7 @@ - (TestMessageSetExtension2_Builder*) mergeFromCodedInputStream:(PBCodedInputStr - (TestMessageSetExtension2_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -908,7 +908,7 @@ - (RawMessageSet*) defaultInstance { - (PBArray *)item { return itemArray; } -- (RawMessageSet_Item*)itemAtIndex:(NSUInteger)index { +- (RawMessageSet_Item*)itemAtIndex:(unsigned long)index { return [itemArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -925,8 +925,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -991,8 +991,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; for (RawMessageSet_Item* element in self.itemArray) { hashCode = hashCode * 31 + [element hash]; } @@ -1002,7 +1002,7 @@ - (NSUInteger) hash { @end @interface RawMessageSet_Item () -@property NSInteger typeId; +@property long typeId; @property (retain) NSData* message; @end @@ -1063,8 +1063,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -1136,8 +1136,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasTypeId) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.typeId] hash]; } @@ -1206,7 +1206,7 @@ - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1232,10 +1232,10 @@ - (RawMessageSet_Item_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) - (BOOL) hasTypeId { return result.hasTypeId; } -- (NSInteger) typeId { +- (long) typeId { return result.typeId; } -- (RawMessageSet_Item_Builder*) setTypeId:(NSInteger) value { +- (RawMessageSet_Item_Builder*) setTypeId:(long) value { result.hasTypeId = YES; result.typeId = value; return self; @@ -1321,7 +1321,7 @@ - (RawMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (RawMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1345,7 +1345,7 @@ - (RawMessageSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input - (PBAppendableArray *)item { return result.itemArray; } -- (RawMessageSet_Item*)itemAtIndex:(NSUInteger)index { +- (RawMessageSet_Item*)itemAtIndex:(unsigned long)index { return [result itemAtIndex:index]; } - (RawMessageSet_Builder *)addItem:(RawMessageSet_Item*)value { @@ -1359,7 +1359,7 @@ - (RawMessageSet_Builder *)setItemArray:(NSArray *)array { result.itemArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (RawMessageSet_Builder *)setItemValues:(const RawMessageSet_Item* *)values count:(NSUInteger)count { +- (RawMessageSet_Builder *)setItemValues:(const RawMessageSet_Item* *)values count:(unsigned long)count { result.itemArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } diff --git a/src/runtime/Tests/UnittestNoGenericServices.pb.h b/src/runtime/Tests/UnittestNoGenericServices.pb.h index d165bbe..839dcf2 100644 --- a/src/runtime/Tests/UnittestNoGenericServices.pb.h +++ b/src/runtime/Tests/UnittestNoGenericServices.pb.h @@ -33,10 +33,10 @@ BOOL TestEnumIsValidValue(TestEnum value); @interface TestMessage : PBExtendableMessage { @private BOOL hasA_:1; - NSInteger a; + long a; } - (BOOL) hasA; -@property (readonly) NSInteger a; +@property (readonly) long a; + (TestMessage*) defaultInstance; - (TestMessage*) defaultInstance; @@ -74,8 +74,8 @@ BOOL TestEnumIsValidValue(TestEnum value); - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasA; -- (NSInteger) a; -- (TestMessage_Builder*) setA:(NSInteger) value; +- (long) a; +- (TestMessage_Builder*) setA:(long) value; - (TestMessage_Builder*) clearA; @end diff --git a/src/runtime/Tests/UnittestNoGenericServices.pb.m b/src/runtime/Tests/UnittestNoGenericServices.pb.m index f66c039..96c725e 100644 --- a/src/runtime/Tests/UnittestNoGenericServices.pb.m +++ b/src/runtime/Tests/UnittestNoGenericServices.pb.m @@ -42,7 +42,7 @@ BOOL TestEnumIsValidValue(TestEnum value) { } } @interface TestMessage () -@property NSInteger a; +@property long a; @end @implementation TestMessage @@ -90,8 +90,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -161,8 +161,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasA) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.a] hash]; } @@ -227,7 +227,7 @@ - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -249,10 +249,10 @@ - (TestMessage_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input e - (BOOL) hasA { return result.hasA; } -- (NSInteger) a { +- (long) a { return result.a; } -- (TestMessage_Builder*) setA:(NSInteger) value { +- (TestMessage_Builder*) setA:(long) value { result.hasA = YES; result.a = value; return self; diff --git a/src/runtime/Tests/UnittestOptimizeFor.pb.h b/src/runtime/Tests/UnittestOptimizeFor.pb.h index 14f277b..d9e11b0 100644 --- a/src/runtime/Tests/UnittestOptimizeFor.pb.h +++ b/src/runtime/Tests/UnittestOptimizeFor.pb.h @@ -117,12 +117,12 @@ @private BOOL hasI_:1; BOOL hasMsg_:1; - NSInteger i; + long i; ForeignMessage* msg; } - (BOOL) hasI; - (BOOL) hasMsg; -@property (readonly) NSInteger i; +@property (readonly) long i; @property (readonly, retain) ForeignMessage* msg; + (TestOptimizedForSize*) defaultInstance; @@ -163,8 +163,8 @@ - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasI; -- (NSInteger) i; -- (TestOptimizedForSize_Builder*) setI:(NSInteger) value; +- (long) i; +- (TestOptimizedForSize_Builder*) setI:(long) value; - (TestOptimizedForSize_Builder*) clearI; - (BOOL) hasMsg; @@ -178,10 +178,10 @@ @interface TestRequiredOptimizedForSize : PBGeneratedMessage { @private BOOL hasX_:1; - NSInteger x; + long x; } - (BOOL) hasX; -@property (readonly) NSInteger x; +@property (readonly) long x; + (TestRequiredOptimizedForSize*) defaultInstance; - (TestRequiredOptimizedForSize*) defaultInstance; @@ -219,8 +219,8 @@ - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasX; -- (NSInteger) x; -- (TestRequiredOptimizedForSize_Builder*) setX:(NSInteger) value; +- (long) x; +- (TestRequiredOptimizedForSize_Builder*) setX:(long) value; - (TestRequiredOptimizedForSize_Builder*) clearX; @end diff --git a/src/runtime/Tests/UnittestOptimizeFor.pb.m b/src/runtime/Tests/UnittestOptimizeFor.pb.m index 31997de..6479405 100644 --- a/src/runtime/Tests/UnittestOptimizeFor.pb.m +++ b/src/runtime/Tests/UnittestOptimizeFor.pb.m @@ -43,7 +43,7 @@ + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry { @end @interface TestOptimizedForSize () -@property NSInteger i; +@property long i; @property (retain) ForeignMessage* msg; @end @@ -110,8 +110,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { to:536870912]; [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -193,8 +193,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasI) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.i] hash]; } @@ -265,7 +265,7 @@ - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -296,10 +296,10 @@ - (TestOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* - (BOOL) hasI { return result.hasI; } -- (NSInteger) i { +- (long) i { return result.i; } -- (TestOptimizedForSize_Builder*) setI:(NSInteger) value { +- (TestOptimizedForSize_Builder*) setI:(long) value { result.hasI = YES; result.i = value; return self; @@ -342,7 +342,7 @@ - (TestOptimizedForSize_Builder*) clearMsg { @end @interface TestRequiredOptimizedForSize () -@property NSInteger x; +@property long x; @end @implementation TestRequiredOptimizedForSize @@ -387,8 +387,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -451,8 +451,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasX) { hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.x] hash]; } @@ -515,7 +515,7 @@ - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -537,10 +537,10 @@ - (TestRequiredOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (BOOL) hasX { return result.hasX; } -- (NSInteger) x { +- (long) x { return result.x; } -- (TestRequiredOptimizedForSize_Builder*) setX:(NSInteger) value { +- (TestRequiredOptimizedForSize_Builder*) setX:(long) value { result.hasX = YES; result.x = value; return self; @@ -601,8 +601,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size = memoizedSerializedSize; +- (long) serializedSize { + long size = memoizedSerializedSize; if (size != -1) { return size; } @@ -668,8 +668,8 @@ - (BOOL) isEqual:(id)other { (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } -- (NSUInteger) hash { - NSUInteger hashCode = 7; +- (unsigned long) hash { + unsigned long hashCode = 7; if (self.hasO) { hashCode = hashCode * 31 + [self.o hash]; } @@ -732,7 +732,7 @@ - (TestOptionalOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInpu - (TestOptionalOptimizedForSize_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; diff --git a/src/runtime/Tests/UnknownFieldSetTest.m b/src/runtime/Tests/UnknownFieldSetTest.m index 39d8b33..05e68d6 100644 --- a/src/runtime/Tests/UnknownFieldSetTest.m +++ b/src/runtime/Tests/UnknownFieldSetTest.m @@ -52,7 +52,7 @@ - (id) init { } -- (PBField*) getField:(NSInteger) number { +- (PBField*) getField:(long) number { return [unknownFields getField:number]; } @@ -133,7 +133,7 @@ - (void) testMergeFrom { - (void) testClear { PBUnknownFieldSet* fields = [[[[PBUnknownFieldSet builder] mergeUnknownFields:unknownFields] clear] build]; - STAssertEquals(fields.fields.count, (NSUInteger) 0, @""); + STAssertEquals(fields.fields.count, (unsigned long) 0, @""); } diff --git a/src/runtime/Tests/WireFormatTests.m b/src/runtime/Tests/WireFormatTests.m index c0cc20f..ac9defd 100644 --- a/src/runtime/Tests/WireFormatTests.m +++ b/src/runtime/Tests/WireFormatTests.m @@ -113,10 +113,10 @@ - (void) testParsePackedExtensions { - (void) assertFieldsInOrder:(NSData*) data { PBCodedInputStream* input = [PBCodedInputStream streamWithData:data]; - NSInteger previousTag = 0; + long previousTag = 0; while (YES) { - NSInteger tag = [input readTag]; + long tag = [input readTag]; if (tag == 0) { break; } From abc18866782b5746ce582b8c0c240477ce803b29 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Sun, 20 Apr 2014 01:11:25 +0400 Subject: [PATCH 03/18] fix arm64; --- Example/Person.pb.h | 8 +- Example/Person.pb.m | 28 +-- Example/Web/person.pb.rb | 78 +++---- Example/iOS/Proto/ViewController.m | 5 +- Example/person.pb.rb | 78 +++---- src/compiler/objc_message.cc | 4 +- src/compiler/objc_primitive_field.cc | 20 +- .../project.pbxproj | 215 ------------------ .../contents.xcworkspacedata | 7 - src/runtime/Classes/PBArray.h | 32 +-- src/runtime/Classes/PBArray.m | 72 +++--- src/runtime/Classes/Utilities.h | 4 +- src/runtime/Classes/Utilities.m | 8 +- 13 files changed, 164 insertions(+), 395 deletions(-) delete mode 100644 src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj delete mode 100644 src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Example/Person.pb.h b/Example/Person.pb.h index fcab4e5..841cbae 100644 --- a/Example/Person.pb.h +++ b/Example/Person.pb.h @@ -40,7 +40,7 @@ BOOL PersonPhoneTypeIsValidValue(PersonPhoneType value); BOOL hasPersonId_:1; BOOL hasName_:1; BOOL hasEmail_:1; - NSInteger personId; + long long personId; NSString* name; NSString* email; PBAppendableArray * phonesArray; @@ -49,7 +49,7 @@ BOOL PersonPhoneTypeIsValidValue(PersonPhoneType value); - (BOOL) hasPersonId; - (BOOL) hasEmail; @property (readonly, strong) NSString* name; -@property (readonly) NSInteger personId; +@property (readonly) long long personId; @property (readonly, strong) NSString* email; @property (readonly, strong) PBArray * phones; - (PersonPhoneNumber*)phonesAtIndex:(NSUInteger)index; @@ -153,8 +153,8 @@ BOOL PersonPhoneTypeIsValidValue(PersonPhoneType value); - (PersonBuilder*) clearName; - (BOOL) hasPersonId; -- (NSInteger) personId; -- (PersonBuilder*) setPersonId:(NSInteger) value; +- (long long) personId; +- (PersonBuilder*) setPersonId:(long long) value; - (PersonBuilder*) clearPersonId; - (BOOL) hasEmail; diff --git a/Example/Person.pb.m b/Example/Person.pb.m index 0932413..dfb6811 100644 --- a/Example/Person.pb.m +++ b/Example/Person.pb.m @@ -22,7 +22,7 @@ + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry { @interface Person () @property (strong) NSString* name; -@property NSInteger personId; +@property long long personId; @property (strong) NSString* email; @property (strong) PBAppendableArray * phonesArray; @end @@ -60,7 +60,7 @@ - (void) dealloc { - (id) init { if ((self = [super init])) { self.name = @""; - self.personId = 0; + self.personId = 0L; self.email = @""; } return self; @@ -102,7 +102,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [output writeString:1 value:self.name]; } if (self.hasPersonId) { - [output writeInt32:2 value:self.personId]; + [output writeInt64:2 value:self.personId]; } if (self.hasEmail) { [output writeString:3 value:self.email]; @@ -112,8 +112,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size_ = memoizedSerializedSize; +- (long) serializedSize { + long size_ = memoizedSerializedSize; if (size_ != -1) { return size_; } @@ -123,7 +123,7 @@ - (NSInteger) serializedSize { size_ += computeStringSize(1, self.name); } if (self.hasPersonId) { - size_ += computeInt32Size(2, self.personId); + size_ += computeInt64Size(2, self.personId); } if (self.hasEmail) { size_ += computeStringSize(3, self.email); @@ -170,7 +170,7 @@ - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) ind [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; } if (self.hasPersonId) { - [output appendFormat:@"%@%@: %@\n", indent, @"personId", [NSNumber numberWithInteger:self.personId]]; + [output appendFormat:@"%@%@: %@\n", indent, @"personId", [NSNumber numberWithLongLong:self.personId]]; } if (self.hasEmail) { [output appendFormat:@"%@%@: %@\n", indent, @"email", self.email]; @@ -207,7 +207,7 @@ - (NSUInteger) hash { hashCode = hashCode * 31 + [self.name hash]; } if (self.hasPersonId) { - hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.personId] hash]; + hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.personId] hash]; } if (self.hasEmail) { hashCode = hashCode * 31 + [self.email hash]; @@ -288,8 +288,8 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } [self.unknownFields writeToCodedOutputStream:output]; } -- (NSInteger) serializedSize { - NSInteger size_ = memoizedSerializedSize; +- (long) serializedSize { + long size_ = memoizedSerializedSize; if (size_ != -1) { return size_; } @@ -573,7 +573,7 @@ - (PersonBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensi break; } case 16: { - [self setPersonId:[input readInt32]]; + [self setPersonId:[input readInt64]]; break; } case 26: { @@ -608,17 +608,17 @@ - (PersonBuilder*) clearName { - (BOOL) hasPersonId { return result.hasPersonId; } -- (NSInteger) personId { +- (long long) personId { return result.personId; } -- (PersonBuilder*) setPersonId:(NSInteger) value { +- (PersonBuilder*) setPersonId:(long long) value { result.hasPersonId = YES; result.personId = value; return self; } - (PersonBuilder*) clearPersonId { result.hasPersonId = NO; - result.personId = 0; + result.personId = 0L; return self; } - (BOOL) hasEmail { diff --git a/Example/Web/person.pb.rb b/Example/Web/person.pb.rb index 1180b0f..be66f2f 100644 --- a/Example/Web/person.pb.rb +++ b/Example/Web/person.pb.rb @@ -1,45 +1,39 @@ -### Generated by rprotoc. DO NOT EDIT! -### -# -# message Person { -# required string name = 1; -# required int32 personId = 2; -# optional string email = 3; -# -# enum PhoneType { -# MOBILE = 0; -# HOME = 1; -# WORK = 2; -# } -# -# message PhoneNumber { -# required string number = 1; -# optional PhoneType type = 2 [default = HOME]; -# } -# -# repeated PhoneNumber phones = 4; -# } - -require 'protobuf/message/message' -require 'protobuf/message/enum' -require 'protobuf/message/service' -require 'protobuf/message/extend' - -class Person < ::Protobuf::Message - defined_in __FILE__ - required :string, :name, 1 - required :int32, :personId, 2 - optional :string, :email, 3 - class PhoneType < ::Protobuf::Enum - defined_in __FILE__ - MOBILE = value(:MOBILE, 0) - HOME = value(:HOME, 1) - WORK = value(:WORK, 2) +#!/usr/bin/env ruby +# Generated by the protocol buffer compiler. DO NOT EDIT! + +require 'protocol_buffers' + +# forward declarations +class Person < ::ProtocolBuffers::Message; end + +class Person < ::ProtocolBuffers::Message + # forward declarations + class PhoneNumber < ::ProtocolBuffers::Message; end + + # enums + module PhoneType + include ::ProtocolBuffers::Enum + + set_fully_qualified_name "Person.PhoneType" + + MOBILE = 0 + HOME = 1 + WORK = 2 end - class PhoneNumber < ::Protobuf::Message - defined_in __FILE__ + + set_fully_qualified_name "Person" + + # nested messages + class PhoneNumber < ::ProtocolBuffers::Message + set_fully_qualified_name "Person.PhoneNumber" + required :string, :number, 1 - optional :PhoneType, :type, 2, :default => :HOME + optional ::Person::PhoneType, :type, 2, :default => ::Person::PhoneType::HOME end - repeated :PhoneNumber, :phones, 4 -end \ No newline at end of file + + required :string, :name, 1 + required :int64, :personId, 2 + optional :string, :email, 3 + repeated ::Person::PhoneNumber, :phones, 4 +end + diff --git a/Example/iOS/Proto/ViewController.m b/Example/iOS/Proto/ViewController.m index aecc7c1..9654db3 100644 --- a/Example/iOS/Proto/ViewController.m +++ b/Example/iOS/Proto/ViewController.m @@ -30,7 +30,10 @@ - (void)viewDidLoad -(void) proto { // Proto Part - NSData* raw_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://192.168.2.1:4567/1/getGroups"]]; + + NSLog(@"%@ %lu %lu %lu %lu",(sizeof(long) == 8 ? @"USING 64 bit system" : @"USING 32 bit system"),sizeof(int32_t), sizeof(long), sizeof(long long), sizeof(int64_t)); + + NSData* raw_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"http://0.0.0.0:4567/1/getGroups"]]; if (!raw_data) { NSLog(@"Please turn on the server"); diff --git a/Example/person.pb.rb b/Example/person.pb.rb index 1180b0f..be66f2f 100644 --- a/Example/person.pb.rb +++ b/Example/person.pb.rb @@ -1,45 +1,39 @@ -### Generated by rprotoc. DO NOT EDIT! -### -# -# message Person { -# required string name = 1; -# required int32 personId = 2; -# optional string email = 3; -# -# enum PhoneType { -# MOBILE = 0; -# HOME = 1; -# WORK = 2; -# } -# -# message PhoneNumber { -# required string number = 1; -# optional PhoneType type = 2 [default = HOME]; -# } -# -# repeated PhoneNumber phones = 4; -# } - -require 'protobuf/message/message' -require 'protobuf/message/enum' -require 'protobuf/message/service' -require 'protobuf/message/extend' - -class Person < ::Protobuf::Message - defined_in __FILE__ - required :string, :name, 1 - required :int32, :personId, 2 - optional :string, :email, 3 - class PhoneType < ::Protobuf::Enum - defined_in __FILE__ - MOBILE = value(:MOBILE, 0) - HOME = value(:HOME, 1) - WORK = value(:WORK, 2) +#!/usr/bin/env ruby +# Generated by the protocol buffer compiler. DO NOT EDIT! + +require 'protocol_buffers' + +# forward declarations +class Person < ::ProtocolBuffers::Message; end + +class Person < ::ProtocolBuffers::Message + # forward declarations + class PhoneNumber < ::ProtocolBuffers::Message; end + + # enums + module PhoneType + include ::ProtocolBuffers::Enum + + set_fully_qualified_name "Person.PhoneType" + + MOBILE = 0 + HOME = 1 + WORK = 2 end - class PhoneNumber < ::Protobuf::Message - defined_in __FILE__ + + set_fully_qualified_name "Person" + + # nested messages + class PhoneNumber < ::ProtocolBuffers::Message + set_fully_qualified_name "Person.PhoneNumber" + required :string, :number, 1 - optional :PhoneType, :type, 2, :default => :HOME + optional ::Person::PhoneType, :type, 2, :default => ::Person::PhoneType::HOME end - repeated :PhoneNumber, :phones, 4 -end \ No newline at end of file + + required :string, :name, 1 + required :int64, :personId, 2 + optional :string, :email, 3 + repeated ::Person::PhoneNumber, :phones, 4 +end + diff --git a/src/compiler/objc_message.cc b/src/compiler/objc_message.cc index 8971856..fe1a7f9 100644 --- a/src/compiler/objc_message.cc +++ b/src/compiler/objc_message.cc @@ -581,8 +581,8 @@ namespace google { namespace protobuf { namespace compiler { namespace objective printer->Outdent(); printer->Print( "}\n" - "- (NSInteger) serializedSize {\n" - " NSInteger size_ = memoizedSerializedSize;\n" + "- (long) serializedSize {\n" + " long size_ = memoizedSerializedSize;\n" " if (size_ != -1) {\n" " return size_;\n" " }\n" diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc index fe43d02..d00bc48 100644 --- a/src/compiler/objc_primitive_field.cc +++ b/src/compiler/objc_primitive_field.cc @@ -38,16 +38,16 @@ namespace google { namespace protobuf { namespace compiler { namespace objective const char* PrimitiveTypeName(const FieldDescriptor* field) { switch (field->type()) { - case FieldDescriptor::TYPE_INT32 : return "NSInteger" ; - case FieldDescriptor::TYPE_UINT32 : return "NSUInteger"; - case FieldDescriptor::TYPE_SINT32 : return "NSInteger" ; - case FieldDescriptor::TYPE_FIXED32 : return "NSUInteger"; - case FieldDescriptor::TYPE_SFIXED32: return "NSInteger" ; - case FieldDescriptor::TYPE_INT64 : return "NSInteger" ; - case FieldDescriptor::TYPE_UINT64 : return "NSUInteger"; - case FieldDescriptor::TYPE_SINT64 : return "NSInteger" ; - case FieldDescriptor::TYPE_FIXED64 : return "NSUInteger"; - case FieldDescriptor::TYPE_SFIXED64: return "NSInteger" ; + case FieldDescriptor::TYPE_INT32 : return "long" ; + case FieldDescriptor::TYPE_UINT32 : return "unsigned long"; + case FieldDescriptor::TYPE_SINT32 : return "long" ; + case FieldDescriptor::TYPE_FIXED32 : return "unsigned long"; + case FieldDescriptor::TYPE_SFIXED32: return "long" ; + case FieldDescriptor::TYPE_INT64 : return "long long" ; + case FieldDescriptor::TYPE_UINT64 : return "unsigned long long"; + case FieldDescriptor::TYPE_SINT64 : return "long" ; + case FieldDescriptor::TYPE_FIXED64 : return "unsigned long long"; + case FieldDescriptor::TYPE_SFIXED64: return "long long" ; case FieldDescriptor::TYPE_FLOAT : return "Float32" ; case FieldDescriptor::TYPE_DOUBLE : return "Float64" ; case FieldDescriptor::TYPE_BOOL : return "BOOL" ; diff --git a/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj b/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj deleted file mode 100644 index 313bdbc..0000000 --- a/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.pbxproj +++ /dev/null @@ -1,215 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXFileReference section */ - 3F867E641903114100D99AD9 /* libprotocolBufGenerators.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libprotocolBufGenerators.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 3F867E611903114100D99AD9 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 3F867E5B1903114100D99AD9 = { - isa = PBXGroup; - children = ( - 3F867E651903114100D99AD9 /* Products */, - ); - sourceTree = ""; - }; - 3F867E651903114100D99AD9 /* Products */ = { - isa = PBXGroup; - children = ( - 3F867E641903114100D99AD9 /* libprotocolBufGenerators.dylib */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 3F867E621903114100D99AD9 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 3F867E631903114100D99AD9 /* protocolBufGenerators */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3F867E681903114100D99AD9 /* Build configuration list for PBXNativeTarget "protocolBufGenerators" */; - buildPhases = ( - 3F867E601903114100D99AD9 /* Sources */, - 3F867E611903114100D99AD9 /* Frameworks */, - 3F867E621903114100D99AD9 /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = protocolBufGenerators; - productName = protocolBufGenerators; - productReference = 3F867E641903114100D99AD9 /* libprotocolBufGenerators.dylib */; - productType = "com.apple.product-type.library.dynamic"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 3F867E5C1903114100D99AD9 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0510; - ORGANIZATIONNAME = "Alexey Khokhlov"; - }; - buildConfigurationList = 3F867E5F1903114100D99AD9 /* Build configuration list for PBXProject "protocolBufGenerators" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 3F867E5B1903114100D99AD9; - productRefGroup = 3F867E651903114100D99AD9 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 3F867E631903114100D99AD9 /* protocolBufGenerators */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 3F867E601903114100D99AD9 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 3F867E661903114100D99AD9 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 3F867E671903114100D99AD9 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - SDKROOT = macosx; - }; - name = Release; - }; - 3F867E691903114100D99AD9 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 3F867E6A1903114100D99AD9 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 3F867E5F1903114100D99AD9 /* Build configuration list for PBXProject "protocolBufGenerators" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3F867E661903114100D99AD9 /* Debug */, - 3F867E671903114100D99AD9 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 3F867E681903114100D99AD9 /* Build configuration list for PBXNativeTarget "protocolBufGenerators" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3F867E691903114100D99AD9 /* Debug */, - 3F867E6A1903114100D99AD9 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; -/* End XCConfigurationList section */ - }; - rootObject = 3F867E5C1903114100D99AD9 /* Project object */; -} diff --git a/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index bc76292..0000000 --- a/src/compiler/protocolBufGenerators/protocolBufGenerators.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/runtime/Classes/PBArray.h b/src/runtime/Classes/PBArray.h index 934426c..d831141 100644 --- a/src/runtime/Classes/PBArray.h +++ b/src/runtime/Classes/PBArray.h @@ -41,30 +41,30 @@ typedef enum _PBArrayValueType { @protected PBArrayValueType _valueType; - unsigned long _capacity; - unsigned long _count; + NSUInteger _capacity; + NSUInteger _count; void * _data; } -- (unsigned long)count; -- (id)objectAtIndex:(unsigned long)index; -- (BOOL)boolAtIndex:(unsigned long)index; -- (long)int32AtIndex:(unsigned long)index; -- (unsigned long)uint32AtIndex:(unsigned long)index; -- (long long)int64AtIndex:(unsigned long)index; -- (unsigned long long)uint64AtIndex:(unsigned long)index; -- (Float32)floatAtIndex:(unsigned long)index; -- (Float64)doubleAtIndex:(unsigned long)index; +- (NSUInteger)count; +- (id)objectAtIndex:(NSUInteger)index; +- (BOOL)boolAtIndex:(NSUInteger)index; +- (long)int32AtIndex:(NSUInteger)index; +- (NSUInteger)uint32AtIndex:(NSUInteger)index; +- (long long)int64AtIndex:(NSUInteger)index; +- (unsigned long long)uint64AtIndex:(NSUInteger)index; +- (Float32)floatAtIndex:(NSUInteger)index; +- (Float64)doubleAtIndex:(NSUInteger)index; - (BOOL)isEqualToArray:(PBArray *)array; -- (void)enumerateObjectsUsingBlock:(void (^)(id obj, unsigned long idx, BOOL *stop))block; +- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block; - (id)firstObject; - (id)lastObject; -- (id)objectAtIndexedSubscript:(unsigned long)idx; +- (id)objectAtIndexedSubscript:(NSUInteger)idx; @property (nonatomic,assign,readonly) PBArrayValueType valueType; @property (nonatomic,assign,readonly) const void * data; -@property (nonatomic,assign,readonly,getter=count) unsigned long count; +@property (nonatomic,assign,readonly,getter=count) NSUInteger count; @end @@ -77,10 +77,10 @@ typedef enum _PBArrayValueType @interface PBArray (PBArrayCreation) + (id)arrayWithValueType:(PBArrayValueType)valueType; -+ (id)arrayWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType; ++ (id)arrayWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType; + (id)arrayWithArray:(NSArray *)array valueType:(PBArrayValueType)valueType; - (id)initWithValueType:(PBArrayValueType)valueType; -- (id)initWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType; +- (id)initWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType; - (id)initWithArray:(NSArray *)array valueType:(PBArrayValueType)valueType; @end diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index b564a7c..1d68b89 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -33,22 +33,22 @@ static void PBArraySetBoolValue(NSNumber *number, void *value) static void PBArraySetInt32Value(NSNumber *number, void *value) { - *((long *)value) = [number intValue]; + *((NSInteger *)value) = [number intValue]; } static void PBArraySetUInt32Value(NSNumber *number, void *value) { - *((unsigned long *)value) = [number unsignedIntValue]; + *((NSUInteger *)value) = [number unsignedIntValue]; } static void PBArraySetInt64Value(NSNumber *number, void *value) { - *((long long *)value) = [number longLongValue]; + *((int64_t *)value) = [number longLongValue]; } static void PBArraySetUInt64Value(NSNumber *number, void *value) { - *((ulong long *)value) = [number unsignedLongLongValue]; + *((uint64_t *)value) = [number unsignedLongLongValue]; } static void PBArraySetFloatValue(NSNumber *number, void *value) @@ -73,10 +73,10 @@ static void PBArraySetDoubleValue(NSNumber *number, void *value) { { sizeof(id), NULL }, { sizeof(BOOL), PBArraySetBoolValue }, - { sizeof(long), PBArraySetInt32Value }, - { sizeof(unsigned long), PBArraySetUInt32Value }, + { sizeof(NSInteger), PBArraySetInt32Value }, + { sizeof(NSUInteger), PBArraySetUInt32Value }, { sizeof(long long), PBArraySetInt64Value }, - { sizeof(ulong long), PBArraySetUInt64Value }, + { sizeof(unsigned long long), PBArraySetUInt64Value }, { sizeof(Float32), PBArraySetFloatValue }, { sizeof(Float64), PBArraySetDoubleValue }, }; @@ -90,7 +90,7 @@ static void PBArraySetDoubleValue(NSNumber *number, void *value) #define PBArrayForEachObject(__data, __count, x) \ if (_valueType == PBArrayValueTypeObject) \ - for (unsigned long i = 0; i < __count; ++i) { id object = ((id *)__data)[i]; [object x]; } + for (NSUInteger i = 0; i < __count; ++i) { id object = ((id *)__data)[i]; [object x]; } #define PBArrayValueTypeAssert(type) \ if (__builtin_expect(_valueType != type, 0)) \ @@ -117,7 +117,7 @@ @implementation PBArray @synthesize valueType = _valueType; @dynamic data; -- (id)initWithCount:(unsigned long)count valueType:(PBArrayValueType)valueType +- (id)initWithCount:(NSUInteger)count valueType:(PBArrayValueType)valueType { if ((self = [super init])) { @@ -168,7 +168,7 @@ - (NSString *)description [self class], self, _valueType, (long)_count, (long)_capacity, _data]; } -- (unsigned long)count +- (NSUInteger)count { return _count; } @@ -178,7 +178,7 @@ - (const void *)data return _data; } -- (unsigned long)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(unsigned long)len +- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len { // TODO: We only support enumeration of object values. In the future, we // can extend this code to return a new list of NSNumber* objects wrapping @@ -197,56 +197,56 @@ - (unsigned long)countByEnumeratingWithState:(NSFastEnumerationState *)state obj return _count; } -- (id)objectAtIndex:(unsigned long)index +- (id)objectAtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeObject); return ((id *)_data)[index]; } -- (BOOL)boolAtIndex:(unsigned long)index +- (BOOL)boolAtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeBool); return ((BOOL *)_data)[index]; } -- (long)int32AtIndex:(unsigned long)index +- (long)int32AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt32); - return ((long *)_data)[index]; + return ((NSInteger *)_data)[index]; } -- (unsigned long)uint32AtIndex:(unsigned long)index +- (NSUInteger)uint32AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt32); - return ((unsigned long *)_data)[index]; + return ((NSUInteger *)_data)[index]; } -- (long long)int64AtIndex:(unsigned long)index +- (long long)int64AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt64); - return ((long long *)_data)[index]; + return ((int64_t *)_data)[index]; } -- (ulong long)uint64AtIndex:(unsigned long)index +- (unsigned long long)uint64AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt64); - return ((ulong long *)_data)[index]; + return ((uint64_t *)_data)[index]; } -- (Float32)floatAtIndex:(unsigned long)index +- (Float32)floatAtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeFloat); return ((Float32 *)_data)[index]; } -- (Float64)doubleAtIndex:(unsigned long)index +- (Float64)doubleAtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeDouble); @@ -295,7 +295,7 @@ -(id)lastObject return nil; } -- (id)objectAtIndexedSubscript:(unsigned long)idx +- (id)objectAtIndexedSubscript:(NSUInteger)idx { if (idx > 0 && idx < self.count) { return [self objectAtIndex:idx]; @@ -303,11 +303,11 @@ - (id)objectAtIndexedSubscript:(unsigned long)idx return nil; } -- (void)enumerateObjectsUsingBlock:(void (^)(id obj, unsigned long idx, BOOL *stop))block +- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block { if (!block) return; BOOL stop = NO; - for (long i = 0; i < self.count; i++) { + for (NSInteger i = 0; i < self.count; i++) { block([self objectAtIndex:i],i,&stop); if(stop){ break; @@ -347,7 +347,7 @@ + (id)arrayWithValueType:(PBArrayValueType)valueType return [[[self alloc] initWithValueType:valueType] autorelease]; } -+ (id)arrayWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType ++ (id)arrayWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType { return [[[self alloc] initWithValues:values count:count valueType:valueType] autorelease]; } @@ -362,7 +362,7 @@ - (id)initWithValueType:(PBArrayValueType)valueType return [self initWithCount:0 valueType:valueType]; } -- (id)initWithValues:(const void *)values count:(unsigned long)count valueType:(PBArrayValueType)valueType +- (id)initWithValues:(const void *)values count:(NSUInteger)count valueType:(PBArrayValueType)valueType { if ((self = [self initWithCount:count valueType:valueType])) { @@ -410,9 +410,9 @@ - (id)initWithArray:(NSArray *)array valueType:(PBArrayValueType)valueType @implementation PBAppendableArray -- (void)ensureAdditionalCapacity:(unsigned long)additionalSlots +- (void)ensureAdditionalCapacity:(NSUInteger)additionalSlots { - const unsigned long requiredSlots = _count + additionalSlots; + const NSUInteger requiredSlots = _count + additionalSlots; if (requiredSlots > _capacity) { @@ -458,7 +458,7 @@ - (void)addInt32:(long)value { PBArrayValueTypeAssert(PBArrayValueTypeInt32); [self ensureAdditionalCapacity:1]; - *(long *)PBArraySlot(_count) = value; + *(NSInteger *)PBArraySlot(_count) = value; _count++; } @@ -466,23 +466,23 @@ - (void)addUint32:(unsigned long)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt32); [self ensureAdditionalCapacity:1]; - *(unsigned long *)PBArraySlot(_count) = value; + *(NSUInteger *)PBArraySlot(_count) = value; _count++; } -- (void)addInt64:(long long)value +- (void)addInt64:(int64_t)value { PBArrayValueTypeAssert(PBArrayValueTypeInt64); [self ensureAdditionalCapacity:1]; - *(long long *)PBArraySlot(_count) = value; + *(int64_t *)PBArraySlot(_count) = value; _count++; } -- (void)addUint64:(ulong long)value +- (void)addUint64:(uint64_t)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt64); [self ensureAdditionalCapacity:1]; - *(ulong long *)PBArraySlot(_count) = value; + *(uint64_t *)PBArraySlot(_count) = value; _count++; } diff --git a/src/runtime/Classes/Utilities.h b/src/runtime/Classes/Utilities.h index 0dcb6a8..5163601 100644 --- a/src/runtime/Classes/Utilities.h +++ b/src/runtime/Classes/Utilities.h @@ -22,8 +22,8 @@ long convertFloat32ToInt32(Float32 f); Float64 convertInt64ToFloat64(long long f); Float32 convertInt32ToFloat32(long f); -ulong long convertInt64ToUInt64(long long i); -long long convertUInt64ToInt64(ulong long u); +unsigned long long convertInt64ToUInt64(long long i); +long long convertUInt64ToInt64(unsigned long long u); unsigned long convertInt32ToUInt32(long i); long long convertUInt32ToInt32(unsigned long u); diff --git a/src/runtime/Classes/Utilities.m b/src/runtime/Classes/Utilities.m index ac05d37..10e6760 100644 --- a/src/runtime/Classes/Utilities.m +++ b/src/runtime/Classes/Utilities.m @@ -52,15 +52,15 @@ Float32 convertInt32ToFloat32(long v) { } -ulong long convertInt64ToUInt64(long long v) { - union { long long i; ulong long u; } u; +unsigned long long convertInt64ToUInt64(long long v) { + union { long long i; unsigned long long u; } u; u.i = v; return u.u; } -long long convertUInt64ToInt64(ulong long v) { - union { long long i; ulong long u; } u; +long long convertUInt64ToInt64(unsigned long long v) { + union { long long i; unsigned long long u; } u; u.u = v; return u.i; } From 62c0610586787c4a87eda651fad8080d7ade21d4 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Mon, 21 Apr 2014 12:20:09 +0400 Subject: [PATCH 04/18] update gitignore --- .gitignore | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5dd08cb..159e3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,13 +27,23 @@ src/compiler/protoc-gen-objc-arc # Mac stuff .DS_Store -# Xcode stuff -Build/ +# Xcode +.DS_Store +build/ *.pbxuser -*.perspective -*.perspectivev3 +!default.pbxuser *.mode1v3 +!default.mode1v3 *.mode2v3 -*.xcuserdata -*.xcuserdatad -*.xccheckout +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +*.xcworkspace +!default.xcworkspace +xcuserdata +profile +*.moved-aside +DerivedData +.idea/ + + From e701d61f36898414e30d3e186dd6132a49983ca7 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Mon, 21 Apr 2014 13:12:05 +0400 Subject: [PATCH 05/18] arm64 fix enum fields --- src/compiler/objc_enum_field.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/objc_enum_field.cc b/src/compiler/objc_enum_field.cc index 69c6333..36adfcc 100644 --- a/src/compiler/objc_enum_field.cc +++ b/src/compiler/objc_enum_field.cc @@ -171,7 +171,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void EnumFieldGenerator::GenerateParsingCodeSource(io::Printer* printer) const { printer->Print(variables_, - "NSInteger value = [input readEnum];\n" + "$type$ value = ($type$)[input readEnum];\n" "if ($type$IsValidValue(value)) {\n" " [self set$capitalized_name$:value];\n" "} else {\n" @@ -385,7 +385,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective } printer->Print(variables_, - "NSInteger value = [input readEnum];\n" + "$type$ value = ($type$)[input readEnum];\n" "if ($type$IsValidValue(value)) {\n" " [self add$capitalized_name$:value];\n" "} else {\n" From 4455d77e7385607c375e545e58b3b5043b957685 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Mon, 21 Apr 2014 13:12:36 +0400 Subject: [PATCH 06/18] descriptors upgrade --- src/runtime/Classes/Descriptor.pb.h | 1382 +++-- src/runtime/Classes/Descriptor.pb.m | 4964 +++++++++++------ .../ProtocolBuffers.xcodeproj/project.pbxproj | 2 +- 3 files changed, 4175 insertions(+), 2173 deletions(-) diff --git a/src/runtime/Classes/Descriptor.pb.h b/src/runtime/Classes/Descriptor.pb.h index ddceba2..a7ee031 100644 --- a/src/runtime/Classes/Descriptor.pb.h +++ b/src/runtime/Classes/Descriptor.pb.h @@ -1,88 +1,106 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! +// @@protoc_insertion_point(imports) #import "ProtocolBuffers.h" @class PBDescriptorProto; -@class PBDescriptorProto_Builder; -@class PBDescriptorProto_ExtensionRange; -@class PBDescriptorProto_ExtensionRange_Builder; +@class PBDescriptorProtoBuilder; +@class PBDescriptorProtoExtensionRange; +@class PBDescriptorProtoExtensionRangeBuilder; @class PBEnumDescriptorProto; -@class PBEnumDescriptorProto_Builder; +@class PBEnumDescriptorProtoBuilder; @class PBEnumOptions; -@class PBEnumOptions_Builder; +@class PBEnumOptionsBuilder; @class PBEnumValueDescriptorProto; -@class PBEnumValueDescriptorProto_Builder; +@class PBEnumValueDescriptorProtoBuilder; @class PBEnumValueOptions; -@class PBEnumValueOptions_Builder; +@class PBEnumValueOptionsBuilder; @class PBFieldDescriptorProto; -@class PBFieldDescriptorProto_Builder; +@class PBFieldDescriptorProtoBuilder; @class PBFieldOptions; -@class PBFieldOptions_Builder; +@class PBFieldOptionsBuilder; @class PBFileDescriptorProto; -@class PBFileDescriptorProto_Builder; +@class PBFileDescriptorProtoBuilder; @class PBFileDescriptorSet; -@class PBFileDescriptorSet_Builder; +@class PBFileDescriptorSetBuilder; @class PBFileOptions; -@class PBFileOptions_Builder; +@class PBFileOptionsBuilder; @class PBMessageOptions; -@class PBMessageOptions_Builder; +@class PBMessageOptionsBuilder; @class PBMethodDescriptorProto; -@class PBMethodDescriptorProto_Builder; +@class PBMethodDescriptorProtoBuilder; @class PBMethodOptions; -@class PBMethodOptions_Builder; +@class PBMethodOptionsBuilder; @class PBServiceDescriptorProto; -@class PBServiceDescriptorProto_Builder; +@class PBServiceDescriptorProtoBuilder; @class PBServiceOptions; -@class PBServiceOptions_Builder; +@class PBServiceOptionsBuilder; +@class PBSourceCodeInfo; +@class PBSourceCodeInfoBuilder; +@class PBSourceCodeInfoLocation; +@class PBSourceCodeInfoLocationBuilder; @class PBUninterpretedOption; -@class PBUninterpretedOption_Builder; -@class PBUninterpretedOption_NamePart; -@class PBUninterpretedOption_NamePart_Builder; +@class PBUninterpretedOptionBuilder; +@class PBUninterpretedOptionNamePart; +@class PBUninterpretedOptionNamePartBuilder; +#ifndef __has_feature + #define __has_feature(x) 0 // Compatibility with non-clang compilers. +#endif // __has_feature + +#ifndef NS_RETURNS_NOT_RETAINED + #if __has_feature(attribute_ns_returns_not_retained) + #define NS_RETURNS_NOT_RETAINED __attribute__((ns_returns_not_retained)) + #else + #define NS_RETURNS_NOT_RETAINED + #endif +#endif + typedef enum { - PBFieldDescriptorProto_TypeTypeDouble = 1, - PBFieldDescriptorProto_TypeTypeFloat = 2, - PBFieldDescriptorProto_TypeTypeInt64 = 3, - PBFieldDescriptorProto_TypeTypeUint64 = 4, - PBFieldDescriptorProto_TypeTypeInt32 = 5, - PBFieldDescriptorProto_TypeTypeFixed64 = 6, - PBFieldDescriptorProto_TypeTypeFixed32 = 7, - PBFieldDescriptorProto_TypeTypeBool = 8, - PBFieldDescriptorProto_TypeTypeString = 9, - PBFieldDescriptorProto_TypeTypeGroup = 10, - PBFieldDescriptorProto_TypeTypeMessage = 11, - PBFieldDescriptorProto_TypeTypeBytes = 12, - PBFieldDescriptorProto_TypeTypeUint32 = 13, - PBFieldDescriptorProto_TypeTypeEnum = 14, - PBFieldDescriptorProto_TypeTypeSfixed32 = 15, - PBFieldDescriptorProto_TypeTypeSfixed64 = 16, - PBFieldDescriptorProto_TypeTypeSint32 = 17, - PBFieldDescriptorProto_TypeTypeSint64 = 18, -} PBFieldDescriptorProto_Type; - -BOOL PBFieldDescriptorProto_TypeIsValidValue(PBFieldDescriptorProto_Type value); + PBFieldDescriptorProtoTypeTypeDouble = 1, + PBFieldDescriptorProtoTypeTypeFloat = 2, + PBFieldDescriptorProtoTypeTypeInt64 = 3, + PBFieldDescriptorProtoTypeTypeUint64 = 4, + PBFieldDescriptorProtoTypeTypeInt32 = 5, + PBFieldDescriptorProtoTypeTypeFixed64 = 6, + PBFieldDescriptorProtoTypeTypeFixed32 = 7, + PBFieldDescriptorProtoTypeTypeBool = 8, + PBFieldDescriptorProtoTypeTypeString = 9, + PBFieldDescriptorProtoTypeTypeGroup = 10, + PBFieldDescriptorProtoTypeTypeMessage = 11, + PBFieldDescriptorProtoTypeTypeBytes = 12, + PBFieldDescriptorProtoTypeTypeUint32 = 13, + PBFieldDescriptorProtoTypeTypeEnum = 14, + PBFieldDescriptorProtoTypeTypeSfixed32 = 15, + PBFieldDescriptorProtoTypeTypeSfixed64 = 16, + PBFieldDescriptorProtoTypeTypeSint32 = 17, + PBFieldDescriptorProtoTypeTypeSint64 = 18, +} PBFieldDescriptorProtoType; + +BOOL PBFieldDescriptorProtoTypeIsValidValue(PBFieldDescriptorProtoType value); typedef enum { - PBFieldDescriptorProto_LabelLabelOptional = 1, - PBFieldDescriptorProto_LabelLabelRequired = 2, - PBFieldDescriptorProto_LabelLabelRepeated = 3, -} PBFieldDescriptorProto_Label; + PBFieldDescriptorProtoLabelLabelOptional = 1, + PBFieldDescriptorProtoLabelLabelRequired = 2, + PBFieldDescriptorProtoLabelLabelRepeated = 3, +} PBFieldDescriptorProtoLabel; -BOOL PBFieldDescriptorProto_LabelIsValidValue(PBFieldDescriptorProto_Label value); +BOOL PBFieldDescriptorProtoLabelIsValidValue(PBFieldDescriptorProtoLabel value); typedef enum { - PBFileOptions_OptimizeModeSpeed = 1, - PBFileOptions_OptimizeModeCodeSize = 2, - PBFileOptions_OptimizeModeLiteRuntime = 3, -} PBFileOptions_OptimizeMode; + PBFileOptionsOptimizeModeSpeed = 1, + PBFileOptionsOptimizeModeCodeSize = 2, + PBFileOptionsOptimizeModeLiteRuntime = 3, +} PBFileOptionsOptimizeMode; -BOOL PBFileOptions_OptimizeModeIsValidValue(PBFileOptions_OptimizeMode value); +BOOL PBFileOptionsOptimizeModeIsValidValue(PBFileOptionsOptimizeMode value); typedef enum { - PBFieldOptions_CTypeCord = 1, - PBFieldOptions_CTypeStringPiece = 2, -} PBFieldOptions_CType; + PBFieldOptionsCTypeString = 0, + PBFieldOptionsCTypeCord = 1, + PBFieldOptionsCTypeStringPiece = 2, +} PBFieldOptionsCType; -BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); +BOOL PBFieldOptionsCTypeIsValidValue(PBFieldOptionsCType value); @interface PBDescriptorRoot : NSObject { @@ -93,19 +111,20 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @interface PBFileDescriptorSet : PBGeneratedMessage { @private - NSMutableArray* mutableFileList; + PBAppendableArray * fileArray; } -- (NSArray*) fileList; -- (PBFileDescriptorProto*) fileAtIndex:(long) index; +@property (readonly, strong) PBArray * file; +- (PBFileDescriptorProto*)fileAtIndex:(NSUInteger)index; + (PBFileDescriptorSet*) defaultInstance; - (PBFileDescriptorSet*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBFileDescriptorSet_Builder*) builder; -+ (PBFileDescriptorSet_Builder*) builder; -+ (PBFileDescriptorSet_Builder*) builderWithPrototype:(PBFileDescriptorSet*) prototype; +- (PBFileDescriptorSetBuilder*) builder; ++ (PBFileDescriptorSetBuilder*) builder; ++ (PBFileDescriptorSetBuilder*) builderWithPrototype:(PBFileDescriptorSet*) prototype; +- (PBFileDescriptorSetBuilder*) toBuilder; + (PBFileDescriptorSet*) parseFromData:(NSData*) data; + (PBFileDescriptorSet*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -115,29 +134,29 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBFileDescriptorSet*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBFileDescriptorSet_Builder : PBGeneratedMessage_Builder { +@interface PBFileDescriptorSetBuilder : PBGeneratedMessage_Builder { @private PBFileDescriptorSet* result; } - (PBFileDescriptorSet*) defaultInstance; -- (PBFileDescriptorSet_Builder*) clear; -- (PBFileDescriptorSet_Builder*) clone; +- (PBFileDescriptorSetBuilder*) clear; +- (PBFileDescriptorSetBuilder*) clone; - (PBFileDescriptorSet*) build; - (PBFileDescriptorSet*) buildPartial; -- (PBFileDescriptorSet_Builder*) mergeFrom:(PBFileDescriptorSet*) other; -- (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBFileDescriptorSetBuilder*) mergeFrom:(PBFileDescriptorSet*) other; +- (PBFileDescriptorSetBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBFileDescriptorSetBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -- (NSArray*) fileList; -- (PBFileDescriptorProto*) fileAtIndex:(long) index; -- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(long) index with:(PBFileDescriptorProto*) value; -- (PBFileDescriptorSet_Builder*) addFile:(PBFileDescriptorProto*) value; -- (PBFileDescriptorSet_Builder*) addAllFile:(NSArray*) values; -- (PBFileDescriptorSet_Builder*) clearFileList; +- (PBAppendableArray *)file; +- (PBFileDescriptorProto*)fileAtIndex:(NSUInteger)index; +- (PBFileDescriptorSetBuilder *)addFile:(PBFileDescriptorProto*)value; +- (PBFileDescriptorSetBuilder *)setFileArray:(NSArray *)array; +- (PBFileDescriptorSetBuilder *)setFileValues:(const PBFileDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBFileDescriptorSetBuilder *)clearFile; @end @interface PBFileDescriptorProto : PBGeneratedMessage { @@ -145,40 +164,45 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasName_:1; BOOL hasPackage_:1; BOOL hasOptions_:1; + BOOL hasSourceCodeInfo_:1; NSString* name; NSString* package; PBFileOptions* options; - NSMutableArray* mutableDependencyList; - NSMutableArray* mutableMessageTypeList; - NSMutableArray* mutableEnumTypeList; - NSMutableArray* mutableServiceList; - NSMutableArray* mutableExtensionList; + PBSourceCodeInfo* sourceCodeInfo; + PBAppendableArray * dependencyArray; + PBAppendableArray * messageTypeArray; + PBAppendableArray * enumTypeArray; + PBAppendableArray * serviceArray; + PBAppendableArray * extensionArray; } - (BOOL) hasName; - (BOOL) hasPackage; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; -@property (readonly, retain) NSString* package; -@property (readonly, retain) PBFileOptions* options; -- (NSArray*) dependencyList; -- (NSString*) dependencyAtIndex:(long) index; -- (NSArray*) messageTypeList; -- (PBDescriptorProto*) messageTypeAtIndex:(long) index; -- (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; -- (NSArray*) serviceList; -- (PBServiceDescriptorProto*) serviceAtIndex:(long) index; -- (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; +- (BOOL) hasSourceCodeInfo; +@property (readonly, strong) NSString* name; +@property (readonly, strong) NSString* package; +@property (readonly, strong) PBArray * dependency; +@property (readonly, strong) PBArray * messageType; +@property (readonly, strong) PBArray * enumType; +@property (readonly, strong) PBArray * service; +@property (readonly, strong) PBArray * extension; +@property (readonly, strong) PBFileOptions* options; +@property (readonly, strong) PBSourceCodeInfo* sourceCodeInfo; +- (NSString*)dependencyAtIndex:(NSUInteger)index; +- (PBDescriptorProto*)messageTypeAtIndex:(NSUInteger)index; +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index; +- (PBServiceDescriptorProto*)serviceAtIndex:(NSUInteger)index; +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index; + (PBFileDescriptorProto*) defaultInstance; - (PBFileDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBFileDescriptorProto_Builder*) builder; -+ (PBFileDescriptorProto_Builder*) builder; -+ (PBFileDescriptorProto_Builder*) builderWithPrototype:(PBFileDescriptorProto*) prototype; +- (PBFileDescriptorProtoBuilder*) builder; ++ (PBFileDescriptorProtoBuilder*) builder; ++ (PBFileDescriptorProtoBuilder*) builderWithPrototype:(PBFileDescriptorProto*) prototype; +- (PBFileDescriptorProtoBuilder*) toBuilder; + (PBFileDescriptorProto*) parseFromData:(NSData*) data; + (PBFileDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -188,74 +212,81 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBFileDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBFileDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBFileDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBFileDescriptorProto* result; } - (PBFileDescriptorProto*) defaultInstance; -- (PBFileDescriptorProto_Builder*) clear; -- (PBFileDescriptorProto_Builder*) clone; +- (PBFileDescriptorProtoBuilder*) clear; +- (PBFileDescriptorProtoBuilder*) clone; - (PBFileDescriptorProto*) build; - (PBFileDescriptorProto*) buildPartial; -- (PBFileDescriptorProto_Builder*) mergeFrom:(PBFileDescriptorProto*) other; -- (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBFileDescriptorProtoBuilder*) mergeFrom:(PBFileDescriptorProto*) other; +- (PBFileDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBFileDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBFileDescriptorProto_Builder*) setName:(NSString*) value; -- (PBFileDescriptorProto_Builder*) clearName; +- (PBFileDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBFileDescriptorProtoBuilder*) clearName; - (BOOL) hasPackage; - (NSString*) package; -- (PBFileDescriptorProto_Builder*) setPackage:(NSString*) value; -- (PBFileDescriptorProto_Builder*) clearPackage; - -- (NSArray*) dependencyList; -- (NSString*) dependencyAtIndex:(long) index; -- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(long) index with:(NSString*) value; -- (PBFileDescriptorProto_Builder*) addDependency:(NSString*) value; -- (PBFileDescriptorProto_Builder*) addAllDependency:(NSArray*) values; -- (PBFileDescriptorProto_Builder*) clearDependencyList; - -- (NSArray*) messageTypeList; -- (PBDescriptorProto*) messageTypeAtIndex:(long) index; -- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(long) index with:(PBDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addMessageType:(PBDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addAllMessageType:(NSArray*) values; -- (PBFileDescriptorProto_Builder*) clearMessageTypeList; - -- (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; -- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addAllEnumType:(NSArray*) values; -- (PBFileDescriptorProto_Builder*) clearEnumTypeList; - -- (NSArray*) serviceList; -- (PBServiceDescriptorProto*) serviceAtIndex:(long) index; -- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(long) index with:(PBServiceDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addService:(PBServiceDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addAllService:(NSArray*) values; -- (PBFileDescriptorProto_Builder*) clearServiceList; - -- (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; -- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value; -- (PBFileDescriptorProto_Builder*) addAllExtension:(NSArray*) values; -- (PBFileDescriptorProto_Builder*) clearExtensionList; +- (PBFileDescriptorProtoBuilder*) setPackage:(NSString*) value; +- (PBFileDescriptorProtoBuilder*) clearPackage; + +- (PBAppendableArray *)dependency; +- (NSString*)dependencyAtIndex:(NSUInteger)index; +- (PBFileDescriptorProtoBuilder *)addDependency:(NSString*)value; +- (PBFileDescriptorProtoBuilder *)setDependencyArray:(NSArray *)array; +- (PBFileDescriptorProtoBuilder *)setDependencyValues:(const NSString* *)values count:(NSUInteger)count; +- (PBFileDescriptorProtoBuilder *)clearDependency; + +- (PBAppendableArray *)messageType; +- (PBDescriptorProto*)messageTypeAtIndex:(NSUInteger)index; +- (PBFileDescriptorProtoBuilder *)addMessageType:(PBDescriptorProto*)value; +- (PBFileDescriptorProtoBuilder *)setMessageTypeArray:(NSArray *)array; +- (PBFileDescriptorProtoBuilder *)setMessageTypeValues:(const PBDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBFileDescriptorProtoBuilder *)clearMessageType; + +- (PBAppendableArray *)enumType; +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index; +- (PBFileDescriptorProtoBuilder *)addEnumType:(PBEnumDescriptorProto*)value; +- (PBFileDescriptorProtoBuilder *)setEnumTypeArray:(NSArray *)array; +- (PBFileDescriptorProtoBuilder *)setEnumTypeValues:(const PBEnumDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBFileDescriptorProtoBuilder *)clearEnumType; + +- (PBAppendableArray *)service; +- (PBServiceDescriptorProto*)serviceAtIndex:(NSUInteger)index; +- (PBFileDescriptorProtoBuilder *)addService:(PBServiceDescriptorProto*)value; +- (PBFileDescriptorProtoBuilder *)setServiceArray:(NSArray *)array; +- (PBFileDescriptorProtoBuilder *)setServiceValues:(const PBServiceDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBFileDescriptorProtoBuilder *)clearService; + +- (PBAppendableArray *)extension; +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index; +- (PBFileDescriptorProtoBuilder *)addExtension:(PBFieldDescriptorProto*)value; +- (PBFileDescriptorProtoBuilder *)setExtensionArray:(NSArray *)array; +- (PBFileDescriptorProtoBuilder *)setExtensionValues:(const PBFieldDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBFileDescriptorProtoBuilder *)clearExtension; - (BOOL) hasOptions; - (PBFileOptions*) options; -- (PBFileDescriptorProto_Builder*) setOptions:(PBFileOptions*) value; -- (PBFileDescriptorProto_Builder*) setOptionsBuilder:(PBFileOptions_Builder*) builderForValue; -- (PBFileDescriptorProto_Builder*) mergeOptions:(PBFileOptions*) value; -- (PBFileDescriptorProto_Builder*) clearOptions; +- (PBFileDescriptorProtoBuilder*) setOptions:(PBFileOptions*) value; +- (PBFileDescriptorProtoBuilder*) setOptionsBuilder:(PBFileOptionsBuilder*) builderForValue; +- (PBFileDescriptorProtoBuilder*) mergeOptions:(PBFileOptions*) value; +- (PBFileDescriptorProtoBuilder*) clearOptions; + +- (BOOL) hasSourceCodeInfo; +- (PBSourceCodeInfo*) sourceCodeInfo; +- (PBFileDescriptorProtoBuilder*) setSourceCodeInfo:(PBSourceCodeInfo*) value; +- (PBFileDescriptorProtoBuilder*) setSourceCodeInfoBuilder:(PBSourceCodeInfoBuilder*) builderForValue; +- (PBFileDescriptorProtoBuilder*) mergeSourceCodeInfo:(PBSourceCodeInfo*) value; +- (PBFileDescriptorProtoBuilder*) clearSourceCodeInfo; @end @interface PBDescriptorProto : PBGeneratedMessage { @@ -264,35 +295,36 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasOptions_:1; NSString* name; PBMessageOptions* options; - NSMutableArray* mutableFieldList; - NSMutableArray* mutableExtensionList; - NSMutableArray* mutableNestedTypeList; - NSMutableArray* mutableEnumTypeList; - NSMutableArray* mutableExtensionRangeList; + PBAppendableArray * fieldArray; + PBAppendableArray * extensionArray; + PBAppendableArray * nestedTypeArray; + PBAppendableArray * enumTypeArray; + PBAppendableArray * extensionRangeArray; } - (BOOL) hasName; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; -@property (readonly, retain) PBMessageOptions* options; -- (NSArray*) fieldList; -- (PBFieldDescriptorProto*) fieldAtIndex:(long) index; -- (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; -- (NSArray*) nestedTypeList; -- (PBDescriptorProto*) nestedTypeAtIndex:(long) index; -- (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; -- (NSArray*) extensionRangeList; -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index; +@property (readonly, strong) NSString* name; +@property (readonly, strong) PBArray * field; +@property (readonly, strong) PBArray * extension; +@property (readonly, strong) PBArray * nestedType; +@property (readonly, strong) PBArray * enumType; +@property (readonly, strong) PBArray * extensionRange; +@property (readonly, strong) PBMessageOptions* options; +- (PBFieldDescriptorProto*)fieldAtIndex:(NSUInteger)index; +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index; +- (PBDescriptorProto*)nestedTypeAtIndex:(NSUInteger)index; +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index; +- (PBDescriptorProtoExtensionRange*)extensionRangeAtIndex:(NSUInteger)index; + (PBDescriptorProto*) defaultInstance; - (PBDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBDescriptorProto_Builder*) builder; -+ (PBDescriptorProto_Builder*) builder; -+ (PBDescriptorProto_Builder*) builderWithPrototype:(PBDescriptorProto*) prototype; +- (PBDescriptorProtoBuilder*) builder; ++ (PBDescriptorProtoBuilder*) builder; ++ (PBDescriptorProtoBuilder*) builderWithPrototype:(PBDescriptorProto*) prototype; +- (PBDescriptorProtoBuilder*) toBuilder; + (PBDescriptorProto*) parseFromData:(NSData*) data; + (PBDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -302,7 +334,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBDescriptorProto_ExtensionRange : PBGeneratedMessage { +@interface PBDescriptorProtoExtensionRange : PBGeneratedMessage { @private BOOL hasStart_:1; BOOL hasEnd_:1; @@ -314,114 +346,115 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); @property (readonly) long start; @property (readonly) long end; -+ (PBDescriptorProto_ExtensionRange*) defaultInstance; -- (PBDescriptorProto_ExtensionRange*) defaultInstance; ++ (PBDescriptorProtoExtensionRange*) defaultInstance; +- (PBDescriptorProtoExtensionRange*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBDescriptorProto_ExtensionRange_Builder*) builder; -+ (PBDescriptorProto_ExtensionRange_Builder*) builder; -+ (PBDescriptorProto_ExtensionRange_Builder*) builderWithPrototype:(PBDescriptorProto_ExtensionRange*) prototype; - -+ (PBDescriptorProto_ExtensionRange*) parseFromData:(NSData*) data; -+ (PBDescriptorProto_ExtensionRange*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (PBDescriptorProto_ExtensionRange*) parseFromInputStream:(NSInputStream*) input; -+ (PBDescriptorProto_ExtensionRange*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (PBDescriptorProto_ExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (PBDescriptorProto_ExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBDescriptorProtoExtensionRangeBuilder*) builder; ++ (PBDescriptorProtoExtensionRangeBuilder*) builder; ++ (PBDescriptorProtoExtensionRangeBuilder*) builderWithPrototype:(PBDescriptorProtoExtensionRange*) prototype; +- (PBDescriptorProtoExtensionRangeBuilder*) toBuilder; + ++ (PBDescriptorProtoExtensionRange*) parseFromData:(NSData*) data; ++ (PBDescriptorProtoExtensionRange*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBDescriptorProtoExtensionRange*) parseFromInputStream:(NSInputStream*) input; ++ (PBDescriptorProtoExtensionRange*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBDescriptorProtoExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (PBDescriptorProtoExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBDescriptorProto_ExtensionRange_Builder : PBGeneratedMessage_Builder { +@interface PBDescriptorProtoExtensionRangeBuilder : PBGeneratedMessage_Builder { @private - PBDescriptorProto_ExtensionRange* result; + PBDescriptorProtoExtensionRange* result; } -- (PBDescriptorProto_ExtensionRange*) defaultInstance; +- (PBDescriptorProtoExtensionRange*) defaultInstance; -- (PBDescriptorProto_ExtensionRange_Builder*) clear; -- (PBDescriptorProto_ExtensionRange_Builder*) clone; +- (PBDescriptorProtoExtensionRangeBuilder*) clear; +- (PBDescriptorProtoExtensionRangeBuilder*) clone; -- (PBDescriptorProto_ExtensionRange*) build; -- (PBDescriptorProto_ExtensionRange*) buildPartial; +- (PBDescriptorProtoExtensionRange*) build; +- (PBDescriptorProtoExtensionRange*) buildPartial; -- (PBDescriptorProto_ExtensionRange_Builder*) mergeFrom:(PBDescriptorProto_ExtensionRange*) other; -- (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBDescriptorProtoExtensionRangeBuilder*) mergeFrom:(PBDescriptorProtoExtensionRange*) other; +- (PBDescriptorProtoExtensionRangeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBDescriptorProtoExtensionRangeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasStart; - (long) start; -- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(long) value; -- (PBDescriptorProto_ExtensionRange_Builder*) clearStart; +- (PBDescriptorProtoExtensionRangeBuilder*) setStart:(long) value; +- (PBDescriptorProtoExtensionRangeBuilder*) clearStart; - (BOOL) hasEnd; - (long) end; -- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(long) value; -- (PBDescriptorProto_ExtensionRange_Builder*) clearEnd; +- (PBDescriptorProtoExtensionRangeBuilder*) setEnd:(long) value; +- (PBDescriptorProtoExtensionRangeBuilder*) clearEnd; @end -@interface PBDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBDescriptorProto* result; } - (PBDescriptorProto*) defaultInstance; -- (PBDescriptorProto_Builder*) clear; -- (PBDescriptorProto_Builder*) clone; +- (PBDescriptorProtoBuilder*) clear; +- (PBDescriptorProtoBuilder*) clone; - (PBDescriptorProto*) build; - (PBDescriptorProto*) buildPartial; -- (PBDescriptorProto_Builder*) mergeFrom:(PBDescriptorProto*) other; -- (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBDescriptorProtoBuilder*) mergeFrom:(PBDescriptorProto*) other; +- (PBDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBDescriptorProto_Builder*) setName:(NSString*) value; -- (PBDescriptorProto_Builder*) clearName; - -- (NSArray*) fieldList; -- (PBFieldDescriptorProto*) fieldAtIndex:(long) index; -- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(long) index with:(PBFieldDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addField:(PBFieldDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addAllField:(NSArray*) values; -- (PBDescriptorProto_Builder*) clearFieldList; - -- (NSArray*) extensionList; -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index; -- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addAllExtension:(NSArray*) values; -- (PBDescriptorProto_Builder*) clearExtensionList; - -- (NSArray*) nestedTypeList; -- (PBDescriptorProto*) nestedTypeAtIndex:(long) index; -- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(long) index with:(PBDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addNestedType:(PBDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addAllNestedType:(NSArray*) values; -- (PBDescriptorProto_Builder*) clearNestedTypeList; - -- (NSArray*) enumTypeList; -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index; -- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value; -- (PBDescriptorProto_Builder*) addAllEnumType:(NSArray*) values; -- (PBDescriptorProto_Builder*) clearEnumTypeList; - -- (NSArray*) extensionRangeList; -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index; -- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(long) index with:(PBDescriptorProto_ExtensionRange*) value; -- (PBDescriptorProto_Builder*) addExtensionRange:(PBDescriptorProto_ExtensionRange*) value; -- (PBDescriptorProto_Builder*) addAllExtensionRange:(NSArray*) values; -- (PBDescriptorProto_Builder*) clearExtensionRangeList; +- (PBDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBDescriptorProtoBuilder*) clearName; + +- (PBAppendableArray *)field; +- (PBFieldDescriptorProto*)fieldAtIndex:(NSUInteger)index; +- (PBDescriptorProtoBuilder *)addField:(PBFieldDescriptorProto*)value; +- (PBDescriptorProtoBuilder *)setFieldArray:(NSArray *)array; +- (PBDescriptorProtoBuilder *)setFieldValues:(const PBFieldDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBDescriptorProtoBuilder *)clearField; + +- (PBAppendableArray *)extension; +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index; +- (PBDescriptorProtoBuilder *)addExtension:(PBFieldDescriptorProto*)value; +- (PBDescriptorProtoBuilder *)setExtensionArray:(NSArray *)array; +- (PBDescriptorProtoBuilder *)setExtensionValues:(const PBFieldDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBDescriptorProtoBuilder *)clearExtension; + +- (PBAppendableArray *)nestedType; +- (PBDescriptorProto*)nestedTypeAtIndex:(NSUInteger)index; +- (PBDescriptorProtoBuilder *)addNestedType:(PBDescriptorProto*)value; +- (PBDescriptorProtoBuilder *)setNestedTypeArray:(NSArray *)array; +- (PBDescriptorProtoBuilder *)setNestedTypeValues:(const PBDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBDescriptorProtoBuilder *)clearNestedType; + +- (PBAppendableArray *)enumType; +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index; +- (PBDescriptorProtoBuilder *)addEnumType:(PBEnumDescriptorProto*)value; +- (PBDescriptorProtoBuilder *)setEnumTypeArray:(NSArray *)array; +- (PBDescriptorProtoBuilder *)setEnumTypeValues:(const PBEnumDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBDescriptorProtoBuilder *)clearEnumType; + +- (PBAppendableArray *)extensionRange; +- (PBDescriptorProtoExtensionRange*)extensionRangeAtIndex:(NSUInteger)index; +- (PBDescriptorProtoBuilder *)addExtensionRange:(PBDescriptorProtoExtensionRange*)value; +- (PBDescriptorProtoBuilder *)setExtensionRangeArray:(NSArray *)array; +- (PBDescriptorProtoBuilder *)setExtensionRangeValues:(const PBDescriptorProtoExtensionRange* __strong *)values count:(NSUInteger)count; +- (PBDescriptorProtoBuilder *)clearExtensionRange; - (BOOL) hasOptions; - (PBMessageOptions*) options; -- (PBDescriptorProto_Builder*) setOptions:(PBMessageOptions*) value; -- (PBDescriptorProto_Builder*) setOptionsBuilder:(PBMessageOptions_Builder*) builderForValue; -- (PBDescriptorProto_Builder*) mergeOptions:(PBMessageOptions*) value; -- (PBDescriptorProto_Builder*) clearOptions; +- (PBDescriptorProtoBuilder*) setOptions:(PBMessageOptions*) value; +- (PBDescriptorProtoBuilder*) setOptionsBuilder:(PBMessageOptionsBuilder*) builderForValue; +- (PBDescriptorProtoBuilder*) mergeOptions:(PBMessageOptions*) value; +- (PBDescriptorProtoBuilder*) clearOptions; @end @interface PBFieldDescriptorProto : PBGeneratedMessage { @@ -440,8 +473,8 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); NSString* extendee; NSString* defaultValue; PBFieldOptions* options; - PBFieldDescriptorProto_Label label; - PBFieldDescriptorProto_Type type; + PBFieldDescriptorProtoLabel label; + PBFieldDescriptorProtoType type; } - (BOOL) hasName; - (BOOL) hasNumber; @@ -451,23 +484,24 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasExtendee; - (BOOL) hasDefaultValue; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; +@property (readonly, strong) NSString* name; @property (readonly) long number; -@property (readonly) PBFieldDescriptorProto_Label label; -@property (readonly) PBFieldDescriptorProto_Type type; -@property (readonly, retain) NSString* typeName; -@property (readonly, retain) NSString* extendee; -@property (readonly, retain) NSString* defaultValue; -@property (readonly, retain) PBFieldOptions* options; +@property (readonly) PBFieldDescriptorProtoLabel label; +@property (readonly) PBFieldDescriptorProtoType type; +@property (readonly, strong) NSString* typeName; +@property (readonly, strong) NSString* extendee; +@property (readonly, strong) NSString* defaultValue; +@property (readonly, strong) PBFieldOptions* options; + (PBFieldDescriptorProto*) defaultInstance; - (PBFieldDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBFieldDescriptorProto_Builder*) builder; -+ (PBFieldDescriptorProto_Builder*) builder; -+ (PBFieldDescriptorProto_Builder*) builderWithPrototype:(PBFieldDescriptorProto*) prototype; +- (PBFieldDescriptorProtoBuilder*) builder; ++ (PBFieldDescriptorProtoBuilder*) builder; ++ (PBFieldDescriptorProtoBuilder*) builderWithPrototype:(PBFieldDescriptorProto*) prototype; +- (PBFieldDescriptorProtoBuilder*) toBuilder; + (PBFieldDescriptorProto*) parseFromData:(NSData*) data; + (PBFieldDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -477,64 +511,64 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBFieldDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBFieldDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBFieldDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBFieldDescriptorProto* result; } - (PBFieldDescriptorProto*) defaultInstance; -- (PBFieldDescriptorProto_Builder*) clear; -- (PBFieldDescriptorProto_Builder*) clone; +- (PBFieldDescriptorProtoBuilder*) clear; +- (PBFieldDescriptorProtoBuilder*) clone; - (PBFieldDescriptorProto*) build; - (PBFieldDescriptorProto*) buildPartial; -- (PBFieldDescriptorProto_Builder*) mergeFrom:(PBFieldDescriptorProto*) other; -- (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBFieldDescriptorProtoBuilder*) mergeFrom:(PBFieldDescriptorProto*) other; +- (PBFieldDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBFieldDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBFieldDescriptorProto_Builder*) setName:(NSString*) value; -- (PBFieldDescriptorProto_Builder*) clearName; +- (PBFieldDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBFieldDescriptorProtoBuilder*) clearName; - (BOOL) hasNumber; - (long) number; -- (PBFieldDescriptorProto_Builder*) setNumber:(long) value; -- (PBFieldDescriptorProto_Builder*) clearNumber; +- (PBFieldDescriptorProtoBuilder*) setNumber:(long) value; +- (PBFieldDescriptorProtoBuilder*) clearNumber; - (BOOL) hasLabel; -- (PBFieldDescriptorProto_Label) label; -- (PBFieldDescriptorProto_Builder*) setLabel:(PBFieldDescriptorProto_Label) value; -- (PBFieldDescriptorProto_Builder*) clearLabel; +- (PBFieldDescriptorProtoLabel) label; +- (PBFieldDescriptorProtoBuilder*) setLabel:(PBFieldDescriptorProtoLabel) value; +- (PBFieldDescriptorProtoBuilder*) clearLabel; - (BOOL) hasType; -- (PBFieldDescriptorProto_Type) type; -- (PBFieldDescriptorProto_Builder*) setType:(PBFieldDescriptorProto_Type) value; -- (PBFieldDescriptorProto_Builder*) clearType; +- (PBFieldDescriptorProtoType) type; +- (PBFieldDescriptorProtoBuilder*) setType:(PBFieldDescriptorProtoType) value; +- (PBFieldDescriptorProtoBuilder*) clearType; - (BOOL) hasTypeName; - (NSString*) typeName; -- (PBFieldDescriptorProto_Builder*) setTypeName:(NSString*) value; -- (PBFieldDescriptorProto_Builder*) clearTypeName; +- (PBFieldDescriptorProtoBuilder*) setTypeName:(NSString*) value; +- (PBFieldDescriptorProtoBuilder*) clearTypeName; - (BOOL) hasExtendee; - (NSString*) extendee; -- (PBFieldDescriptorProto_Builder*) setExtendee:(NSString*) value; -- (PBFieldDescriptorProto_Builder*) clearExtendee; +- (PBFieldDescriptorProtoBuilder*) setExtendee:(NSString*) value; +- (PBFieldDescriptorProtoBuilder*) clearExtendee; - (BOOL) hasDefaultValue; - (NSString*) defaultValue; -- (PBFieldDescriptorProto_Builder*) setDefaultValue:(NSString*) value; -- (PBFieldDescriptorProto_Builder*) clearDefaultValue; +- (PBFieldDescriptorProtoBuilder*) setDefaultValue:(NSString*) value; +- (PBFieldDescriptorProtoBuilder*) clearDefaultValue; - (BOOL) hasOptions; - (PBFieldOptions*) options; -- (PBFieldDescriptorProto_Builder*) setOptions:(PBFieldOptions*) value; -- (PBFieldDescriptorProto_Builder*) setOptionsBuilder:(PBFieldOptions_Builder*) builderForValue; -- (PBFieldDescriptorProto_Builder*) mergeOptions:(PBFieldOptions*) value; -- (PBFieldDescriptorProto_Builder*) clearOptions; +- (PBFieldDescriptorProtoBuilder*) setOptions:(PBFieldOptions*) value; +- (PBFieldDescriptorProtoBuilder*) setOptionsBuilder:(PBFieldOptionsBuilder*) builderForValue; +- (PBFieldDescriptorProtoBuilder*) mergeOptions:(PBFieldOptions*) value; +- (PBFieldDescriptorProtoBuilder*) clearOptions; @end @interface PBEnumDescriptorProto : PBGeneratedMessage { @@ -543,23 +577,24 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasOptions_:1; NSString* name; PBEnumOptions* options; - NSMutableArray* mutableValueList; + PBAppendableArray * valueArray; } - (BOOL) hasName; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; -@property (readonly, retain) PBEnumOptions* options; -- (NSArray*) valueList; -- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index; +@property (readonly, strong) NSString* name; +@property (readonly, strong) PBArray * value; +@property (readonly, strong) PBEnumOptions* options; +- (PBEnumValueDescriptorProto*)valueAtIndex:(NSUInteger)index; + (PBEnumDescriptorProto*) defaultInstance; - (PBEnumDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBEnumDescriptorProto_Builder*) builder; -+ (PBEnumDescriptorProto_Builder*) builder; -+ (PBEnumDescriptorProto_Builder*) builderWithPrototype:(PBEnumDescriptorProto*) prototype; +- (PBEnumDescriptorProtoBuilder*) builder; ++ (PBEnumDescriptorProtoBuilder*) builder; ++ (PBEnumDescriptorProtoBuilder*) builderWithPrototype:(PBEnumDescriptorProto*) prototype; +- (PBEnumDescriptorProtoBuilder*) toBuilder; + (PBEnumDescriptorProto*) parseFromData:(NSData*) data; + (PBEnumDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -569,41 +604,41 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBEnumDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBEnumDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBEnumDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBEnumDescriptorProto* result; } - (PBEnumDescriptorProto*) defaultInstance; -- (PBEnumDescriptorProto_Builder*) clear; -- (PBEnumDescriptorProto_Builder*) clone; +- (PBEnumDescriptorProtoBuilder*) clear; +- (PBEnumDescriptorProtoBuilder*) clone; - (PBEnumDescriptorProto*) build; - (PBEnumDescriptorProto*) buildPartial; -- (PBEnumDescriptorProto_Builder*) mergeFrom:(PBEnumDescriptorProto*) other; -- (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBEnumDescriptorProtoBuilder*) mergeFrom:(PBEnumDescriptorProto*) other; +- (PBEnumDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBEnumDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBEnumDescriptorProto_Builder*) setName:(NSString*) value; -- (PBEnumDescriptorProto_Builder*) clearName; +- (PBEnumDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBEnumDescriptorProtoBuilder*) clearName; -- (NSArray*) valueList; -- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index; -- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(long) index with:(PBEnumValueDescriptorProto*) value; -- (PBEnumDescriptorProto_Builder*) addValue:(PBEnumValueDescriptorProto*) value; -- (PBEnumDescriptorProto_Builder*) addAllValue:(NSArray*) values; -- (PBEnumDescriptorProto_Builder*) clearValueList; +- (PBAppendableArray *)value; +- (PBEnumValueDescriptorProto*)valueAtIndex:(NSUInteger)index; +- (PBEnumDescriptorProtoBuilder *)addValue:(PBEnumValueDescriptorProto*)value; +- (PBEnumDescriptorProtoBuilder *)setValueArray:(NSArray *)array; +- (PBEnumDescriptorProtoBuilder *)setValueValues:(const PBEnumValueDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBEnumDescriptorProtoBuilder *)clearValue; - (BOOL) hasOptions; - (PBEnumOptions*) options; -- (PBEnumDescriptorProto_Builder*) setOptions:(PBEnumOptions*) value; -- (PBEnumDescriptorProto_Builder*) setOptionsBuilder:(PBEnumOptions_Builder*) builderForValue; -- (PBEnumDescriptorProto_Builder*) mergeOptions:(PBEnumOptions*) value; -- (PBEnumDescriptorProto_Builder*) clearOptions; +- (PBEnumDescriptorProtoBuilder*) setOptions:(PBEnumOptions*) value; +- (PBEnumDescriptorProtoBuilder*) setOptionsBuilder:(PBEnumOptionsBuilder*) builderForValue; +- (PBEnumDescriptorProtoBuilder*) mergeOptions:(PBEnumOptions*) value; +- (PBEnumDescriptorProtoBuilder*) clearOptions; @end @interface PBEnumValueDescriptorProto : PBGeneratedMessage { @@ -618,18 +653,19 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasName; - (BOOL) hasNumber; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; +@property (readonly, strong) NSString* name; @property (readonly) long number; -@property (readonly, retain) PBEnumValueOptions* options; +@property (readonly, strong) PBEnumValueOptions* options; + (PBEnumValueDescriptorProto*) defaultInstance; - (PBEnumValueDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBEnumValueDescriptorProto_Builder*) builder; -+ (PBEnumValueDescriptorProto_Builder*) builder; -+ (PBEnumValueDescriptorProto_Builder*) builderWithPrototype:(PBEnumValueDescriptorProto*) prototype; +- (PBEnumValueDescriptorProtoBuilder*) builder; ++ (PBEnumValueDescriptorProtoBuilder*) builder; ++ (PBEnumValueDescriptorProtoBuilder*) builderWithPrototype:(PBEnumValueDescriptorProto*) prototype; +- (PBEnumValueDescriptorProtoBuilder*) toBuilder; + (PBEnumValueDescriptorProto*) parseFromData:(NSData*) data; + (PBEnumValueDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -639,39 +675,39 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBEnumValueDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBEnumValueDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBEnumValueDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBEnumValueDescriptorProto* result; } - (PBEnumValueDescriptorProto*) defaultInstance; -- (PBEnumValueDescriptorProto_Builder*) clear; -- (PBEnumValueDescriptorProto_Builder*) clone; +- (PBEnumValueDescriptorProtoBuilder*) clear; +- (PBEnumValueDescriptorProtoBuilder*) clone; - (PBEnumValueDescriptorProto*) build; - (PBEnumValueDescriptorProto*) buildPartial; -- (PBEnumValueDescriptorProto_Builder*) mergeFrom:(PBEnumValueDescriptorProto*) other; -- (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBEnumValueDescriptorProtoBuilder*) mergeFrom:(PBEnumValueDescriptorProto*) other; +- (PBEnumValueDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBEnumValueDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBEnumValueDescriptorProto_Builder*) setName:(NSString*) value; -- (PBEnumValueDescriptorProto_Builder*) clearName; +- (PBEnumValueDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBEnumValueDescriptorProtoBuilder*) clearName; - (BOOL) hasNumber; - (long) number; -- (PBEnumValueDescriptorProto_Builder*) setNumber:(long) value; -- (PBEnumValueDescriptorProto_Builder*) clearNumber; +- (PBEnumValueDescriptorProtoBuilder*) setNumber:(long) value; +- (PBEnumValueDescriptorProtoBuilder*) clearNumber; - (BOOL) hasOptions; - (PBEnumValueOptions*) options; -- (PBEnumValueDescriptorProto_Builder*) setOptions:(PBEnumValueOptions*) value; -- (PBEnumValueDescriptorProto_Builder*) setOptionsBuilder:(PBEnumValueOptions_Builder*) builderForValue; -- (PBEnumValueDescriptorProto_Builder*) mergeOptions:(PBEnumValueOptions*) value; -- (PBEnumValueDescriptorProto_Builder*) clearOptions; +- (PBEnumValueDescriptorProtoBuilder*) setOptions:(PBEnumValueOptions*) value; +- (PBEnumValueDescriptorProtoBuilder*) setOptionsBuilder:(PBEnumValueOptionsBuilder*) builderForValue; +- (PBEnumValueDescriptorProtoBuilder*) mergeOptions:(PBEnumValueOptions*) value; +- (PBEnumValueDescriptorProtoBuilder*) clearOptions; @end @interface PBServiceDescriptorProto : PBGeneratedMessage { @@ -680,23 +716,24 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasOptions_:1; NSString* name; PBServiceOptions* options; - NSMutableArray* mutableMethodList; + PBAppendableArray * methodArray; } - (BOOL) hasName; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; -@property (readonly, retain) PBServiceOptions* options; -- (NSArray*) methodList; -- (PBMethodDescriptorProto*) methodAtIndex:(long) index; +@property (readonly, strong) NSString* name; +@property (readonly, strong) PBArray * method; +@property (readonly, strong) PBServiceOptions* options; +- (PBMethodDescriptorProto*)methodAtIndex:(NSUInteger)index; + (PBServiceDescriptorProto*) defaultInstance; - (PBServiceDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBServiceDescriptorProto_Builder*) builder; -+ (PBServiceDescriptorProto_Builder*) builder; -+ (PBServiceDescriptorProto_Builder*) builderWithPrototype:(PBServiceDescriptorProto*) prototype; +- (PBServiceDescriptorProtoBuilder*) builder; ++ (PBServiceDescriptorProtoBuilder*) builder; ++ (PBServiceDescriptorProtoBuilder*) builderWithPrototype:(PBServiceDescriptorProto*) prototype; +- (PBServiceDescriptorProtoBuilder*) toBuilder; + (PBServiceDescriptorProto*) parseFromData:(NSData*) data; + (PBServiceDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -706,41 +743,41 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBServiceDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBServiceDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBServiceDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBServiceDescriptorProto* result; } - (PBServiceDescriptorProto*) defaultInstance; -- (PBServiceDescriptorProto_Builder*) clear; -- (PBServiceDescriptorProto_Builder*) clone; +- (PBServiceDescriptorProtoBuilder*) clear; +- (PBServiceDescriptorProtoBuilder*) clone; - (PBServiceDescriptorProto*) build; - (PBServiceDescriptorProto*) buildPartial; -- (PBServiceDescriptorProto_Builder*) mergeFrom:(PBServiceDescriptorProto*) other; -- (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBServiceDescriptorProtoBuilder*) mergeFrom:(PBServiceDescriptorProto*) other; +- (PBServiceDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBServiceDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBServiceDescriptorProto_Builder*) setName:(NSString*) value; -- (PBServiceDescriptorProto_Builder*) clearName; +- (PBServiceDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBServiceDescriptorProtoBuilder*) clearName; -- (NSArray*) methodList; -- (PBMethodDescriptorProto*) methodAtIndex:(long) index; -- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(long) index with:(PBMethodDescriptorProto*) value; -- (PBServiceDescriptorProto_Builder*) addMethod:(PBMethodDescriptorProto*) value; -- (PBServiceDescriptorProto_Builder*) addAllMethod:(NSArray*) values; -- (PBServiceDescriptorProto_Builder*) clearMethodList; +- (PBAppendableArray *)method; +- (PBMethodDescriptorProto*)methodAtIndex:(NSUInteger)index; +- (PBServiceDescriptorProtoBuilder *)addMethod:(PBMethodDescriptorProto*)value; +- (PBServiceDescriptorProtoBuilder *)setMethodArray:(NSArray *)array; +- (PBServiceDescriptorProtoBuilder *)setMethodValues:(const PBMethodDescriptorProto* __strong *)values count:(NSUInteger)count; +- (PBServiceDescriptorProtoBuilder *)clearMethod; - (BOOL) hasOptions; - (PBServiceOptions*) options; -- (PBServiceDescriptorProto_Builder*) setOptions:(PBServiceOptions*) value; -- (PBServiceDescriptorProto_Builder*) setOptionsBuilder:(PBServiceOptions_Builder*) builderForValue; -- (PBServiceDescriptorProto_Builder*) mergeOptions:(PBServiceOptions*) value; -- (PBServiceDescriptorProto_Builder*) clearOptions; +- (PBServiceDescriptorProtoBuilder*) setOptions:(PBServiceOptions*) value; +- (PBServiceDescriptorProtoBuilder*) setOptionsBuilder:(PBServiceOptionsBuilder*) builderForValue; +- (PBServiceDescriptorProtoBuilder*) mergeOptions:(PBServiceOptions*) value; +- (PBServiceDescriptorProtoBuilder*) clearOptions; @end @interface PBMethodDescriptorProto : PBGeneratedMessage { @@ -758,19 +795,20 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); - (BOOL) hasInputType; - (BOOL) hasOutputType; - (BOOL) hasOptions; -@property (readonly, retain) NSString* name; -@property (readonly, retain) NSString* inputType; -@property (readonly, retain) NSString* outputType; -@property (readonly, retain) PBMethodOptions* options; +@property (readonly, strong) NSString* name; +@property (readonly, strong) NSString* inputType; +@property (readonly, strong) NSString* outputType; +@property (readonly, strong) PBMethodOptions* options; + (PBMethodDescriptorProto*) defaultInstance; - (PBMethodDescriptorProto*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBMethodDescriptorProto_Builder*) builder; -+ (PBMethodDescriptorProto_Builder*) builder; -+ (PBMethodDescriptorProto_Builder*) builderWithPrototype:(PBMethodDescriptorProto*) prototype; +- (PBMethodDescriptorProtoBuilder*) builder; ++ (PBMethodDescriptorProtoBuilder*) builder; ++ (PBMethodDescriptorProtoBuilder*) builderWithPrototype:(PBMethodDescriptorProto*) prototype; +- (PBMethodDescriptorProtoBuilder*) toBuilder; + (PBMethodDescriptorProto*) parseFromData:(NSData*) data; + (PBMethodDescriptorProto*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -780,77 +818,94 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBMethodDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBMethodDescriptorProto_Builder : PBGeneratedMessage_Builder { +@interface PBMethodDescriptorProtoBuilder : PBGeneratedMessage_Builder { @private PBMethodDescriptorProto* result; } - (PBMethodDescriptorProto*) defaultInstance; -- (PBMethodDescriptorProto_Builder*) clear; -- (PBMethodDescriptorProto_Builder*) clone; +- (PBMethodDescriptorProtoBuilder*) clear; +- (PBMethodDescriptorProtoBuilder*) clone; - (PBMethodDescriptorProto*) build; - (PBMethodDescriptorProto*) buildPartial; -- (PBMethodDescriptorProto_Builder*) mergeFrom:(PBMethodDescriptorProto*) other; -- (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBMethodDescriptorProtoBuilder*) mergeFrom:(PBMethodDescriptorProto*) other; +- (PBMethodDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBMethodDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; - (NSString*) name; -- (PBMethodDescriptorProto_Builder*) setName:(NSString*) value; -- (PBMethodDescriptorProto_Builder*) clearName; +- (PBMethodDescriptorProtoBuilder*) setName:(NSString*) value; +- (PBMethodDescriptorProtoBuilder*) clearName; - (BOOL) hasInputType; - (NSString*) inputType; -- (PBMethodDescriptorProto_Builder*) setInputType:(NSString*) value; -- (PBMethodDescriptorProto_Builder*) clearInputType; +- (PBMethodDescriptorProtoBuilder*) setInputType:(NSString*) value; +- (PBMethodDescriptorProtoBuilder*) clearInputType; - (BOOL) hasOutputType; - (NSString*) outputType; -- (PBMethodDescriptorProto_Builder*) setOutputType:(NSString*) value; -- (PBMethodDescriptorProto_Builder*) clearOutputType; +- (PBMethodDescriptorProtoBuilder*) setOutputType:(NSString*) value; +- (PBMethodDescriptorProtoBuilder*) clearOutputType; - (BOOL) hasOptions; - (PBMethodOptions*) options; -- (PBMethodDescriptorProto_Builder*) setOptions:(PBMethodOptions*) value; -- (PBMethodDescriptorProto_Builder*) setOptionsBuilder:(PBMethodOptions_Builder*) builderForValue; -- (PBMethodDescriptorProto_Builder*) mergeOptions:(PBMethodOptions*) value; -- (PBMethodDescriptorProto_Builder*) clearOptions; +- (PBMethodDescriptorProtoBuilder*) setOptions:(PBMethodOptions*) value; +- (PBMethodDescriptorProtoBuilder*) setOptionsBuilder:(PBMethodOptionsBuilder*) builderForValue; +- (PBMethodDescriptorProtoBuilder*) mergeOptions:(PBMethodOptions*) value; +- (PBMethodDescriptorProtoBuilder*) clearOptions; @end @interface PBFileOptions : PBExtendableMessage { @private BOOL hasJavaMultipleFiles_:1; + BOOL hasJavaGenerateEqualsAndHash_:1; + BOOL hasCcGenericServices_:1; + BOOL hasJavaGenericServices_:1; + BOOL hasPyGenericServices_:1; BOOL hasJavaPackage_:1; BOOL hasJavaOuterClassname_:1; BOOL hasOptimizeFor_:1; BOOL javaMultipleFiles_:1; + BOOL javaGenerateEqualsAndHash_:1; + BOOL ccGenericServices_:1; + BOOL javaGenericServices_:1; + BOOL pyGenericServices_:1; NSString* javaPackage; NSString* javaOuterClassname; - PBFileOptions_OptimizeMode optimizeFor; - NSMutableArray* mutableUninterpretedOptionList; + PBFileOptionsOptimizeMode optimizeFor; + PBAppendableArray * uninterpretedOptionArray; } - (BOOL) hasJavaPackage; - (BOOL) hasJavaOuterClassname; - (BOOL) hasJavaMultipleFiles; +- (BOOL) hasJavaGenerateEqualsAndHash; - (BOOL) hasOptimizeFor; -@property (readonly, retain) NSString* javaPackage; -@property (readonly, retain) NSString* javaOuterClassname; +- (BOOL) hasCcGenericServices; +- (BOOL) hasJavaGenericServices; +- (BOOL) hasPyGenericServices; +@property (readonly, strong) NSString* javaPackage; +@property (readonly, strong) NSString* javaOuterClassname; - (BOOL) javaMultipleFiles; -@property (readonly) PBFileOptions_OptimizeMode optimizeFor; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +- (BOOL) javaGenerateEqualsAndHash; +@property (readonly) PBFileOptionsOptimizeMode optimizeFor; +- (BOOL) ccGenericServices; +- (BOOL) javaGenericServices; +- (BOOL) pyGenericServices; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBFileOptions*) defaultInstance; - (PBFileOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBFileOptions_Builder*) builder; -+ (PBFileOptions_Builder*) builder; -+ (PBFileOptions_Builder*) builderWithPrototype:(PBFileOptions*) prototype; +- (PBFileOptionsBuilder*) builder; ++ (PBFileOptionsBuilder*) builder; ++ (PBFileOptionsBuilder*) builderWithPrototype:(PBFileOptions*) prototype; +- (PBFileOptionsBuilder*) toBuilder; + (PBFileOptions*) parseFromData:(NSData*) data; + (PBFileOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -860,49 +915,69 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBFileOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBFileOptions_Builder : PBExtendableMessage_Builder { +@interface PBFileOptionsBuilder : PBExtendableMessage_Builder { @private PBFileOptions* result; } - (PBFileOptions*) defaultInstance; -- (PBFileOptions_Builder*) clear; -- (PBFileOptions_Builder*) clone; +- (PBFileOptionsBuilder*) clear; +- (PBFileOptionsBuilder*) clone; - (PBFileOptions*) build; - (PBFileOptions*) buildPartial; -- (PBFileOptions_Builder*) mergeFrom:(PBFileOptions*) other; -- (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBFileOptionsBuilder*) mergeFrom:(PBFileOptions*) other; +- (PBFileOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBFileOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasJavaPackage; - (NSString*) javaPackage; -- (PBFileOptions_Builder*) setJavaPackage:(NSString*) value; -- (PBFileOptions_Builder*) clearJavaPackage; +- (PBFileOptionsBuilder*) setJavaPackage:(NSString*) value; +- (PBFileOptionsBuilder*) clearJavaPackage; - (BOOL) hasJavaOuterClassname; - (NSString*) javaOuterClassname; -- (PBFileOptions_Builder*) setJavaOuterClassname:(NSString*) value; -- (PBFileOptions_Builder*) clearJavaOuterClassname; +- (PBFileOptionsBuilder*) setJavaOuterClassname:(NSString*) value; +- (PBFileOptionsBuilder*) clearJavaOuterClassname; - (BOOL) hasJavaMultipleFiles; - (BOOL) javaMultipleFiles; -- (PBFileOptions_Builder*) setJavaMultipleFiles:(BOOL) value; -- (PBFileOptions_Builder*) clearJavaMultipleFiles; +- (PBFileOptionsBuilder*) setJavaMultipleFiles:(BOOL) value; +- (PBFileOptionsBuilder*) clearJavaMultipleFiles; + +- (BOOL) hasJavaGenerateEqualsAndHash; +- (BOOL) javaGenerateEqualsAndHash; +- (PBFileOptionsBuilder*) setJavaGenerateEqualsAndHash:(BOOL) value; +- (PBFileOptionsBuilder*) clearJavaGenerateEqualsAndHash; - (BOOL) hasOptimizeFor; -- (PBFileOptions_OptimizeMode) optimizeFor; -- (PBFileOptions_Builder*) setOptimizeFor:(PBFileOptions_OptimizeMode) value; -- (PBFileOptions_Builder*) clearOptimizeFor; - -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBFileOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBFileOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBFileOptions_Builder*) clearUninterpretedOptionList; +- (PBFileOptionsOptimizeMode) optimizeFor; +- (PBFileOptionsBuilder*) setOptimizeFor:(PBFileOptionsOptimizeMode) value; +- (PBFileOptionsBuilder*) clearOptimizeFor; + +- (BOOL) hasCcGenericServices; +- (BOOL) ccGenericServices; +- (PBFileOptionsBuilder*) setCcGenericServices:(BOOL) value; +- (PBFileOptionsBuilder*) clearCcGenericServices; + +- (BOOL) hasJavaGenericServices; +- (BOOL) javaGenericServices; +- (PBFileOptionsBuilder*) setJavaGenericServices:(BOOL) value; +- (PBFileOptionsBuilder*) clearJavaGenericServices; + +- (BOOL) hasPyGenericServices; +- (BOOL) pyGenericServices; +- (PBFileOptionsBuilder*) setPyGenericServices:(BOOL) value; +- (PBFileOptionsBuilder*) clearPyGenericServices; + +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBFileOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBFileOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBFileOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBFileOptionsBuilder *)clearUninterpretedOption; @end @interface PBMessageOptions : PBExtendableMessage { @@ -911,23 +986,24 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasNoStandardDescriptorAccessor_:1; BOOL messageSetWireFormat_:1; BOOL noStandardDescriptorAccessor_:1; - NSMutableArray* mutableUninterpretedOptionList; + PBAppendableArray * uninterpretedOptionArray; } - (BOOL) hasMessageSetWireFormat; - (BOOL) hasNoStandardDescriptorAccessor; - (BOOL) messageSetWireFormat; - (BOOL) noStandardDescriptorAccessor; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBMessageOptions*) defaultInstance; - (PBMessageOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBMessageOptions_Builder*) builder; -+ (PBMessageOptions_Builder*) builder; -+ (PBMessageOptions_Builder*) builderWithPrototype:(PBMessageOptions*) prototype; +- (PBMessageOptionsBuilder*) builder; ++ (PBMessageOptionsBuilder*) builder; ++ (PBMessageOptionsBuilder*) builderWithPrototype:(PBMessageOptions*) prototype; +- (PBMessageOptionsBuilder*) toBuilder; + (PBMessageOptions*) parseFromData:(NSData*) data; + (PBMessageOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -937,39 +1013,39 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBMessageOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBMessageOptions_Builder : PBExtendableMessage_Builder { +@interface PBMessageOptionsBuilder : PBExtendableMessage_Builder { @private PBMessageOptions* result; } - (PBMessageOptions*) defaultInstance; -- (PBMessageOptions_Builder*) clear; -- (PBMessageOptions_Builder*) clone; +- (PBMessageOptionsBuilder*) clear; +- (PBMessageOptionsBuilder*) clone; - (PBMessageOptions*) build; - (PBMessageOptions*) buildPartial; -- (PBMessageOptions_Builder*) mergeFrom:(PBMessageOptions*) other; -- (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBMessageOptionsBuilder*) mergeFrom:(PBMessageOptions*) other; +- (PBMessageOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBMessageOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasMessageSetWireFormat; - (BOOL) messageSetWireFormat; -- (PBMessageOptions_Builder*) setMessageSetWireFormat:(BOOL) value; -- (PBMessageOptions_Builder*) clearMessageSetWireFormat; +- (PBMessageOptionsBuilder*) setMessageSetWireFormat:(BOOL) value; +- (PBMessageOptionsBuilder*) clearMessageSetWireFormat; - (BOOL) hasNoStandardDescriptorAccessor; - (BOOL) noStandardDescriptorAccessor; -- (PBMessageOptions_Builder*) setNoStandardDescriptorAccessor:(BOOL) value; -- (PBMessageOptions_Builder*) clearNoStandardDescriptorAccessor; - -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBMessageOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBMessageOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBMessageOptions_Builder*) clearUninterpretedOptionList; +- (PBMessageOptionsBuilder*) setNoStandardDescriptorAccessor:(BOOL) value; +- (PBMessageOptionsBuilder*) clearNoStandardDescriptorAccessor; + +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBMessageOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBMessageOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBMessageOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBMessageOptionsBuilder *)clearUninterpretedOption; @end @interface PBFieldOptions : PBExtendableMessage { @@ -981,28 +1057,29 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL packed_:1; BOOL deprecated_:1; NSString* experimentalMapKey; - PBFieldOptions_CType ctype; - NSMutableArray* mutableUninterpretedOptionList; + PBFieldOptionsCType ctype; + PBAppendableArray * uninterpretedOptionArray; } - (BOOL) hasCtype; - (BOOL) hasPacked; - (BOOL) hasDeprecated; - (BOOL) hasExperimentalMapKey; -@property (readonly) PBFieldOptions_CType ctype; +@property (readonly) PBFieldOptionsCType ctype; - (BOOL) packed; - (BOOL) deprecated; -@property (readonly, retain) NSString* experimentalMapKey; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +@property (readonly, strong) NSString* experimentalMapKey; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBFieldOptions*) defaultInstance; - (PBFieldOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBFieldOptions_Builder*) builder; -+ (PBFieldOptions_Builder*) builder; -+ (PBFieldOptions_Builder*) builderWithPrototype:(PBFieldOptions*) prototype; +- (PBFieldOptionsBuilder*) builder; ++ (PBFieldOptionsBuilder*) builder; ++ (PBFieldOptionsBuilder*) builderWithPrototype:(PBFieldOptions*) prototype; +- (PBFieldOptionsBuilder*) toBuilder; + (PBFieldOptions*) parseFromData:(NSData*) data; + (PBFieldOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -1012,66 +1089,67 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBFieldOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBFieldOptions_Builder : PBExtendableMessage_Builder { +@interface PBFieldOptionsBuilder : PBExtendableMessage_Builder { @private PBFieldOptions* result; } - (PBFieldOptions*) defaultInstance; -- (PBFieldOptions_Builder*) clear; -- (PBFieldOptions_Builder*) clone; +- (PBFieldOptionsBuilder*) clear; +- (PBFieldOptionsBuilder*) clone; - (PBFieldOptions*) build; - (PBFieldOptions*) buildPartial; -- (PBFieldOptions_Builder*) mergeFrom:(PBFieldOptions*) other; -- (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBFieldOptionsBuilder*) mergeFrom:(PBFieldOptions*) other; +- (PBFieldOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBFieldOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasCtype; -- (PBFieldOptions_CType) ctype; -- (PBFieldOptions_Builder*) setCtype:(PBFieldOptions_CType) value; -- (PBFieldOptions_Builder*) clearCtype; +- (PBFieldOptionsCType) ctype; +- (PBFieldOptionsBuilder*) setCtype:(PBFieldOptionsCType) value; +- (PBFieldOptionsBuilder*) clearCtype; - (BOOL) hasPacked; - (BOOL) packed; -- (PBFieldOptions_Builder*) setPacked:(BOOL) value; -- (PBFieldOptions_Builder*) clearPacked; +- (PBFieldOptionsBuilder*) setPacked:(BOOL) value; +- (PBFieldOptionsBuilder*) clearPacked; - (BOOL) hasDeprecated; - (BOOL) deprecated; -- (PBFieldOptions_Builder*) setDeprecated:(BOOL) value; -- (PBFieldOptions_Builder*) clearDeprecated; +- (PBFieldOptionsBuilder*) setDeprecated:(BOOL) value; +- (PBFieldOptionsBuilder*) clearDeprecated; - (BOOL) hasExperimentalMapKey; - (NSString*) experimentalMapKey; -- (PBFieldOptions_Builder*) setExperimentalMapKey:(NSString*) value; -- (PBFieldOptions_Builder*) clearExperimentalMapKey; - -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBFieldOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBFieldOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBFieldOptions_Builder*) clearUninterpretedOptionList; +- (PBFieldOptionsBuilder*) setExperimentalMapKey:(NSString*) value; +- (PBFieldOptionsBuilder*) clearExperimentalMapKey; + +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBFieldOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBFieldOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBFieldOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBFieldOptionsBuilder *)clearUninterpretedOption; @end @interface PBEnumOptions : PBExtendableMessage { @private - NSMutableArray* mutableUninterpretedOptionList; + PBAppendableArray * uninterpretedOptionArray; } -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBEnumOptions*) defaultInstance; - (PBEnumOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBEnumOptions_Builder*) builder; -+ (PBEnumOptions_Builder*) builder; -+ (PBEnumOptions_Builder*) builderWithPrototype:(PBEnumOptions*) prototype; +- (PBEnumOptionsBuilder*) builder; ++ (PBEnumOptionsBuilder*) builder; ++ (PBEnumOptionsBuilder*) builderWithPrototype:(PBEnumOptions*) prototype; +- (PBEnumOptionsBuilder*) toBuilder; + (PBEnumOptions*) parseFromData:(NSData*) data; + (PBEnumOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -1081,46 +1159,47 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBEnumOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBEnumOptions_Builder : PBExtendableMessage_Builder { +@interface PBEnumOptionsBuilder : PBExtendableMessage_Builder { @private PBEnumOptions* result; } - (PBEnumOptions*) defaultInstance; -- (PBEnumOptions_Builder*) clear; -- (PBEnumOptions_Builder*) clone; +- (PBEnumOptionsBuilder*) clear; +- (PBEnumOptionsBuilder*) clone; - (PBEnumOptions*) build; - (PBEnumOptions*) buildPartial; -- (PBEnumOptions_Builder*) mergeFrom:(PBEnumOptions*) other; -- (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBEnumOptionsBuilder*) mergeFrom:(PBEnumOptions*) other; +- (PBEnumOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBEnumOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBEnumOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBEnumOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBEnumOptions_Builder*) clearUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBEnumOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBEnumOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBEnumOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBEnumOptionsBuilder *)clearUninterpretedOption; @end @interface PBEnumValueOptions : PBExtendableMessage { @private - NSMutableArray* mutableUninterpretedOptionList; + PBAppendableArray * uninterpretedOptionArray; } -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBEnumValueOptions*) defaultInstance; - (PBEnumValueOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBEnumValueOptions_Builder*) builder; -+ (PBEnumValueOptions_Builder*) builder; -+ (PBEnumValueOptions_Builder*) builderWithPrototype:(PBEnumValueOptions*) prototype; +- (PBEnumValueOptionsBuilder*) builder; ++ (PBEnumValueOptionsBuilder*) builder; ++ (PBEnumValueOptionsBuilder*) builderWithPrototype:(PBEnumValueOptions*) prototype; +- (PBEnumValueOptionsBuilder*) toBuilder; + (PBEnumValueOptions*) parseFromData:(NSData*) data; + (PBEnumValueOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -1130,46 +1209,47 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBEnumValueOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBEnumValueOptions_Builder : PBExtendableMessage_Builder { +@interface PBEnumValueOptionsBuilder : PBExtendableMessage_Builder { @private PBEnumValueOptions* result; } - (PBEnumValueOptions*) defaultInstance; -- (PBEnumValueOptions_Builder*) clear; -- (PBEnumValueOptions_Builder*) clone; +- (PBEnumValueOptionsBuilder*) clear; +- (PBEnumValueOptionsBuilder*) clone; - (PBEnumValueOptions*) build; - (PBEnumValueOptions*) buildPartial; -- (PBEnumValueOptions_Builder*) mergeFrom:(PBEnumValueOptions*) other; -- (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBEnumValueOptionsBuilder*) mergeFrom:(PBEnumValueOptions*) other; +- (PBEnumValueOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBEnumValueOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBEnumValueOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBEnumValueOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBEnumValueOptions_Builder*) clearUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBEnumValueOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBEnumValueOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBEnumValueOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBEnumValueOptionsBuilder *)clearUninterpretedOption; @end @interface PBServiceOptions : PBExtendableMessage { @private - NSMutableArray* mutableUninterpretedOptionList; + PBAppendableArray * uninterpretedOptionArray; } -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBServiceOptions*) defaultInstance; - (PBServiceOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBServiceOptions_Builder*) builder; -+ (PBServiceOptions_Builder*) builder; -+ (PBServiceOptions_Builder*) builderWithPrototype:(PBServiceOptions*) prototype; +- (PBServiceOptionsBuilder*) builder; ++ (PBServiceOptionsBuilder*) builder; ++ (PBServiceOptionsBuilder*) builderWithPrototype:(PBServiceOptions*) prototype; +- (PBServiceOptionsBuilder*) toBuilder; + (PBServiceOptions*) parseFromData:(NSData*) data; + (PBServiceOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -1179,46 +1259,47 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBServiceOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBServiceOptions_Builder : PBExtendableMessage_Builder { +@interface PBServiceOptionsBuilder : PBExtendableMessage_Builder { @private PBServiceOptions* result; } - (PBServiceOptions*) defaultInstance; -- (PBServiceOptions_Builder*) clear; -- (PBServiceOptions_Builder*) clone; +- (PBServiceOptionsBuilder*) clear; +- (PBServiceOptionsBuilder*) clone; - (PBServiceOptions*) build; - (PBServiceOptions*) buildPartial; -- (PBServiceOptions_Builder*) mergeFrom:(PBServiceOptions*) other; -- (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBServiceOptionsBuilder*) mergeFrom:(PBServiceOptions*) other; +- (PBServiceOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBServiceOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBServiceOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBServiceOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBServiceOptions_Builder*) clearUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBServiceOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBServiceOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBServiceOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBServiceOptionsBuilder *)clearUninterpretedOption; @end @interface PBMethodOptions : PBExtendableMessage { @private - NSMutableArray* mutableUninterpretedOptionList; + PBAppendableArray * uninterpretedOptionArray; } -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; +@property (readonly, strong) PBArray * uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; + (PBMethodOptions*) defaultInstance; - (PBMethodOptions*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBMethodOptions_Builder*) builder; -+ (PBMethodOptions_Builder*) builder; -+ (PBMethodOptions_Builder*) builderWithPrototype:(PBMethodOptions*) prototype; +- (PBMethodOptionsBuilder*) builder; ++ (PBMethodOptionsBuilder*) builder; ++ (PBMethodOptionsBuilder*) builderWithPrototype:(PBMethodOptions*) prototype; +- (PBMethodOptionsBuilder*) toBuilder; + (PBMethodOptions*) parseFromData:(NSData*) data; + (PBMethodOptions*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -1228,29 +1309,29 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBMethodOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBMethodOptions_Builder : PBExtendableMessage_Builder { +@interface PBMethodOptionsBuilder : PBExtendableMessage_Builder { @private PBMethodOptions* result; } - (PBMethodOptions*) defaultInstance; -- (PBMethodOptions_Builder*) clear; -- (PBMethodOptions_Builder*) clone; +- (PBMethodOptionsBuilder*) clear; +- (PBMethodOptionsBuilder*) clone; - (PBMethodOptions*) build; - (PBMethodOptions*) buildPartial; -- (PBMethodOptions_Builder*) mergeFrom:(PBMethodOptions*) other; -- (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBMethodOptionsBuilder*) mergeFrom:(PBMethodOptions*) other; +- (PBMethodOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBMethodOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -- (NSArray*) uninterpretedOptionList; -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index; -- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value; -- (PBMethodOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value; -- (PBMethodOptions_Builder*) addAllUninterpretedOption:(NSArray*) values; -- (PBMethodOptions_Builder*) clearUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index; +- (PBMethodOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value; +- (PBMethodOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array; +- (PBMethodOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count; +- (PBMethodOptionsBuilder *)clearUninterpretedOption; @end @interface PBUninterpretedOption : PBGeneratedMessage { @@ -1259,35 +1340,40 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); BOOL hasNegativeIntValue_:1; BOOL hasPositiveIntValue_:1; BOOL hasIdentifierValue_:1; + BOOL hasAggregateValue_:1; BOOL hasStringValue_:1; Float64 doubleValue; long long negativeIntValue; - long long positiveIntValue; + unsigned long long positiveIntValue; NSString* identifierValue; + NSString* aggregateValue; NSData* stringValue; - NSMutableArray* mutableNameList; + PBAppendableArray * nameArray; } - (BOOL) hasIdentifierValue; - (BOOL) hasPositiveIntValue; - (BOOL) hasNegativeIntValue; - (BOOL) hasDoubleValue; - (BOOL) hasStringValue; -@property (readonly, retain) NSString* identifierValue; -@property (readonly) long long positiveIntValue; +- (BOOL) hasAggregateValue; +@property (readonly, strong) PBArray * name; +@property (readonly, strong) NSString* identifierValue; +@property (readonly) unsigned long long positiveIntValue; @property (readonly) long long negativeIntValue; @property (readonly) Float64 doubleValue; -@property (readonly, retain) NSData* stringValue; -- (NSArray*) nameList; -- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index; +@property (readonly, strong) NSData* stringValue; +@property (readonly, strong) NSString* aggregateValue; +- (PBUninterpretedOptionNamePart*)nameAtIndex:(NSUInteger)index; + (PBUninterpretedOption*) defaultInstance; - (PBUninterpretedOption*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBUninterpretedOption_Builder*) builder; -+ (PBUninterpretedOption_Builder*) builder; -+ (PBUninterpretedOption_Builder*) builderWithPrototype:(PBUninterpretedOption*) prototype; +- (PBUninterpretedOptionBuilder*) builder; ++ (PBUninterpretedOptionBuilder*) builder; ++ (PBUninterpretedOptionBuilder*) builderWithPrototype:(PBUninterpretedOption*) prototype; +- (PBUninterpretedOptionBuilder*) toBuilder; + (PBUninterpretedOption*) parseFromData:(NSData*) data; + (PBUninterpretedOption*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @@ -1297,7 +1383,7 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); + (PBUninterpretedOption*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBUninterpretedOption_NamePart : PBGeneratedMessage { +@interface PBUninterpretedOptionNamePart : PBGeneratedMessage { @private BOOL hasIsExtension_:1; BOOL hasNamePart_:1; @@ -1306,101 +1392,221 @@ BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value); } - (BOOL) hasNamePart; - (BOOL) hasIsExtension; -@property (readonly, retain) NSString* namePart; +@property (readonly, strong) NSString* namePart; - (BOOL) isExtension; -+ (PBUninterpretedOption_NamePart*) defaultInstance; -- (PBUninterpretedOption_NamePart*) defaultInstance; ++ (PBUninterpretedOptionNamePart*) defaultInstance; +- (PBUninterpretedOptionNamePart*) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (PBUninterpretedOption_NamePart_Builder*) builder; -+ (PBUninterpretedOption_NamePart_Builder*) builder; -+ (PBUninterpretedOption_NamePart_Builder*) builderWithPrototype:(PBUninterpretedOption_NamePart*) prototype; - -+ (PBUninterpretedOption_NamePart*) parseFromData:(NSData*) data; -+ (PBUninterpretedOption_NamePart*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (PBUninterpretedOption_NamePart*) parseFromInputStream:(NSInputStream*) input; -+ (PBUninterpretedOption_NamePart*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (PBUninterpretedOption_NamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (PBUninterpretedOption_NamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBUninterpretedOptionNamePartBuilder*) builder; ++ (PBUninterpretedOptionNamePartBuilder*) builder; ++ (PBUninterpretedOptionNamePartBuilder*) builderWithPrototype:(PBUninterpretedOptionNamePart*) prototype; +- (PBUninterpretedOptionNamePartBuilder*) toBuilder; + ++ (PBUninterpretedOptionNamePart*) parseFromData:(NSData*) data; ++ (PBUninterpretedOptionNamePart*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBUninterpretedOptionNamePart*) parseFromInputStream:(NSInputStream*) input; ++ (PBUninterpretedOptionNamePart*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBUninterpretedOptionNamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (PBUninterpretedOptionNamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface PBUninterpretedOption_NamePart_Builder : PBGeneratedMessage_Builder { +@interface PBUninterpretedOptionNamePartBuilder : PBGeneratedMessage_Builder { @private - PBUninterpretedOption_NamePart* result; + PBUninterpretedOptionNamePart* result; } -- (PBUninterpretedOption_NamePart*) defaultInstance; +- (PBUninterpretedOptionNamePart*) defaultInstance; -- (PBUninterpretedOption_NamePart_Builder*) clear; -- (PBUninterpretedOption_NamePart_Builder*) clone; +- (PBUninterpretedOptionNamePartBuilder*) clear; +- (PBUninterpretedOptionNamePartBuilder*) clone; -- (PBUninterpretedOption_NamePart*) build; -- (PBUninterpretedOption_NamePart*) buildPartial; +- (PBUninterpretedOptionNamePart*) build; +- (PBUninterpretedOptionNamePart*) buildPartial; -- (PBUninterpretedOption_NamePart_Builder*) mergeFrom:(PBUninterpretedOption_NamePart*) other; -- (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBUninterpretedOptionNamePartBuilder*) mergeFrom:(PBUninterpretedOptionNamePart*) other; +- (PBUninterpretedOptionNamePartBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBUninterpretedOptionNamePartBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasNamePart; - (NSString*) namePart; -- (PBUninterpretedOption_NamePart_Builder*) setNamePart:(NSString*) value; -- (PBUninterpretedOption_NamePart_Builder*) clearNamePart; +- (PBUninterpretedOptionNamePartBuilder*) setNamePart:(NSString*) value; +- (PBUninterpretedOptionNamePartBuilder*) clearNamePart; - (BOOL) hasIsExtension; - (BOOL) isExtension; -- (PBUninterpretedOption_NamePart_Builder*) setIsExtension:(BOOL) value; -- (PBUninterpretedOption_NamePart_Builder*) clearIsExtension; +- (PBUninterpretedOptionNamePartBuilder*) setIsExtension:(BOOL) value; +- (PBUninterpretedOptionNamePartBuilder*) clearIsExtension; @end -@interface PBUninterpretedOption_Builder : PBGeneratedMessage_Builder { +@interface PBUninterpretedOptionBuilder : PBGeneratedMessage_Builder { @private PBUninterpretedOption* result; } - (PBUninterpretedOption*) defaultInstance; -- (PBUninterpretedOption_Builder*) clear; -- (PBUninterpretedOption_Builder*) clone; +- (PBUninterpretedOptionBuilder*) clear; +- (PBUninterpretedOptionBuilder*) clone; - (PBUninterpretedOption*) build; - (PBUninterpretedOption*) buildPartial; -- (PBUninterpretedOption_Builder*) mergeFrom:(PBUninterpretedOption*) other; -- (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (PBUninterpretedOptionBuilder*) mergeFrom:(PBUninterpretedOption*) other; +- (PBUninterpretedOptionBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBUninterpretedOptionBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -- (NSArray*) nameList; -- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index; -- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(long) index with:(PBUninterpretedOption_NamePart*) value; -- (PBUninterpretedOption_Builder*) addName:(PBUninterpretedOption_NamePart*) value; -- (PBUninterpretedOption_Builder*) addAllName:(NSArray*) values; -- (PBUninterpretedOption_Builder*) clearNameList; +- (PBAppendableArray *)name; +- (PBUninterpretedOptionNamePart*)nameAtIndex:(NSUInteger)index; +- (PBUninterpretedOptionBuilder *)addName:(PBUninterpretedOptionNamePart*)value; +- (PBUninterpretedOptionBuilder *)setNameArray:(NSArray *)array; +- (PBUninterpretedOptionBuilder *)setNameValues:(const PBUninterpretedOptionNamePart* __strong *)values count:(NSUInteger)count; +- (PBUninterpretedOptionBuilder *)clearName; - (BOOL) hasIdentifierValue; - (NSString*) identifierValue; -- (PBUninterpretedOption_Builder*) setIdentifierValue:(NSString*) value; -- (PBUninterpretedOption_Builder*) clearIdentifierValue; +- (PBUninterpretedOptionBuilder*) setIdentifierValue:(NSString*) value; +- (PBUninterpretedOptionBuilder*) clearIdentifierValue; - (BOOL) hasPositiveIntValue; -- (long long) positiveIntValue; -- (PBUninterpretedOption_Builder*) setPositiveIntValue:(long long) value; -- (PBUninterpretedOption_Builder*) clearPositiveIntValue; +- (unsigned long long) positiveIntValue; +- (PBUninterpretedOptionBuilder*) setPositiveIntValue:(unsigned long long) value; +- (PBUninterpretedOptionBuilder*) clearPositiveIntValue; - (BOOL) hasNegativeIntValue; - (long long) negativeIntValue; -- (PBUninterpretedOption_Builder*) setNegativeIntValue:(long long) value; -- (PBUninterpretedOption_Builder*) clearNegativeIntValue; +- (PBUninterpretedOptionBuilder*) setNegativeIntValue:(long long) value; +- (PBUninterpretedOptionBuilder*) clearNegativeIntValue; - (BOOL) hasDoubleValue; - (Float64) doubleValue; -- (PBUninterpretedOption_Builder*) setDoubleValue:(Float64) value; -- (PBUninterpretedOption_Builder*) clearDoubleValue; +- (PBUninterpretedOptionBuilder*) setDoubleValue:(Float64) value; +- (PBUninterpretedOptionBuilder*) clearDoubleValue; - (BOOL) hasStringValue; - (NSData*) stringValue; -- (PBUninterpretedOption_Builder*) setStringValue:(NSData*) value; -- (PBUninterpretedOption_Builder*) clearStringValue; +- (PBUninterpretedOptionBuilder*) setStringValue:(NSData*) value; +- (PBUninterpretedOptionBuilder*) clearStringValue; + +- (BOOL) hasAggregateValue; +- (NSString*) aggregateValue; +- (PBUninterpretedOptionBuilder*) setAggregateValue:(NSString*) value; +- (PBUninterpretedOptionBuilder*) clearAggregateValue; +@end + +@interface PBSourceCodeInfo : PBGeneratedMessage { +@private + PBAppendableArray * locationArray; +} +@property (readonly, strong) PBArray * location; +- (PBSourceCodeInfoLocation*)locationAtIndex:(NSUInteger)index; + ++ (PBSourceCodeInfo*) defaultInstance; +- (PBSourceCodeInfo*) defaultInstance; + +- (BOOL) isInitialized; +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; +- (PBSourceCodeInfoBuilder*) builder; ++ (PBSourceCodeInfoBuilder*) builder; ++ (PBSourceCodeInfoBuilder*) builderWithPrototype:(PBSourceCodeInfo*) prototype; +- (PBSourceCodeInfoBuilder*) toBuilder; + ++ (PBSourceCodeInfo*) parseFromData:(NSData*) data; ++ (PBSourceCodeInfo*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBSourceCodeInfo*) parseFromInputStream:(NSInputStream*) input; ++ (PBSourceCodeInfo*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBSourceCodeInfo*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (PBSourceCodeInfo*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +@end + +@interface PBSourceCodeInfoLocation : PBGeneratedMessage { +@private + PBAppendableArray * pathArray; + NSInteger pathMemoizedSerializedSize; + PBAppendableArray * spanArray; + NSInteger spanMemoizedSerializedSize; +} +@property (readonly, strong) PBArray * path; +@property (readonly, strong) PBArray * span; +- (long)pathAtIndex:(NSUInteger)index; +- (long)spanAtIndex:(NSUInteger)index; + ++ (PBSourceCodeInfoLocation*) defaultInstance; +- (PBSourceCodeInfoLocation*) defaultInstance; + +- (BOOL) isInitialized; +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; +- (PBSourceCodeInfoLocationBuilder*) builder; ++ (PBSourceCodeInfoLocationBuilder*) builder; ++ (PBSourceCodeInfoLocationBuilder*) builderWithPrototype:(PBSourceCodeInfoLocation*) prototype; +- (PBSourceCodeInfoLocationBuilder*) toBuilder; + ++ (PBSourceCodeInfoLocation*) parseFromData:(NSData*) data; ++ (PBSourceCodeInfoLocation*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBSourceCodeInfoLocation*) parseFromInputStream:(NSInputStream*) input; ++ (PBSourceCodeInfoLocation*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (PBSourceCodeInfoLocation*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (PBSourceCodeInfoLocation*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end +@interface PBSourceCodeInfoLocationBuilder : PBGeneratedMessage_Builder { +@private + PBSourceCodeInfoLocation* result; +} + +- (PBSourceCodeInfoLocation*) defaultInstance; + +- (PBSourceCodeInfoLocationBuilder*) clear; +- (PBSourceCodeInfoLocationBuilder*) clone; + +- (PBSourceCodeInfoLocation*) build; +- (PBSourceCodeInfoLocation*) buildPartial; + +- (PBSourceCodeInfoLocationBuilder*) mergeFrom:(PBSourceCodeInfoLocation*) other; +- (PBSourceCodeInfoLocationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBSourceCodeInfoLocationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; + +- (PBAppendableArray *)path; +- (long)pathAtIndex:(NSUInteger)index; +- (PBSourceCodeInfoLocationBuilder *)addPath:(long)value; +- (PBSourceCodeInfoLocationBuilder *)setPathArray:(NSArray *)array; +- (PBSourceCodeInfoLocationBuilder *)setPathValues:(const long *)values count:(NSUInteger)count; +- (PBSourceCodeInfoLocationBuilder *)clearPath; + +- (PBAppendableArray *)span; +- (long)spanAtIndex:(NSUInteger)index; +- (PBSourceCodeInfoLocationBuilder *)addSpan:(long)value; +- (PBSourceCodeInfoLocationBuilder *)setSpanArray:(NSArray *)array; +- (PBSourceCodeInfoLocationBuilder *)setSpanValues:(const long *)values count:(NSUInteger)count; +- (PBSourceCodeInfoLocationBuilder *)clearSpan; +@end + +@interface PBSourceCodeInfoBuilder : PBGeneratedMessage_Builder { +@private + PBSourceCodeInfo* result; +} + +- (PBSourceCodeInfo*) defaultInstance; + +- (PBSourceCodeInfoBuilder*) clear; +- (PBSourceCodeInfoBuilder*) clone; + +- (PBSourceCodeInfo*) build; +- (PBSourceCodeInfo*) buildPartial; + +- (PBSourceCodeInfoBuilder*) mergeFrom:(PBSourceCodeInfo*) other; +- (PBSourceCodeInfoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (PBSourceCodeInfoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; + +- (PBAppendableArray *)location; +- (PBSourceCodeInfoLocation*)locationAtIndex:(NSUInteger)index; +- (PBSourceCodeInfoBuilder *)addLocation:(PBSourceCodeInfoLocation*)value; +- (PBSourceCodeInfoBuilder *)setLocationArray:(NSArray *)array; +- (PBSourceCodeInfoBuilder *)setLocationValues:(const PBSourceCodeInfoLocation* __strong *)values count:(NSUInteger)count; +- (PBSourceCodeInfoBuilder *)clearLocation; +@end + + +// @@protoc_insertion_point(global_scope) diff --git a/src/runtime/Classes/Descriptor.pb.m b/src/runtime/Classes/Descriptor.pb.m index 1faf3d2..b85fe34 100644 --- a/src/runtime/Classes/Descriptor.pb.m +++ b/src/runtime/Classes/Descriptor.pb.m @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! #import "Descriptor.pb.h" +// @@protoc_insertion_point(imports) @implementation PBDescriptorRoot static PBExtensionRegistry* extensionRegistry = nil; @@ -12,7 +13,7 @@ + (void) initialize { if (self == [PBDescriptorRoot class]) { PBMutableExtensionRegistry* registry = [PBMutableExtensionRegistry registry]; [self registerAllExtensions:registry]; - extensionRegistry = [registry retain]; + extensionRegistry = registry; } } + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry { @@ -20,15 +21,15 @@ + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry { @end @interface PBFileDescriptorSet () -@property (retain) NSMutableArray* mutableFileList; +@property (strong) PBAppendableArray * fileArray; @end @implementation PBFileDescriptorSet -@synthesize mutableFileList; +@synthesize fileArray; +@dynamic file; - (void) dealloc { - self.mutableFileList = nil; - [super dealloc]; + self.fileArray = nil; } - (id) init { if ((self = [super init])) { @@ -47,15 +48,14 @@ + (PBFileDescriptorSet*) defaultInstance { - (PBFileDescriptorSet*) defaultInstance { return defaultPBFileDescriptorSetInstance; } -- (NSArray*) fileList { - return mutableFileList; +- (PBArray *)file { + return fileArray; } -- (PBFileDescriptorProto*) fileAtIndex:(long) index { - id value = [mutableFileList objectAtIndex:index]; - return value; +- (PBFileDescriptorProto*)fileAtIndex:(NSUInteger)index { + return [fileArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBFileDescriptorProto* element in self.fileList) { + for (PBFileDescriptorProto* element in self.file) { if (!element.isInitialized) { return NO; } @@ -63,24 +63,24 @@ - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - for (PBFileDescriptorProto* element in self.fileList) { + for (PBFileDescriptorProto *element in self.fileArray) { [output writeMessage:1 value:element]; } [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; - for (PBFileDescriptorProto* element in self.fileList) { - size += computeMessageSize(1, element); + size_ = 0; + for (PBFileDescriptorProto *element in self.fileArray) { + size_ += computeMessageSize(1, element); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBFileDescriptorSet*) parseFromData:(NSData*) data { return (PBFileDescriptorSet*)[[[PBFileDescriptorSet builder] mergeFromData:data] build]; @@ -100,41 +100,72 @@ + (PBFileDescriptorSet*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBFileDescriptorSet*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBFileDescriptorSet*)[[[PBFileDescriptorSet builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBFileDescriptorSet_Builder*) builder { - return [[[PBFileDescriptorSet_Builder alloc] init] autorelease]; ++ (PBFileDescriptorSetBuilder*) builder { + return [[PBFileDescriptorSetBuilder alloc] init]; } -+ (PBFileDescriptorSet_Builder*) builderWithPrototype:(PBFileDescriptorSet*) prototype { ++ (PBFileDescriptorSetBuilder*) builderWithPrototype:(PBFileDescriptorSet*) prototype { return [[PBFileDescriptorSet builder] mergeFrom:prototype]; } -- (PBFileDescriptorSet_Builder*) builder { +- (PBFileDescriptorSetBuilder*) builder { return [PBFileDescriptorSet builder]; } +- (PBFileDescriptorSetBuilder*) toBuilder { + return [PBFileDescriptorSet builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBFileDescriptorProto* element in self.fileArray) { + [output appendFormat:@"%@%@ {\n", indent, @"file"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBFileDescriptorSet class]]) { + return NO; + } + PBFileDescriptorSet *otherMessage = other; + return + [self.fileArray isEqualToArray:otherMessage.fileArray] && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBFileDescriptorProto* element in self.fileArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBFileDescriptorSet_Builder() -@property (retain) PBFileDescriptorSet* result; +@interface PBFileDescriptorSetBuilder() +@property (strong) PBFileDescriptorSet* result; @end -@implementation PBFileDescriptorSet_Builder +@implementation PBFileDescriptorSetBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBFileDescriptorSet alloc] init] autorelease]; + self.result = [[PBFileDescriptorSet alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBFileDescriptorSet_Builder*) clear { - self.result = [[[PBFileDescriptorSet alloc] init] autorelease]; +- (PBFileDescriptorSetBuilder*) clear { + self.result = [[PBFileDescriptorSet alloc] init]; return self; } -- (PBFileDescriptorSet_Builder*) clone { +- (PBFileDescriptorSetBuilder*) clone { return [PBFileDescriptorSet builderWithPrototype:result]; } - (PBFileDescriptorSet*) defaultInstance { @@ -145,30 +176,31 @@ - (PBFileDescriptorSet*) build { return [self buildPartial]; } - (PBFileDescriptorSet*) buildPartial { - PBFileDescriptorSet* returnMe = [[result retain] autorelease]; + PBFileDescriptorSet* returnMe = result; self.result = nil; return returnMe; } -- (PBFileDescriptorSet_Builder*) mergeFrom:(PBFileDescriptorSet*) other { +- (PBFileDescriptorSetBuilder*) mergeFrom:(PBFileDescriptorSet*) other { if (other == [PBFileDescriptorSet defaultInstance]) { return self; } - if (other.mutableFileList.count > 0) { - if (result.mutableFileList == nil) { - result.mutableFileList = [NSMutableArray array]; + if (other.fileArray.count > 0) { + if (result.fileArray == nil) { + result.fileArray = [other.fileArray copy]; + } else { + [result.fileArray appendArray:other.fileArray]; } - [result.mutableFileList addObjectsFromArray:other.mutableFileList]; } [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBFileDescriptorSetBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBFileDescriptorSetBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -181,7 +213,7 @@ - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 10: { - PBFileDescriptorProto_Builder* subBuilder = [PBFileDescriptorProto builder]; + PBFileDescriptorProtoBuilder* subBuilder = [PBFileDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addFile:[subBuilder buildPartial]]; break; @@ -189,46 +221,43 @@ - (PBFileDescriptorSet_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) } } } -- (NSArray*) fileList { - if (result.mutableFileList == nil) { return [NSArray array]; } - return result.mutableFileList; +- (PBAppendableArray *)file { + return result.fileArray; } -- (PBFileDescriptorProto*) fileAtIndex:(long) index { +- (PBFileDescriptorProto*)fileAtIndex:(NSUInteger)index { return [result fileAtIndex:index]; } -- (PBFileDescriptorSet_Builder*) replaceFileAtIndex:(long) index with:(PBFileDescriptorProto*) value { - [result.mutableFileList replaceObjectAtIndex:index withObject:value]; +- (PBFileDescriptorSetBuilder *)addFile:(PBFileDescriptorProto*)value { + if (result.fileArray == nil) { + result.fileArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.fileArray addObject:value]; return self; } -- (PBFileDescriptorSet_Builder*) addAllFile:(NSArray*) values { - if (result.mutableFileList == nil) { - result.mutableFileList = [NSMutableArray array]; - } - [result.mutableFileList addObjectsFromArray:values]; +- (PBFileDescriptorSetBuilder *)setFileArray:(NSArray *)array { + result.fileArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorSet_Builder*) clearFileList { - result.mutableFileList = nil; +- (PBFileDescriptorSetBuilder *)setFileValues:(const PBFileDescriptorProto* __strong *)values count:(NSUInteger)count { + result.fileArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorSet_Builder*) addFile:(PBFileDescriptorProto*) value { - if (result.mutableFileList == nil) { - result.mutableFileList = [NSMutableArray array]; - } - [result.mutableFileList addObject:value]; +- (PBFileDescriptorSetBuilder *)clearFile { + result.fileArray = nil; return self; } @end @interface PBFileDescriptorProto () -@property (retain) NSString* name; -@property (retain) NSString* package; -@property (retain) NSMutableArray* mutableDependencyList; -@property (retain) NSMutableArray* mutableMessageTypeList; -@property (retain) NSMutableArray* mutableEnumTypeList; -@property (retain) NSMutableArray* mutableServiceList; -@property (retain) NSMutableArray* mutableExtensionList; -@property (retain) PBFileOptions* options; +@property (strong) NSString* name; +@property (strong) NSString* package; +@property (strong) PBAppendableArray * dependencyArray; +@property (strong) PBAppendableArray * messageTypeArray; +@property (strong) PBAppendableArray * enumTypeArray; +@property (strong) PBAppendableArray * serviceArray; +@property (strong) PBAppendableArray * extensionArray; +@property (strong) PBFileOptions* options; +@property (strong) PBSourceCodeInfo* sourceCodeInfo; @end @implementation PBFileDescriptorProto @@ -236,45 +265,58 @@ @implementation PBFileDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; - (BOOL) hasPackage { return !!hasPackage_; } -- (void) setHasPackage:(BOOL) value { - hasPackage_ = !!value; +- (void) setHasPackage:(BOOL) value_ { + hasPackage_ = !!value_; } @synthesize package; -@synthesize mutableDependencyList; -@synthesize mutableMessageTypeList; -@synthesize mutableEnumTypeList; -@synthesize mutableServiceList; -@synthesize mutableExtensionList; +@synthesize dependencyArray; +@dynamic dependency; +@synthesize messageTypeArray; +@dynamic messageType; +@synthesize enumTypeArray; +@dynamic enumType; +@synthesize serviceArray; +@dynamic service; +@synthesize extensionArray; +@dynamic extension; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; +- (BOOL) hasSourceCodeInfo { + return !!hasSourceCodeInfo_; +} +- (void) setHasSourceCodeInfo:(BOOL) value_ { + hasSourceCodeInfo_ = !!value_; +} +@synthesize sourceCodeInfo; - (void) dealloc { self.name = nil; self.package = nil; - self.mutableDependencyList = nil; - self.mutableMessageTypeList = nil; - self.mutableEnumTypeList = nil; - self.mutableServiceList = nil; - self.mutableExtensionList = nil; + self.dependencyArray = nil; + self.messageTypeArray = nil; + self.enumTypeArray = nil; + self.serviceArray = nil; + self.extensionArray = nil; self.options = nil; - [super dealloc]; + self.sourceCodeInfo = nil; } - (id) init { if ((self = [super init])) { self.name = @""; self.package = @""; self.options = [PBFileOptions defaultInstance]; + self.sourceCodeInfo = [PBSourceCodeInfo defaultInstance]; } return self; } @@ -290,58 +332,53 @@ + (PBFileDescriptorProto*) defaultInstance { - (PBFileDescriptorProto*) defaultInstance { return defaultPBFileDescriptorProtoInstance; } -- (NSArray*) dependencyList { - return mutableDependencyList; +- (PBArray *)dependency { + return dependencyArray; } -- (NSString*) dependencyAtIndex:(long) index { - id value = [mutableDependencyList objectAtIndex:index]; - return value; +- (NSString*)dependencyAtIndex:(NSUInteger)index { + return [dependencyArray objectAtIndex:index]; } -- (NSArray*) messageTypeList { - return mutableMessageTypeList; +- (PBArray *)messageType { + return messageTypeArray; } -- (PBDescriptorProto*) messageTypeAtIndex:(long) index { - id value = [mutableMessageTypeList objectAtIndex:index]; - return value; +- (PBDescriptorProto*)messageTypeAtIndex:(NSUInteger)index { + return [messageTypeArray objectAtIndex:index]; } -- (NSArray*) enumTypeList { - return mutableEnumTypeList; +- (PBArray *)enumType { + return enumTypeArray; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { - id value = [mutableEnumTypeList objectAtIndex:index]; - return value; +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index { + return [enumTypeArray objectAtIndex:index]; } -- (NSArray*) serviceList { - return mutableServiceList; +- (PBArray *)service { + return serviceArray; } -- (PBServiceDescriptorProto*) serviceAtIndex:(long) index { - id value = [mutableServiceList objectAtIndex:index]; - return value; +- (PBServiceDescriptorProto*)serviceAtIndex:(NSUInteger)index { + return [serviceArray objectAtIndex:index]; } -- (NSArray*) extensionList { - return mutableExtensionList; +- (PBArray *)extension { + return extensionArray; } -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { - id value = [mutableExtensionList objectAtIndex:index]; - return value; +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index { + return [extensionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBDescriptorProto* element in self.messageTypeList) { + for (PBDescriptorProto* element in self.messageType) { if (!element.isInitialized) { return NO; } } - for (PBEnumDescriptorProto* element in self.enumTypeList) { + for (PBEnumDescriptorProto* element in self.enumType) { if (!element.isInitialized) { return NO; } } - for (PBServiceDescriptorProto* element in self.serviceList) { + for (PBServiceDescriptorProto* element in self.service) { if (!element.isInitialized) { return NO; } } - for (PBFieldDescriptorProto* element in self.extensionList) { + for (PBFieldDescriptorProto* element in self.extension) { if (!element.isInitialized) { return NO; } @@ -360,65 +397,77 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasPackage) { [output writeString:2 value:self.package]; } - for (NSString* element in self.mutableDependencyList) { - [output writeString:3 value:element]; + const NSUInteger dependencyArrayCount = self.dependencyArray.count; + if (dependencyArrayCount > 0) { + const __strong NSString* *values = (const __strong NSString* *)self.dependencyArray.data; + for (NSUInteger i = 0; i < dependencyArrayCount; ++i) { + [output writeString:3 value:values[i]]; + } } - for (PBDescriptorProto* element in self.messageTypeList) { + for (PBDescriptorProto *element in self.messageTypeArray) { [output writeMessage:4 value:element]; } - for (PBEnumDescriptorProto* element in self.enumTypeList) { + for (PBEnumDescriptorProto *element in self.enumTypeArray) { [output writeMessage:5 value:element]; } - for (PBServiceDescriptorProto* element in self.serviceList) { + for (PBServiceDescriptorProto *element in self.serviceArray) { [output writeMessage:6 value:element]; } - for (PBFieldDescriptorProto* element in self.extensionList) { + for (PBFieldDescriptorProto *element in self.extensionArray) { [output writeMessage:7 value:element]; } if (self.hasOptions) { [output writeMessage:8 value:self.options]; } + if (self.hasSourceCodeInfo) { + [output writeMessage:9 value:self.sourceCodeInfo]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } if (self.hasPackage) { - size += computeStringSize(2, self.package); + size_ += computeStringSize(2, self.package); } { - long dataSize = 0; - for (NSString* element in self.mutableDependencyList) { - dataSize += computeStringSizeNoTag(element); + NSInteger dataSize = 0; + const NSUInteger count = self.dependencyArray.count; + const __strong NSString* *values = (const __strong NSString* *)self.dependencyArray.data; + for (NSUInteger i = 0; i < count; ++i) { + dataSize += computeStringSizeNoTag(values[i]); } - size += dataSize; - size += 1 * self.mutableDependencyList.count; + size_ += dataSize; + size_ += 1 * count; } - for (PBDescriptorProto* element in self.messageTypeList) { - size += computeMessageSize(4, element); + for (PBDescriptorProto *element in self.messageTypeArray) { + size_ += computeMessageSize(4, element); } - for (PBEnumDescriptorProto* element in self.enumTypeList) { - size += computeMessageSize(5, element); + for (PBEnumDescriptorProto *element in self.enumTypeArray) { + size_ += computeMessageSize(5, element); } - for (PBServiceDescriptorProto* element in self.serviceList) { - size += computeMessageSize(6, element); + for (PBServiceDescriptorProto *element in self.serviceArray) { + size_ += computeMessageSize(6, element); } - for (PBFieldDescriptorProto* element in self.extensionList) { - size += computeMessageSize(7, element); + for (PBFieldDescriptorProto *element in self.extensionArray) { + size_ += computeMessageSize(7, element); } if (self.hasOptions) { - size += computeMessageSize(8, self.options); + size_ += computeMessageSize(8, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + if (self.hasSourceCodeInfo) { + size_ += computeMessageSize(9, self.sourceCodeInfo); + } + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBFileDescriptorProto*) parseFromData:(NSData*) data { return (PBFileDescriptorProto*)[[[PBFileDescriptorProto builder] mergeFromData:data] build]; @@ -438,41 +487,147 @@ + (PBFileDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input + (PBFileDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBFileDescriptorProto*)[[[PBFileDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBFileDescriptorProto_Builder*) builder { - return [[[PBFileDescriptorProto_Builder alloc] init] autorelease]; ++ (PBFileDescriptorProtoBuilder*) builder { + return [[PBFileDescriptorProtoBuilder alloc] init]; } -+ (PBFileDescriptorProto_Builder*) builderWithPrototype:(PBFileDescriptorProto*) prototype { ++ (PBFileDescriptorProtoBuilder*) builderWithPrototype:(PBFileDescriptorProto*) prototype { return [[PBFileDescriptorProto builder] mergeFrom:prototype]; } -- (PBFileDescriptorProto_Builder*) builder { +- (PBFileDescriptorProtoBuilder*) builder { return [PBFileDescriptorProto builder]; } +- (PBFileDescriptorProtoBuilder*) toBuilder { + return [PBFileDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + if (self.hasPackage) { + [output appendFormat:@"%@%@: %@\n", indent, @"package", self.package]; + } + for (NSString* element in self.dependencyArray) { + [output appendFormat:@"%@%@: %@\n", indent, @"dependency", element]; + } + for (PBDescriptorProto* element in self.messageTypeArray) { + [output appendFormat:@"%@%@ {\n", indent, @"messageType"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBEnumDescriptorProto* element in self.enumTypeArray) { + [output appendFormat:@"%@%@ {\n", indent, @"enumType"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBServiceDescriptorProto* element in self.serviceArray) { + [output appendFormat:@"%@%@ {\n", indent, @"service"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBFieldDescriptorProto* element in self.extensionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"extension"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasSourceCodeInfo) { + [output appendFormat:@"%@%@ {\n", indent, @"sourceCodeInfo"]; + [self.sourceCodeInfo writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBFileDescriptorProto class]]) { + return NO; + } + PBFileDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + self.hasPackage == otherMessage.hasPackage && + (!self.hasPackage || [self.package isEqual:otherMessage.package]) && + [self.dependencyArray isEqualToArray:otherMessage.dependencyArray] && + [self.messageTypeArray isEqualToArray:otherMessage.messageTypeArray] && + [self.enumTypeArray isEqualToArray:otherMessage.enumTypeArray] && + [self.serviceArray isEqualToArray:otherMessage.serviceArray] && + [self.extensionArray isEqualToArray:otherMessage.extensionArray] && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + self.hasSourceCodeInfo == otherMessage.hasSourceCodeInfo && + (!self.hasSourceCodeInfo || [self.sourceCodeInfo isEqual:otherMessage.sourceCodeInfo]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + if (self.hasPackage) { + hashCode = hashCode * 31 + [self.package hash]; + } + for (NSString* element in self.dependencyArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBDescriptorProto* element in self.messageTypeArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBEnumDescriptorProto* element in self.enumTypeArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBServiceDescriptorProto* element in self.serviceArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBFieldDescriptorProto* element in self.extensionArray) { + hashCode = hashCode * 31 + [element hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + if (self.hasSourceCodeInfo) { + hashCode = hashCode * 31 + [self.sourceCodeInfo hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBFileDescriptorProto_Builder() -@property (retain) PBFileDescriptorProto* result; +@interface PBFileDescriptorProtoBuilder() +@property (strong) PBFileDescriptorProto* result; @end -@implementation PBFileDescriptorProto_Builder +@implementation PBFileDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBFileDescriptorProto alloc] init] autorelease]; + self.result = [[PBFileDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBFileDescriptorProto_Builder*) clear { - self.result = [[[PBFileDescriptorProto alloc] init] autorelease]; +- (PBFileDescriptorProtoBuilder*) clear { + self.result = [[PBFileDescriptorProto alloc] init]; return self; } -- (PBFileDescriptorProto_Builder*) clone { +- (PBFileDescriptorProtoBuilder*) clone { return [PBFileDescriptorProto builderWithPrototype:result]; } - (PBFileDescriptorProto*) defaultInstance { @@ -483,11 +638,11 @@ - (PBFileDescriptorProto*) build { return [self buildPartial]; } - (PBFileDescriptorProto*) buildPartial { - PBFileDescriptorProto* returnMe = [[result retain] autorelease]; + PBFileDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBFileDescriptorProto_Builder*) mergeFrom:(PBFileDescriptorProto*) other { +- (PBFileDescriptorProtoBuilder*) mergeFrom:(PBFileDescriptorProto*) other { if (other == [PBFileDescriptorProto defaultInstance]) { return self; } @@ -497,49 +652,57 @@ - (PBFileDescriptorProto_Builder*) mergeFrom:(PBFileDescriptorProto*) other { if (other.hasPackage) { [self setPackage:other.package]; } - if (other.mutableDependencyList.count > 0) { - if (result.mutableDependencyList == nil) { - result.mutableDependencyList = [NSMutableArray array]; + if (other.dependencyArray.count > 0) { + if (result.dependencyArray == nil) { + result.dependencyArray = [other.dependencyArray copy]; + } else { + [result.dependencyArray appendArray:other.dependencyArray]; } - [result.mutableDependencyList addObjectsFromArray:other.mutableDependencyList]; } - if (other.mutableMessageTypeList.count > 0) { - if (result.mutableMessageTypeList == nil) { - result.mutableMessageTypeList = [NSMutableArray array]; + if (other.messageTypeArray.count > 0) { + if (result.messageTypeArray == nil) { + result.messageTypeArray = [other.messageTypeArray copy]; + } else { + [result.messageTypeArray appendArray:other.messageTypeArray]; } - [result.mutableMessageTypeList addObjectsFromArray:other.mutableMessageTypeList]; } - if (other.mutableEnumTypeList.count > 0) { - if (result.mutableEnumTypeList == nil) { - result.mutableEnumTypeList = [NSMutableArray array]; + if (other.enumTypeArray.count > 0) { + if (result.enumTypeArray == nil) { + result.enumTypeArray = [other.enumTypeArray copy]; + } else { + [result.enumTypeArray appendArray:other.enumTypeArray]; } - [result.mutableEnumTypeList addObjectsFromArray:other.mutableEnumTypeList]; } - if (other.mutableServiceList.count > 0) { - if (result.mutableServiceList == nil) { - result.mutableServiceList = [NSMutableArray array]; + if (other.serviceArray.count > 0) { + if (result.serviceArray == nil) { + result.serviceArray = [other.serviceArray copy]; + } else { + [result.serviceArray appendArray:other.serviceArray]; } - [result.mutableServiceList addObjectsFromArray:other.mutableServiceList]; } - if (other.mutableExtensionList.count > 0) { - if (result.mutableExtensionList == nil) { - result.mutableExtensionList = [NSMutableArray array]; + if (other.extensionArray.count > 0) { + if (result.extensionArray == nil) { + result.extensionArray = [other.extensionArray copy]; + } else { + [result.extensionArray appendArray:other.extensionArray]; } - [result.mutableExtensionList addObjectsFromArray:other.mutableExtensionList]; } if (other.hasOptions) { [self mergeOptions:other.options]; } + if (other.hasSourceCodeInfo) { + [self mergeSourceCodeInfo:other.sourceCodeInfo]; + } [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBFileDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBFileDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -564,31 +727,31 @@ - (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 34: { - PBDescriptorProto_Builder* subBuilder = [PBDescriptorProto builder]; + PBDescriptorProtoBuilder* subBuilder = [PBDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addMessageType:[subBuilder buildPartial]]; break; } case 42: { - PBEnumDescriptorProto_Builder* subBuilder = [PBEnumDescriptorProto builder]; + PBEnumDescriptorProtoBuilder* subBuilder = [PBEnumDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addEnumType:[subBuilder buildPartial]]; break; } case 50: { - PBServiceDescriptorProto_Builder* subBuilder = [PBServiceDescriptorProto builder]; + PBServiceDescriptorProtoBuilder* subBuilder = [PBServiceDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addService:[subBuilder buildPartial]]; break; } case 58: { - PBFieldDescriptorProto_Builder* subBuilder = [PBFieldDescriptorProto builder]; + PBFieldDescriptorProtoBuilder* subBuilder = [PBFieldDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addExtension:[subBuilder buildPartial]]; break; } case 66: { - PBFileOptions_Builder* subBuilder = [PBFileOptions builder]; + PBFileOptionsBuilder* subBuilder = [PBFileOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -596,6 +759,15 @@ - (PBFileDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream [self setOptions:[subBuilder buildPartial]]; break; } + case 74: { + PBSourceCodeInfoBuilder* subBuilder = [PBSourceCodeInfo builder]; + if (self.hasSourceCodeInfo) { + [subBuilder mergeFrom:self.sourceCodeInfo]; + } + [input readMessage:subBuilder extensionRegistry:extensionRegistry]; + [self setSourceCodeInfo:[subBuilder buildPartial]]; + break; + } } } } @@ -605,12 +777,12 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBFileDescriptorProto_Builder*) setName:(NSString*) value { +- (PBFileDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBFileDescriptorProto_Builder*) clearName { +- (PBFileDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; @@ -621,161 +793,139 @@ - (BOOL) hasPackage { - (NSString*) package { return result.package; } -- (PBFileDescriptorProto_Builder*) setPackage:(NSString*) value { +- (PBFileDescriptorProtoBuilder*) setPackage:(NSString*) value { result.hasPackage = YES; result.package = value; return self; } -- (PBFileDescriptorProto_Builder*) clearPackage { +- (PBFileDescriptorProtoBuilder*) clearPackage { result.hasPackage = NO; result.package = @""; return self; } -- (NSArray*) dependencyList { - if (result.mutableDependencyList == nil) { - return [NSArray array]; - } - return result.mutableDependencyList; +- (PBAppendableArray *)dependency { + return result.dependencyArray; } -- (NSString*) dependencyAtIndex:(long) index { +- (NSString*)dependencyAtIndex:(NSUInteger)index { return [result dependencyAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceDependencyAtIndex:(long) index with:(NSString*) value { - [result.mutableDependencyList replaceObjectAtIndex:index withObject:value]; +- (PBFileDescriptorProtoBuilder *)addDependency:(NSString*)value { + if (result.dependencyArray == nil) { + result.dependencyArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.dependencyArray addObject:value]; return self; } -- (PBFileDescriptorProto_Builder*) addDependency:(NSString*) value { - if (result.mutableDependencyList == nil) { - result.mutableDependencyList = [NSMutableArray array]; - } - [result.mutableDependencyList addObject:value]; +- (PBFileDescriptorProtoBuilder *)setDependencyArray:(NSArray *)array { + result.dependencyArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) addAllDependency:(NSArray*) values { - if (result.mutableDependencyList == nil) { - result.mutableDependencyList = [NSMutableArray array]; - } - [result.mutableDependencyList addObjectsFromArray:values]; +- (PBFileDescriptorProtoBuilder *)setDependencyValues:(const NSString* *)values count:(NSUInteger)count { + result.dependencyArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) clearDependencyList { - result.mutableDependencyList = nil; +- (PBFileDescriptorProtoBuilder *)clearDependency { + result.dependencyArray = nil; return self; } -- (NSArray*) messageTypeList { - if (result.mutableMessageTypeList == nil) { return [NSArray array]; } - return result.mutableMessageTypeList; +- (PBAppendableArray *)messageType { + return result.messageTypeArray; } -- (PBDescriptorProto*) messageTypeAtIndex:(long) index { +- (PBDescriptorProto*)messageTypeAtIndex:(NSUInteger)index { return [result messageTypeAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceMessageTypeAtIndex:(long) index with:(PBDescriptorProto*) value { - [result.mutableMessageTypeList replaceObjectAtIndex:index withObject:value]; +- (PBFileDescriptorProtoBuilder *)addMessageType:(PBDescriptorProto*)value { + if (result.messageTypeArray == nil) { + result.messageTypeArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.messageTypeArray addObject:value]; return self; } -- (PBFileDescriptorProto_Builder*) addAllMessageType:(NSArray*) values { - if (result.mutableMessageTypeList == nil) { - result.mutableMessageTypeList = [NSMutableArray array]; - } - [result.mutableMessageTypeList addObjectsFromArray:values]; +- (PBFileDescriptorProtoBuilder *)setMessageTypeArray:(NSArray *)array { + result.messageTypeArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) clearMessageTypeList { - result.mutableMessageTypeList = nil; +- (PBFileDescriptorProtoBuilder *)setMessageTypeValues:(const PBDescriptorProto* __strong *)values count:(NSUInteger)count { + result.messageTypeArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) addMessageType:(PBDescriptorProto*) value { - if (result.mutableMessageTypeList == nil) { - result.mutableMessageTypeList = [NSMutableArray array]; - } - [result.mutableMessageTypeList addObject:value]; +- (PBFileDescriptorProtoBuilder *)clearMessageType { + result.messageTypeArray = nil; return self; } -- (NSArray*) enumTypeList { - if (result.mutableEnumTypeList == nil) { return [NSArray array]; } - return result.mutableEnumTypeList; +- (PBAppendableArray *)enumType { + return result.enumTypeArray; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index { return [result enumTypeAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value { - [result.mutableEnumTypeList replaceObjectAtIndex:index withObject:value]; +- (PBFileDescriptorProtoBuilder *)addEnumType:(PBEnumDescriptorProto*)value { + if (result.enumTypeArray == nil) { + result.enumTypeArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.enumTypeArray addObject:value]; return self; } -- (PBFileDescriptorProto_Builder*) addAllEnumType:(NSArray*) values { - if (result.mutableEnumTypeList == nil) { - result.mutableEnumTypeList = [NSMutableArray array]; - } - [result.mutableEnumTypeList addObjectsFromArray:values]; +- (PBFileDescriptorProtoBuilder *)setEnumTypeArray:(NSArray *)array { + result.enumTypeArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) clearEnumTypeList { - result.mutableEnumTypeList = nil; +- (PBFileDescriptorProtoBuilder *)setEnumTypeValues:(const PBEnumDescriptorProto* __strong *)values count:(NSUInteger)count { + result.enumTypeArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value { - if (result.mutableEnumTypeList == nil) { - result.mutableEnumTypeList = [NSMutableArray array]; - } - [result.mutableEnumTypeList addObject:value]; +- (PBFileDescriptorProtoBuilder *)clearEnumType { + result.enumTypeArray = nil; return self; } -- (NSArray*) serviceList { - if (result.mutableServiceList == nil) { return [NSArray array]; } - return result.mutableServiceList; +- (PBAppendableArray *)service { + return result.serviceArray; } -- (PBServiceDescriptorProto*) serviceAtIndex:(long) index { +- (PBServiceDescriptorProto*)serviceAtIndex:(NSUInteger)index { return [result serviceAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceServiceAtIndex:(long) index with:(PBServiceDescriptorProto*) value { - [result.mutableServiceList replaceObjectAtIndex:index withObject:value]; +- (PBFileDescriptorProtoBuilder *)addService:(PBServiceDescriptorProto*)value { + if (result.serviceArray == nil) { + result.serviceArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.serviceArray addObject:value]; return self; } -- (PBFileDescriptorProto_Builder*) addAllService:(NSArray*) values { - if (result.mutableServiceList == nil) { - result.mutableServiceList = [NSMutableArray array]; - } - [result.mutableServiceList addObjectsFromArray:values]; +- (PBFileDescriptorProtoBuilder *)setServiceArray:(NSArray *)array { + result.serviceArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) clearServiceList { - result.mutableServiceList = nil; +- (PBFileDescriptorProtoBuilder *)setServiceValues:(const PBServiceDescriptorProto* __strong *)values count:(NSUInteger)count { + result.serviceArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) addService:(PBServiceDescriptorProto*) value { - if (result.mutableServiceList == nil) { - result.mutableServiceList = [NSMutableArray array]; - } - [result.mutableServiceList addObject:value]; +- (PBFileDescriptorProtoBuilder *)clearService { + result.serviceArray = nil; return self; } -- (NSArray*) extensionList { - if (result.mutableExtensionList == nil) { return [NSArray array]; } - return result.mutableExtensionList; +- (PBAppendableArray *)extension { + return result.extensionArray; } -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index { return [result extensionAtIndex:index]; } -- (PBFileDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value { - [result.mutableExtensionList replaceObjectAtIndex:index withObject:value]; +- (PBFileDescriptorProtoBuilder *)addExtension:(PBFieldDescriptorProto*)value { + if (result.extensionArray == nil) { + result.extensionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.extensionArray addObject:value]; return self; } -- (PBFileDescriptorProto_Builder*) addAllExtension:(NSArray*) values { - if (result.mutableExtensionList == nil) { - result.mutableExtensionList = [NSMutableArray array]; - } - [result.mutableExtensionList addObjectsFromArray:values]; +- (PBFileDescriptorProtoBuilder *)setExtensionArray:(NSArray *)array { + result.extensionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) clearExtensionList { - result.mutableExtensionList = nil; +- (PBFileDescriptorProtoBuilder *)setExtensionValues:(const PBFieldDescriptorProto* __strong *)values count:(NSUInteger)count { + result.extensionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFileDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value { - if (result.mutableExtensionList == nil) { - result.mutableExtensionList = [NSMutableArray array]; - } - [result.mutableExtensionList addObject:value]; +- (PBFileDescriptorProtoBuilder *)clearExtension { + result.extensionArray = nil; return self; } - (BOOL) hasOptions { @@ -784,15 +934,15 @@ - (BOOL) hasOptions { - (PBFileOptions*) options { return result.options; } -- (PBFileDescriptorProto_Builder*) setOptions:(PBFileOptions*) value { +- (PBFileDescriptorProtoBuilder*) setOptions:(PBFileOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBFileDescriptorProto_Builder*) setOptionsBuilder:(PBFileOptions_Builder*) builderForValue { +- (PBFileDescriptorProtoBuilder*) setOptionsBuilder:(PBFileOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBFileDescriptorProto_Builder*) mergeOptions:(PBFileOptions*) value { +- (PBFileDescriptorProtoBuilder*) mergeOptions:(PBFileOptions*) value { if (result.hasOptions && result.options != [PBFileOptions defaultInstance]) { result.options = @@ -803,21 +953,51 @@ - (PBFileDescriptorProto_Builder*) mergeOptions:(PBFileOptions*) value { result.hasOptions = YES; return self; } -- (PBFileDescriptorProto_Builder*) clearOptions { +- (PBFileDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBFileOptions defaultInstance]; return self; } +- (BOOL) hasSourceCodeInfo { + return result.hasSourceCodeInfo; +} +- (PBSourceCodeInfo*) sourceCodeInfo { + return result.sourceCodeInfo; +} +- (PBFileDescriptorProtoBuilder*) setSourceCodeInfo:(PBSourceCodeInfo*) value { + result.hasSourceCodeInfo = YES; + result.sourceCodeInfo = value; + return self; +} +- (PBFileDescriptorProtoBuilder*) setSourceCodeInfoBuilder:(PBSourceCodeInfoBuilder*) builderForValue { + return [self setSourceCodeInfo:[builderForValue build]]; +} +- (PBFileDescriptorProtoBuilder*) mergeSourceCodeInfo:(PBSourceCodeInfo*) value { + if (result.hasSourceCodeInfo && + result.sourceCodeInfo != [PBSourceCodeInfo defaultInstance]) { + result.sourceCodeInfo = + [[[PBSourceCodeInfo builderWithPrototype:result.sourceCodeInfo] mergeFrom:value] buildPartial]; + } else { + result.sourceCodeInfo = value; + } + result.hasSourceCodeInfo = YES; + return self; +} +- (PBFileDescriptorProtoBuilder*) clearSourceCodeInfo { + result.hasSourceCodeInfo = NO; + result.sourceCodeInfo = [PBSourceCodeInfo defaultInstance]; + return self; +} @end @interface PBDescriptorProto () -@property (retain) NSString* name; -@property (retain) NSMutableArray* mutableFieldList; -@property (retain) NSMutableArray* mutableExtensionList; -@property (retain) NSMutableArray* mutableNestedTypeList; -@property (retain) NSMutableArray* mutableEnumTypeList; -@property (retain) NSMutableArray* mutableExtensionRangeList; -@property (retain) PBMessageOptions* options; +@property (strong) NSString* name; +@property (strong) PBAppendableArray * fieldArray; +@property (strong) PBAppendableArray * extensionArray; +@property (strong) PBAppendableArray * nestedTypeArray; +@property (strong) PBAppendableArray * enumTypeArray; +@property (strong) PBAppendableArray * extensionRangeArray; +@property (strong) PBMessageOptions* options; @end @implementation PBDescriptorProto @@ -825,31 +1005,35 @@ @implementation PBDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; -@synthesize mutableFieldList; -@synthesize mutableExtensionList; -@synthesize mutableNestedTypeList; -@synthesize mutableEnumTypeList; -@synthesize mutableExtensionRangeList; +@synthesize fieldArray; +@dynamic field; +@synthesize extensionArray; +@dynamic extension; +@synthesize nestedTypeArray; +@dynamic nestedType; +@synthesize enumTypeArray; +@dynamic enumType; +@synthesize extensionRangeArray; +@dynamic extensionRange; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; - (void) dealloc { self.name = nil; - self.mutableFieldList = nil; - self.mutableExtensionList = nil; - self.mutableNestedTypeList = nil; - self.mutableEnumTypeList = nil; - self.mutableExtensionRangeList = nil; + self.fieldArray = nil; + self.extensionArray = nil; + self.nestedTypeArray = nil; + self.enumTypeArray = nil; + self.extensionRangeArray = nil; self.options = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -870,58 +1054,53 @@ + (PBDescriptorProto*) defaultInstance { - (PBDescriptorProto*) defaultInstance { return defaultPBDescriptorProtoInstance; } -- (NSArray*) fieldList { - return mutableFieldList; +- (PBArray *)field { + return fieldArray; } -- (PBFieldDescriptorProto*) fieldAtIndex:(long) index { - id value = [mutableFieldList objectAtIndex:index]; - return value; +- (PBFieldDescriptorProto*)fieldAtIndex:(NSUInteger)index { + return [fieldArray objectAtIndex:index]; } -- (NSArray*) extensionList { - return mutableExtensionList; +- (PBArray *)extension { + return extensionArray; } -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { - id value = [mutableExtensionList objectAtIndex:index]; - return value; +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index { + return [extensionArray objectAtIndex:index]; } -- (NSArray*) nestedTypeList { - return mutableNestedTypeList; +- (PBArray *)nestedType { + return nestedTypeArray; } -- (PBDescriptorProto*) nestedTypeAtIndex:(long) index { - id value = [mutableNestedTypeList objectAtIndex:index]; - return value; +- (PBDescriptorProto*)nestedTypeAtIndex:(NSUInteger)index { + return [nestedTypeArray objectAtIndex:index]; } -- (NSArray*) enumTypeList { - return mutableEnumTypeList; +- (PBArray *)enumType { + return enumTypeArray; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { - id value = [mutableEnumTypeList objectAtIndex:index]; - return value; +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index { + return [enumTypeArray objectAtIndex:index]; } -- (NSArray*) extensionRangeList { - return mutableExtensionRangeList; +- (PBArray *)extensionRange { + return extensionRangeArray; } -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index { - id value = [mutableExtensionRangeList objectAtIndex:index]; - return value; +- (PBDescriptorProtoExtensionRange*)extensionRangeAtIndex:(NSUInteger)index { + return [extensionRangeArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBFieldDescriptorProto* element in self.fieldList) { + for (PBFieldDescriptorProto* element in self.field) { if (!element.isInitialized) { return NO; } } - for (PBFieldDescriptorProto* element in self.extensionList) { + for (PBFieldDescriptorProto* element in self.extension) { if (!element.isInitialized) { return NO; } } - for (PBDescriptorProto* element in self.nestedTypeList) { + for (PBDescriptorProto* element in self.nestedType) { if (!element.isInitialized) { return NO; } } - for (PBEnumDescriptorProto* element in self.enumTypeList) { + for (PBEnumDescriptorProto* element in self.enumType) { if (!element.isInitialized) { return NO; } @@ -937,19 +1116,19 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasName) { [output writeString:1 value:self.name]; } - for (PBFieldDescriptorProto* element in self.fieldList) { + for (PBFieldDescriptorProto *element in self.fieldArray) { [output writeMessage:2 value:element]; } - for (PBDescriptorProto* element in self.nestedTypeList) { + for (PBDescriptorProto *element in self.nestedTypeArray) { [output writeMessage:3 value:element]; } - for (PBEnumDescriptorProto* element in self.enumTypeList) { + for (PBEnumDescriptorProto *element in self.enumTypeArray) { [output writeMessage:4 value:element]; } - for (PBDescriptorProto_ExtensionRange* element in self.extensionRangeList) { + for (PBDescriptorProtoExtensionRange *element in self.extensionRangeArray) { [output writeMessage:5 value:element]; } - for (PBFieldDescriptorProto* element in self.extensionList) { + for (PBFieldDescriptorProto *element in self.extensionArray) { [output writeMessage:6 value:element]; } if (self.hasOptions) { @@ -958,36 +1137,36 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } - for (PBFieldDescriptorProto* element in self.fieldList) { - size += computeMessageSize(2, element); + for (PBFieldDescriptorProto *element in self.fieldArray) { + size_ += computeMessageSize(2, element); } - for (PBDescriptorProto* element in self.nestedTypeList) { - size += computeMessageSize(3, element); + for (PBDescriptorProto *element in self.nestedTypeArray) { + size_ += computeMessageSize(3, element); } - for (PBEnumDescriptorProto* element in self.enumTypeList) { - size += computeMessageSize(4, element); + for (PBEnumDescriptorProto *element in self.enumTypeArray) { + size_ += computeMessageSize(4, element); } - for (PBDescriptorProto_ExtensionRange* element in self.extensionRangeList) { - size += computeMessageSize(5, element); + for (PBDescriptorProtoExtensionRange *element in self.extensionRangeArray) { + size_ += computeMessageSize(5, element); } - for (PBFieldDescriptorProto* element in self.extensionList) { - size += computeMessageSize(6, element); + for (PBFieldDescriptorProto *element in self.extensionArray) { + size_ += computeMessageSize(6, element); } if (self.hasOptions) { - size += computeMessageSize(7, self.options); + size_ += computeMessageSize(7, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBDescriptorProto*) parseFromData:(NSData*) data { return (PBDescriptorProto*)[[[PBDescriptorProto builder] mergeFromData:data] build]; @@ -1007,40 +1186,130 @@ + (PBDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBDescriptorProto*)[[[PBDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBDescriptorProto_Builder*) builder { - return [[[PBDescriptorProto_Builder alloc] init] autorelease]; ++ (PBDescriptorProtoBuilder*) builder { + return [[PBDescriptorProtoBuilder alloc] init]; } -+ (PBDescriptorProto_Builder*) builderWithPrototype:(PBDescriptorProto*) prototype { ++ (PBDescriptorProtoBuilder*) builderWithPrototype:(PBDescriptorProto*) prototype { return [[PBDescriptorProto builder] mergeFrom:prototype]; } -- (PBDescriptorProto_Builder*) builder { +- (PBDescriptorProtoBuilder*) builder { return [PBDescriptorProto builder]; } +- (PBDescriptorProtoBuilder*) toBuilder { + return [PBDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + for (PBFieldDescriptorProto* element in self.fieldArray) { + [output appendFormat:@"%@%@ {\n", indent, @"field"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBDescriptorProto* element in self.nestedTypeArray) { + [output appendFormat:@"%@%@ {\n", indent, @"nestedType"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBEnumDescriptorProto* element in self.enumTypeArray) { + [output appendFormat:@"%@%@ {\n", indent, @"enumType"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBDescriptorProtoExtensionRange* element in self.extensionRangeArray) { + [output appendFormat:@"%@%@ {\n", indent, @"extensionRange"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + for (PBFieldDescriptorProto* element in self.extensionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"extension"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBDescriptorProto class]]) { + return NO; + } + PBDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + [self.fieldArray isEqualToArray:otherMessage.fieldArray] && + [self.nestedTypeArray isEqualToArray:otherMessage.nestedTypeArray] && + [self.enumTypeArray isEqualToArray:otherMessage.enumTypeArray] && + [self.extensionRangeArray isEqualToArray:otherMessage.extensionRangeArray] && + [self.extensionArray isEqualToArray:otherMessage.extensionArray] && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + for (PBFieldDescriptorProto* element in self.fieldArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBDescriptorProto* element in self.nestedTypeArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBEnumDescriptorProto* element in self.enumTypeArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBDescriptorProtoExtensionRange* element in self.extensionRangeArray) { + hashCode = hashCode * 31 + [element hash]; + } + for (PBFieldDescriptorProto* element in self.extensionArray) { + hashCode = hashCode * 31 + [element hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBDescriptorProto_ExtensionRange () +@interface PBDescriptorProtoExtensionRange () @property long start; @property long end; @end -@implementation PBDescriptorProto_ExtensionRange +@implementation PBDescriptorProtoExtensionRange - (BOOL) hasStart { return !!hasStart_; } -- (void) setHasStart:(BOOL) value { - hasStart_ = !!value; +- (void) setHasStart:(BOOL) value_ { + hasStart_ = !!value_; } @synthesize start; - (BOOL) hasEnd { return !!hasEnd_; } -- (void) setHasEnd:(BOOL) value { - hasEnd_ = !!value; +- (void) setHasEnd:(BOOL) value_ { + hasEnd_ = !!value_; } @synthesize end; - (void) dealloc { - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -1049,17 +1318,17 @@ - (id) init { } return self; } -static PBDescriptorProto_ExtensionRange* defaultPBDescriptorProto_ExtensionRangeInstance = nil; +static PBDescriptorProtoExtensionRange* defaultPBDescriptorProtoExtensionRangeInstance = nil; + (void) initialize { - if (self == [PBDescriptorProto_ExtensionRange class]) { - defaultPBDescriptorProto_ExtensionRangeInstance = [[PBDescriptorProto_ExtensionRange alloc] init]; + if (self == [PBDescriptorProtoExtensionRange class]) { + defaultPBDescriptorProtoExtensionRangeInstance = [[PBDescriptorProtoExtensionRange alloc] init]; } } -+ (PBDescriptorProto_ExtensionRange*) defaultInstance { - return defaultPBDescriptorProto_ExtensionRangeInstance; ++ (PBDescriptorProtoExtensionRange*) defaultInstance { + return defaultPBDescriptorProtoExtensionRangeInstance; } -- (PBDescriptorProto_ExtensionRange*) defaultInstance { - return defaultPBDescriptorProto_ExtensionRangeInstance; +- (PBDescriptorProtoExtensionRange*) defaultInstance { + return defaultPBDescriptorProtoExtensionRangeInstance; } - (BOOL) isInitialized { return YES; @@ -1074,91 +1343,128 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasStart) { - size += computeInt32Size(1, self.start); + size_ += computeInt32Size(1, self.start); } if (self.hasEnd) { - size += computeInt32Size(2, self.end); + size_ += computeInt32Size(2, self.end); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; +} ++ (PBDescriptorProtoExtensionRange*) parseFromData:(NSData*) data { + return (PBDescriptorProtoExtensionRange*)[[[PBDescriptorProtoExtensionRange builder] mergeFromData:data] build]; +} ++ (PBDescriptorProtoExtensionRange*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBDescriptorProtoExtensionRange*)[[[PBDescriptorProtoExtensionRange builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (PBDescriptorProto_ExtensionRange*) parseFromData:(NSData*) data { - return (PBDescriptorProto_ExtensionRange*)[[[PBDescriptorProto_ExtensionRange builder] mergeFromData:data] build]; ++ (PBDescriptorProtoExtensionRange*) parseFromInputStream:(NSInputStream*) input { + return (PBDescriptorProtoExtensionRange*)[[[PBDescriptorProtoExtensionRange builder] mergeFromInputStream:input] build]; } -+ (PBDescriptorProto_ExtensionRange*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (PBDescriptorProto_ExtensionRange*)[[[PBDescriptorProto_ExtensionRange builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (PBDescriptorProtoExtensionRange*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBDescriptorProtoExtensionRange*)[[[PBDescriptorProtoExtensionRange builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBDescriptorProto_ExtensionRange*) parseFromInputStream:(NSInputStream*) input { - return (PBDescriptorProto_ExtensionRange*)[[[PBDescriptorProto_ExtensionRange builder] mergeFromInputStream:input] build]; ++ (PBDescriptorProtoExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (PBDescriptorProtoExtensionRange*)[[[PBDescriptorProtoExtensionRange builder] mergeFromCodedInputStream:input] build]; } -+ (PBDescriptorProto_ExtensionRange*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (PBDescriptorProto_ExtensionRange*)[[[PBDescriptorProto_ExtensionRange builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (PBDescriptorProtoExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBDescriptorProtoExtensionRange*)[[[PBDescriptorProtoExtensionRange builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBDescriptorProto_ExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (PBDescriptorProto_ExtensionRange*)[[[PBDescriptorProto_ExtensionRange builder] mergeFromCodedInputStream:input] build]; ++ (PBDescriptorProtoExtensionRangeBuilder*) builder { + return [[PBDescriptorProtoExtensionRangeBuilder alloc] init]; } -+ (PBDescriptorProto_ExtensionRange*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (PBDescriptorProto_ExtensionRange*)[[[PBDescriptorProto_ExtensionRange builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (PBDescriptorProtoExtensionRangeBuilder*) builderWithPrototype:(PBDescriptorProtoExtensionRange*) prototype { + return [[PBDescriptorProtoExtensionRange builder] mergeFrom:prototype]; } -+ (PBDescriptorProto_ExtensionRange_Builder*) builder { - return [[[PBDescriptorProto_ExtensionRange_Builder alloc] init] autorelease]; +- (PBDescriptorProtoExtensionRangeBuilder*) builder { + return [PBDescriptorProtoExtensionRange builder]; } -+ (PBDescriptorProto_ExtensionRange_Builder*) builderWithPrototype:(PBDescriptorProto_ExtensionRange*) prototype { - return [[PBDescriptorProto_ExtensionRange builder] mergeFrom:prototype]; +- (PBDescriptorProtoExtensionRangeBuilder*) toBuilder { + return [PBDescriptorProtoExtensionRange builderWithPrototype:self]; } -- (PBDescriptorProto_ExtensionRange_Builder*) builder { - return [PBDescriptorProto_ExtensionRange builder]; +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasStart) { + [output appendFormat:@"%@%@: %@\n", indent, @"start", [NSNumber numberWithInteger:self.start]]; + } + if (self.hasEnd) { + [output appendFormat:@"%@%@: %@\n", indent, @"end", [NSNumber numberWithInteger:self.end]]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBDescriptorProtoExtensionRange class]]) { + return NO; + } + PBDescriptorProtoExtensionRange *otherMessage = other; + return + self.hasStart == otherMessage.hasStart && + (!self.hasStart || self.start == otherMessage.start) && + self.hasEnd == otherMessage.hasEnd && + (!self.hasEnd || self.end == otherMessage.end) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasStart) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.start] hash]; + } + if (self.hasEnd) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.end] hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; } @end -@interface PBDescriptorProto_ExtensionRange_Builder() -@property (retain) PBDescriptorProto_ExtensionRange* result; +@interface PBDescriptorProtoExtensionRangeBuilder() +@property (strong) PBDescriptorProtoExtensionRange* result; @end -@implementation PBDescriptorProto_ExtensionRange_Builder +@implementation PBDescriptorProtoExtensionRangeBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBDescriptorProto_ExtensionRange alloc] init] autorelease]; + self.result = [[PBDescriptorProtoExtensionRange alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBDescriptorProto_ExtensionRange_Builder*) clear { - self.result = [[[PBDescriptorProto_ExtensionRange alloc] init] autorelease]; +- (PBDescriptorProtoExtensionRangeBuilder*) clear { + self.result = [[PBDescriptorProtoExtensionRange alloc] init]; return self; } -- (PBDescriptorProto_ExtensionRange_Builder*) clone { - return [PBDescriptorProto_ExtensionRange builderWithPrototype:result]; +- (PBDescriptorProtoExtensionRangeBuilder*) clone { + return [PBDescriptorProtoExtensionRange builderWithPrototype:result]; } -- (PBDescriptorProto_ExtensionRange*) defaultInstance { - return [PBDescriptorProto_ExtensionRange defaultInstance]; +- (PBDescriptorProtoExtensionRange*) defaultInstance { + return [PBDescriptorProtoExtensionRange defaultInstance]; } -- (PBDescriptorProto_ExtensionRange*) build { +- (PBDescriptorProtoExtensionRange*) build { [self checkInitialized]; return [self buildPartial]; } -- (PBDescriptorProto_ExtensionRange*) buildPartial { - PBDescriptorProto_ExtensionRange* returnMe = [[result retain] autorelease]; +- (PBDescriptorProtoExtensionRange*) buildPartial { + PBDescriptorProtoExtensionRange* returnMe = result; self.result = nil; return returnMe; } -- (PBDescriptorProto_ExtensionRange_Builder*) mergeFrom:(PBDescriptorProto_ExtensionRange*) other { - if (other == [PBDescriptorProto_ExtensionRange defaultInstance]) { +- (PBDescriptorProtoExtensionRangeBuilder*) mergeFrom:(PBDescriptorProtoExtensionRange*) other { + if (other == [PBDescriptorProtoExtensionRange defaultInstance]) { return self; } if (other.hasStart) { @@ -1170,13 +1476,13 @@ - (PBDescriptorProto_ExtensionRange_Builder*) mergeFrom:(PBDescriptorProto_Exten [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBDescriptorProtoExtensionRangeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBDescriptorProto_ExtensionRange_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBDescriptorProtoExtensionRangeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1205,12 +1511,12 @@ - (BOOL) hasStart { - (long) start { return result.start; } -- (PBDescriptorProto_ExtensionRange_Builder*) setStart:(long) value { +- (PBDescriptorProtoExtensionRangeBuilder*) setStart:(long) value { result.hasStart = YES; result.start = value; return self; } -- (PBDescriptorProto_ExtensionRange_Builder*) clearStart { +- (PBDescriptorProtoExtensionRangeBuilder*) clearStart { result.hasStart = NO; result.start = 0; return self; @@ -1221,42 +1527,41 @@ - (BOOL) hasEnd { - (long) end { return result.end; } -- (PBDescriptorProto_ExtensionRange_Builder*) setEnd:(long) value { +- (PBDescriptorProtoExtensionRangeBuilder*) setEnd:(long) value { result.hasEnd = YES; result.end = value; return self; } -- (PBDescriptorProto_ExtensionRange_Builder*) clearEnd { +- (PBDescriptorProtoExtensionRangeBuilder*) clearEnd { result.hasEnd = NO; result.end = 0; return self; } @end -@interface PBDescriptorProto_Builder() -@property (retain) PBDescriptorProto* result; +@interface PBDescriptorProtoBuilder() +@property (strong) PBDescriptorProto* result; @end -@implementation PBDescriptorProto_Builder +@implementation PBDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBDescriptorProto alloc] init] autorelease]; + self.result = [[PBDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBDescriptorProto_Builder*) clear { - self.result = [[[PBDescriptorProto alloc] init] autorelease]; +- (PBDescriptorProtoBuilder*) clear { + self.result = [[PBDescriptorProto alloc] init]; return self; } -- (PBDescriptorProto_Builder*) clone { +- (PBDescriptorProtoBuilder*) clone { return [PBDescriptorProto builderWithPrototype:result]; } - (PBDescriptorProto*) defaultInstance { @@ -1267,46 +1572,51 @@ - (PBDescriptorProto*) build { return [self buildPartial]; } - (PBDescriptorProto*) buildPartial { - PBDescriptorProto* returnMe = [[result retain] autorelease]; + PBDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBDescriptorProto_Builder*) mergeFrom:(PBDescriptorProto*) other { +- (PBDescriptorProtoBuilder*) mergeFrom:(PBDescriptorProto*) other { if (other == [PBDescriptorProto defaultInstance]) { return self; } if (other.hasName) { [self setName:other.name]; } - if (other.mutableFieldList.count > 0) { - if (result.mutableFieldList == nil) { - result.mutableFieldList = [NSMutableArray array]; + if (other.fieldArray.count > 0) { + if (result.fieldArray == nil) { + result.fieldArray = [other.fieldArray copy]; + } else { + [result.fieldArray appendArray:other.fieldArray]; } - [result.mutableFieldList addObjectsFromArray:other.mutableFieldList]; } - if (other.mutableExtensionList.count > 0) { - if (result.mutableExtensionList == nil) { - result.mutableExtensionList = [NSMutableArray array]; + if (other.extensionArray.count > 0) { + if (result.extensionArray == nil) { + result.extensionArray = [other.extensionArray copy]; + } else { + [result.extensionArray appendArray:other.extensionArray]; } - [result.mutableExtensionList addObjectsFromArray:other.mutableExtensionList]; } - if (other.mutableNestedTypeList.count > 0) { - if (result.mutableNestedTypeList == nil) { - result.mutableNestedTypeList = [NSMutableArray array]; + if (other.nestedTypeArray.count > 0) { + if (result.nestedTypeArray == nil) { + result.nestedTypeArray = [other.nestedTypeArray copy]; + } else { + [result.nestedTypeArray appendArray:other.nestedTypeArray]; } - [result.mutableNestedTypeList addObjectsFromArray:other.mutableNestedTypeList]; } - if (other.mutableEnumTypeList.count > 0) { - if (result.mutableEnumTypeList == nil) { - result.mutableEnumTypeList = [NSMutableArray array]; + if (other.enumTypeArray.count > 0) { + if (result.enumTypeArray == nil) { + result.enumTypeArray = [other.enumTypeArray copy]; + } else { + [result.enumTypeArray appendArray:other.enumTypeArray]; } - [result.mutableEnumTypeList addObjectsFromArray:other.mutableEnumTypeList]; } - if (other.mutableExtensionRangeList.count > 0) { - if (result.mutableExtensionRangeList == nil) { - result.mutableExtensionRangeList = [NSMutableArray array]; + if (other.extensionRangeArray.count > 0) { + if (result.extensionRangeArray == nil) { + result.extensionRangeArray = [other.extensionRangeArray copy]; + } else { + [result.extensionRangeArray appendArray:other.extensionRangeArray]; } - [result.mutableExtensionRangeList addObjectsFromArray:other.mutableExtensionRangeList]; } if (other.hasOptions) { [self mergeOptions:other.options]; @@ -1314,13 +1624,13 @@ - (PBDescriptorProto_Builder*) mergeFrom:(PBDescriptorProto*) other { [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1337,37 +1647,37 @@ - (PBDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) i break; } case 18: { - PBFieldDescriptorProto_Builder* subBuilder = [PBFieldDescriptorProto builder]; + PBFieldDescriptorProtoBuilder* subBuilder = [PBFieldDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addField:[subBuilder buildPartial]]; break; } case 26: { - PBDescriptorProto_Builder* subBuilder = [PBDescriptorProto builder]; + PBDescriptorProtoBuilder* subBuilder = [PBDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addNestedType:[subBuilder buildPartial]]; break; } case 34: { - PBEnumDescriptorProto_Builder* subBuilder = [PBEnumDescriptorProto builder]; + PBEnumDescriptorProtoBuilder* subBuilder = [PBEnumDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addEnumType:[subBuilder buildPartial]]; break; } case 42: { - PBDescriptorProto_ExtensionRange_Builder* subBuilder = [PBDescriptorProto_ExtensionRange builder]; + PBDescriptorProtoExtensionRangeBuilder* subBuilder = [PBDescriptorProtoExtensionRange builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addExtensionRange:[subBuilder buildPartial]]; break; } case 50: { - PBFieldDescriptorProto_Builder* subBuilder = [PBFieldDescriptorProto builder]; + PBFieldDescriptorProtoBuilder* subBuilder = [PBFieldDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addExtension:[subBuilder buildPartial]]; break; } case 58: { - PBMessageOptions_Builder* subBuilder = [PBMessageOptions builder]; + PBMessageOptionsBuilder* subBuilder = [PBMessageOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -1384,159 +1694,139 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBDescriptorProto_Builder*) setName:(NSString*) value { +- (PBDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBDescriptorProto_Builder*) clearName { +- (PBDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; } -- (NSArray*) fieldList { - if (result.mutableFieldList == nil) { return [NSArray array]; } - return result.mutableFieldList; +- (PBAppendableArray *)field { + return result.fieldArray; } -- (PBFieldDescriptorProto*) fieldAtIndex:(long) index { +- (PBFieldDescriptorProto*)fieldAtIndex:(NSUInteger)index { return [result fieldAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceFieldAtIndex:(long) index with:(PBFieldDescriptorProto*) value { - [result.mutableFieldList replaceObjectAtIndex:index withObject:value]; +- (PBDescriptorProtoBuilder *)addField:(PBFieldDescriptorProto*)value { + if (result.fieldArray == nil) { + result.fieldArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.fieldArray addObject:value]; return self; } -- (PBDescriptorProto_Builder*) addAllField:(NSArray*) values { - if (result.mutableFieldList == nil) { - result.mutableFieldList = [NSMutableArray array]; - } - [result.mutableFieldList addObjectsFromArray:values]; +- (PBDescriptorProtoBuilder *)setFieldArray:(NSArray *)array { + result.fieldArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) clearFieldList { - result.mutableFieldList = nil; +- (PBDescriptorProtoBuilder *)setFieldValues:(const PBFieldDescriptorProto* __strong *)values count:(NSUInteger)count { + result.fieldArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) addField:(PBFieldDescriptorProto*) value { - if (result.mutableFieldList == nil) { - result.mutableFieldList = [NSMutableArray array]; - } - [result.mutableFieldList addObject:value]; +- (PBDescriptorProtoBuilder *)clearField { + result.fieldArray = nil; return self; } -- (NSArray*) extensionList { - if (result.mutableExtensionList == nil) { return [NSArray array]; } - return result.mutableExtensionList; +- (PBAppendableArray *)extension { + return result.extensionArray; } -- (PBFieldDescriptorProto*) extensionAtIndex:(long) index { +- (PBFieldDescriptorProto*)extensionAtIndex:(NSUInteger)index { return [result extensionAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceExtensionAtIndex:(long) index with:(PBFieldDescriptorProto*) value { - [result.mutableExtensionList replaceObjectAtIndex:index withObject:value]; +- (PBDescriptorProtoBuilder *)addExtension:(PBFieldDescriptorProto*)value { + if (result.extensionArray == nil) { + result.extensionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.extensionArray addObject:value]; return self; } -- (PBDescriptorProto_Builder*) addAllExtension:(NSArray*) values { - if (result.mutableExtensionList == nil) { - result.mutableExtensionList = [NSMutableArray array]; - } - [result.mutableExtensionList addObjectsFromArray:values]; +- (PBDescriptorProtoBuilder *)setExtensionArray:(NSArray *)array { + result.extensionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) clearExtensionList { - result.mutableExtensionList = nil; +- (PBDescriptorProtoBuilder *)setExtensionValues:(const PBFieldDescriptorProto* __strong *)values count:(NSUInteger)count { + result.extensionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) addExtension:(PBFieldDescriptorProto*) value { - if (result.mutableExtensionList == nil) { - result.mutableExtensionList = [NSMutableArray array]; - } - [result.mutableExtensionList addObject:value]; +- (PBDescriptorProtoBuilder *)clearExtension { + result.extensionArray = nil; return self; } -- (NSArray*) nestedTypeList { - if (result.mutableNestedTypeList == nil) { return [NSArray array]; } - return result.mutableNestedTypeList; +- (PBAppendableArray *)nestedType { + return result.nestedTypeArray; } -- (PBDescriptorProto*) nestedTypeAtIndex:(long) index { +- (PBDescriptorProto*)nestedTypeAtIndex:(NSUInteger)index { return [result nestedTypeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceNestedTypeAtIndex:(long) index with:(PBDescriptorProto*) value { - [result.mutableNestedTypeList replaceObjectAtIndex:index withObject:value]; +- (PBDescriptorProtoBuilder *)addNestedType:(PBDescriptorProto*)value { + if (result.nestedTypeArray == nil) { + result.nestedTypeArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.nestedTypeArray addObject:value]; return self; } -- (PBDescriptorProto_Builder*) addAllNestedType:(NSArray*) values { - if (result.mutableNestedTypeList == nil) { - result.mutableNestedTypeList = [NSMutableArray array]; - } - [result.mutableNestedTypeList addObjectsFromArray:values]; +- (PBDescriptorProtoBuilder *)setNestedTypeArray:(NSArray *)array { + result.nestedTypeArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) clearNestedTypeList { - result.mutableNestedTypeList = nil; +- (PBDescriptorProtoBuilder *)setNestedTypeValues:(const PBDescriptorProto* __strong *)values count:(NSUInteger)count { + result.nestedTypeArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) addNestedType:(PBDescriptorProto*) value { - if (result.mutableNestedTypeList == nil) { - result.mutableNestedTypeList = [NSMutableArray array]; - } - [result.mutableNestedTypeList addObject:value]; +- (PBDescriptorProtoBuilder *)clearNestedType { + result.nestedTypeArray = nil; return self; } -- (NSArray*) enumTypeList { - if (result.mutableEnumTypeList == nil) { return [NSArray array]; } - return result.mutableEnumTypeList; +- (PBAppendableArray *)enumType { + return result.enumTypeArray; } -- (PBEnumDescriptorProto*) enumTypeAtIndex:(long) index { +- (PBEnumDescriptorProto*)enumTypeAtIndex:(NSUInteger)index { return [result enumTypeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceEnumTypeAtIndex:(long) index with:(PBEnumDescriptorProto*) value { - [result.mutableEnumTypeList replaceObjectAtIndex:index withObject:value]; +- (PBDescriptorProtoBuilder *)addEnumType:(PBEnumDescriptorProto*)value { + if (result.enumTypeArray == nil) { + result.enumTypeArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.enumTypeArray addObject:value]; return self; } -- (PBDescriptorProto_Builder*) addAllEnumType:(NSArray*) values { - if (result.mutableEnumTypeList == nil) { - result.mutableEnumTypeList = [NSMutableArray array]; - } - [result.mutableEnumTypeList addObjectsFromArray:values]; +- (PBDescriptorProtoBuilder *)setEnumTypeArray:(NSArray *)array { + result.enumTypeArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) clearEnumTypeList { - result.mutableEnumTypeList = nil; +- (PBDescriptorProtoBuilder *)setEnumTypeValues:(const PBEnumDescriptorProto* __strong *)values count:(NSUInteger)count { + result.enumTypeArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) addEnumType:(PBEnumDescriptorProto*) value { - if (result.mutableEnumTypeList == nil) { - result.mutableEnumTypeList = [NSMutableArray array]; - } - [result.mutableEnumTypeList addObject:value]; +- (PBDescriptorProtoBuilder *)clearEnumType { + result.enumTypeArray = nil; return self; } -- (NSArray*) extensionRangeList { - if (result.mutableExtensionRangeList == nil) { return [NSArray array]; } - return result.mutableExtensionRangeList; +- (PBAppendableArray *)extensionRange { + return result.extensionRangeArray; } -- (PBDescriptorProto_ExtensionRange*) extensionRangeAtIndex:(long) index { +- (PBDescriptorProtoExtensionRange*)extensionRangeAtIndex:(NSUInteger)index { return [result extensionRangeAtIndex:index]; } -- (PBDescriptorProto_Builder*) replaceExtensionRangeAtIndex:(long) index with:(PBDescriptorProto_ExtensionRange*) value { - [result.mutableExtensionRangeList replaceObjectAtIndex:index withObject:value]; +- (PBDescriptorProtoBuilder *)addExtensionRange:(PBDescriptorProtoExtensionRange*)value { + if (result.extensionRangeArray == nil) { + result.extensionRangeArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.extensionRangeArray addObject:value]; return self; } -- (PBDescriptorProto_Builder*) addAllExtensionRange:(NSArray*) values { - if (result.mutableExtensionRangeList == nil) { - result.mutableExtensionRangeList = [NSMutableArray array]; - } - [result.mutableExtensionRangeList addObjectsFromArray:values]; +- (PBDescriptorProtoBuilder *)setExtensionRangeArray:(NSArray *)array { + result.extensionRangeArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) clearExtensionRangeList { - result.mutableExtensionRangeList = nil; +- (PBDescriptorProtoBuilder *)setExtensionRangeValues:(const PBDescriptorProtoExtensionRange* __strong *)values count:(NSUInteger)count { + result.extensionRangeArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBDescriptorProto_Builder*) addExtensionRange:(PBDescriptorProto_ExtensionRange*) value { - if (result.mutableExtensionRangeList == nil) { - result.mutableExtensionRangeList = [NSMutableArray array]; - } - [result.mutableExtensionRangeList addObject:value]; +- (PBDescriptorProtoBuilder *)clearExtensionRange { + result.extensionRangeArray = nil; return self; } - (BOOL) hasOptions { @@ -1545,15 +1835,15 @@ - (BOOL) hasOptions { - (PBMessageOptions*) options { return result.options; } -- (PBDescriptorProto_Builder*) setOptions:(PBMessageOptions*) value { +- (PBDescriptorProtoBuilder*) setOptions:(PBMessageOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBDescriptorProto_Builder*) setOptionsBuilder:(PBMessageOptions_Builder*) builderForValue { +- (PBDescriptorProtoBuilder*) setOptionsBuilder:(PBMessageOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBDescriptorProto_Builder*) mergeOptions:(PBMessageOptions*) value { +- (PBDescriptorProtoBuilder*) mergeOptions:(PBMessageOptions*) value { if (result.hasOptions && result.options != [PBMessageOptions defaultInstance]) { result.options = @@ -1564,7 +1854,7 @@ - (PBDescriptorProto_Builder*) mergeOptions:(PBMessageOptions*) value { result.hasOptions = YES; return self; } -- (PBDescriptorProto_Builder*) clearOptions { +- (PBDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBMessageOptions defaultInstance]; return self; @@ -1572,14 +1862,14 @@ - (PBDescriptorProto_Builder*) clearOptions { @end @interface PBFieldDescriptorProto () -@property (retain) NSString* name; +@property (strong) NSString* name; @property long number; -@property PBFieldDescriptorProto_Label label; -@property PBFieldDescriptorProto_Type type; -@property (retain) NSString* typeName; -@property (retain) NSString* extendee; -@property (retain) NSString* defaultValue; -@property (retain) PBFieldOptions* options; +@property PBFieldDescriptorProtoLabel label; +@property PBFieldDescriptorProtoType type; +@property (strong) NSString* typeName; +@property (strong) NSString* extendee; +@property (strong) NSString* defaultValue; +@property (strong) PBFieldOptions* options; @end @implementation PBFieldDescriptorProto @@ -1587,57 +1877,57 @@ @implementation PBFieldDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; - (BOOL) hasNumber { return !!hasNumber_; } -- (void) setHasNumber:(BOOL) value { - hasNumber_ = !!value; +- (void) setHasNumber:(BOOL) value_ { + hasNumber_ = !!value_; } @synthesize number; - (BOOL) hasLabel { return !!hasLabel_; } -- (void) setHasLabel:(BOOL) value { - hasLabel_ = !!value; +- (void) setHasLabel:(BOOL) value_ { + hasLabel_ = !!value_; } @synthesize label; - (BOOL) hasType { return !!hasType_; } -- (void) setHasType:(BOOL) value { - hasType_ = !!value; +- (void) setHasType:(BOOL) value_ { + hasType_ = !!value_; } @synthesize type; - (BOOL) hasTypeName { return !!hasTypeName_; } -- (void) setHasTypeName:(BOOL) value { - hasTypeName_ = !!value; +- (void) setHasTypeName:(BOOL) value_ { + hasTypeName_ = !!value_; } @synthesize typeName; - (BOOL) hasExtendee { return !!hasExtendee_; } -- (void) setHasExtendee:(BOOL) value { - hasExtendee_ = !!value; +- (void) setHasExtendee:(BOOL) value_ { + hasExtendee_ = !!value_; } @synthesize extendee; - (BOOL) hasDefaultValue { return !!hasDefaultValue_; } -- (void) setHasDefaultValue:(BOOL) value { - hasDefaultValue_ = !!value; +- (void) setHasDefaultValue:(BOOL) value_ { + hasDefaultValue_ = !!value_; } @synthesize defaultValue; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; - (void) dealloc { @@ -1646,14 +1936,13 @@ - (void) dealloc { self.extendee = nil; self.defaultValue = nil; self.options = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { self.name = @""; self.number = 0; - self.label = PBFieldDescriptorProto_LabelLabelOptional; - self.type = PBFieldDescriptorProto_TypeTypeDouble; + self.label = PBFieldDescriptorProtoLabelLabelOptional; + self.type = PBFieldDescriptorProtoTypeTypeDouble; self.typeName = @""; self.extendee = @""; self.defaultValue = @""; @@ -1709,39 +1998,39 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } if (self.hasExtendee) { - size += computeStringSize(2, self.extendee); + size_ += computeStringSize(2, self.extendee); } if (self.hasNumber) { - size += computeInt32Size(3, self.number); + size_ += computeInt32Size(3, self.number); } if (self.hasLabel) { - size += computeEnumSize(4, self.label); + size_ += computeEnumSize(4, self.label); } if (self.hasType) { - size += computeEnumSize(5, self.type); + size_ += computeEnumSize(5, self.type); } if (self.hasTypeName) { - size += computeStringSize(6, self.typeName); + size_ += computeStringSize(6, self.typeName); } if (self.hasDefaultValue) { - size += computeStringSize(7, self.defaultValue); + size_ += computeStringSize(7, self.defaultValue); } if (self.hasOptions) { - size += computeMessageSize(8, self.options); + size_ += computeMessageSize(8, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBFieldDescriptorProto*) parseFromData:(NSData*) data { return (PBFieldDescriptorProto*)[[[PBFieldDescriptorProto builder] mergeFromData:data] build]; @@ -1761,76 +2050,164 @@ + (PBFieldDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) inpu + (PBFieldDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBFieldDescriptorProto*)[[[PBFieldDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBFieldDescriptorProto_Builder*) builder { - return [[[PBFieldDescriptorProto_Builder alloc] init] autorelease]; ++ (PBFieldDescriptorProtoBuilder*) builder { + return [[PBFieldDescriptorProtoBuilder alloc] init]; } -+ (PBFieldDescriptorProto_Builder*) builderWithPrototype:(PBFieldDescriptorProto*) prototype { ++ (PBFieldDescriptorProtoBuilder*) builderWithPrototype:(PBFieldDescriptorProto*) prototype { return [[PBFieldDescriptorProto builder] mergeFrom:prototype]; } -- (PBFieldDescriptorProto_Builder*) builder { +- (PBFieldDescriptorProtoBuilder*) builder { return [PBFieldDescriptorProto builder]; } +- (PBFieldDescriptorProtoBuilder*) toBuilder { + return [PBFieldDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + if (self.hasExtendee) { + [output appendFormat:@"%@%@: %@\n", indent, @"extendee", self.extendee]; + } + if (self.hasNumber) { + [output appendFormat:@"%@%@: %@\n", indent, @"number", [NSNumber numberWithInteger:self.number]]; + } + if (self.hasLabel) { + [output appendFormat:@"%@%@: %d\n", indent, @"label", self.label]; + } + if (self.hasType) { + [output appendFormat:@"%@%@: %d\n", indent, @"type", self.type]; + } + if (self.hasTypeName) { + [output appendFormat:@"%@%@: %@\n", indent, @"typeName", self.typeName]; + } + if (self.hasDefaultValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"defaultValue", self.defaultValue]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBFieldDescriptorProto class]]) { + return NO; + } + PBFieldDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + self.hasExtendee == otherMessage.hasExtendee && + (!self.hasExtendee || [self.extendee isEqual:otherMessage.extendee]) && + self.hasNumber == otherMessage.hasNumber && + (!self.hasNumber || self.number == otherMessage.number) && + self.hasLabel == otherMessage.hasLabel && + (!self.hasLabel || self.label == otherMessage.label) && + self.hasType == otherMessage.hasType && + (!self.hasType || self.type == otherMessage.type) && + self.hasTypeName == otherMessage.hasTypeName && + (!self.hasTypeName || [self.typeName isEqual:otherMessage.typeName]) && + self.hasDefaultValue == otherMessage.hasDefaultValue && + (!self.hasDefaultValue || [self.defaultValue isEqual:otherMessage.defaultValue]) && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + if (self.hasExtendee) { + hashCode = hashCode * 31 + [self.extendee hash]; + } + if (self.hasNumber) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.number] hash]; + } + if (self.hasLabel) { + hashCode = hashCode * 31 + self.label; + } + if (self.hasType) { + hashCode = hashCode * 31 + self.type; + } + if (self.hasTypeName) { + hashCode = hashCode * 31 + [self.typeName hash]; + } + if (self.hasDefaultValue) { + hashCode = hashCode * 31 + [self.defaultValue hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -BOOL PBFieldDescriptorProto_TypeIsValidValue(PBFieldDescriptorProto_Type value) { +BOOL PBFieldDescriptorProtoTypeIsValidValue(PBFieldDescriptorProtoType value) { switch (value) { - case PBFieldDescriptorProto_TypeTypeDouble: - case PBFieldDescriptorProto_TypeTypeFloat: - case PBFieldDescriptorProto_TypeTypeInt64: - case PBFieldDescriptorProto_TypeTypeUint64: - case PBFieldDescriptorProto_TypeTypeInt32: - case PBFieldDescriptorProto_TypeTypeFixed64: - case PBFieldDescriptorProto_TypeTypeFixed32: - case PBFieldDescriptorProto_TypeTypeBool: - case PBFieldDescriptorProto_TypeTypeString: - case PBFieldDescriptorProto_TypeTypeGroup: - case PBFieldDescriptorProto_TypeTypeMessage: - case PBFieldDescriptorProto_TypeTypeBytes: - case PBFieldDescriptorProto_TypeTypeUint32: - case PBFieldDescriptorProto_TypeTypeEnum: - case PBFieldDescriptorProto_TypeTypeSfixed32: - case PBFieldDescriptorProto_TypeTypeSfixed64: - case PBFieldDescriptorProto_TypeTypeSint32: - case PBFieldDescriptorProto_TypeTypeSint64: + case PBFieldDescriptorProtoTypeTypeDouble: + case PBFieldDescriptorProtoTypeTypeFloat: + case PBFieldDescriptorProtoTypeTypeInt64: + case PBFieldDescriptorProtoTypeTypeUint64: + case PBFieldDescriptorProtoTypeTypeInt32: + case PBFieldDescriptorProtoTypeTypeFixed64: + case PBFieldDescriptorProtoTypeTypeFixed32: + case PBFieldDescriptorProtoTypeTypeBool: + case PBFieldDescriptorProtoTypeTypeString: + case PBFieldDescriptorProtoTypeTypeGroup: + case PBFieldDescriptorProtoTypeTypeMessage: + case PBFieldDescriptorProtoTypeTypeBytes: + case PBFieldDescriptorProtoTypeTypeUint32: + case PBFieldDescriptorProtoTypeTypeEnum: + case PBFieldDescriptorProtoTypeTypeSfixed32: + case PBFieldDescriptorProtoTypeTypeSfixed64: + case PBFieldDescriptorProtoTypeTypeSint32: + case PBFieldDescriptorProtoTypeTypeSint64: return YES; default: return NO; } } -BOOL PBFieldDescriptorProto_LabelIsValidValue(PBFieldDescriptorProto_Label value) { +BOOL PBFieldDescriptorProtoLabelIsValidValue(PBFieldDescriptorProtoLabel value) { switch (value) { - case PBFieldDescriptorProto_LabelLabelOptional: - case PBFieldDescriptorProto_LabelLabelRequired: - case PBFieldDescriptorProto_LabelLabelRepeated: + case PBFieldDescriptorProtoLabelLabelOptional: + case PBFieldDescriptorProtoLabelLabelRequired: + case PBFieldDescriptorProtoLabelLabelRepeated: return YES; default: return NO; } } -@interface PBFieldDescriptorProto_Builder() -@property (retain) PBFieldDescriptorProto* result; +@interface PBFieldDescriptorProtoBuilder() +@property (strong) PBFieldDescriptorProto* result; @end -@implementation PBFieldDescriptorProto_Builder +@implementation PBFieldDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBFieldDescriptorProto alloc] init] autorelease]; + self.result = [[PBFieldDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBFieldDescriptorProto_Builder*) clear { - self.result = [[[PBFieldDescriptorProto alloc] init] autorelease]; +- (PBFieldDescriptorProtoBuilder*) clear { + self.result = [[PBFieldDescriptorProto alloc] init]; return self; } -- (PBFieldDescriptorProto_Builder*) clone { +- (PBFieldDescriptorProtoBuilder*) clone { return [PBFieldDescriptorProto builderWithPrototype:result]; } - (PBFieldDescriptorProto*) defaultInstance { @@ -1841,11 +2218,11 @@ - (PBFieldDescriptorProto*) build { return [self buildPartial]; } - (PBFieldDescriptorProto*) buildPartial { - PBFieldDescriptorProto* returnMe = [[result retain] autorelease]; + PBFieldDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBFieldDescriptorProto_Builder*) mergeFrom:(PBFieldDescriptorProto*) other { +- (PBFieldDescriptorProtoBuilder*) mergeFrom:(PBFieldDescriptorProto*) other { if (other == [PBFieldDescriptorProto defaultInstance]) { return self; } @@ -1876,13 +2253,13 @@ - (PBFieldDescriptorProto_Builder*) mergeFrom:(PBFieldDescriptorProto*) other { [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBFieldDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBFieldDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -1907,8 +2284,8 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 32: { - long value = [input readEnum]; - if (PBFieldDescriptorProto_LabelIsValidValue(value)) { + PBFieldDescriptorProtoLabel value = (PBFieldDescriptorProtoLabel)[input readEnum]; + if (PBFieldDescriptorProtoLabelIsValidValue(value)) { [self setLabel:value]; } else { [unknownFields mergeVarintField:4 value:value]; @@ -1916,8 +2293,8 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 40: { - long value = [input readEnum]; - if (PBFieldDescriptorProto_TypeIsValidValue(value)) { + PBFieldDescriptorProtoType value = (PBFieldDescriptorProtoType)[input readEnum]; + if (PBFieldDescriptorProtoTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:5 value:value]; @@ -1933,7 +2310,7 @@ - (PBFieldDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStrea break; } case 66: { - PBFieldOptions_Builder* subBuilder = [PBFieldOptions builder]; + PBFieldOptionsBuilder* subBuilder = [PBFieldOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -1950,12 +2327,12 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBFieldDescriptorProto_Builder*) setName:(NSString*) value { +- (PBFieldDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearName { +- (PBFieldDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; @@ -1966,12 +2343,12 @@ - (BOOL) hasNumber { - (long) number { return result.number; } -- (PBFieldDescriptorProto_Builder*) setNumber:(long) value { +- (PBFieldDescriptorProtoBuilder*) setNumber:(long) value { result.hasNumber = YES; result.number = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearNumber { +- (PBFieldDescriptorProtoBuilder*) clearNumber { result.hasNumber = NO; result.number = 0; return self; @@ -1979,33 +2356,33 @@ - (PBFieldDescriptorProto_Builder*) clearNumber { - (BOOL) hasLabel { return result.hasLabel; } -- (PBFieldDescriptorProto_Label) label { +- (PBFieldDescriptorProtoLabel) label { return result.label; } -- (PBFieldDescriptorProto_Builder*) setLabel:(PBFieldDescriptorProto_Label) value { +- (PBFieldDescriptorProtoBuilder*) setLabel:(PBFieldDescriptorProtoLabel) value { result.hasLabel = YES; result.label = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearLabel { +- (PBFieldDescriptorProtoBuilder*) clearLabel { result.hasLabel = NO; - result.label = PBFieldDescriptorProto_LabelLabelOptional; + result.label = PBFieldDescriptorProtoLabelLabelOptional; return self; } - (BOOL) hasType { return result.hasType; } -- (PBFieldDescriptorProto_Type) type { +- (PBFieldDescriptorProtoType) type { return result.type; } -- (PBFieldDescriptorProto_Builder*) setType:(PBFieldDescriptorProto_Type) value { +- (PBFieldDescriptorProtoBuilder*) setType:(PBFieldDescriptorProtoType) value { result.hasType = YES; result.type = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearType { +- (PBFieldDescriptorProtoBuilder*) clearType { result.hasType = NO; - result.type = PBFieldDescriptorProto_TypeTypeDouble; + result.type = PBFieldDescriptorProtoTypeTypeDouble; return self; } - (BOOL) hasTypeName { @@ -2014,12 +2391,12 @@ - (BOOL) hasTypeName { - (NSString*) typeName { return result.typeName; } -- (PBFieldDescriptorProto_Builder*) setTypeName:(NSString*) value { +- (PBFieldDescriptorProtoBuilder*) setTypeName:(NSString*) value { result.hasTypeName = YES; result.typeName = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearTypeName { +- (PBFieldDescriptorProtoBuilder*) clearTypeName { result.hasTypeName = NO; result.typeName = @""; return self; @@ -2030,12 +2407,12 @@ - (BOOL) hasExtendee { - (NSString*) extendee { return result.extendee; } -- (PBFieldDescriptorProto_Builder*) setExtendee:(NSString*) value { +- (PBFieldDescriptorProtoBuilder*) setExtendee:(NSString*) value { result.hasExtendee = YES; result.extendee = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearExtendee { +- (PBFieldDescriptorProtoBuilder*) clearExtendee { result.hasExtendee = NO; result.extendee = @""; return self; @@ -2046,12 +2423,12 @@ - (BOOL) hasDefaultValue { - (NSString*) defaultValue { return result.defaultValue; } -- (PBFieldDescriptorProto_Builder*) setDefaultValue:(NSString*) value { +- (PBFieldDescriptorProtoBuilder*) setDefaultValue:(NSString*) value { result.hasDefaultValue = YES; result.defaultValue = value; return self; } -- (PBFieldDescriptorProto_Builder*) clearDefaultValue { +- (PBFieldDescriptorProtoBuilder*) clearDefaultValue { result.hasDefaultValue = NO; result.defaultValue = @""; return self; @@ -2062,15 +2439,15 @@ - (BOOL) hasOptions { - (PBFieldOptions*) options { return result.options; } -- (PBFieldDescriptorProto_Builder*) setOptions:(PBFieldOptions*) value { +- (PBFieldDescriptorProtoBuilder*) setOptions:(PBFieldOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBFieldDescriptorProto_Builder*) setOptionsBuilder:(PBFieldOptions_Builder*) builderForValue { +- (PBFieldDescriptorProtoBuilder*) setOptionsBuilder:(PBFieldOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBFieldDescriptorProto_Builder*) mergeOptions:(PBFieldOptions*) value { +- (PBFieldDescriptorProtoBuilder*) mergeOptions:(PBFieldOptions*) value { if (result.hasOptions && result.options != [PBFieldOptions defaultInstance]) { result.options = @@ -2081,7 +2458,7 @@ - (PBFieldDescriptorProto_Builder*) mergeOptions:(PBFieldOptions*) value { result.hasOptions = YES; return self; } -- (PBFieldDescriptorProto_Builder*) clearOptions { +- (PBFieldDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBFieldOptions defaultInstance]; return self; @@ -2089,9 +2466,9 @@ - (PBFieldDescriptorProto_Builder*) clearOptions { @end @interface PBEnumDescriptorProto () -@property (retain) NSString* name; -@property (retain) NSMutableArray* mutableValueList; -@property (retain) PBEnumOptions* options; +@property (strong) NSString* name; +@property (strong) PBAppendableArray * valueArray; +@property (strong) PBEnumOptions* options; @end @implementation PBEnumDescriptorProto @@ -2099,23 +2476,23 @@ @implementation PBEnumDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; -@synthesize mutableValueList; +@synthesize valueArray; +@dynamic value; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; - (void) dealloc { self.name = nil; - self.mutableValueList = nil; + self.valueArray = nil; self.options = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -2136,15 +2513,14 @@ + (PBEnumDescriptorProto*) defaultInstance { - (PBEnumDescriptorProto*) defaultInstance { return defaultPBEnumDescriptorProtoInstance; } -- (NSArray*) valueList { - return mutableValueList; +- (PBArray *)value { + return valueArray; } -- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index { - id value = [mutableValueList objectAtIndex:index]; - return value; +- (PBEnumValueDescriptorProto*)valueAtIndex:(NSUInteger)index { + return [valueArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBEnumValueDescriptorProto* element in self.valueList) { + for (PBEnumValueDescriptorProto* element in self.value) { if (!element.isInitialized) { return NO; } @@ -2160,7 +2536,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasName) { [output writeString:1 value:self.name]; } - for (PBEnumValueDescriptorProto* element in self.valueList) { + for (PBEnumValueDescriptorProto *element in self.valueArray) { [output writeMessage:2 value:element]; } if (self.hasOptions) { @@ -2169,24 +2545,24 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } - for (PBEnumValueDescriptorProto* element in self.valueList) { - size += computeMessageSize(2, element); + for (PBEnumValueDescriptorProto *element in self.valueArray) { + size_ += computeMessageSize(2, element); } if (self.hasOptions) { - size += computeMessageSize(3, self.options); + size_ += computeMessageSize(3, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBEnumDescriptorProto*) parseFromData:(NSData*) data { return (PBEnumDescriptorProto*)[[[PBEnumDescriptorProto builder] mergeFromData:data] build]; @@ -2206,41 +2582,91 @@ + (PBEnumDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input + (PBEnumDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBEnumDescriptorProto*)[[[PBEnumDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBEnumDescriptorProto_Builder*) builder { - return [[[PBEnumDescriptorProto_Builder alloc] init] autorelease]; ++ (PBEnumDescriptorProtoBuilder*) builder { + return [[PBEnumDescriptorProtoBuilder alloc] init]; } -+ (PBEnumDescriptorProto_Builder*) builderWithPrototype:(PBEnumDescriptorProto*) prototype { ++ (PBEnumDescriptorProtoBuilder*) builderWithPrototype:(PBEnumDescriptorProto*) prototype { return [[PBEnumDescriptorProto builder] mergeFrom:prototype]; } -- (PBEnumDescriptorProto_Builder*) builder { +- (PBEnumDescriptorProtoBuilder*) builder { return [PBEnumDescriptorProto builder]; } +- (PBEnumDescriptorProtoBuilder*) toBuilder { + return [PBEnumDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + for (PBEnumValueDescriptorProto* element in self.valueArray) { + [output appendFormat:@"%@%@ {\n", indent, @"value"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBEnumDescriptorProto class]]) { + return NO; + } + PBEnumDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + [self.valueArray isEqualToArray:otherMessage.valueArray] && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + for (PBEnumValueDescriptorProto* element in self.valueArray) { + hashCode = hashCode * 31 + [element hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBEnumDescriptorProto_Builder() -@property (retain) PBEnumDescriptorProto* result; +@interface PBEnumDescriptorProtoBuilder() +@property (strong) PBEnumDescriptorProto* result; @end -@implementation PBEnumDescriptorProto_Builder +@implementation PBEnumDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBEnumDescriptorProto alloc] init] autorelease]; + self.result = [[PBEnumDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBEnumDescriptorProto_Builder*) clear { - self.result = [[[PBEnumDescriptorProto alloc] init] autorelease]; +- (PBEnumDescriptorProtoBuilder*) clear { + self.result = [[PBEnumDescriptorProto alloc] init]; return self; } -- (PBEnumDescriptorProto_Builder*) clone { +- (PBEnumDescriptorProtoBuilder*) clone { return [PBEnumDescriptorProto builderWithPrototype:result]; } - (PBEnumDescriptorProto*) defaultInstance { @@ -2251,22 +2677,23 @@ - (PBEnumDescriptorProto*) build { return [self buildPartial]; } - (PBEnumDescriptorProto*) buildPartial { - PBEnumDescriptorProto* returnMe = [[result retain] autorelease]; + PBEnumDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBEnumDescriptorProto_Builder*) mergeFrom:(PBEnumDescriptorProto*) other { +- (PBEnumDescriptorProtoBuilder*) mergeFrom:(PBEnumDescriptorProto*) other { if (other == [PBEnumDescriptorProto defaultInstance]) { return self; } if (other.hasName) { [self setName:other.name]; } - if (other.mutableValueList.count > 0) { - if (result.mutableValueList == nil) { - result.mutableValueList = [NSMutableArray array]; + if (other.valueArray.count > 0) { + if (result.valueArray == nil) { + result.valueArray = [other.valueArray copy]; + } else { + [result.valueArray appendArray:other.valueArray]; } - [result.mutableValueList addObjectsFromArray:other.mutableValueList]; } if (other.hasOptions) { [self mergeOptions:other.options]; @@ -2274,13 +2701,13 @@ - (PBEnumDescriptorProto_Builder*) mergeFrom:(PBEnumDescriptorProto*) other { [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBEnumDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBEnumDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2297,13 +2724,13 @@ - (PBEnumDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 18: { - PBEnumValueDescriptorProto_Builder* subBuilder = [PBEnumValueDescriptorProto builder]; + PBEnumValueDescriptorProtoBuilder* subBuilder = [PBEnumValueDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addValue:[subBuilder buildPartial]]; break; } case 26: { - PBEnumOptions_Builder* subBuilder = [PBEnumOptions builder]; + PBEnumOptionsBuilder* subBuilder = [PBEnumOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -2320,43 +2747,39 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBEnumDescriptorProto_Builder*) setName:(NSString*) value { +- (PBEnumDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBEnumDescriptorProto_Builder*) clearName { +- (PBEnumDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; } -- (NSArray*) valueList { - if (result.mutableValueList == nil) { return [NSArray array]; } - return result.mutableValueList; +- (PBAppendableArray *)value { + return result.valueArray; } -- (PBEnumValueDescriptorProto*) valueAtIndex:(long) index { +- (PBEnumValueDescriptorProto*)valueAtIndex:(NSUInteger)index { return [result valueAtIndex:index]; } -- (PBEnumDescriptorProto_Builder*) replaceValueAtIndex:(long) index with:(PBEnumValueDescriptorProto*) value { - [result.mutableValueList replaceObjectAtIndex:index withObject:value]; +- (PBEnumDescriptorProtoBuilder *)addValue:(PBEnumValueDescriptorProto*)value { + if (result.valueArray == nil) { + result.valueArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.valueArray addObject:value]; return self; } -- (PBEnumDescriptorProto_Builder*) addAllValue:(NSArray*) values { - if (result.mutableValueList == nil) { - result.mutableValueList = [NSMutableArray array]; - } - [result.mutableValueList addObjectsFromArray:values]; +- (PBEnumDescriptorProtoBuilder *)setValueArray:(NSArray *)array { + result.valueArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBEnumDescriptorProto_Builder*) clearValueList { - result.mutableValueList = nil; +- (PBEnumDescriptorProtoBuilder *)setValueValues:(const PBEnumValueDescriptorProto* __strong *)values count:(NSUInteger)count { + result.valueArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBEnumDescriptorProto_Builder*) addValue:(PBEnumValueDescriptorProto*) value { - if (result.mutableValueList == nil) { - result.mutableValueList = [NSMutableArray array]; - } - [result.mutableValueList addObject:value]; +- (PBEnumDescriptorProtoBuilder *)clearValue { + result.valueArray = nil; return self; } - (BOOL) hasOptions { @@ -2365,15 +2788,15 @@ - (BOOL) hasOptions { - (PBEnumOptions*) options { return result.options; } -- (PBEnumDescriptorProto_Builder*) setOptions:(PBEnumOptions*) value { +- (PBEnumDescriptorProtoBuilder*) setOptions:(PBEnumOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBEnumDescriptorProto_Builder*) setOptionsBuilder:(PBEnumOptions_Builder*) builderForValue { +- (PBEnumDescriptorProtoBuilder*) setOptionsBuilder:(PBEnumOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBEnumDescriptorProto_Builder*) mergeOptions:(PBEnumOptions*) value { +- (PBEnumDescriptorProtoBuilder*) mergeOptions:(PBEnumOptions*) value { if (result.hasOptions && result.options != [PBEnumOptions defaultInstance]) { result.options = @@ -2384,7 +2807,7 @@ - (PBEnumDescriptorProto_Builder*) mergeOptions:(PBEnumOptions*) value { result.hasOptions = YES; return self; } -- (PBEnumDescriptorProto_Builder*) clearOptions { +- (PBEnumDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBEnumOptions defaultInstance]; return self; @@ -2392,9 +2815,9 @@ - (PBEnumDescriptorProto_Builder*) clearOptions { @end @interface PBEnumValueDescriptorProto () -@property (retain) NSString* name; +@property (strong) NSString* name; @property long number; -@property (retain) PBEnumValueOptions* options; +@property (strong) PBEnumValueOptions* options; @end @implementation PBEnumValueDescriptorProto @@ -2402,28 +2825,27 @@ @implementation PBEnumValueDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; - (BOOL) hasNumber { return !!hasNumber_; } -- (void) setHasNumber:(BOOL) value { - hasNumber_ = !!value; +- (void) setHasNumber:(BOOL) value_ { + hasNumber_ = !!value_; } @synthesize number; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; - (void) dealloc { self.name = nil; self.options = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -2466,24 +2888,24 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } if (self.hasNumber) { - size += computeInt32Size(2, self.number); + size_ += computeInt32Size(2, self.number); } if (self.hasOptions) { - size += computeMessageSize(3, self.options); + size_ += computeMessageSize(3, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBEnumValueDescriptorProto*) parseFromData:(NSData*) data { return (PBEnumValueDescriptorProto*)[[[PBEnumValueDescriptorProto builder] mergeFromData:data] build]; @@ -2503,41 +2925,89 @@ + (PBEnumValueDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) + (PBEnumValueDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBEnumValueDescriptorProto*)[[[PBEnumValueDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBEnumValueDescriptorProto_Builder*) builder { - return [[[PBEnumValueDescriptorProto_Builder alloc] init] autorelease]; ++ (PBEnumValueDescriptorProtoBuilder*) builder { + return [[PBEnumValueDescriptorProtoBuilder alloc] init]; } -+ (PBEnumValueDescriptorProto_Builder*) builderWithPrototype:(PBEnumValueDescriptorProto*) prototype { ++ (PBEnumValueDescriptorProtoBuilder*) builderWithPrototype:(PBEnumValueDescriptorProto*) prototype { return [[PBEnumValueDescriptorProto builder] mergeFrom:prototype]; } -- (PBEnumValueDescriptorProto_Builder*) builder { +- (PBEnumValueDescriptorProtoBuilder*) builder { return [PBEnumValueDescriptorProto builder]; } +- (PBEnumValueDescriptorProtoBuilder*) toBuilder { + return [PBEnumValueDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + if (self.hasNumber) { + [output appendFormat:@"%@%@: %@\n", indent, @"number", [NSNumber numberWithInteger:self.number]]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBEnumValueDescriptorProto class]]) { + return NO; + } + PBEnumValueDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + self.hasNumber == otherMessage.hasNumber && + (!self.hasNumber || self.number == otherMessage.number) && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + if (self.hasNumber) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.number] hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBEnumValueDescriptorProto_Builder() -@property (retain) PBEnumValueDescriptorProto* result; +@interface PBEnumValueDescriptorProtoBuilder() +@property (strong) PBEnumValueDescriptorProto* result; @end -@implementation PBEnumValueDescriptorProto_Builder +@implementation PBEnumValueDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBEnumValueDescriptorProto alloc] init] autorelease]; + self.result = [[PBEnumValueDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBEnumValueDescriptorProto_Builder*) clear { - self.result = [[[PBEnumValueDescriptorProto alloc] init] autorelease]; +- (PBEnumValueDescriptorProtoBuilder*) clear { + self.result = [[PBEnumValueDescriptorProto alloc] init]; return self; } -- (PBEnumValueDescriptorProto_Builder*) clone { +- (PBEnumValueDescriptorProtoBuilder*) clone { return [PBEnumValueDescriptorProto builderWithPrototype:result]; } - (PBEnumValueDescriptorProto*) defaultInstance { @@ -2548,11 +3018,11 @@ - (PBEnumValueDescriptorProto*) build { return [self buildPartial]; } - (PBEnumValueDescriptorProto*) buildPartial { - PBEnumValueDescriptorProto* returnMe = [[result retain] autorelease]; + PBEnumValueDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBEnumValueDescriptorProto_Builder*) mergeFrom:(PBEnumValueDescriptorProto*) other { +- (PBEnumValueDescriptorProtoBuilder*) mergeFrom:(PBEnumValueDescriptorProto*) other { if (other == [PBEnumValueDescriptorProto defaultInstance]) { return self; } @@ -2568,13 +3038,13 @@ - (PBEnumValueDescriptorProto_Builder*) mergeFrom:(PBEnumValueDescriptorProto*) [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBEnumValueDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBEnumValueDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2595,7 +3065,7 @@ - (PBEnumValueDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputS break; } case 26: { - PBEnumValueOptions_Builder* subBuilder = [PBEnumValueOptions builder]; + PBEnumValueOptionsBuilder* subBuilder = [PBEnumValueOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -2612,12 +3082,12 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBEnumValueDescriptorProto_Builder*) setName:(NSString*) value { +- (PBEnumValueDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBEnumValueDescriptorProto_Builder*) clearName { +- (PBEnumValueDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; @@ -2628,12 +3098,12 @@ - (BOOL) hasNumber { - (long) number { return result.number; } -- (PBEnumValueDescriptorProto_Builder*) setNumber:(long) value { +- (PBEnumValueDescriptorProtoBuilder*) setNumber:(long) value { result.hasNumber = YES; result.number = value; return self; } -- (PBEnumValueDescriptorProto_Builder*) clearNumber { +- (PBEnumValueDescriptorProtoBuilder*) clearNumber { result.hasNumber = NO; result.number = 0; return self; @@ -2644,15 +3114,15 @@ - (BOOL) hasOptions { - (PBEnumValueOptions*) options { return result.options; } -- (PBEnumValueDescriptorProto_Builder*) setOptions:(PBEnumValueOptions*) value { +- (PBEnumValueDescriptorProtoBuilder*) setOptions:(PBEnumValueOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBEnumValueDescriptorProto_Builder*) setOptionsBuilder:(PBEnumValueOptions_Builder*) builderForValue { +- (PBEnumValueDescriptorProtoBuilder*) setOptionsBuilder:(PBEnumValueOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBEnumValueDescriptorProto_Builder*) mergeOptions:(PBEnumValueOptions*) value { +- (PBEnumValueDescriptorProtoBuilder*) mergeOptions:(PBEnumValueOptions*) value { if (result.hasOptions && result.options != [PBEnumValueOptions defaultInstance]) { result.options = @@ -2663,7 +3133,7 @@ - (PBEnumValueDescriptorProto_Builder*) mergeOptions:(PBEnumValueOptions*) value result.hasOptions = YES; return self; } -- (PBEnumValueDescriptorProto_Builder*) clearOptions { +- (PBEnumValueDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBEnumValueOptions defaultInstance]; return self; @@ -2671,9 +3141,9 @@ - (PBEnumValueDescriptorProto_Builder*) clearOptions { @end @interface PBServiceDescriptorProto () -@property (retain) NSString* name; -@property (retain) NSMutableArray* mutableMethodList; -@property (retain) PBServiceOptions* options; +@property (strong) NSString* name; +@property (strong) PBAppendableArray * methodArray; +@property (strong) PBServiceOptions* options; @end @implementation PBServiceDescriptorProto @@ -2681,23 +3151,23 @@ @implementation PBServiceDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; -@synthesize mutableMethodList; +@synthesize methodArray; +@dynamic method; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; - (void) dealloc { self.name = nil; - self.mutableMethodList = nil; + self.methodArray = nil; self.options = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -2718,15 +3188,14 @@ + (PBServiceDescriptorProto*) defaultInstance { - (PBServiceDescriptorProto*) defaultInstance { return defaultPBServiceDescriptorProtoInstance; } -- (NSArray*) methodList { - return mutableMethodList; +- (PBArray *)method { + return methodArray; } -- (PBMethodDescriptorProto*) methodAtIndex:(long) index { - id value = [mutableMethodList objectAtIndex:index]; - return value; +- (PBMethodDescriptorProto*)methodAtIndex:(NSUInteger)index { + return [methodArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBMethodDescriptorProto* element in self.methodList) { + for (PBMethodDescriptorProto* element in self.method) { if (!element.isInitialized) { return NO; } @@ -2742,7 +3211,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasName) { [output writeString:1 value:self.name]; } - for (PBMethodDescriptorProto* element in self.methodList) { + for (PBMethodDescriptorProto *element in self.methodArray) { [output writeMessage:2 value:element]; } if (self.hasOptions) { @@ -2751,24 +3220,24 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } - for (PBMethodDescriptorProto* element in self.methodList) { - size += computeMessageSize(2, element); + for (PBMethodDescriptorProto *element in self.methodArray) { + size_ += computeMessageSize(2, element); } if (self.hasOptions) { - size += computeMessageSize(3, self.options); + size_ += computeMessageSize(3, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBServiceDescriptorProto*) parseFromData:(NSData*) data { return (PBServiceDescriptorProto*)[[[PBServiceDescriptorProto builder] mergeFromData:data] build]; @@ -2788,41 +3257,91 @@ + (PBServiceDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) in + (PBServiceDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBServiceDescriptorProto*)[[[PBServiceDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBServiceDescriptorProto_Builder*) builder { - return [[[PBServiceDescriptorProto_Builder alloc] init] autorelease]; ++ (PBServiceDescriptorProtoBuilder*) builder { + return [[PBServiceDescriptorProtoBuilder alloc] init]; } -+ (PBServiceDescriptorProto_Builder*) builderWithPrototype:(PBServiceDescriptorProto*) prototype { ++ (PBServiceDescriptorProtoBuilder*) builderWithPrototype:(PBServiceDescriptorProto*) prototype { return [[PBServiceDescriptorProto builder] mergeFrom:prototype]; } -- (PBServiceDescriptorProto_Builder*) builder { +- (PBServiceDescriptorProtoBuilder*) builder { return [PBServiceDescriptorProto builder]; } +- (PBServiceDescriptorProtoBuilder*) toBuilder { + return [PBServiceDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + for (PBMethodDescriptorProto* element in self.methodArray) { + [output appendFormat:@"%@%@ {\n", indent, @"method"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBServiceDescriptorProto class]]) { + return NO; + } + PBServiceDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + [self.methodArray isEqualToArray:otherMessage.methodArray] && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + for (PBMethodDescriptorProto* element in self.methodArray) { + hashCode = hashCode * 31 + [element hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBServiceDescriptorProto_Builder() -@property (retain) PBServiceDescriptorProto* result; +@interface PBServiceDescriptorProtoBuilder() +@property (strong) PBServiceDescriptorProto* result; @end -@implementation PBServiceDescriptorProto_Builder +@implementation PBServiceDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBServiceDescriptorProto alloc] init] autorelease]; + self.result = [[PBServiceDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBServiceDescriptorProto_Builder*) clear { - self.result = [[[PBServiceDescriptorProto alloc] init] autorelease]; +- (PBServiceDescriptorProtoBuilder*) clear { + self.result = [[PBServiceDescriptorProto alloc] init]; return self; } -- (PBServiceDescriptorProto_Builder*) clone { +- (PBServiceDescriptorProtoBuilder*) clone { return [PBServiceDescriptorProto builderWithPrototype:result]; } - (PBServiceDescriptorProto*) defaultInstance { @@ -2833,22 +3352,23 @@ - (PBServiceDescriptorProto*) build { return [self buildPartial]; } - (PBServiceDescriptorProto*) buildPartial { - PBServiceDescriptorProto* returnMe = [[result retain] autorelease]; + PBServiceDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBServiceDescriptorProto_Builder*) mergeFrom:(PBServiceDescriptorProto*) other { +- (PBServiceDescriptorProtoBuilder*) mergeFrom:(PBServiceDescriptorProto*) other { if (other == [PBServiceDescriptorProto defaultInstance]) { return self; } if (other.hasName) { [self setName:other.name]; } - if (other.mutableMethodList.count > 0) { - if (result.mutableMethodList == nil) { - result.mutableMethodList = [NSMutableArray array]; + if (other.methodArray.count > 0) { + if (result.methodArray == nil) { + result.methodArray = [other.methodArray copy]; + } else { + [result.methodArray appendArray:other.methodArray]; } - [result.mutableMethodList addObjectsFromArray:other.mutableMethodList]; } if (other.hasOptions) { [self mergeOptions:other.options]; @@ -2856,13 +3376,13 @@ - (PBServiceDescriptorProto_Builder*) mergeFrom:(PBServiceDescriptorProto*) othe [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBServiceDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBServiceDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -2879,13 +3399,13 @@ - (PBServiceDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStr break; } case 18: { - PBMethodDescriptorProto_Builder* subBuilder = [PBMethodDescriptorProto builder]; + PBMethodDescriptorProtoBuilder* subBuilder = [PBMethodDescriptorProto builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addMethod:[subBuilder buildPartial]]; break; } case 26: { - PBServiceOptions_Builder* subBuilder = [PBServiceOptions builder]; + PBServiceOptionsBuilder* subBuilder = [PBServiceOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -2902,43 +3422,39 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBServiceDescriptorProto_Builder*) setName:(NSString*) value { +- (PBServiceDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBServiceDescriptorProto_Builder*) clearName { +- (PBServiceDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; } -- (NSArray*) methodList { - if (result.mutableMethodList == nil) { return [NSArray array]; } - return result.mutableMethodList; +- (PBAppendableArray *)method { + return result.methodArray; } -- (PBMethodDescriptorProto*) methodAtIndex:(long) index { +- (PBMethodDescriptorProto*)methodAtIndex:(NSUInteger)index { return [result methodAtIndex:index]; } -- (PBServiceDescriptorProto_Builder*) replaceMethodAtIndex:(long) index with:(PBMethodDescriptorProto*) value { - [result.mutableMethodList replaceObjectAtIndex:index withObject:value]; +- (PBServiceDescriptorProtoBuilder *)addMethod:(PBMethodDescriptorProto*)value { + if (result.methodArray == nil) { + result.methodArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.methodArray addObject:value]; return self; } -- (PBServiceDescriptorProto_Builder*) addAllMethod:(NSArray*) values { - if (result.mutableMethodList == nil) { - result.mutableMethodList = [NSMutableArray array]; - } - [result.mutableMethodList addObjectsFromArray:values]; +- (PBServiceDescriptorProtoBuilder *)setMethodArray:(NSArray *)array { + result.methodArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBServiceDescriptorProto_Builder*) clearMethodList { - result.mutableMethodList = nil; +- (PBServiceDescriptorProtoBuilder *)setMethodValues:(const PBMethodDescriptorProto* __strong *)values count:(NSUInteger)count { + result.methodArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBServiceDescriptorProto_Builder*) addMethod:(PBMethodDescriptorProto*) value { - if (result.mutableMethodList == nil) { - result.mutableMethodList = [NSMutableArray array]; - } - [result.mutableMethodList addObject:value]; +- (PBServiceDescriptorProtoBuilder *)clearMethod { + result.methodArray = nil; return self; } - (BOOL) hasOptions { @@ -2947,15 +3463,15 @@ - (BOOL) hasOptions { - (PBServiceOptions*) options { return result.options; } -- (PBServiceDescriptorProto_Builder*) setOptions:(PBServiceOptions*) value { +- (PBServiceDescriptorProtoBuilder*) setOptions:(PBServiceOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBServiceDescriptorProto_Builder*) setOptionsBuilder:(PBServiceOptions_Builder*) builderForValue { +- (PBServiceDescriptorProtoBuilder*) setOptionsBuilder:(PBServiceOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBServiceDescriptorProto_Builder*) mergeOptions:(PBServiceOptions*) value { +- (PBServiceDescriptorProtoBuilder*) mergeOptions:(PBServiceOptions*) value { if (result.hasOptions && result.options != [PBServiceOptions defaultInstance]) { result.options = @@ -2966,7 +3482,7 @@ - (PBServiceDescriptorProto_Builder*) mergeOptions:(PBServiceOptions*) value { result.hasOptions = YES; return self; } -- (PBServiceDescriptorProto_Builder*) clearOptions { +- (PBServiceDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBServiceOptions defaultInstance]; return self; @@ -2974,10 +3490,10 @@ - (PBServiceDescriptorProto_Builder*) clearOptions { @end @interface PBMethodDescriptorProto () -@property (retain) NSString* name; -@property (retain) NSString* inputType; -@property (retain) NSString* outputType; -@property (retain) PBMethodOptions* options; +@property (strong) NSString* name; +@property (strong) NSString* inputType; +@property (strong) NSString* outputType; +@property (strong) PBMethodOptions* options; @end @implementation PBMethodDescriptorProto @@ -2985,29 +3501,29 @@ @implementation PBMethodDescriptorProto - (BOOL) hasName { return !!hasName_; } -- (void) setHasName:(BOOL) value { - hasName_ = !!value; +- (void) setHasName:(BOOL) value_ { + hasName_ = !!value_; } @synthesize name; - (BOOL) hasInputType { return !!hasInputType_; } -- (void) setHasInputType:(BOOL) value { - hasInputType_ = !!value; +- (void) setHasInputType:(BOOL) value_ { + hasInputType_ = !!value_; } @synthesize inputType; - (BOOL) hasOutputType { return !!hasOutputType_; } -- (void) setHasOutputType:(BOOL) value { - hasOutputType_ = !!value; +- (void) setHasOutputType:(BOOL) value_ { + hasOutputType_ = !!value_; } @synthesize outputType; - (BOOL) hasOptions { return !!hasOptions_; } -- (void) setHasOptions:(BOOL) value { - hasOptions_ = !!value; +- (void) setHasOptions:(BOOL) value_ { + hasOptions_ = !!value_; } @synthesize options; - (void) dealloc { @@ -3015,7 +3531,6 @@ - (void) dealloc { self.inputType = nil; self.outputType = nil; self.options = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -3062,27 +3577,27 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasName) { - size += computeStringSize(1, self.name); + size_ += computeStringSize(1, self.name); } if (self.hasInputType) { - size += computeStringSize(2, self.inputType); + size_ += computeStringSize(2, self.inputType); } if (self.hasOutputType) { - size += computeStringSize(3, self.outputType); + size_ += computeStringSize(3, self.outputType); } if (self.hasOptions) { - size += computeMessageSize(4, self.options); + size_ += computeMessageSize(4, self.options); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBMethodDescriptorProto*) parseFromData:(NSData*) data { return (PBMethodDescriptorProto*)[[[PBMethodDescriptorProto builder] mergeFromData:data] build]; @@ -3102,41 +3617,97 @@ + (PBMethodDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) inp + (PBMethodDescriptorProto*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBMethodDescriptorProto*)[[[PBMethodDescriptorProto builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBMethodDescriptorProto_Builder*) builder { - return [[[PBMethodDescriptorProto_Builder alloc] init] autorelease]; ++ (PBMethodDescriptorProtoBuilder*) builder { + return [[PBMethodDescriptorProtoBuilder alloc] init]; } -+ (PBMethodDescriptorProto_Builder*) builderWithPrototype:(PBMethodDescriptorProto*) prototype { ++ (PBMethodDescriptorProtoBuilder*) builderWithPrototype:(PBMethodDescriptorProto*) prototype { return [[PBMethodDescriptorProto builder] mergeFrom:prototype]; } -- (PBMethodDescriptorProto_Builder*) builder { +- (PBMethodDescriptorProtoBuilder*) builder { return [PBMethodDescriptorProto builder]; } +- (PBMethodDescriptorProtoBuilder*) toBuilder { + return [PBMethodDescriptorProto builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasName) { + [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; + } + if (self.hasInputType) { + [output appendFormat:@"%@%@: %@\n", indent, @"inputType", self.inputType]; + } + if (self.hasOutputType) { + [output appendFormat:@"%@%@: %@\n", indent, @"outputType", self.outputType]; + } + if (self.hasOptions) { + [output appendFormat:@"%@%@ {\n", indent, @"options"]; + [self.options writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBMethodDescriptorProto class]]) { + return NO; + } + PBMethodDescriptorProto *otherMessage = other; + return + self.hasName == otherMessage.hasName && + (!self.hasName || [self.name isEqual:otherMessage.name]) && + self.hasInputType == otherMessage.hasInputType && + (!self.hasInputType || [self.inputType isEqual:otherMessage.inputType]) && + self.hasOutputType == otherMessage.hasOutputType && + (!self.hasOutputType || [self.outputType isEqual:otherMessage.outputType]) && + self.hasOptions == otherMessage.hasOptions && + (!self.hasOptions || [self.options isEqual:otherMessage.options]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasName) { + hashCode = hashCode * 31 + [self.name hash]; + } + if (self.hasInputType) { + hashCode = hashCode * 31 + [self.inputType hash]; + } + if (self.hasOutputType) { + hashCode = hashCode * 31 + [self.outputType hash]; + } + if (self.hasOptions) { + hashCode = hashCode * 31 + [self.options hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBMethodDescriptorProto_Builder() -@property (retain) PBMethodDescriptorProto* result; +@interface PBMethodDescriptorProtoBuilder() +@property (strong) PBMethodDescriptorProto* result; @end -@implementation PBMethodDescriptorProto_Builder +@implementation PBMethodDescriptorProtoBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBMethodDescriptorProto alloc] init] autorelease]; + self.result = [[PBMethodDescriptorProto alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBMethodDescriptorProto_Builder*) clear { - self.result = [[[PBMethodDescriptorProto alloc] init] autorelease]; +- (PBMethodDescriptorProtoBuilder*) clear { + self.result = [[PBMethodDescriptorProto alloc] init]; return self; } -- (PBMethodDescriptorProto_Builder*) clone { +- (PBMethodDescriptorProtoBuilder*) clone { return [PBMethodDescriptorProto builderWithPrototype:result]; } - (PBMethodDescriptorProto*) defaultInstance { @@ -3147,11 +3718,11 @@ - (PBMethodDescriptorProto*) build { return [self buildPartial]; } - (PBMethodDescriptorProto*) buildPartial { - PBMethodDescriptorProto* returnMe = [[result retain] autorelease]; + PBMethodDescriptorProto* returnMe = result; self.result = nil; return returnMe; } -- (PBMethodDescriptorProto_Builder*) mergeFrom:(PBMethodDescriptorProto*) other { +- (PBMethodDescriptorProtoBuilder*) mergeFrom:(PBMethodDescriptorProto*) other { if (other == [PBMethodDescriptorProto defaultInstance]) { return self; } @@ -3170,13 +3741,13 @@ - (PBMethodDescriptorProto_Builder*) mergeFrom:(PBMethodDescriptorProto*) other [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBMethodDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBMethodDescriptorProtoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3201,7 +3772,7 @@ - (PBMethodDescriptorProto_Builder*) mergeFromCodedInputStream:(PBCodedInputStre break; } case 34: { - PBMethodOptions_Builder* subBuilder = [PBMethodOptions builder]; + PBMethodOptionsBuilder* subBuilder = [PBMethodOptions builder]; if (self.hasOptions) { [subBuilder mergeFrom:self.options]; } @@ -3218,12 +3789,12 @@ - (BOOL) hasName { - (NSString*) name { return result.name; } -- (PBMethodDescriptorProto_Builder*) setName:(NSString*) value { +- (PBMethodDescriptorProtoBuilder*) setName:(NSString*) value { result.hasName = YES; result.name = value; return self; } -- (PBMethodDescriptorProto_Builder*) clearName { +- (PBMethodDescriptorProtoBuilder*) clearName { result.hasName = NO; result.name = @""; return self; @@ -3234,12 +3805,12 @@ - (BOOL) hasInputType { - (NSString*) inputType { return result.inputType; } -- (PBMethodDescriptorProto_Builder*) setInputType:(NSString*) value { +- (PBMethodDescriptorProtoBuilder*) setInputType:(NSString*) value { result.hasInputType = YES; result.inputType = value; return self; } -- (PBMethodDescriptorProto_Builder*) clearInputType { +- (PBMethodDescriptorProtoBuilder*) clearInputType { result.hasInputType = NO; result.inputType = @""; return self; @@ -3250,12 +3821,12 @@ - (BOOL) hasOutputType { - (NSString*) outputType { return result.outputType; } -- (PBMethodDescriptorProto_Builder*) setOutputType:(NSString*) value { +- (PBMethodDescriptorProtoBuilder*) setOutputType:(NSString*) value { result.hasOutputType = YES; result.outputType = value; return self; } -- (PBMethodDescriptorProto_Builder*) clearOutputType { +- (PBMethodDescriptorProtoBuilder*) clearOutputType { result.hasOutputType = NO; result.outputType = @""; return self; @@ -3266,15 +3837,15 @@ - (BOOL) hasOptions { - (PBMethodOptions*) options { return result.options; } -- (PBMethodDescriptorProto_Builder*) setOptions:(PBMethodOptions*) value { +- (PBMethodDescriptorProtoBuilder*) setOptions:(PBMethodOptions*) value { result.hasOptions = YES; result.options = value; return self; } -- (PBMethodDescriptorProto_Builder*) setOptionsBuilder:(PBMethodOptions_Builder*) builderForValue { +- (PBMethodDescriptorProtoBuilder*) setOptionsBuilder:(PBMethodOptionsBuilder*) builderForValue { return [self setOptions:[builderForValue build]]; } -- (PBMethodDescriptorProto_Builder*) mergeOptions:(PBMethodOptions*) value { +- (PBMethodDescriptorProtoBuilder*) mergeOptions:(PBMethodOptions*) value { if (result.hasOptions && result.options != [PBMethodOptions defaultInstance]) { result.options = @@ -3285,7 +3856,7 @@ - (PBMethodDescriptorProto_Builder*) mergeOptions:(PBMethodOptions*) value { result.hasOptions = YES; return self; } -- (PBMethodDescriptorProto_Builder*) clearOptions { +- (PBMethodDescriptorProtoBuilder*) clearOptions { result.hasOptions = NO; result.options = [PBMethodOptions defaultInstance]; return self; @@ -3293,11 +3864,15 @@ - (PBMethodDescriptorProto_Builder*) clearOptions { @end @interface PBFileOptions () -@property (retain) NSString* javaPackage; -@property (retain) NSString* javaOuterClassname; +@property (strong) NSString* javaPackage; +@property (strong) NSString* javaOuterClassname; @property BOOL javaMultipleFiles; -@property PBFileOptions_OptimizeMode optimizeFor; -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property BOOL javaGenerateEqualsAndHash; +@property PBFileOptionsOptimizeMode optimizeFor; +@property BOOL ccGenericServices; +@property BOOL javaGenericServices; +@property BOOL pyGenericServices; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBFileOptions @@ -3305,49 +3880,101 @@ @implementation PBFileOptions - (BOOL) hasJavaPackage { return !!hasJavaPackage_; } -- (void) setHasJavaPackage:(BOOL) value { - hasJavaPackage_ = !!value; +- (void) setHasJavaPackage:(BOOL) value_ { + hasJavaPackage_ = !!value_; } @synthesize javaPackage; - (BOOL) hasJavaOuterClassname { return !!hasJavaOuterClassname_; } -- (void) setHasJavaOuterClassname:(BOOL) value { - hasJavaOuterClassname_ = !!value; +- (void) setHasJavaOuterClassname:(BOOL) value_ { + hasJavaOuterClassname_ = !!value_; } @synthesize javaOuterClassname; - (BOOL) hasJavaMultipleFiles { return !!hasJavaMultipleFiles_; } -- (void) setHasJavaMultipleFiles:(BOOL) value { - hasJavaMultipleFiles_ = !!value; +- (void) setHasJavaMultipleFiles:(BOOL) value_ { + hasJavaMultipleFiles_ = !!value_; } - (BOOL) javaMultipleFiles { return !!javaMultipleFiles_; } -- (void) setJavaMultipleFiles:(BOOL) value { - javaMultipleFiles_ = !!value; +- (void) setJavaMultipleFiles:(BOOL) value_ { + javaMultipleFiles_ = !!value_; +} +- (BOOL) hasJavaGenerateEqualsAndHash { + return !!hasJavaGenerateEqualsAndHash_; +} +- (void) setHasJavaGenerateEqualsAndHash:(BOOL) value_ { + hasJavaGenerateEqualsAndHash_ = !!value_; +} +- (BOOL) javaGenerateEqualsAndHash { + return !!javaGenerateEqualsAndHash_; +} +- (void) setJavaGenerateEqualsAndHash:(BOOL) value_ { + javaGenerateEqualsAndHash_ = !!value_; } - (BOOL) hasOptimizeFor { return !!hasOptimizeFor_; } -- (void) setHasOptimizeFor:(BOOL) value { - hasOptimizeFor_ = !!value; +- (void) setHasOptimizeFor:(BOOL) value_ { + hasOptimizeFor_ = !!value_; } @synthesize optimizeFor; -@synthesize mutableUninterpretedOptionList; +- (BOOL) hasCcGenericServices { + return !!hasCcGenericServices_; +} +- (void) setHasCcGenericServices:(BOOL) value_ { + hasCcGenericServices_ = !!value_; +} +- (BOOL) ccGenericServices { + return !!ccGenericServices_; +} +- (void) setCcGenericServices:(BOOL) value_ { + ccGenericServices_ = !!value_; +} +- (BOOL) hasJavaGenericServices { + return !!hasJavaGenericServices_; +} +- (void) setHasJavaGenericServices:(BOOL) value_ { + hasJavaGenericServices_ = !!value_; +} +- (BOOL) javaGenericServices { + return !!javaGenericServices_; +} +- (void) setJavaGenericServices:(BOOL) value_ { + javaGenericServices_ = !!value_; +} +- (BOOL) hasPyGenericServices { + return !!hasPyGenericServices_; +} +- (void) setHasPyGenericServices:(BOOL) value_ { + hasPyGenericServices_ = !!value_; +} +- (BOOL) pyGenericServices { + return !!pyGenericServices_; +} +- (void) setPyGenericServices:(BOOL) value_ { + pyGenericServices_ = !!value_; +} +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { self.javaPackage = nil; self.javaOuterClassname = nil; - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { self.javaPackage = @""; self.javaOuterClassname = @""; self.javaMultipleFiles = NO; - self.optimizeFor = PBFileOptions_OptimizeModeSpeed; + self.javaGenerateEqualsAndHash = NO; + self.optimizeFor = PBFileOptionsOptimizeModeSpeed; + self.ccGenericServices = NO; + self.javaGenericServices = NO; + self.pyGenericServices = NO; } return self; } @@ -3363,15 +3990,14 @@ + (PBFileOptions*) defaultInstance { - (PBFileOptions*) defaultInstance { return defaultPBFileOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -3394,7 +4020,19 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasJavaMultipleFiles) { [output writeBool:10 value:self.javaMultipleFiles]; } - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + if (self.hasCcGenericServices) { + [output writeBool:16 value:self.ccGenericServices]; + } + if (self.hasJavaGenericServices) { + [output writeBool:17 value:self.javaGenericServices]; + } + if (self.hasPyGenericServices) { + [output writeBool:18 value:self.pyGenericServices]; + } + if (self.hasJavaGenerateEqualsAndHash) { + [output writeBool:20 value:self.javaGenerateEqualsAndHash]; + } + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -3403,31 +4041,43 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasJavaPackage) { - size += computeStringSize(1, self.javaPackage); + size_ += computeStringSize(1, self.javaPackage); } if (self.hasJavaOuterClassname) { - size += computeStringSize(8, self.javaOuterClassname); + size_ += computeStringSize(8, self.javaOuterClassname); } if (self.hasOptimizeFor) { - size += computeEnumSize(9, self.optimizeFor); + size_ += computeEnumSize(9, self.optimizeFor); } if (self.hasJavaMultipleFiles) { - size += computeBoolSize(10, self.javaMultipleFiles); + size_ += computeBoolSize(10, self.javaMultipleFiles); + } + if (self.hasCcGenericServices) { + size_ += computeBoolSize(16, self.ccGenericServices); + } + if (self.hasJavaGenericServices) { + size_ += computeBoolSize(17, self.javaGenericServices); + } + if (self.hasPyGenericServices) { + size_ += computeBoolSize(18, self.pyGenericServices); + } + if (self.hasJavaGenerateEqualsAndHash) { + size_ += computeBoolSize(20, self.javaGenerateEqualsAndHash); } - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBFileOptions*) parseFromData:(NSData*) data { return (PBFileOptions*)[[[PBFileOptions builder] mergeFromData:data] build]; @@ -3447,51 +4097,153 @@ + (PBFileOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBFileOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBFileOptions*)[[[PBFileOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBFileOptions_Builder*) builder { - return [[[PBFileOptions_Builder alloc] init] autorelease]; ++ (PBFileOptionsBuilder*) builder { + return [[PBFileOptionsBuilder alloc] init]; } -+ (PBFileOptions_Builder*) builderWithPrototype:(PBFileOptions*) prototype { ++ (PBFileOptionsBuilder*) builderWithPrototype:(PBFileOptions*) prototype { return [[PBFileOptions builder] mergeFrom:prototype]; } -- (PBFileOptions_Builder*) builder { +- (PBFileOptionsBuilder*) builder { return [PBFileOptions builder]; } +- (PBFileOptionsBuilder*) toBuilder { + return [PBFileOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasJavaPackage) { + [output appendFormat:@"%@%@: %@\n", indent, @"javaPackage", self.javaPackage]; + } + if (self.hasJavaOuterClassname) { + [output appendFormat:@"%@%@: %@\n", indent, @"javaOuterClassname", self.javaOuterClassname]; + } + if (self.hasOptimizeFor) { + [output appendFormat:@"%@%@: %d\n", indent, @"optimizeFor", self.optimizeFor]; + } + if (self.hasJavaMultipleFiles) { + [output appendFormat:@"%@%@: %@\n", indent, @"javaMultipleFiles", [NSNumber numberWithBool:self.javaMultipleFiles]]; + } + if (self.hasCcGenericServices) { + [output appendFormat:@"%@%@: %@\n", indent, @"ccGenericServices", [NSNumber numberWithBool:self.ccGenericServices]]; + } + if (self.hasJavaGenericServices) { + [output appendFormat:@"%@%@: %@\n", indent, @"javaGenericServices", [NSNumber numberWithBool:self.javaGenericServices]]; + } + if (self.hasPyGenericServices) { + [output appendFormat:@"%@%@: %@\n", indent, @"pyGenericServices", [NSNumber numberWithBool:self.pyGenericServices]]; + } + if (self.hasJavaGenerateEqualsAndHash) { + [output appendFormat:@"%@%@: %@\n", indent, @"javaGenerateEqualsAndHash", [NSNumber numberWithBool:self.javaGenerateEqualsAndHash]]; + } + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBFileOptions class]]) { + return NO; + } + PBFileOptions *otherMessage = other; + return + self.hasJavaPackage == otherMessage.hasJavaPackage && + (!self.hasJavaPackage || [self.javaPackage isEqual:otherMessage.javaPackage]) && + self.hasJavaOuterClassname == otherMessage.hasJavaOuterClassname && + (!self.hasJavaOuterClassname || [self.javaOuterClassname isEqual:otherMessage.javaOuterClassname]) && + self.hasOptimizeFor == otherMessage.hasOptimizeFor && + (!self.hasOptimizeFor || self.optimizeFor == otherMessage.optimizeFor) && + self.hasJavaMultipleFiles == otherMessage.hasJavaMultipleFiles && + (!self.hasJavaMultipleFiles || self.javaMultipleFiles == otherMessage.javaMultipleFiles) && + self.hasCcGenericServices == otherMessage.hasCcGenericServices && + (!self.hasCcGenericServices || self.ccGenericServices == otherMessage.ccGenericServices) && + self.hasJavaGenericServices == otherMessage.hasJavaGenericServices && + (!self.hasJavaGenericServices || self.javaGenericServices == otherMessage.javaGenericServices) && + self.hasPyGenericServices == otherMessage.hasPyGenericServices && + (!self.hasPyGenericServices || self.pyGenericServices == otherMessage.pyGenericServices) && + self.hasJavaGenerateEqualsAndHash == otherMessage.hasJavaGenerateEqualsAndHash && + (!self.hasJavaGenerateEqualsAndHash || self.javaGenerateEqualsAndHash == otherMessage.javaGenerateEqualsAndHash) && + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasJavaPackage) { + hashCode = hashCode * 31 + [self.javaPackage hash]; + } + if (self.hasJavaOuterClassname) { + hashCode = hashCode * 31 + [self.javaOuterClassname hash]; + } + if (self.hasOptimizeFor) { + hashCode = hashCode * 31 + self.optimizeFor; + } + if (self.hasJavaMultipleFiles) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.javaMultipleFiles] hash]; + } + if (self.hasCcGenericServices) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.ccGenericServices] hash]; + } + if (self.hasJavaGenericServices) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.javaGenericServices] hash]; + } + if (self.hasPyGenericServices) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.pyGenericServices] hash]; + } + if (self.hasJavaGenerateEqualsAndHash) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.javaGenerateEqualsAndHash] hash]; + } + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -BOOL PBFileOptions_OptimizeModeIsValidValue(PBFileOptions_OptimizeMode value) { +BOOL PBFileOptionsOptimizeModeIsValidValue(PBFileOptionsOptimizeMode value) { switch (value) { - case PBFileOptions_OptimizeModeSpeed: - case PBFileOptions_OptimizeModeCodeSize: - case PBFileOptions_OptimizeModeLiteRuntime: + case PBFileOptionsOptimizeModeSpeed: + case PBFileOptionsOptimizeModeCodeSize: + case PBFileOptionsOptimizeModeLiteRuntime: return YES; default: return NO; } } -@interface PBFileOptions_Builder() -@property (retain) PBFileOptions* result; +@interface PBFileOptionsBuilder() +@property (strong) PBFileOptions* result; @end -@implementation PBFileOptions_Builder +@implementation PBFileOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBFileOptions alloc] init] autorelease]; + self.result = [[PBFileOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBFileOptions_Builder*) clear { - self.result = [[[PBFileOptions alloc] init] autorelease]; +- (PBFileOptionsBuilder*) clear { + self.result = [[PBFileOptions alloc] init]; return self; } -- (PBFileOptions_Builder*) clone { +- (PBFileOptionsBuilder*) clone { return [PBFileOptions builderWithPrototype:result]; } - (PBFileOptions*) defaultInstance { @@ -3502,11 +4254,11 @@ - (PBFileOptions*) build { return [self buildPartial]; } - (PBFileOptions*) buildPartial { - PBFileOptions* returnMe = [[result retain] autorelease]; + PBFileOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBFileOptions_Builder*) mergeFrom:(PBFileOptions*) other { +- (PBFileOptionsBuilder*) mergeFrom:(PBFileOptions*) other { if (other == [PBFileOptions defaultInstance]) { return self; } @@ -3519,26 +4271,39 @@ - (PBFileOptions_Builder*) mergeFrom:(PBFileOptions*) other { if (other.hasJavaMultipleFiles) { [self setJavaMultipleFiles:other.javaMultipleFiles]; } + if (other.hasJavaGenerateEqualsAndHash) { + [self setJavaGenerateEqualsAndHash:other.javaGenerateEqualsAndHash]; + } if (other.hasOptimizeFor) { [self setOptimizeFor:other.optimizeFor]; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.hasCcGenericServices) { + [self setCcGenericServices:other.ccGenericServices]; + } + if (other.hasJavaGenericServices) { + [self setJavaGenericServices:other.javaGenericServices]; + } + if (other.hasPyGenericServices) { + [self setPyGenericServices:other.pyGenericServices]; + } + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBFileOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBFileOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3559,8 +4324,8 @@ - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 72: { - long value = [input readEnum]; - if (PBFileOptions_OptimizeModeIsValidValue(value)) { + PBFileOptionsOptimizeMode value = (PBFileOptionsOptimizeMode)[input readEnum]; + if (PBFileOptionsOptimizeModeIsValidValue(value)) { [self setOptimizeFor:value]; } else { [unknownFields mergeVarintField:9 value:value]; @@ -3571,8 +4336,24 @@ - (PBFileOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input [self setJavaMultipleFiles:[input readBool]]; break; } + case 128: { + [self setCcGenericServices:[input readBool]]; + break; + } + case 136: { + [self setJavaGenericServices:[input readBool]]; + break; + } + case 144: { + [self setPyGenericServices:[input readBool]]; + break; + } + case 160: { + [self setJavaGenerateEqualsAndHash:[input readBool]]; + break; + } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -3586,12 +4367,12 @@ - (BOOL) hasJavaPackage { - (NSString*) javaPackage { return result.javaPackage; } -- (PBFileOptions_Builder*) setJavaPackage:(NSString*) value { +- (PBFileOptionsBuilder*) setJavaPackage:(NSString*) value { result.hasJavaPackage = YES; result.javaPackage = value; return self; } -- (PBFileOptions_Builder*) clearJavaPackage { +- (PBFileOptionsBuilder*) clearJavaPackage { result.hasJavaPackage = NO; result.javaPackage = @""; return self; @@ -3602,12 +4383,12 @@ - (BOOL) hasJavaOuterClassname { - (NSString*) javaOuterClassname { return result.javaOuterClassname; } -- (PBFileOptions_Builder*) setJavaOuterClassname:(NSString*) value { +- (PBFileOptionsBuilder*) setJavaOuterClassname:(NSString*) value { result.hasJavaOuterClassname = YES; result.javaOuterClassname = value; return self; } -- (PBFileOptions_Builder*) clearJavaOuterClassname { +- (PBFileOptionsBuilder*) clearJavaOuterClassname { result.hasJavaOuterClassname = NO; result.javaOuterClassname = @""; return self; @@ -3618,59 +4399,119 @@ - (BOOL) hasJavaMultipleFiles { - (BOOL) javaMultipleFiles { return result.javaMultipleFiles; } -- (PBFileOptions_Builder*) setJavaMultipleFiles:(BOOL) value { +- (PBFileOptionsBuilder*) setJavaMultipleFiles:(BOOL) value { result.hasJavaMultipleFiles = YES; result.javaMultipleFiles = value; return self; } -- (PBFileOptions_Builder*) clearJavaMultipleFiles { +- (PBFileOptionsBuilder*) clearJavaMultipleFiles { result.hasJavaMultipleFiles = NO; result.javaMultipleFiles = NO; return self; } +- (BOOL) hasJavaGenerateEqualsAndHash { + return result.hasJavaGenerateEqualsAndHash; +} +- (BOOL) javaGenerateEqualsAndHash { + return result.javaGenerateEqualsAndHash; +} +- (PBFileOptionsBuilder*) setJavaGenerateEqualsAndHash:(BOOL) value { + result.hasJavaGenerateEqualsAndHash = YES; + result.javaGenerateEqualsAndHash = value; + return self; +} +- (PBFileOptionsBuilder*) clearJavaGenerateEqualsAndHash { + result.hasJavaGenerateEqualsAndHash = NO; + result.javaGenerateEqualsAndHash = NO; + return self; +} - (BOOL) hasOptimizeFor { return result.hasOptimizeFor; } -- (PBFileOptions_OptimizeMode) optimizeFor { +- (PBFileOptionsOptimizeMode) optimizeFor { return result.optimizeFor; } -- (PBFileOptions_Builder*) setOptimizeFor:(PBFileOptions_OptimizeMode) value { +- (PBFileOptionsBuilder*) setOptimizeFor:(PBFileOptionsOptimizeMode) value { result.hasOptimizeFor = YES; result.optimizeFor = value; return self; } -- (PBFileOptions_Builder*) clearOptimizeFor { +- (PBFileOptionsBuilder*) clearOptimizeFor { result.hasOptimizeFor = NO; - result.optimizeFor = PBFileOptions_OptimizeModeSpeed; + result.optimizeFor = PBFileOptionsOptimizeModeSpeed; return self; } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (BOOL) hasCcGenericServices { + return result.hasCcGenericServices; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - return [result uninterpretedOptionAtIndex:index]; +- (BOOL) ccGenericServices { + return result.ccGenericServices; } -- (PBFileOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBFileOptionsBuilder*) setCcGenericServices:(BOOL) value { + result.hasCcGenericServices = YES; + result.ccGenericServices = value; return self; } -- (PBFileOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBFileOptionsBuilder*) clearCcGenericServices { + result.hasCcGenericServices = NO; + result.ccGenericServices = NO; + return self; +} +- (BOOL) hasJavaGenericServices { + return result.hasJavaGenericServices; +} +- (BOOL) javaGenericServices { + return result.javaGenericServices; +} +- (PBFileOptionsBuilder*) setJavaGenericServices:(BOOL) value { + result.hasJavaGenericServices = YES; + result.javaGenericServices = value; + return self; +} +- (PBFileOptionsBuilder*) clearJavaGenericServices { + result.hasJavaGenericServices = NO; + result.javaGenericServices = NO; + return self; +} +- (BOOL) hasPyGenericServices { + return result.hasPyGenericServices; +} +- (BOOL) pyGenericServices { + return result.pyGenericServices; +} +- (PBFileOptionsBuilder*) setPyGenericServices:(BOOL) value { + result.hasPyGenericServices = YES; + result.pyGenericServices = value; return self; } -- (PBFileOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBFileOptionsBuilder*) clearPyGenericServices { + result.hasPyGenericServices = NO; + result.pyGenericServices = NO; return self; } -- (PBFileOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; +} +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [result uninterpretedOptionAtIndex:index]; +} +- (PBFileOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; } - [result.mutableUninterpretedOptionList addObject:value]; + [result.uninterpretedOptionArray addObject:value]; + return self; +} +- (PBFileOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; + return self; +} +- (PBFileOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; + return self; +} +- (PBFileOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @@ -3678,7 +4519,7 @@ - (PBFileOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value @interface PBMessageOptions () @property BOOL messageSetWireFormat; @property BOOL noStandardDescriptorAccessor; -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBMessageOptions @@ -3686,31 +4527,31 @@ @implementation PBMessageOptions - (BOOL) hasMessageSetWireFormat { return !!hasMessageSetWireFormat_; } -- (void) setHasMessageSetWireFormat:(BOOL) value { - hasMessageSetWireFormat_ = !!value; +- (void) setHasMessageSetWireFormat:(BOOL) value_ { + hasMessageSetWireFormat_ = !!value_; } - (BOOL) messageSetWireFormat { return !!messageSetWireFormat_; } -- (void) setMessageSetWireFormat:(BOOL) value { - messageSetWireFormat_ = !!value; +- (void) setMessageSetWireFormat:(BOOL) value_ { + messageSetWireFormat_ = !!value_; } - (BOOL) hasNoStandardDescriptorAccessor { return !!hasNoStandardDescriptorAccessor_; } -- (void) setHasNoStandardDescriptorAccessor:(BOOL) value { - hasNoStandardDescriptorAccessor_ = !!value; +- (void) setHasNoStandardDescriptorAccessor:(BOOL) value_ { + hasNoStandardDescriptorAccessor_ = !!value_; } - (BOOL) noStandardDescriptorAccessor { return !!noStandardDescriptorAccessor_; } -- (void) setNoStandardDescriptorAccessor:(BOOL) value { - noStandardDescriptorAccessor_ = !!value; +- (void) setNoStandardDescriptorAccessor:(BOOL) value_ { + noStandardDescriptorAccessor_ = !!value_; } -@synthesize mutableUninterpretedOptionList; +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { @@ -3731,15 +4572,14 @@ + (PBMessageOptions*) defaultInstance { - (PBMessageOptions*) defaultInstance { return defaultPBMessageOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -3756,7 +4596,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasNoStandardDescriptorAccessor) { [output writeBool:2 value:self.noStandardDescriptorAccessor]; } - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -3765,25 +4605,25 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasMessageSetWireFormat) { - size += computeBoolSize(1, self.messageSetWireFormat); + size_ += computeBoolSize(1, self.messageSetWireFormat); } if (self.hasNoStandardDescriptorAccessor) { - size += computeBoolSize(2, self.noStandardDescriptorAccessor); + size_ += computeBoolSize(2, self.noStandardDescriptorAccessor); } - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBMessageOptions*) parseFromData:(NSData*) data { return (PBMessageOptions*)[[[PBMessageOptions builder] mergeFromData:data] build]; @@ -3803,41 +4643,95 @@ + (PBMessageOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBMessageOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBMessageOptions*)[[[PBMessageOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBMessageOptions_Builder*) builder { - return [[[PBMessageOptions_Builder alloc] init] autorelease]; ++ (PBMessageOptionsBuilder*) builder { + return [[PBMessageOptionsBuilder alloc] init]; } -+ (PBMessageOptions_Builder*) builderWithPrototype:(PBMessageOptions*) prototype { ++ (PBMessageOptionsBuilder*) builderWithPrototype:(PBMessageOptions*) prototype { return [[PBMessageOptions builder] mergeFrom:prototype]; } -- (PBMessageOptions_Builder*) builder { +- (PBMessageOptionsBuilder*) builder { return [PBMessageOptions builder]; } +- (PBMessageOptionsBuilder*) toBuilder { + return [PBMessageOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasMessageSetWireFormat) { + [output appendFormat:@"%@%@: %@\n", indent, @"messageSetWireFormat", [NSNumber numberWithBool:self.messageSetWireFormat]]; + } + if (self.hasNoStandardDescriptorAccessor) { + [output appendFormat:@"%@%@: %@\n", indent, @"noStandardDescriptorAccessor", [NSNumber numberWithBool:self.noStandardDescriptorAccessor]]; + } + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBMessageOptions class]]) { + return NO; + } + PBMessageOptions *otherMessage = other; + return + self.hasMessageSetWireFormat == otherMessage.hasMessageSetWireFormat && + (!self.hasMessageSetWireFormat || self.messageSetWireFormat == otherMessage.messageSetWireFormat) && + self.hasNoStandardDescriptorAccessor == otherMessage.hasNoStandardDescriptorAccessor && + (!self.hasNoStandardDescriptorAccessor || self.noStandardDescriptorAccessor == otherMessage.noStandardDescriptorAccessor) && + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasMessageSetWireFormat) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.messageSetWireFormat] hash]; + } + if (self.hasNoStandardDescriptorAccessor) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.noStandardDescriptorAccessor] hash]; + } + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBMessageOptions_Builder() -@property (retain) PBMessageOptions* result; +@interface PBMessageOptionsBuilder() +@property (strong) PBMessageOptions* result; @end -@implementation PBMessageOptions_Builder +@implementation PBMessageOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBMessageOptions alloc] init] autorelease]; + self.result = [[PBMessageOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBMessageOptions_Builder*) clear { - self.result = [[[PBMessageOptions alloc] init] autorelease]; +- (PBMessageOptionsBuilder*) clear { + self.result = [[PBMessageOptions alloc] init]; return self; } -- (PBMessageOptions_Builder*) clone { +- (PBMessageOptionsBuilder*) clone { return [PBMessageOptions builderWithPrototype:result]; } - (PBMessageOptions*) defaultInstance { @@ -3848,11 +4742,11 @@ - (PBMessageOptions*) build { return [self buildPartial]; } - (PBMessageOptions*) buildPartial { - PBMessageOptions* returnMe = [[result retain] autorelease]; + PBMessageOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBMessageOptions_Builder*) mergeFrom:(PBMessageOptions*) other { +- (PBMessageOptionsBuilder*) mergeFrom:(PBMessageOptions*) other { if (other == [PBMessageOptions defaultInstance]) { return self; } @@ -3862,23 +4756,24 @@ - (PBMessageOptions_Builder*) mergeFrom:(PBMessageOptions*) other { if (other.hasNoStandardDescriptorAccessor) { [self setNoStandardDescriptorAccessor:other.noStandardDescriptorAccessor]; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBMessageOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBMessageOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -3899,7 +4794,7 @@ - (PBMessageOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -3913,12 +4808,12 @@ - (BOOL) hasMessageSetWireFormat { - (BOOL) messageSetWireFormat { return result.messageSetWireFormat; } -- (PBMessageOptions_Builder*) setMessageSetWireFormat:(BOOL) value { +- (PBMessageOptionsBuilder*) setMessageSetWireFormat:(BOOL) value { result.hasMessageSetWireFormat = YES; result.messageSetWireFormat = value; return self; } -- (PBMessageOptions_Builder*) clearMessageSetWireFormat { +- (PBMessageOptionsBuilder*) clearMessageSetWireFormat { result.hasMessageSetWireFormat = NO; result.messageSetWireFormat = NO; return self; @@ -3929,53 +4824,49 @@ - (BOOL) hasNoStandardDescriptorAccessor { - (BOOL) noStandardDescriptorAccessor { return result.noStandardDescriptorAccessor; } -- (PBMessageOptions_Builder*) setNoStandardDescriptorAccessor:(BOOL) value { +- (PBMessageOptionsBuilder*) setNoStandardDescriptorAccessor:(BOOL) value { result.hasNoStandardDescriptorAccessor = YES; result.noStandardDescriptorAccessor = value; return self; } -- (PBMessageOptions_Builder*) clearNoStandardDescriptorAccessor { +- (PBMessageOptionsBuilder*) clearNoStandardDescriptorAccessor { result.hasNoStandardDescriptorAccessor = NO; result.noStandardDescriptorAccessor = NO; return self; } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { return [result uninterpretedOptionAtIndex:index]; } -- (PBMessageOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBMessageOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.uninterpretedOptionArray addObject:value]; return self; } -- (PBMessageOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBMessageOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBMessageOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBMessageOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBMessageOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObject:value]; +- (PBMessageOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @interface PBFieldOptions () -@property PBFieldOptions_CType ctype; +@property PBFieldOptionsCType ctype; @property BOOL packed; @property BOOL deprecated; -@property (retain) NSString* experimentalMapKey; -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property (strong) NSString* experimentalMapKey; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBFieldOptions @@ -3983,50 +4874,50 @@ @implementation PBFieldOptions - (BOOL) hasCtype { return !!hasCtype_; } -- (void) setHasCtype:(BOOL) value { - hasCtype_ = !!value; +- (void) setHasCtype:(BOOL) value_ { + hasCtype_ = !!value_; } @synthesize ctype; - (BOOL) hasPacked { return !!hasPacked_; } -- (void) setHasPacked:(BOOL) value { - hasPacked_ = !!value; +- (void) setHasPacked:(BOOL) value_ { + hasPacked_ = !!value_; } - (BOOL) packed { return !!packed_; } -- (void) setPacked:(BOOL) value { - packed_ = !!value; +- (void) setPacked:(BOOL) value_ { + packed_ = !!value_; } - (BOOL) hasDeprecated { return !!hasDeprecated_; } -- (void) setHasDeprecated:(BOOL) value { - hasDeprecated_ = !!value; +- (void) setHasDeprecated:(BOOL) value_ { + hasDeprecated_ = !!value_; } - (BOOL) deprecated { return !!deprecated_; } -- (void) setDeprecated:(BOOL) value { - deprecated_ = !!value; +- (void) setDeprecated:(BOOL) value_ { + deprecated_ = !!value_; } - (BOOL) hasExperimentalMapKey { return !!hasExperimentalMapKey_; } -- (void) setHasExperimentalMapKey:(BOOL) value { - hasExperimentalMapKey_ = !!value; +- (void) setHasExperimentalMapKey:(BOOL) value_ { + hasExperimentalMapKey_ = !!value_; } @synthesize experimentalMapKey; -@synthesize mutableUninterpretedOptionList; +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { self.experimentalMapKey = nil; - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { - self.ctype = PBFieldOptions_CTypeCord; + self.ctype = PBFieldOptionsCTypeString; self.packed = NO; self.deprecated = NO; self.experimentalMapKey = @""; @@ -4045,15 +4936,14 @@ + (PBFieldOptions*) defaultInstance { - (PBFieldOptions*) defaultInstance { return defaultPBFieldOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -4076,7 +4966,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasExperimentalMapKey) { [output writeString:9 value:self.experimentalMapKey]; } - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -4085,31 +4975,31 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasCtype) { - size += computeEnumSize(1, self.ctype); + size_ += computeEnumSize(1, self.ctype); } if (self.hasPacked) { - size += computeBoolSize(2, self.packed); + size_ += computeBoolSize(2, self.packed); } if (self.hasDeprecated) { - size += computeBoolSize(3, self.deprecated); + size_ += computeBoolSize(3, self.deprecated); } if (self.hasExperimentalMapKey) { - size += computeStringSize(9, self.experimentalMapKey); + size_ += computeStringSize(9, self.experimentalMapKey); } - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBFieldOptions*) parseFromData:(NSData*) data { return (PBFieldOptions*)[[[PBFieldOptions builder] mergeFromData:data] build]; @@ -4129,50 +5019,121 @@ + (PBFieldOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBFieldOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBFieldOptions*)[[[PBFieldOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBFieldOptions_Builder*) builder { - return [[[PBFieldOptions_Builder alloc] init] autorelease]; ++ (PBFieldOptionsBuilder*) builder { + return [[PBFieldOptionsBuilder alloc] init]; } -+ (PBFieldOptions_Builder*) builderWithPrototype:(PBFieldOptions*) prototype { ++ (PBFieldOptionsBuilder*) builderWithPrototype:(PBFieldOptions*) prototype { return [[PBFieldOptions builder] mergeFrom:prototype]; } -- (PBFieldOptions_Builder*) builder { +- (PBFieldOptionsBuilder*) builder { return [PBFieldOptions builder]; } +- (PBFieldOptionsBuilder*) toBuilder { + return [PBFieldOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasCtype) { + [output appendFormat:@"%@%@: %d\n", indent, @"ctype", self.ctype]; + } + if (self.hasPacked) { + [output appendFormat:@"%@%@: %@\n", indent, @"packed", [NSNumber numberWithBool:self.packed]]; + } + if (self.hasDeprecated) { + [output appendFormat:@"%@%@: %@\n", indent, @"deprecated", [NSNumber numberWithBool:self.deprecated]]; + } + if (self.hasExperimentalMapKey) { + [output appendFormat:@"%@%@: %@\n", indent, @"experimentalMapKey", self.experimentalMapKey]; + } + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBFieldOptions class]]) { + return NO; + } + PBFieldOptions *otherMessage = other; + return + self.hasCtype == otherMessage.hasCtype && + (!self.hasCtype || self.ctype == otherMessage.ctype) && + self.hasPacked == otherMessage.hasPacked && + (!self.hasPacked || self.packed == otherMessage.packed) && + self.hasDeprecated == otherMessage.hasDeprecated && + (!self.hasDeprecated || self.deprecated == otherMessage.deprecated) && + self.hasExperimentalMapKey == otherMessage.hasExperimentalMapKey && + (!self.hasExperimentalMapKey || [self.experimentalMapKey isEqual:otherMessage.experimentalMapKey]) && + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasCtype) { + hashCode = hashCode * 31 + self.ctype; + } + if (self.hasPacked) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.packed] hash]; + } + if (self.hasDeprecated) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.deprecated] hash]; + } + if (self.hasExperimentalMapKey) { + hashCode = hashCode * 31 + [self.experimentalMapKey hash]; + } + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -BOOL PBFieldOptions_CTypeIsValidValue(PBFieldOptions_CType value) { +BOOL PBFieldOptionsCTypeIsValidValue(PBFieldOptionsCType value) { switch (value) { - case PBFieldOptions_CTypeCord: - case PBFieldOptions_CTypeStringPiece: + case PBFieldOptionsCTypeString: + case PBFieldOptionsCTypeCord: + case PBFieldOptionsCTypeStringPiece: return YES; default: return NO; } } -@interface PBFieldOptions_Builder() -@property (retain) PBFieldOptions* result; +@interface PBFieldOptionsBuilder() +@property (strong) PBFieldOptions* result; @end -@implementation PBFieldOptions_Builder +@implementation PBFieldOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBFieldOptions alloc] init] autorelease]; + self.result = [[PBFieldOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBFieldOptions_Builder*) clear { - self.result = [[[PBFieldOptions alloc] init] autorelease]; +- (PBFieldOptionsBuilder*) clear { + self.result = [[PBFieldOptions alloc] init]; return self; } -- (PBFieldOptions_Builder*) clone { +- (PBFieldOptionsBuilder*) clone { return [PBFieldOptions builderWithPrototype:result]; } - (PBFieldOptions*) defaultInstance { @@ -4183,11 +5144,11 @@ - (PBFieldOptions*) build { return [self buildPartial]; } - (PBFieldOptions*) buildPartial { - PBFieldOptions* returnMe = [[result retain] autorelease]; + PBFieldOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBFieldOptions_Builder*) mergeFrom:(PBFieldOptions*) other { +- (PBFieldOptionsBuilder*) mergeFrom:(PBFieldOptions*) other { if (other == [PBFieldOptions defaultInstance]) { return self; } @@ -4203,23 +5164,24 @@ - (PBFieldOptions_Builder*) mergeFrom:(PBFieldOptions*) other { if (other.hasExperimentalMapKey) { [self setExperimentalMapKey:other.experimentalMapKey]; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBFieldOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBFieldOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4232,8 +5194,8 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu break; } case 8: { - long value = [input readEnum]; - if (PBFieldOptions_CTypeIsValidValue(value)) { + PBFieldOptionsCType value = (PBFieldOptionsCType)[input readEnum]; + if (PBFieldOptionsCTypeIsValidValue(value)) { [self setCtype:value]; } else { [unknownFields mergeVarintField:1 value:value]; @@ -4253,7 +5215,7 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu break; } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -4264,17 +5226,17 @@ - (PBFieldOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inpu - (BOOL) hasCtype { return result.hasCtype; } -- (PBFieldOptions_CType) ctype { +- (PBFieldOptionsCType) ctype { return result.ctype; } -- (PBFieldOptions_Builder*) setCtype:(PBFieldOptions_CType) value { +- (PBFieldOptionsBuilder*) setCtype:(PBFieldOptionsCType) value { result.hasCtype = YES; result.ctype = value; return self; } -- (PBFieldOptions_Builder*) clearCtype { +- (PBFieldOptionsBuilder*) clearCtype { result.hasCtype = NO; - result.ctype = PBFieldOptions_CTypeCord; + result.ctype = PBFieldOptionsCTypeString; return self; } - (BOOL) hasPacked { @@ -4283,12 +5245,12 @@ - (BOOL) hasPacked { - (BOOL) packed { return result.packed; } -- (PBFieldOptions_Builder*) setPacked:(BOOL) value { +- (PBFieldOptionsBuilder*) setPacked:(BOOL) value { result.hasPacked = YES; result.packed = value; return self; } -- (PBFieldOptions_Builder*) clearPacked { +- (PBFieldOptionsBuilder*) clearPacked { result.hasPacked = NO; result.packed = NO; return self; @@ -4299,12 +5261,12 @@ - (BOOL) hasDeprecated { - (BOOL) deprecated { return result.deprecated; } -- (PBFieldOptions_Builder*) setDeprecated:(BOOL) value { +- (PBFieldOptionsBuilder*) setDeprecated:(BOOL) value { result.hasDeprecated = YES; result.deprecated = value; return self; } -- (PBFieldOptions_Builder*) clearDeprecated { +- (PBFieldOptionsBuilder*) clearDeprecated { result.hasDeprecated = NO; result.deprecated = NO; return self; @@ -4315,57 +5277,53 @@ - (BOOL) hasExperimentalMapKey { - (NSString*) experimentalMapKey { return result.experimentalMapKey; } -- (PBFieldOptions_Builder*) setExperimentalMapKey:(NSString*) value { +- (PBFieldOptionsBuilder*) setExperimentalMapKey:(NSString*) value { result.hasExperimentalMapKey = YES; result.experimentalMapKey = value; return self; } -- (PBFieldOptions_Builder*) clearExperimentalMapKey { +- (PBFieldOptionsBuilder*) clearExperimentalMapKey { result.hasExperimentalMapKey = NO; result.experimentalMapKey = @""; return self; } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { return [result uninterpretedOptionAtIndex:index]; } -- (PBFieldOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBFieldOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.uninterpretedOptionArray addObject:value]; return self; } -- (PBFieldOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBFieldOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBFieldOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBFieldOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBFieldOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObject:value]; +- (PBFieldOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @interface PBEnumOptions () -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBEnumOptions -@synthesize mutableUninterpretedOptionList; +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { @@ -4384,15 +5342,14 @@ + (PBEnumOptions*) defaultInstance { - (PBEnumOptions*) defaultInstance { return defaultPBEnumOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -4403,7 +5360,7 @@ - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -4412,19 +5369,19 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + size_ = 0; + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBEnumOptions*) parseFromData:(NSData*) data { return (PBEnumOptions*)[[[PBEnumOptions builder] mergeFromData:data] build]; @@ -4444,41 +5401,79 @@ + (PBEnumOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBEnumOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBEnumOptions*)[[[PBEnumOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBEnumOptions_Builder*) builder { - return [[[PBEnumOptions_Builder alloc] init] autorelease]; ++ (PBEnumOptionsBuilder*) builder { + return [[PBEnumOptionsBuilder alloc] init]; } -+ (PBEnumOptions_Builder*) builderWithPrototype:(PBEnumOptions*) prototype { ++ (PBEnumOptionsBuilder*) builderWithPrototype:(PBEnumOptions*) prototype { return [[PBEnumOptions builder] mergeFrom:prototype]; } -- (PBEnumOptions_Builder*) builder { +- (PBEnumOptionsBuilder*) builder { return [PBEnumOptions builder]; } +- (PBEnumOptionsBuilder*) toBuilder { + return [PBEnumOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBEnumOptions class]]) { + return NO; + } + PBEnumOptions *otherMessage = other; + return + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBEnumOptions_Builder() -@property (retain) PBEnumOptions* result; +@interface PBEnumOptionsBuilder() +@property (strong) PBEnumOptions* result; @end -@implementation PBEnumOptions_Builder +@implementation PBEnumOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBEnumOptions alloc] init] autorelease]; + self.result = [[PBEnumOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBEnumOptions_Builder*) clear { - self.result = [[[PBEnumOptions alloc] init] autorelease]; +- (PBEnumOptionsBuilder*) clear { + self.result = [[PBEnumOptions alloc] init]; return self; } -- (PBEnumOptions_Builder*) clone { +- (PBEnumOptionsBuilder*) clone { return [PBEnumOptions builderWithPrototype:result]; } - (PBEnumOptions*) defaultInstance { @@ -4489,31 +5484,32 @@ - (PBEnumOptions*) build { return [self buildPartial]; } - (PBEnumOptions*) buildPartial { - PBEnumOptions* returnMe = [[result retain] autorelease]; + PBEnumOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBEnumOptions_Builder*) mergeFrom:(PBEnumOptions*) other { +- (PBEnumOptionsBuilder*) mergeFrom:(PBEnumOptions*) other { if (other == [PBEnumOptions defaultInstance]) { return self; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBEnumOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBEnumOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4526,7 +5522,7 @@ - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input break; } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -4534,47 +5530,43 @@ - (PBEnumOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input } } } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { return [result uninterpretedOptionAtIndex:index]; } -- (PBEnumOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBEnumOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.uninterpretedOptionArray addObject:value]; return self; } -- (PBEnumOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBEnumOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBEnumOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBEnumOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBEnumOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObject:value]; +- (PBEnumOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @interface PBEnumValueOptions () -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBEnumValueOptions -@synthesize mutableUninterpretedOptionList; +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { @@ -4593,15 +5585,14 @@ + (PBEnumValueOptions*) defaultInstance { - (PBEnumValueOptions*) defaultInstance { return defaultPBEnumValueOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -4612,7 +5603,7 @@ - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -4621,19 +5612,19 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + size_ = 0; + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBEnumValueOptions*) parseFromData:(NSData*) data { return (PBEnumValueOptions*)[[[PBEnumValueOptions builder] mergeFromData:data] build]; @@ -4653,41 +5644,79 @@ + (PBEnumValueOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBEnumValueOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBEnumValueOptions*)[[[PBEnumValueOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBEnumValueOptions_Builder*) builder { - return [[[PBEnumValueOptions_Builder alloc] init] autorelease]; ++ (PBEnumValueOptionsBuilder*) builder { + return [[PBEnumValueOptionsBuilder alloc] init]; } -+ (PBEnumValueOptions_Builder*) builderWithPrototype:(PBEnumValueOptions*) prototype { ++ (PBEnumValueOptionsBuilder*) builderWithPrototype:(PBEnumValueOptions*) prototype { return [[PBEnumValueOptions builder] mergeFrom:prototype]; } -- (PBEnumValueOptions_Builder*) builder { +- (PBEnumValueOptionsBuilder*) builder { return [PBEnumValueOptions builder]; } +- (PBEnumValueOptionsBuilder*) toBuilder { + return [PBEnumValueOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBEnumValueOptions class]]) { + return NO; + } + PBEnumValueOptions *otherMessage = other; + return + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBEnumValueOptions_Builder() -@property (retain) PBEnumValueOptions* result; +@interface PBEnumValueOptionsBuilder() +@property (strong) PBEnumValueOptions* result; @end -@implementation PBEnumValueOptions_Builder +@implementation PBEnumValueOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBEnumValueOptions alloc] init] autorelease]; + self.result = [[PBEnumValueOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBEnumValueOptions_Builder*) clear { - self.result = [[[PBEnumValueOptions alloc] init] autorelease]; +- (PBEnumValueOptionsBuilder*) clear { + self.result = [[PBEnumValueOptions alloc] init]; return self; } -- (PBEnumValueOptions_Builder*) clone { +- (PBEnumValueOptionsBuilder*) clone { return [PBEnumValueOptions builderWithPrototype:result]; } - (PBEnumValueOptions*) defaultInstance { @@ -4698,31 +5727,32 @@ - (PBEnumValueOptions*) build { return [self buildPartial]; } - (PBEnumValueOptions*) buildPartial { - PBEnumValueOptions* returnMe = [[result retain] autorelease]; + PBEnumValueOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBEnumValueOptions_Builder*) mergeFrom:(PBEnumValueOptions*) other { +- (PBEnumValueOptionsBuilder*) mergeFrom:(PBEnumValueOptions*) other { if (other == [PBEnumValueOptions defaultInstance]) { return self; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBEnumValueOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBEnumValueOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4735,7 +5765,7 @@ - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) break; } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -4743,47 +5773,43 @@ - (PBEnumValueOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) } } } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { return [result uninterpretedOptionAtIndex:index]; } -- (PBEnumValueOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBEnumValueOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.uninterpretedOptionArray addObject:value]; return self; } -- (PBEnumValueOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBEnumValueOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBEnumValueOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBEnumValueOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBEnumValueOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObject:value]; +- (PBEnumValueOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @interface PBServiceOptions () -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBServiceOptions -@synthesize mutableUninterpretedOptionList; +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { @@ -4802,15 +5828,14 @@ + (PBServiceOptions*) defaultInstance { - (PBServiceOptions*) defaultInstance { return defaultPBServiceOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -4821,7 +5846,7 @@ - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -4830,19 +5855,19 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + size_ = 0; + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBServiceOptions*) parseFromData:(NSData*) data { return (PBServiceOptions*)[[[PBServiceOptions builder] mergeFromData:data] build]; @@ -4862,41 +5887,79 @@ + (PBServiceOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBServiceOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBServiceOptions*)[[[PBServiceOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBServiceOptions_Builder*) builder { - return [[[PBServiceOptions_Builder alloc] init] autorelease]; ++ (PBServiceOptionsBuilder*) builder { + return [[PBServiceOptionsBuilder alloc] init]; } -+ (PBServiceOptions_Builder*) builderWithPrototype:(PBServiceOptions*) prototype { ++ (PBServiceOptionsBuilder*) builderWithPrototype:(PBServiceOptions*) prototype { return [[PBServiceOptions builder] mergeFrom:prototype]; } -- (PBServiceOptions_Builder*) builder { +- (PBServiceOptionsBuilder*) builder { return [PBServiceOptions builder]; } +- (PBServiceOptionsBuilder*) toBuilder { + return [PBServiceOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBServiceOptions class]]) { + return NO; + } + PBServiceOptions *otherMessage = other; + return + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBServiceOptions_Builder() -@property (retain) PBServiceOptions* result; +@interface PBServiceOptionsBuilder() +@property (strong) PBServiceOptions* result; @end -@implementation PBServiceOptions_Builder +@implementation PBServiceOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBServiceOptions alloc] init] autorelease]; + self.result = [[PBServiceOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBServiceOptions_Builder*) clear { - self.result = [[[PBServiceOptions alloc] init] autorelease]; +- (PBServiceOptionsBuilder*) clear { + self.result = [[PBServiceOptions alloc] init]; return self; } -- (PBServiceOptions_Builder*) clone { +- (PBServiceOptionsBuilder*) clone { return [PBServiceOptions builderWithPrototype:result]; } - (PBServiceOptions*) defaultInstance { @@ -4907,31 +5970,32 @@ - (PBServiceOptions*) build { return [self buildPartial]; } - (PBServiceOptions*) buildPartial { - PBServiceOptions* returnMe = [[result retain] autorelease]; + PBServiceOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBServiceOptions_Builder*) mergeFrom:(PBServiceOptions*) other { +- (PBServiceOptionsBuilder*) mergeFrom:(PBServiceOptions*) other { if (other == [PBServiceOptions defaultInstance]) { return self; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBServiceOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBServiceOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -4944,7 +6008,7 @@ - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -4952,47 +6016,43 @@ - (PBServiceOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) in } } } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { return [result uninterpretedOptionAtIndex:index]; } -- (PBServiceOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBServiceOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.uninterpretedOptionArray addObject:value]; return self; } -- (PBServiceOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBServiceOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBServiceOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBServiceOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBServiceOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObject:value]; +- (PBServiceOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @interface PBMethodOptions () -@property (retain) NSMutableArray* mutableUninterpretedOptionList; +@property (strong) PBAppendableArray * uninterpretedOptionArray; @end @implementation PBMethodOptions -@synthesize mutableUninterpretedOptionList; +@synthesize uninterpretedOptionArray; +@dynamic uninterpretedOption; - (void) dealloc { - self.mutableUninterpretedOptionList = nil; - [super dealloc]; + self.uninterpretedOptionArray = nil; } - (id) init { if ((self = [super init])) { @@ -5011,15 +6071,14 @@ + (PBMethodOptions*) defaultInstance { - (PBMethodOptions*) defaultInstance { return defaultPBMethodOptionsInstance; } -- (NSArray*) uninterpretedOptionList { - return mutableUninterpretedOptionList; +- (PBArray *)uninterpretedOption { + return uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { - id value = [mutableUninterpretedOptionList objectAtIndex:index]; - return value; +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { + return [uninterpretedOptionArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption* element in self.uninterpretedOption) { if (!element.isInitialized) { return NO; } @@ -5030,7 +6089,7 @@ - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { [output writeMessage:999 value:element]; } [self writeExtensionsToCodedOutputStream:output @@ -5039,19 +6098,19 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; - for (PBUninterpretedOption* element in self.uninterpretedOptionList) { - size += computeMessageSize(999, element); + size_ = 0; + for (PBUninterpretedOption *element in self.uninterpretedOptionArray) { + size_ += computeMessageSize(999, element); } - size += [self extensionsSerializedSize]; - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += [self extensionsSerializedSize]; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBMethodOptions*) parseFromData:(NSData*) data { return (PBMethodOptions*)[[[PBMethodOptions builder] mergeFromData:data] build]; @@ -5071,41 +6130,79 @@ + (PBMethodOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input { + (PBMethodOptions*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBMethodOptions*)[[[PBMethodOptions builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBMethodOptions_Builder*) builder { - return [[[PBMethodOptions_Builder alloc] init] autorelease]; ++ (PBMethodOptionsBuilder*) builder { + return [[PBMethodOptionsBuilder alloc] init]; } -+ (PBMethodOptions_Builder*) builderWithPrototype:(PBMethodOptions*) prototype { ++ (PBMethodOptionsBuilder*) builderWithPrototype:(PBMethodOptions*) prototype { return [[PBMethodOptions builder] mergeFrom:prototype]; } -- (PBMethodOptions_Builder*) builder { +- (PBMethodOptionsBuilder*) builder { return [PBMethodOptions builder]; } +- (PBMethodOptionsBuilder*) toBuilder { + return [PBMethodOptions builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + [output appendFormat:@"%@%@ {\n", indent, @"uninterpretedOption"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self writeExtensionDescriptionToMutableString:(NSMutableString*)output + from:1000 + to:536870912 + withIndent:indent]; + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBMethodOptions class]]) { + return NO; + } + PBMethodOptions *otherMessage = other; + return + [self.uninterpretedOptionArray isEqualToArray:otherMessage.uninterpretedOptionArray] && + [self isEqualExtensionsInOther:otherMessage from:1000 to:536870912] && + + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBUninterpretedOption* element in self.uninterpretedOptionArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self hashExtensionsFrom:1000 to:536870912]; + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBMethodOptions_Builder() -@property (retain) PBMethodOptions* result; +@interface PBMethodOptionsBuilder() +@property (strong) PBMethodOptions* result; @end -@implementation PBMethodOptions_Builder +@implementation PBMethodOptionsBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBMethodOptions alloc] init] autorelease]; + self.result = [[PBMethodOptions alloc] init]; } return self; } - (PBExtendableMessage*) internalGetResult { return result; } -- (PBMethodOptions_Builder*) clear { - self.result = [[[PBMethodOptions alloc] init] autorelease]; +- (PBMethodOptionsBuilder*) clear { + self.result = [[PBMethodOptions alloc] init]; return self; } -- (PBMethodOptions_Builder*) clone { +- (PBMethodOptionsBuilder*) clone { return [PBMethodOptions builderWithPrototype:result]; } - (PBMethodOptions*) defaultInstance { @@ -5116,31 +6213,32 @@ - (PBMethodOptions*) build { return [self buildPartial]; } - (PBMethodOptions*) buildPartial { - PBMethodOptions* returnMe = [[result retain] autorelease]; + PBMethodOptions* returnMe = result; self.result = nil; return returnMe; } -- (PBMethodOptions_Builder*) mergeFrom:(PBMethodOptions*) other { +- (PBMethodOptionsBuilder*) mergeFrom:(PBMethodOptions*) other { if (other == [PBMethodOptions defaultInstance]) { return self; } - if (other.mutableUninterpretedOptionList.count > 0) { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; + if (other.uninterpretedOptionArray.count > 0) { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [other.uninterpretedOptionArray copy]; + } else { + [result.uninterpretedOptionArray appendArray:other.uninterpretedOptionArray]; } - [result.mutableUninterpretedOptionList addObjectsFromArray:other.mutableUninterpretedOptionList]; } [self mergeExtensionFields:other]; [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBMethodOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBMethodOptionsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5153,7 +6251,7 @@ - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp break; } case 7994: { - PBUninterpretedOption_Builder* subBuilder = [PBUninterpretedOption builder]; + PBUninterpretedOptionBuilder* subBuilder = [PBUninterpretedOption builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addUninterpretedOption:[subBuilder buildPartial]]; break; @@ -5161,89 +6259,94 @@ - (PBMethodOptions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) inp } } } -- (NSArray*) uninterpretedOptionList { - if (result.mutableUninterpretedOptionList == nil) { return [NSArray array]; } - return result.mutableUninterpretedOptionList; +- (PBAppendableArray *)uninterpretedOption { + return result.uninterpretedOptionArray; } -- (PBUninterpretedOption*) uninterpretedOptionAtIndex:(long) index { +- (PBUninterpretedOption*)uninterpretedOptionAtIndex:(NSUInteger)index { return [result uninterpretedOptionAtIndex:index]; } -- (PBMethodOptions_Builder*) replaceUninterpretedOptionAtIndex:(long) index with:(PBUninterpretedOption*) value { - [result.mutableUninterpretedOptionList replaceObjectAtIndex:index withObject:value]; +- (PBMethodOptionsBuilder *)addUninterpretedOption:(PBUninterpretedOption*)value { + if (result.uninterpretedOptionArray == nil) { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.uninterpretedOptionArray addObject:value]; return self; } -- (PBMethodOptions_Builder*) addAllUninterpretedOption:(NSArray*) values { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObjectsFromArray:values]; +- (PBMethodOptionsBuilder *)setUninterpretedOptionArray:(NSArray *)array { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBMethodOptions_Builder*) clearUninterpretedOptionList { - result.mutableUninterpretedOptionList = nil; +- (PBMethodOptionsBuilder *)setUninterpretedOptionValues:(const PBUninterpretedOption* __strong *)values count:(NSUInteger)count { + result.uninterpretedOptionArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBMethodOptions_Builder*) addUninterpretedOption:(PBUninterpretedOption*) value { - if (result.mutableUninterpretedOptionList == nil) { - result.mutableUninterpretedOptionList = [NSMutableArray array]; - } - [result.mutableUninterpretedOptionList addObject:value]; +- (PBMethodOptionsBuilder *)clearUninterpretedOption { + result.uninterpretedOptionArray = nil; return self; } @end @interface PBUninterpretedOption () -@property (retain) NSMutableArray* mutableNameList; -@property (retain) NSString* identifierValue; -@property long long positiveIntValue; +@property (strong) PBAppendableArray * nameArray; +@property (strong) NSString* identifierValue; +@property unsigned long long positiveIntValue; @property long long negativeIntValue; @property Float64 doubleValue; -@property (retain) NSData* stringValue; +@property (strong) NSData* stringValue; +@property (strong) NSString* aggregateValue; @end @implementation PBUninterpretedOption -@synthesize mutableNameList; +@synthesize nameArray; +@dynamic name; - (BOOL) hasIdentifierValue { return !!hasIdentifierValue_; } -- (void) setHasIdentifierValue:(BOOL) value { - hasIdentifierValue_ = !!value; +- (void) setHasIdentifierValue:(BOOL) value_ { + hasIdentifierValue_ = !!value_; } @synthesize identifierValue; - (BOOL) hasPositiveIntValue { return !!hasPositiveIntValue_; } -- (void) setHasPositiveIntValue:(BOOL) value { - hasPositiveIntValue_ = !!value; +- (void) setHasPositiveIntValue:(BOOL) value_ { + hasPositiveIntValue_ = !!value_; } @synthesize positiveIntValue; - (BOOL) hasNegativeIntValue { return !!hasNegativeIntValue_; } -- (void) setHasNegativeIntValue:(BOOL) value { - hasNegativeIntValue_ = !!value; +- (void) setHasNegativeIntValue:(BOOL) value_ { + hasNegativeIntValue_ = !!value_; } @synthesize negativeIntValue; - (BOOL) hasDoubleValue { return !!hasDoubleValue_; } -- (void) setHasDoubleValue:(BOOL) value { - hasDoubleValue_ = !!value; +- (void) setHasDoubleValue:(BOOL) value_ { + hasDoubleValue_ = !!value_; } @synthesize doubleValue; - (BOOL) hasStringValue { return !!hasStringValue_; } -- (void) setHasStringValue:(BOOL) value { - hasStringValue_ = !!value; +- (void) setHasStringValue:(BOOL) value_ { + hasStringValue_ = !!value_; } @synthesize stringValue; +- (BOOL) hasAggregateValue { + return !!hasAggregateValue_; +} +- (void) setHasAggregateValue:(BOOL) value_ { + hasAggregateValue_ = !!value_; +} +@synthesize aggregateValue; - (void) dealloc { - self.mutableNameList = nil; + self.nameArray = nil; self.identifierValue = nil; self.stringValue = nil; - [super dealloc]; + self.aggregateValue = nil; } - (id) init { if ((self = [super init])) { @@ -5252,6 +6355,7 @@ - (id) init { self.negativeIntValue = 0L; self.doubleValue = 0; self.stringValue = [NSData data]; + self.aggregateValue = @""; } return self; } @@ -5267,15 +6371,14 @@ + (PBUninterpretedOption*) defaultInstance { - (PBUninterpretedOption*) defaultInstance { return defaultPBUninterpretedOptionInstance; } -- (NSArray*) nameList { - return mutableNameList; +- (PBArray *)name { + return nameArray; } -- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index { - id value = [mutableNameList objectAtIndex:index]; - return value; +- (PBUninterpretedOptionNamePart*)nameAtIndex:(NSUInteger)index { + return [nameArray objectAtIndex:index]; } - (BOOL) isInitialized { - for (PBUninterpretedOption_NamePart* element in self.nameList) { + for (PBUninterpretedOptionNamePart* element in self.name) { if (!element.isInitialized) { return NO; } @@ -5283,7 +6386,7 @@ - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - for (PBUninterpretedOption_NamePart* element in self.nameList) { + for (PBUninterpretedOptionNamePart *element in self.nameArray) { [output writeMessage:2 value:element]; } if (self.hasIdentifierValue) { @@ -5301,36 +6404,42 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasStringValue) { [output writeData:7 value:self.stringValue]; } + if (self.hasAggregateValue) { + [output writeString:8 value:self.aggregateValue]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; - for (PBUninterpretedOption_NamePart* element in self.nameList) { - size += computeMessageSize(2, element); + size_ = 0; + for (PBUninterpretedOptionNamePart *element in self.nameArray) { + size_ += computeMessageSize(2, element); } if (self.hasIdentifierValue) { - size += computeStringSize(3, self.identifierValue); + size_ += computeStringSize(3, self.identifierValue); } if (self.hasPositiveIntValue) { - size += computeUInt64Size(4, self.positiveIntValue); + size_ += computeUInt64Size(4, self.positiveIntValue); } if (self.hasNegativeIntValue) { - size += computeInt64Size(5, self.negativeIntValue); + size_ += computeInt64Size(5, self.negativeIntValue); } if (self.hasDoubleValue) { - size += computeDoubleSize(6, self.doubleValue); + size_ += computeDoubleSize(6, self.doubleValue); } if (self.hasStringValue) { - size += computeDataSize(7, self.stringValue); + size_ += computeDataSize(7, self.stringValue); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + if (self.hasAggregateValue) { + size_ += computeStringSize(8, self.aggregateValue); + } + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; } + (PBUninterpretedOption*) parseFromData:(NSData*) data { return (PBUninterpretedOption*)[[[PBUninterpretedOption builder] mergeFromData:data] build]; @@ -5350,46 +6459,125 @@ + (PBUninterpretedOption*) parseFromCodedInputStream:(PBCodedInputStream*) input + (PBUninterpretedOption*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { return (PBUninterpretedOption*)[[[PBUninterpretedOption builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBUninterpretedOption_Builder*) builder { - return [[[PBUninterpretedOption_Builder alloc] init] autorelease]; ++ (PBUninterpretedOptionBuilder*) builder { + return [[PBUninterpretedOptionBuilder alloc] init]; } -+ (PBUninterpretedOption_Builder*) builderWithPrototype:(PBUninterpretedOption*) prototype { ++ (PBUninterpretedOptionBuilder*) builderWithPrototype:(PBUninterpretedOption*) prototype { return [[PBUninterpretedOption builder] mergeFrom:prototype]; } -- (PBUninterpretedOption_Builder*) builder { +- (PBUninterpretedOptionBuilder*) builder { return [PBUninterpretedOption builder]; } +- (PBUninterpretedOptionBuilder*) toBuilder { + return [PBUninterpretedOption builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBUninterpretedOptionNamePart* element in self.nameArray) { + [output appendFormat:@"%@%@ {\n", indent, @"name"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasIdentifierValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"identifierValue", self.identifierValue]; + } + if (self.hasPositiveIntValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"positiveIntValue", [NSNumber numberWithLongLong:self.positiveIntValue]]; + } + if (self.hasNegativeIntValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"negativeIntValue", [NSNumber numberWithLongLong:self.negativeIntValue]]; + } + if (self.hasDoubleValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"doubleValue", [NSNumber numberWithDouble:self.doubleValue]]; + } + if (self.hasStringValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"stringValue", self.stringValue]; + } + if (self.hasAggregateValue) { + [output appendFormat:@"%@%@: %@\n", indent, @"aggregateValue", self.aggregateValue]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBUninterpretedOption class]]) { + return NO; + } + PBUninterpretedOption *otherMessage = other; + return + [self.nameArray isEqualToArray:otherMessage.nameArray] && + self.hasIdentifierValue == otherMessage.hasIdentifierValue && + (!self.hasIdentifierValue || [self.identifierValue isEqual:otherMessage.identifierValue]) && + self.hasPositiveIntValue == otherMessage.hasPositiveIntValue && + (!self.hasPositiveIntValue || self.positiveIntValue == otherMessage.positiveIntValue) && + self.hasNegativeIntValue == otherMessage.hasNegativeIntValue && + (!self.hasNegativeIntValue || self.negativeIntValue == otherMessage.negativeIntValue) && + self.hasDoubleValue == otherMessage.hasDoubleValue && + (!self.hasDoubleValue || self.doubleValue == otherMessage.doubleValue) && + self.hasStringValue == otherMessage.hasStringValue && + (!self.hasStringValue || [self.stringValue isEqual:otherMessage.stringValue]) && + self.hasAggregateValue == otherMessage.hasAggregateValue && + (!self.hasAggregateValue || [self.aggregateValue isEqual:otherMessage.aggregateValue]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBUninterpretedOptionNamePart* element in self.nameArray) { + hashCode = hashCode * 31 + [element hash]; + } + if (self.hasIdentifierValue) { + hashCode = hashCode * 31 + [self.identifierValue hash]; + } + if (self.hasPositiveIntValue) { + hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.positiveIntValue] hash]; + } + if (self.hasNegativeIntValue) { + hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.negativeIntValue] hash]; + } + if (self.hasDoubleValue) { + hashCode = hashCode * 31 + [[NSNumber numberWithDouble:self.doubleValue] hash]; + } + if (self.hasStringValue) { + hashCode = hashCode * 31 + [self.stringValue hash]; + } + if (self.hasAggregateValue) { + hashCode = hashCode * 31 + [self.aggregateValue hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} @end -@interface PBUninterpretedOption_NamePart () -@property (retain) NSString* namePart; +@interface PBUninterpretedOptionNamePart () +@property (strong) NSString* namePart; @property BOOL isExtension; @end -@implementation PBUninterpretedOption_NamePart +@implementation PBUninterpretedOptionNamePart - (BOOL) hasNamePart { return !!hasNamePart_; } -- (void) setHasNamePart:(BOOL) value { - hasNamePart_ = !!value; +- (void) setHasNamePart:(BOOL) value_ { + hasNamePart_ = !!value_; } @synthesize namePart; - (BOOL) hasIsExtension { return !!hasIsExtension_; } -- (void) setHasIsExtension:(BOOL) value { - hasIsExtension_ = !!value; +- (void) setHasIsExtension:(BOOL) value_ { + hasIsExtension_ = !!value_; } - (BOOL) isExtension { return !!isExtension_; } -- (void) setIsExtension:(BOOL) value { - isExtension_ = !!value; +- (void) setIsExtension:(BOOL) value_ { + isExtension_ = !!value_; } - (void) dealloc { self.namePart = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { @@ -5398,17 +6586,17 @@ - (id) init { } return self; } -static PBUninterpretedOption_NamePart* defaultPBUninterpretedOption_NamePartInstance = nil; +static PBUninterpretedOptionNamePart* defaultPBUninterpretedOptionNamePartInstance = nil; + (void) initialize { - if (self == [PBUninterpretedOption_NamePart class]) { - defaultPBUninterpretedOption_NamePartInstance = [[PBUninterpretedOption_NamePart alloc] init]; + if (self == [PBUninterpretedOptionNamePart class]) { + defaultPBUninterpretedOptionNamePartInstance = [[PBUninterpretedOptionNamePart alloc] init]; } } -+ (PBUninterpretedOption_NamePart*) defaultInstance { - return defaultPBUninterpretedOption_NamePartInstance; ++ (PBUninterpretedOptionNamePart*) defaultInstance { + return defaultPBUninterpretedOptionNamePartInstance; } -- (PBUninterpretedOption_NamePart*) defaultInstance { - return defaultPBUninterpretedOption_NamePartInstance; +- (PBUninterpretedOptionNamePart*) defaultInstance { + return defaultPBUninterpretedOptionNamePartInstance; } - (BOOL) isInitialized { if (!self.hasNamePart) { @@ -5429,91 +6617,128 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { - long size = memoizedSerializedSize; - if (size != -1) { - return size; + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; } - size = 0; + size_ = 0; if (self.hasNamePart) { - size += computeStringSize(1, self.namePart); + size_ += computeStringSize(1, self.namePart); } if (self.hasIsExtension) { - size += computeBoolSize(2, self.isExtension); + size_ += computeBoolSize(2, self.isExtension); } - size += self.unknownFields.serializedSize; - memoizedSerializedSize = size; - return size; + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; +} ++ (PBUninterpretedOptionNamePart*) parseFromData:(NSData*) data { + return (PBUninterpretedOptionNamePart*)[[[PBUninterpretedOptionNamePart builder] mergeFromData:data] build]; } -+ (PBUninterpretedOption_NamePart*) parseFromData:(NSData*) data { - return (PBUninterpretedOption_NamePart*)[[[PBUninterpretedOption_NamePart builder] mergeFromData:data] build]; ++ (PBUninterpretedOptionNamePart*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBUninterpretedOptionNamePart*)[[[PBUninterpretedOptionNamePart builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (PBUninterpretedOption_NamePart*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (PBUninterpretedOption_NamePart*)[[[PBUninterpretedOption_NamePart builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (PBUninterpretedOptionNamePart*) parseFromInputStream:(NSInputStream*) input { + return (PBUninterpretedOptionNamePart*)[[[PBUninterpretedOptionNamePart builder] mergeFromInputStream:input] build]; } -+ (PBUninterpretedOption_NamePart*) parseFromInputStream:(NSInputStream*) input { - return (PBUninterpretedOption_NamePart*)[[[PBUninterpretedOption_NamePart builder] mergeFromInputStream:input] build]; ++ (PBUninterpretedOptionNamePart*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBUninterpretedOptionNamePart*)[[[PBUninterpretedOptionNamePart builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBUninterpretedOption_NamePart*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (PBUninterpretedOption_NamePart*)[[[PBUninterpretedOption_NamePart builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (PBUninterpretedOptionNamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (PBUninterpretedOptionNamePart*)[[[PBUninterpretedOptionNamePart builder] mergeFromCodedInputStream:input] build]; } -+ (PBUninterpretedOption_NamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (PBUninterpretedOption_NamePart*)[[[PBUninterpretedOption_NamePart builder] mergeFromCodedInputStream:input] build]; ++ (PBUninterpretedOptionNamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBUninterpretedOptionNamePart*)[[[PBUninterpretedOptionNamePart builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (PBUninterpretedOption_NamePart*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (PBUninterpretedOption_NamePart*)[[[PBUninterpretedOption_NamePart builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (PBUninterpretedOptionNamePartBuilder*) builder { + return [[PBUninterpretedOptionNamePartBuilder alloc] init]; } -+ (PBUninterpretedOption_NamePart_Builder*) builder { - return [[[PBUninterpretedOption_NamePart_Builder alloc] init] autorelease]; ++ (PBUninterpretedOptionNamePartBuilder*) builderWithPrototype:(PBUninterpretedOptionNamePart*) prototype { + return [[PBUninterpretedOptionNamePart builder] mergeFrom:prototype]; } -+ (PBUninterpretedOption_NamePart_Builder*) builderWithPrototype:(PBUninterpretedOption_NamePart*) prototype { - return [[PBUninterpretedOption_NamePart builder] mergeFrom:prototype]; +- (PBUninterpretedOptionNamePartBuilder*) builder { + return [PBUninterpretedOptionNamePart builder]; } -- (PBUninterpretedOption_NamePart_Builder*) builder { - return [PBUninterpretedOption_NamePart builder]; +- (PBUninterpretedOptionNamePartBuilder*) toBuilder { + return [PBUninterpretedOptionNamePart builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasNamePart) { + [output appendFormat:@"%@%@: %@\n", indent, @"namePart", self.namePart]; + } + if (self.hasIsExtension) { + [output appendFormat:@"%@%@: %@\n", indent, @"isExtension", [NSNumber numberWithBool:self.isExtension]]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBUninterpretedOptionNamePart class]]) { + return NO; + } + PBUninterpretedOptionNamePart *otherMessage = other; + return + self.hasNamePart == otherMessage.hasNamePart && + (!self.hasNamePart || [self.namePart isEqual:otherMessage.namePart]) && + self.hasIsExtension == otherMessage.hasIsExtension && + (!self.hasIsExtension || self.isExtension == otherMessage.isExtension) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + if (self.hasNamePart) { + hashCode = hashCode * 31 + [self.namePart hash]; + } + if (self.hasIsExtension) { + hashCode = hashCode * 31 + [[NSNumber numberWithBool:self.isExtension] hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; } @end -@interface PBUninterpretedOption_NamePart_Builder() -@property (retain) PBUninterpretedOption_NamePart* result; +@interface PBUninterpretedOptionNamePartBuilder() +@property (strong) PBUninterpretedOptionNamePart* result; @end -@implementation PBUninterpretedOption_NamePart_Builder +@implementation PBUninterpretedOptionNamePartBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBUninterpretedOption_NamePart alloc] init] autorelease]; + self.result = [[PBUninterpretedOptionNamePart alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBUninterpretedOption_NamePart_Builder*) clear { - self.result = [[[PBUninterpretedOption_NamePart alloc] init] autorelease]; +- (PBUninterpretedOptionNamePartBuilder*) clear { + self.result = [[PBUninterpretedOptionNamePart alloc] init]; return self; } -- (PBUninterpretedOption_NamePart_Builder*) clone { - return [PBUninterpretedOption_NamePart builderWithPrototype:result]; +- (PBUninterpretedOptionNamePartBuilder*) clone { + return [PBUninterpretedOptionNamePart builderWithPrototype:result]; } -- (PBUninterpretedOption_NamePart*) defaultInstance { - return [PBUninterpretedOption_NamePart defaultInstance]; +- (PBUninterpretedOptionNamePart*) defaultInstance { + return [PBUninterpretedOptionNamePart defaultInstance]; } -- (PBUninterpretedOption_NamePart*) build { +- (PBUninterpretedOptionNamePart*) build { [self checkInitialized]; return [self buildPartial]; } -- (PBUninterpretedOption_NamePart*) buildPartial { - PBUninterpretedOption_NamePart* returnMe = [[result retain] autorelease]; +- (PBUninterpretedOptionNamePart*) buildPartial { + PBUninterpretedOptionNamePart* returnMe = result; self.result = nil; return returnMe; } -- (PBUninterpretedOption_NamePart_Builder*) mergeFrom:(PBUninterpretedOption_NamePart*) other { - if (other == [PBUninterpretedOption_NamePart defaultInstance]) { +- (PBUninterpretedOptionNamePartBuilder*) mergeFrom:(PBUninterpretedOptionNamePart*) other { + if (other == [PBUninterpretedOptionNamePart defaultInstance]) { return self; } if (other.hasNamePart) { @@ -5525,13 +6750,13 @@ - (PBUninterpretedOption_NamePart_Builder*) mergeFrom:(PBUninterpretedOption_Nam [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBUninterpretedOptionNamePartBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBUninterpretedOption_NamePart_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBUninterpretedOptionNamePartBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5560,12 +6785,12 @@ - (BOOL) hasNamePart { - (NSString*) namePart { return result.namePart; } -- (PBUninterpretedOption_NamePart_Builder*) setNamePart:(NSString*) value { +- (PBUninterpretedOptionNamePartBuilder*) setNamePart:(NSString*) value { result.hasNamePart = YES; result.namePart = value; return self; } -- (PBUninterpretedOption_NamePart_Builder*) clearNamePart { +- (PBUninterpretedOptionNamePartBuilder*) clearNamePart { result.hasNamePart = NO; result.namePart = @""; return self; @@ -5576,42 +6801,41 @@ - (BOOL) hasIsExtension { - (BOOL) isExtension { return result.isExtension; } -- (PBUninterpretedOption_NamePart_Builder*) setIsExtension:(BOOL) value { +- (PBUninterpretedOptionNamePartBuilder*) setIsExtension:(BOOL) value { result.hasIsExtension = YES; result.isExtension = value; return self; } -- (PBUninterpretedOption_NamePart_Builder*) clearIsExtension { +- (PBUninterpretedOptionNamePartBuilder*) clearIsExtension { result.hasIsExtension = NO; result.isExtension = NO; return self; } @end -@interface PBUninterpretedOption_Builder() -@property (retain) PBUninterpretedOption* result; +@interface PBUninterpretedOptionBuilder() +@property (strong) PBUninterpretedOption* result; @end -@implementation PBUninterpretedOption_Builder +@implementation PBUninterpretedOptionBuilder @synthesize result; - (void) dealloc { self.result = nil; - [super dealloc]; } - (id) init { if ((self = [super init])) { - self.result = [[[PBUninterpretedOption alloc] init] autorelease]; + self.result = [[PBUninterpretedOption alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return result; } -- (PBUninterpretedOption_Builder*) clear { - self.result = [[[PBUninterpretedOption alloc] init] autorelease]; +- (PBUninterpretedOptionBuilder*) clear { + self.result = [[PBUninterpretedOption alloc] init]; return self; } -- (PBUninterpretedOption_Builder*) clone { +- (PBUninterpretedOptionBuilder*) clone { return [PBUninterpretedOption builderWithPrototype:result]; } - (PBUninterpretedOption*) defaultInstance { @@ -5622,19 +6846,20 @@ - (PBUninterpretedOption*) build { return [self buildPartial]; } - (PBUninterpretedOption*) buildPartial { - PBUninterpretedOption* returnMe = [[result retain] autorelease]; + PBUninterpretedOption* returnMe = result; self.result = nil; return returnMe; } -- (PBUninterpretedOption_Builder*) mergeFrom:(PBUninterpretedOption*) other { +- (PBUninterpretedOptionBuilder*) mergeFrom:(PBUninterpretedOption*) other { if (other == [PBUninterpretedOption defaultInstance]) { return self; } - if (other.mutableNameList.count > 0) { - if (result.mutableNameList == nil) { - result.mutableNameList = [NSMutableArray array]; + if (other.nameArray.count > 0) { + if (result.nameArray == nil) { + result.nameArray = [other.nameArray copy]; + } else { + [result.nameArray appendArray:other.nameArray]; } - [result.mutableNameList addObjectsFromArray:other.mutableNameList]; } if (other.hasIdentifierValue) { [self setIdentifierValue:other.identifierValue]; @@ -5651,16 +6876,19 @@ - (PBUninterpretedOption_Builder*) mergeFrom:(PBUninterpretedOption*) other { if (other.hasStringValue) { [self setStringValue:other.stringValue]; } + if (other.hasAggregateValue) { + [self setAggregateValue:other.aggregateValue]; + } [self mergeUnknownFields:other.unknownFields]; return self; } -- (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (PBUninterpretedOptionBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (PBUninterpretedOptionBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { - long tag = [input readTag]; + NSInteger tag = [input readTag]; switch (tag) { case 0: [self setUnknownFields:[unknownFields build]]; @@ -5673,7 +6901,7 @@ - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream break; } case 18: { - PBUninterpretedOption_NamePart_Builder* subBuilder = [PBUninterpretedOption_NamePart builder]; + PBUninterpretedOptionNamePartBuilder* subBuilder = [PBUninterpretedOptionNamePart builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addName:[subBuilder buildPartial]]; break; @@ -5698,36 +6926,36 @@ - (PBUninterpretedOption_Builder*) mergeFromCodedInputStream:(PBCodedInputStream [self setStringValue:[input readData]]; break; } + case 66: { + [self setAggregateValue:[input readString]]; + break; + } } } } -- (NSArray*) nameList { - if (result.mutableNameList == nil) { return [NSArray array]; } - return result.mutableNameList; +- (PBAppendableArray *)name { + return result.nameArray; } -- (PBUninterpretedOption_NamePart*) nameAtIndex:(long) index { +- (PBUninterpretedOptionNamePart*)nameAtIndex:(NSUInteger)index { return [result nameAtIndex:index]; } -- (PBUninterpretedOption_Builder*) replaceNameAtIndex:(long) index with:(PBUninterpretedOption_NamePart*) value { - [result.mutableNameList replaceObjectAtIndex:index withObject:value]; +- (PBUninterpretedOptionBuilder *)addName:(PBUninterpretedOptionNamePart*)value { + if (result.nameArray == nil) { + result.nameArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.nameArray addObject:value]; return self; } -- (PBUninterpretedOption_Builder*) addAllName:(NSArray*) values { - if (result.mutableNameList == nil) { - result.mutableNameList = [NSMutableArray array]; - } - [result.mutableNameList addObjectsFromArray:values]; +- (PBUninterpretedOptionBuilder *)setNameArray:(NSArray *)array { + result.nameArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; return self; } -- (PBUninterpretedOption_Builder*) clearNameList { - result.mutableNameList = nil; +- (PBUninterpretedOptionBuilder *)setNameValues:(const PBUninterpretedOptionNamePart* __strong *)values count:(NSUInteger)count { + result.nameArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; return self; } -- (PBUninterpretedOption_Builder*) addName:(PBUninterpretedOption_NamePart*) value { - if (result.mutableNameList == nil) { - result.mutableNameList = [NSMutableArray array]; - } - [result.mutableNameList addObject:value]; +- (PBUninterpretedOptionBuilder *)clearName { + result.nameArray = nil; return self; } - (BOOL) hasIdentifierValue { @@ -5736,12 +6964,12 @@ - (BOOL) hasIdentifierValue { - (NSString*) identifierValue { return result.identifierValue; } -- (PBUninterpretedOption_Builder*) setIdentifierValue:(NSString*) value { +- (PBUninterpretedOptionBuilder*) setIdentifierValue:(NSString*) value { result.hasIdentifierValue = YES; result.identifierValue = value; return self; } -- (PBUninterpretedOption_Builder*) clearIdentifierValue { +- (PBUninterpretedOptionBuilder*) clearIdentifierValue { result.hasIdentifierValue = NO; result.identifierValue = @""; return self; @@ -5749,15 +6977,15 @@ - (PBUninterpretedOption_Builder*) clearIdentifierValue { - (BOOL) hasPositiveIntValue { return result.hasPositiveIntValue; } -- (long long) positiveIntValue { +- (unsigned long long) positiveIntValue { return result.positiveIntValue; } -- (PBUninterpretedOption_Builder*) setPositiveIntValue:(long long) value { +- (PBUninterpretedOptionBuilder*) setPositiveIntValue:(unsigned long long) value { result.hasPositiveIntValue = YES; result.positiveIntValue = value; return self; } -- (PBUninterpretedOption_Builder*) clearPositiveIntValue { +- (PBUninterpretedOptionBuilder*) clearPositiveIntValue { result.hasPositiveIntValue = NO; result.positiveIntValue = 0L; return self; @@ -5768,12 +6996,12 @@ - (BOOL) hasNegativeIntValue { - (long long) negativeIntValue { return result.negativeIntValue; } -- (PBUninterpretedOption_Builder*) setNegativeIntValue:(long long) value { +- (PBUninterpretedOptionBuilder*) setNegativeIntValue:(long long) value { result.hasNegativeIntValue = YES; result.negativeIntValue = value; return self; } -- (PBUninterpretedOption_Builder*) clearNegativeIntValue { +- (PBUninterpretedOptionBuilder*) clearNegativeIntValue { result.hasNegativeIntValue = NO; result.negativeIntValue = 0L; return self; @@ -5784,12 +7012,12 @@ - (BOOL) hasDoubleValue { - (Float64) doubleValue { return result.doubleValue; } -- (PBUninterpretedOption_Builder*) setDoubleValue:(Float64) value { +- (PBUninterpretedOptionBuilder*) setDoubleValue:(Float64) value { result.hasDoubleValue = YES; result.doubleValue = value; return self; } -- (PBUninterpretedOption_Builder*) clearDoubleValue { +- (PBUninterpretedOptionBuilder*) clearDoubleValue { result.hasDoubleValue = NO; result.doubleValue = 0; return self; @@ -5800,15 +7028,583 @@ - (BOOL) hasStringValue { - (NSData*) stringValue { return result.stringValue; } -- (PBUninterpretedOption_Builder*) setStringValue:(NSData*) value { +- (PBUninterpretedOptionBuilder*) setStringValue:(NSData*) value { result.hasStringValue = YES; result.stringValue = value; return self; } -- (PBUninterpretedOption_Builder*) clearStringValue { +- (PBUninterpretedOptionBuilder*) clearStringValue { result.hasStringValue = NO; result.stringValue = [NSData data]; return self; } +- (BOOL) hasAggregateValue { + return result.hasAggregateValue; +} +- (NSString*) aggregateValue { + return result.aggregateValue; +} +- (PBUninterpretedOptionBuilder*) setAggregateValue:(NSString*) value { + result.hasAggregateValue = YES; + result.aggregateValue = value; + return self; +} +- (PBUninterpretedOptionBuilder*) clearAggregateValue { + result.hasAggregateValue = NO; + result.aggregateValue = @""; + return self; +} +@end + +@interface PBSourceCodeInfo () +@property (strong) PBAppendableArray * locationArray; +@end + +@implementation PBSourceCodeInfo + +@synthesize locationArray; +@dynamic location; +- (void) dealloc { + self.locationArray = nil; +} +- (id) init { + if ((self = [super init])) { + } + return self; +} +static PBSourceCodeInfo* defaultPBSourceCodeInfoInstance = nil; ++ (void) initialize { + if (self == [PBSourceCodeInfo class]) { + defaultPBSourceCodeInfoInstance = [[PBSourceCodeInfo alloc] init]; + } +} ++ (PBSourceCodeInfo*) defaultInstance { + return defaultPBSourceCodeInfoInstance; +} +- (PBSourceCodeInfo*) defaultInstance { + return defaultPBSourceCodeInfoInstance; +} +- (PBArray *)location { + return locationArray; +} +- (PBSourceCodeInfoLocation*)locationAtIndex:(NSUInteger)index { + return [locationArray objectAtIndex:index]; +} +- (BOOL) isInitialized { + return YES; +} +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { + for (PBSourceCodeInfoLocation *element in self.locationArray) { + [output writeMessage:1 value:element]; + } + [self.unknownFields writeToCodedOutputStream:output]; +} +- (long) serializedSize { + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; + } + + size_ = 0; + for (PBSourceCodeInfoLocation *element in self.locationArray) { + size_ += computeMessageSize(1, element); + } + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; +} ++ (PBSourceCodeInfo*) parseFromData:(NSData*) data { + return (PBSourceCodeInfo*)[[[PBSourceCodeInfo builder] mergeFromData:data] build]; +} ++ (PBSourceCodeInfo*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBSourceCodeInfo*)[[[PBSourceCodeInfo builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; +} ++ (PBSourceCodeInfo*) parseFromInputStream:(NSInputStream*) input { + return (PBSourceCodeInfo*)[[[PBSourceCodeInfo builder] mergeFromInputStream:input] build]; +} ++ (PBSourceCodeInfo*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBSourceCodeInfo*)[[[PBSourceCodeInfo builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (PBSourceCodeInfo*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (PBSourceCodeInfo*)[[[PBSourceCodeInfo builder] mergeFromCodedInputStream:input] build]; +} ++ (PBSourceCodeInfo*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBSourceCodeInfo*)[[[PBSourceCodeInfo builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (PBSourceCodeInfoBuilder*) builder { + return [[PBSourceCodeInfoBuilder alloc] init]; +} ++ (PBSourceCodeInfoBuilder*) builderWithPrototype:(PBSourceCodeInfo*) prototype { + return [[PBSourceCodeInfo builder] mergeFrom:prototype]; +} +- (PBSourceCodeInfoBuilder*) builder { + return [PBSourceCodeInfo builder]; +} +- (PBSourceCodeInfoBuilder*) toBuilder { + return [PBSourceCodeInfo builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (PBSourceCodeInfoLocation* element in self.locationArray) { + [output appendFormat:@"%@%@ {\n", indent, @"location"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBSourceCodeInfo class]]) { + return NO; + } + PBSourceCodeInfo *otherMessage = other; + return + [self.locationArray isEqualToArray:otherMessage.locationArray] && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (PBSourceCodeInfoLocation* element in self.locationArray) { + hashCode = hashCode * 31 + [element hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} +@end + +@interface PBSourceCodeInfoLocation () +@property (strong) PBAppendableArray * pathArray; +@property (strong) PBAppendableArray * spanArray; +@end + +@implementation PBSourceCodeInfoLocation + +@synthesize pathArray; +@dynamic path; +@synthesize spanArray; +@dynamic span; +- (void) dealloc { + self.pathArray = nil; + self.spanArray = nil; +} +- (id) init { + if ((self = [super init])) { + } + return self; +} +static PBSourceCodeInfoLocation* defaultPBSourceCodeInfoLocationInstance = nil; ++ (void) initialize { + if (self == [PBSourceCodeInfoLocation class]) { + defaultPBSourceCodeInfoLocationInstance = [[PBSourceCodeInfoLocation alloc] init]; + } +} ++ (PBSourceCodeInfoLocation*) defaultInstance { + return defaultPBSourceCodeInfoLocationInstance; +} +- (PBSourceCodeInfoLocation*) defaultInstance { + return defaultPBSourceCodeInfoLocationInstance; +} +- (PBArray *)path { + return pathArray; +} +- (long)pathAtIndex:(NSUInteger)index { + return [pathArray int32AtIndex:index]; +} +- (PBArray *)span { + return spanArray; +} +- (long)spanAtIndex:(NSUInteger)index { + return [spanArray int32AtIndex:index]; +} +- (BOOL) isInitialized { + return YES; +} +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { + const NSUInteger pathArrayCount = self.pathArray.count; + if (pathArrayCount > 0) { + const long *values = (const long *)self.pathArray.data; + [output writeRawVarint32:10]; + [output writeRawVarint32:pathMemoizedSerializedSize]; + for (NSUInteger i = 0; i < pathArrayCount; ++i) { + [output writeInt32NoTag:values[i]]; + } + } + const NSUInteger spanArrayCount = self.spanArray.count; + if (spanArrayCount > 0) { + const long *values = (const long *)self.spanArray.data; + [output writeRawVarint32:18]; + [output writeRawVarint32:spanMemoizedSerializedSize]; + for (NSUInteger i = 0; i < spanArrayCount; ++i) { + [output writeInt32NoTag:values[i]]; + } + } + [self.unknownFields writeToCodedOutputStream:output]; +} +- (long) serializedSize { + long size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; + } + + size_ = 0; + { + NSInteger dataSize = 0; + const NSUInteger count = self.pathArray.count; + const long *values = (const long *)self.pathArray.data; + for (NSUInteger i = 0; i < count; ++i) { + dataSize += computeInt32SizeNoTag(values[i]); + } + size_ += dataSize; + if (count > 0) { + size_ += 1; + size_ += computeInt32SizeNoTag(dataSize); + } + pathMemoizedSerializedSize = dataSize; + } + { + NSInteger dataSize = 0; + const NSUInteger count = self.spanArray.count; + const long *values = (const long *)self.spanArray.data; + for (NSUInteger i = 0; i < count; ++i) { + dataSize += computeInt32SizeNoTag(values[i]); + } + size_ += dataSize; + if (count > 0) { + size_ += 1; + size_ += computeInt32SizeNoTag(dataSize); + } + spanMemoizedSerializedSize = dataSize; + } + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; +} ++ (PBSourceCodeInfoLocation*) parseFromData:(NSData*) data { + return (PBSourceCodeInfoLocation*)[[[PBSourceCodeInfoLocation builder] mergeFromData:data] build]; +} ++ (PBSourceCodeInfoLocation*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBSourceCodeInfoLocation*)[[[PBSourceCodeInfoLocation builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; +} ++ (PBSourceCodeInfoLocation*) parseFromInputStream:(NSInputStream*) input { + return (PBSourceCodeInfoLocation*)[[[PBSourceCodeInfoLocation builder] mergeFromInputStream:input] build]; +} ++ (PBSourceCodeInfoLocation*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBSourceCodeInfoLocation*)[[[PBSourceCodeInfoLocation builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (PBSourceCodeInfoLocation*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (PBSourceCodeInfoLocation*)[[[PBSourceCodeInfoLocation builder] mergeFromCodedInputStream:input] build]; +} ++ (PBSourceCodeInfoLocation*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (PBSourceCodeInfoLocation*)[[[PBSourceCodeInfoLocation builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (PBSourceCodeInfoLocationBuilder*) builder { + return [[PBSourceCodeInfoLocationBuilder alloc] init]; +} ++ (PBSourceCodeInfoLocationBuilder*) builderWithPrototype:(PBSourceCodeInfoLocation*) prototype { + return [[PBSourceCodeInfoLocation builder] mergeFrom:prototype]; +} +- (PBSourceCodeInfoLocationBuilder*) builder { + return [PBSourceCodeInfoLocation builder]; +} +- (PBSourceCodeInfoLocationBuilder*) toBuilder { + return [PBSourceCodeInfoLocation builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + for (NSNumber* value in self.pathArray) { + [output appendFormat:@"%@%@: %@\n", indent, @"path", value]; + } + for (NSNumber* value in self.spanArray) { + [output appendFormat:@"%@%@: %@\n", indent, @"span", value]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[PBSourceCodeInfoLocation class]]) { + return NO; + } + PBSourceCodeInfoLocation *otherMessage = other; + return + [self.pathArray isEqualToArray:otherMessage.pathArray] && + [self.spanArray isEqualToArray:otherMessage.spanArray] && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + NSUInteger hashCode = 7; + for (NSNumber* value in self.pathArray) { + hashCode = hashCode * 31 + [value intValue]; + } + for (NSNumber* value in self.spanArray) { + hashCode = hashCode * 31 + [value intValue]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} +@end + +@interface PBSourceCodeInfoLocationBuilder() +@property (strong) PBSourceCodeInfoLocation* result; @end +@implementation PBSourceCodeInfoLocationBuilder +@synthesize result; +- (void) dealloc { + self.result = nil; +} +- (id) init { + if ((self = [super init])) { + self.result = [[PBSourceCodeInfoLocation alloc] init]; + } + return self; +} +- (PBGeneratedMessage*) internalGetResult { + return result; +} +- (PBSourceCodeInfoLocationBuilder*) clear { + self.result = [[PBSourceCodeInfoLocation alloc] init]; + return self; +} +- (PBSourceCodeInfoLocationBuilder*) clone { + return [PBSourceCodeInfoLocation builderWithPrototype:result]; +} +- (PBSourceCodeInfoLocation*) defaultInstance { + return [PBSourceCodeInfoLocation defaultInstance]; +} +- (PBSourceCodeInfoLocation*) build { + [self checkInitialized]; + return [self buildPartial]; +} +- (PBSourceCodeInfoLocation*) buildPartial { + PBSourceCodeInfoLocation* returnMe = result; + self.result = nil; + return returnMe; +} +- (PBSourceCodeInfoLocationBuilder*) mergeFrom:(PBSourceCodeInfoLocation*) other { + if (other == [PBSourceCodeInfoLocation defaultInstance]) { + return self; + } + if (other.pathArray.count > 0) { + if (result.pathArray == nil) { + result.pathArray = [other.pathArray copy]; + } else { + [result.pathArray appendArray:other.pathArray]; + } + } + if (other.spanArray.count > 0) { + if (result.spanArray == nil) { + result.spanArray = [other.spanArray copy]; + } else { + [result.spanArray appendArray:other.spanArray]; + } + } + [self mergeUnknownFields:other.unknownFields]; + return self; +} +- (PBSourceCodeInfoLocationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { + return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; +} +- (PBSourceCodeInfoLocationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; + while (YES) { + NSInteger tag = [input readTag]; + switch (tag) { + case 0: + [self setUnknownFields:[unknownFields build]]; + return self; + default: { + if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) { + [self setUnknownFields:[unknownFields build]]; + return self; + } + break; + } + case 10: { + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; + if (result.pathArray == nil) { + result.pathArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; + } + while (input.bytesUntilLimit > 0) { + [result.pathArray addInt32:[input readInt32]]; + } + [input popLimit:limit]; + break; + } + case 18: { + NSInteger length = [input readRawVarint32]; + NSInteger limit = [input pushLimit:length]; + if (result.spanArray == nil) { + result.spanArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; + } + while (input.bytesUntilLimit > 0) { + [result.spanArray addInt32:[input readInt32]]; + } + [input popLimit:limit]; + break; + } + } + } +} +- (PBAppendableArray *)path { + return result.pathArray; +} +- (long)pathAtIndex:(NSUInteger)index { + return [result pathAtIndex:index]; +} +- (PBSourceCodeInfoLocationBuilder *)addPath:(long)value { + if (result.pathArray == nil) { + result.pathArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; + } + [result.pathArray addInt32:value]; + return self; +} +- (PBSourceCodeInfoLocationBuilder *)setPathArray:(NSArray *)array { + result.pathArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; + return self; +} +- (PBSourceCodeInfoLocationBuilder *)setPathValues:(const long *)values count:(NSUInteger)count { + result.pathArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; + return self; +} +- (PBSourceCodeInfoLocationBuilder *)clearPath { + result.pathArray = nil; + return self; +} +- (PBAppendableArray *)span { + return result.spanArray; +} +- (long)spanAtIndex:(NSUInteger)index { + return [result spanAtIndex:index]; +} +- (PBSourceCodeInfoLocationBuilder *)addSpan:(long)value { + if (result.spanArray == nil) { + result.spanArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; + } + [result.spanArray addInt32:value]; + return self; +} +- (PBSourceCodeInfoLocationBuilder *)setSpanArray:(NSArray *)array { + result.spanArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; + return self; +} +- (PBSourceCodeInfoLocationBuilder *)setSpanValues:(const long *)values count:(NSUInteger)count { + result.spanArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; + return self; +} +- (PBSourceCodeInfoLocationBuilder *)clearSpan { + result.spanArray = nil; + return self; +} +@end + +@interface PBSourceCodeInfoBuilder() +@property (strong) PBSourceCodeInfo* result; +@end + +@implementation PBSourceCodeInfoBuilder +@synthesize result; +- (void) dealloc { + self.result = nil; +} +- (id) init { + if ((self = [super init])) { + self.result = [[PBSourceCodeInfo alloc] init]; + } + return self; +} +- (PBGeneratedMessage*) internalGetResult { + return result; +} +- (PBSourceCodeInfoBuilder*) clear { + self.result = [[PBSourceCodeInfo alloc] init]; + return self; +} +- (PBSourceCodeInfoBuilder*) clone { + return [PBSourceCodeInfo builderWithPrototype:result]; +} +- (PBSourceCodeInfo*) defaultInstance { + return [PBSourceCodeInfo defaultInstance]; +} +- (PBSourceCodeInfo*) build { + [self checkInitialized]; + return [self buildPartial]; +} +- (PBSourceCodeInfo*) buildPartial { + PBSourceCodeInfo* returnMe = result; + self.result = nil; + return returnMe; +} +- (PBSourceCodeInfoBuilder*) mergeFrom:(PBSourceCodeInfo*) other { + if (other == [PBSourceCodeInfo defaultInstance]) { + return self; + } + if (other.locationArray.count > 0) { + if (result.locationArray == nil) { + result.locationArray = [other.locationArray copy]; + } else { + [result.locationArray appendArray:other.locationArray]; + } + } + [self mergeUnknownFields:other.unknownFields]; + return self; +} +- (PBSourceCodeInfoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { + return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; +} +- (PBSourceCodeInfoBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + PBUnknownFieldSet_Builder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; + while (YES) { + NSInteger tag = [input readTag]; + switch (tag) { + case 0: + [self setUnknownFields:[unknownFields build]]; + return self; + default: { + if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) { + [self setUnknownFields:[unknownFields build]]; + return self; + } + break; + } + case 10: { + PBSourceCodeInfoLocationBuilder* subBuilder = [PBSourceCodeInfoLocation builder]; + [input readMessage:subBuilder extensionRegistry:extensionRegistry]; + [self addLocation:[subBuilder buildPartial]]; + break; + } + } + } +} +- (PBAppendableArray *)location { + return result.locationArray; +} +- (PBSourceCodeInfoLocation*)locationAtIndex:(NSUInteger)index { + return [result locationAtIndex:index]; +} +- (PBSourceCodeInfoBuilder *)addLocation:(PBSourceCodeInfoLocation*)value { + if (result.locationArray == nil) { + result.locationArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeObject]; + } + [result.locationArray addObject:value]; + return self; +} +- (PBSourceCodeInfoBuilder *)setLocationArray:(NSArray *)array { + result.locationArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeObject]; + return self; +} +- (PBSourceCodeInfoBuilder *)setLocationValues:(const PBSourceCodeInfoLocation* __strong *)values count:(NSUInteger)count { + result.locationArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeObject]; + return self; +} +- (PBSourceCodeInfoBuilder *)clearLocation { + result.locationArray = nil; + return self; +} +@end + + +// @@protoc_insertion_point(global_scope) diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj b/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj index 91856e3..ee24df2 100644 --- a/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj +++ b/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj @@ -81,7 +81,7 @@ C5B03FF712517CA00087887C /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5B03FF612517CA00087887C /* SenTestingKit.framework */; }; C5B0406312517D0A0087887C /* Main.m in Sources */ = {isa = PBXBuildFile; fileRef = C5B03F8312517A1A0087887C /* Main.m */; }; C5CBB7FD126CBD5100354923 /* Descriptor.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = C5CBB7FB126CBD5100354923 /* Descriptor.pb.h */; }; - C5CBB7FE126CBD5100354923 /* Descriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = C5CBB7FC126CBD5100354923 /* Descriptor.pb.m */; }; + C5CBB7FE126CBD5100354923 /* Descriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = C5CBB7FC126CBD5100354923 /* Descriptor.pb.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; C5D8D6EB12767BC300F0BAE4 /* ArrayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D8D6EA12767BC300F0BAE4 /* ArrayTests.m */; }; C5D8D7351276810200F0BAE4 /* PBArray.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F36E031275FA5A00013BB4 /* PBArray.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ From c25fa02005b92ae983f5d611804069dae0fb19e5 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Mon, 21 Apr 2014 13:20:18 +0400 Subject: [PATCH 07/18] fix enums fields --- src/compiler/objc_enum_field.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/objc_enum_field.cc b/src/compiler/objc_enum_field.cc index 36adfcc..3679df1 100644 --- a/src/compiler/objc_enum_field.cc +++ b/src/compiler/objc_enum_field.cc @@ -327,7 +327,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective " return $list_name$;\n" "}\n" "- ($type$)$name$AtIndex:(NSUInteger)index {\n" - " return [$list_name$ int32AtIndex:index];\n" + " return ($type$)[$list_name$ int32AtIndex:index];\n" "}\n"); } From 00b33ca011bfa3b5529ded150a0e7817f0674261 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 22 Apr 2014 00:16:29 +0400 Subject: [PATCH 08/18] *add NSArray method: -(NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger, BOOL *stop))predicate; --- src/runtime/Classes/PBArray.h | 1 + src/runtime/Classes/PBArray.m | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/runtime/Classes/PBArray.h b/src/runtime/Classes/PBArray.h index d831141..0020ed0 100644 --- a/src/runtime/Classes/PBArray.h +++ b/src/runtime/Classes/PBArray.h @@ -58,6 +58,7 @@ typedef enum _PBArrayValueType - (Float64)doubleAtIndex:(NSUInteger)index; - (BOOL)isEqualToArray:(PBArray *)array; - (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block; +- (NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger idx, BOOL *stop))predicate; - (id)firstObject; - (id)lastObject; - (id)objectAtIndexedSubscript:(NSUInteger)idx; diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 1d68b89..9369a64 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -315,6 +315,26 @@ - (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop) } } +-(NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger, BOOL *stop))predicate +{ + if (!predicate) return NSNotFound; + BOOL stop = NO; + __block BOOL bb; + __block NSUInteger index; + [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { + + bb = predicate(obj,idx,*stop); + if (bb) { + index = idx; + } + }]; + + if (bb) { + return index; + } + return NSNotFound; +} + @end @implementation PBArray (PBArrayExtended) From b4ba1defd12103230998a721c1e521a1f51fce74 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 22 Apr 2014 15:20:34 +0400 Subject: [PATCH 09/18] *fix NSArray method: -(NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger, BOOL *stop))predicate; --- src/runtime/Classes/PBArray.m | 1 - 1 file changed, 1 deletion(-) diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 9369a64..82bf4de 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -318,7 +318,6 @@ - (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop) -(NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger, BOOL *stop))predicate { if (!predicate) return NSNotFound; - BOOL stop = NO; __block BOOL bb; __block NSUInteger index; [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { From 3e002328f8abbd60483ebf0641db7f9849d896fc Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 22 Apr 2014 17:35:45 +0400 Subject: [PATCH 10/18] fix PBArray --- src/runtime/Classes/PBArray.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 82bf4de..7c29219 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -322,7 +322,7 @@ -(NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger, BOOL *stop)) __block NSUInteger index; [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { - bb = predicate(obj,idx,*stop); + bb = predicate(obj,idx,stop); if (bb) { index = idx; } From 4b15ef060627f4e2b61c0d9707d7b0f295b081ed Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Wed, 23 Apr 2014 15:30:46 +0400 Subject: [PATCH 11/18] objectAtIndexedSubscript: --- src/runtime/Classes/PBArray.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 7c29219..905b062 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -297,7 +297,7 @@ -(id)lastObject - (id)objectAtIndexedSubscript:(NSUInteger)idx { - if (idx > 0 && idx < self.count) { + if (idx < self.count) { return [self objectAtIndex:idx]; } return nil; From 50153bb44d35733836c72b974153188a9ecc4a3f Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Wed, 23 Apr 2014 15:31:21 +0400 Subject: [PATCH 12/18] fix method objectAtIndexedSubscript: --- src/runtime/Classes/PBArray.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 905b062..ca3e0c2 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -297,10 +297,12 @@ -(id)lastObject - (id)objectAtIndexedSubscript:(NSUInteger)idx { + if (idx < self.count) { return [self objectAtIndex:idx]; } return nil; + } - (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block From dd6181a854c2560fdf0cb36fd163d06c2366c216 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Fri, 25 Apr 2014 19:51:19 +0400 Subject: [PATCH 13/18] fix repeated primitive types --- src/compiler/objc_enum_field.cc | 10 +-- src/compiler/objc_primitive_field.cc | 8 ++- src/runtime/Classes/PBArray.h | 6 +- src/runtime/Classes/PBArray.m | 100 +++++++++++++++++++++------ 4 files changed, 94 insertions(+), 30 deletions(-) diff --git a/src/compiler/objc_enum_field.cc b/src/compiler/objc_enum_field.cc index 3679df1..1204a96 100644 --- a/src/compiler/objc_enum_field.cc +++ b/src/compiler/objc_enum_field.cc @@ -327,7 +327,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective " return $list_name$;\n" "}\n" "- ($type$)$name$AtIndex:(NSUInteger)index {\n" - " return ($type$)[$list_name$ int32AtIndex:index];\n" + " return ($type$)[$list_name$ enumAtIndex:index];\n" "}\n"); } @@ -343,7 +343,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective " if (result.$list_name$ == nil) {\n" " result.$list_name$ = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32];\n" " }\n" - " [result.$list_name$ addInt32:value];\n" + " [result.$list_name$ addEnum:value];\n" " return self;\n" "}\n" "- ($classname$Builder *)set$capitalized_name$Array:(NSArray *)array {\n" @@ -462,8 +462,8 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void RepeatedEnumFieldGenerator::GenerateDescriptionCodeSource(io::Printer* printer) const { printer->Print(variables_, - "for (NSNumber* element in self.$list_name$) {\n" - " [output appendFormat:@\"%@%@: %d\\n\", indent, @\"$name$\", element.intValue];\n" + "for (id element in self.$list_name$) {\n" + " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)element)];\n" "}\n"); } @@ -476,7 +476,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void RepeatedEnumFieldGenerator::GenerateHashCodeSource(io::Printer* printer) const { printer->Print(variables_, "for (NSNumber* element in self.$list_name$) {\n" - " hashCode = hashCode * 31 + element.intValue;\n" + " hashCode = hashCode * 31 + element.longValue;\n" "}\n"); } } // namespace objectivec diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc index d00bc48..042db10 100644 --- a/src/compiler/objc_primitive_field.cc +++ b/src/compiler/objc_primitive_field.cc @@ -667,12 +667,14 @@ namespace google { namespace protobuf { namespace compiler { namespace objective if (ReturnsPrimitiveType(descriptor_)) { printer->Print(variables_, "for (NSNumber* value in self.$list_name$) {\n" - " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", value];\n" + " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)value)];\n" "}\n"); } else { + + //TODO NEED TEST PRIMITIVES printer->Print(variables_, "for ($storage_type$ element in self.$list_name$) {\n" - " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", element];\n" + " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)element)];\n" "}\n"); } } @@ -688,7 +690,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective if (ReturnsPrimitiveType(descriptor_)) { printer->Print(variables_, "for (NSNumber* value in self.$list_name$) {\n" - " hashCode = hashCode * 31 + [value intValue];\n" + " hashCode = hashCode * 31 + [value longValue];\n" "}\n"); } else { printer->Print(variables_, diff --git a/src/runtime/Classes/PBArray.h b/src/runtime/Classes/PBArray.h index 0020ed0..e36da1b 100644 --- a/src/runtime/Classes/PBArray.h +++ b/src/runtime/Classes/PBArray.h @@ -51,7 +51,8 @@ typedef enum _PBArrayValueType - (id)objectAtIndex:(NSUInteger)index; - (BOOL)boolAtIndex:(NSUInteger)index; - (long)int32AtIndex:(NSUInteger)index; -- (NSUInteger)uint32AtIndex:(NSUInteger)index; +- (long)enumAtIndex:(NSUInteger)index; +- (unsigned long)uint32AtIndex:(NSUInteger)index; - (long long)int64AtIndex:(NSUInteger)index; - (unsigned long long)uint64AtIndex:(NSUInteger)index; - (Float32)floatAtIndex:(NSUInteger)index; @@ -59,6 +60,8 @@ typedef enum _PBArrayValueType - (BOOL)isEqualToArray:(PBArray *)array; - (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block; - (NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger idx, BOOL *stop))predicate; + +//This Methods automaticaly pack/unpack in NSNumber primitive values - (id)firstObject; - (id)lastObject; - (id)objectAtIndexedSubscript:(NSUInteger)idx; @@ -98,6 +101,7 @@ typedef enum _PBArrayValueType - (void)addUint64:(unsigned long long)value; - (void)addFloat:(Float32)value; - (void)addDouble:(Float64)value; +- (void)addEnum:(long)value; - (void)appendArray:(PBArray *)array; - (void)appendValues:(const void *)values count:(unsigned long)count; diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index ca3e0c2..c04b579 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -26,6 +26,8 @@ typedef void (*PBArrayValueSetter)(NSNumber *number, void *value); +typedef void (*PBArrayValueGetter)(NSNumber *number, void *value); + static void PBArraySetBoolValue(NSNumber *number, void *value) { *((BOOL *)value) = [number charValue]; @@ -33,22 +35,22 @@ static void PBArraySetBoolValue(NSNumber *number, void *value) static void PBArraySetInt32Value(NSNumber *number, void *value) { - *((NSInteger *)value) = [number intValue]; + *((long *)value) = [number integerValue]; } static void PBArraySetUInt32Value(NSNumber *number, void *value) { - *((NSUInteger *)value) = [number unsignedIntValue]; + *((unsigned long *)value) = [number unsignedIntegerValue]; } static void PBArraySetInt64Value(NSNumber *number, void *value) { - *((int64_t *)value) = [number longLongValue]; + *((long long *)value) = [number longLongValue]; } static void PBArraySetUInt64Value(NSNumber *number, void *value) { - *((uint64_t *)value) = [number unsignedLongLongValue]; + *((unsigned long long *)value) = [number unsignedLongLongValue]; } static void PBArraySetFloatValue(NSNumber *number, void *value) @@ -61,20 +63,28 @@ static void PBArraySetDoubleValue(NSNumber *number, void *value) *((Float64 *)value) = [number doubleValue]; } +static void PBArraySetEnumValue(NSNumber *number, void *value) +{ + *((long *)value) = [number integerValue]; +} + + #pragma mark Array Value Types typedef struct _PBArrayValueTypeInfo { const size_t size; const PBArrayValueSetter setter; + const PBArrayValueGetter getter; + } PBArrayValueTypeInfo; static PBArrayValueTypeInfo PBValueTypes[] = { - { sizeof(id), NULL }, + { sizeof(id), NULL}, { sizeof(BOOL), PBArraySetBoolValue }, - { sizeof(NSInteger), PBArraySetInt32Value }, - { sizeof(NSUInteger), PBArraySetUInt32Value }, + { sizeof(long), PBArraySetInt32Value }, + { sizeof(unsigned long), PBArraySetUInt32Value }, { sizeof(long long), PBArraySetInt64Value }, { sizeof(unsigned long long), PBArraySetUInt64Value }, { sizeof(Float32), PBArraySetFloatValue }, @@ -183,7 +193,7 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state object // TODO: We only support enumeration of object values. In the future, we // can extend this code to return a new list of NSNumber* objects wrapping // our primitive values. - PBArrayValueTypeAssert(PBArrayValueTypeObject); +// PBArrayValueTypeAssert(PBArrayValueTypeObject); if (state->state >= _count) { @@ -215,28 +225,36 @@ - (long)int32AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt32); - return ((NSInteger *)_data)[index]; + return ((long *)_data)[index]; } -- (NSUInteger)uint32AtIndex:(NSUInteger)index +- (unsigned long)uint32AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt32); - return ((NSUInteger *)_data)[index]; + return ((unsigned long *)_data)[index]; } +- (long)enumAtIndex:(NSUInteger)index +{ + PBArrayValueRangeAssert(index); + PBArrayValueTypeAssert(PBArrayValueTypeInt32); + return ((long *)_data)[index]; +} + + - (long long)int64AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeInt64); - return ((int64_t *)_data)[index]; + return ((long long *)_data)[index]; } - (unsigned long long)uint64AtIndex:(NSUInteger)index { PBArrayValueRangeAssert(index); PBArrayValueTypeAssert(PBArrayValueTypeUInt64); - return ((uint64_t *)_data)[index]; + return ((unsigned long long *)_data)[index]; } - (Float32)floatAtIndex:(NSUInteger)index @@ -282,7 +300,7 @@ - (BOOL)isEqual:(id)object -(id)firstObject { if (self.count>0) { - return [self objectAtIndex:0]; + return [self objectAtIndexedSubscript:0]; } return nil; } @@ -290,7 +308,7 @@ -(id)firstObject -(id)lastObject { if (self.count>0) { - return [self objectAtIndex:self.count-1]; + return [self objectAtIndexedSubscript:self.count - 1]; } return nil; } @@ -299,18 +317,50 @@ - (id)objectAtIndexedSubscript:(NSUInteger)idx { if (idx < self.count) { - return [self objectAtIndex:idx]; + if (PBArrayValueTypeObject == _valueType) { + return [self objectAtIndex:idx]; + } + else if (PBArrayValueTypeBool == _valueType) + { + return [NSNumber numberWithBool:[self boolAtIndex:idx]]; + } + else if (PBArrayValueTypeInt32 == _valueType) + { + return [NSNumber numberWithLong:[self int32AtIndex:idx]]; + } + else if (PBArrayValueTypeInt64 == _valueType) + { + return [NSNumber numberWithLongLong:[self int64AtIndex:idx]]; + } + else if (PBArrayValueTypeUInt32 == _valueType) + { + return [NSNumber numberWithUnsignedLong:[self uint32AtIndex:idx]]; + } + else if (PBArrayValueTypeUInt64 == _valueType) + { + return [NSNumber numberWithUnsignedLongLong:[self uint64AtIndex:idx]]; + } + else if (_valueType == PBArrayValueTypeFloat) + { + return [NSNumber numberWithFloat:[self floatAtIndex:idx]]; + } + else if (_valueType == PBArrayValueTypeDouble) + { + return [NSNumber numberWithDouble:[self doubleAtIndex:idx]]; + } } return nil; } + + - (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block { if (!block) return; BOOL stop = NO; for (NSInteger i = 0; i < self.count; i++) { - block([self objectAtIndex:i],i,&stop); + block([self objectAtIndexedSubscript:i],i,&stop); if(stop){ break; } @@ -479,7 +529,7 @@ - (void)addInt32:(long)value { PBArrayValueTypeAssert(PBArrayValueTypeInt32); [self ensureAdditionalCapacity:1]; - *(NSInteger *)PBArraySlot(_count) = value; + *(long *)PBArraySlot(_count) = value; _count++; } @@ -487,7 +537,15 @@ - (void)addUint32:(unsigned long)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt32); [self ensureAdditionalCapacity:1]; - *(NSUInteger *)PBArraySlot(_count) = value; + *(unsigned long *)PBArraySlot(_count) = value; + _count++; +} + +- (void)addEnum:(long)value +{ + PBArrayValueTypeAssert(PBArrayValueTypeInt32); + [self ensureAdditionalCapacity:1]; + *(long *)PBArraySlot(_count) = value; _count++; } @@ -495,7 +553,7 @@ - (void)addInt64:(int64_t)value { PBArrayValueTypeAssert(PBArrayValueTypeInt64); [self ensureAdditionalCapacity:1]; - *(int64_t *)PBArraySlot(_count) = value; + *(long long *)PBArraySlot(_count) = value; _count++; } @@ -503,7 +561,7 @@ - (void)addUint64:(uint64_t)value { PBArrayValueTypeAssert(PBArrayValueTypeUInt64); [self ensureAdditionalCapacity:1]; - *(uint64_t *)PBArraySlot(_count) = value; + *(unsigned long long *)PBArraySlot(_count) = value; _count++; } From e4367facafc6844d3c8dba316d87905cfb0e391e Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Fri, 25 Apr 2014 20:41:49 +0400 Subject: [PATCH 14/18] fix repeated primitive types --- src/runtime/Classes/PBArray.m | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index c04b579..118054e 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -26,8 +26,6 @@ typedef void (*PBArrayValueSetter)(NSNumber *number, void *value); -typedef void (*PBArrayValueGetter)(NSNumber *number, void *value); - static void PBArraySetBoolValue(NSNumber *number, void *value) { *((BOOL *)value) = [number charValue]; @@ -75,7 +73,6 @@ static void PBArraySetEnumValue(NSNumber *number, void *value) { const size_t size; const PBArrayValueSetter setter; - const PBArrayValueGetter getter; } PBArrayValueTypeInfo; From c601ce3de84e177ed246d109565c8b2e33345d7d Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 29 Apr 2014 18:42:35 +0400 Subject: [PATCH 15/18] fix fields --- src/compiler/objc_primitive_field.cc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc index 042db10..83b1495 100644 --- a/src/compiler/objc_primitive_field.cc +++ b/src/compiler/objc_primitive_field.cc @@ -665,17 +665,27 @@ namespace google { namespace protobuf { namespace compiler { namespace objective void RepeatedPrimitiveFieldGenerator::GenerateDescriptionCodeSource(io::Printer* printer) const { if (ReturnsPrimitiveType(descriptor_)) { - printer->Print(variables_, + + printer->Print(variables_, "for (NSNumber* value in self.$list_name$) {\n" " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)value)];\n" "}\n"); + } else { //TODO NEED TEST PRIMITIVES printer->Print(variables_, - "for ($storage_type$ element in self.$list_name$) {\n" - " [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)element)];\n" - "}\n"); + "for ($storage_type$ element in self.$list_name$) {\n"); + + if (ReturnsPrimitiveType(descriptor_)) { + printer->Print(variables_," [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)element)];\n"); + } + else + { + printer->Print(variables_," [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", element];\n"); + } + + printer->Print(variables_,"}\n"); } } From 3a719074570e3a806fe463a4919342dba9c3811c Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 29 Apr 2014 19:17:28 +0400 Subject: [PATCH 16/18] fix fields --- src/compiler/objc_primitive_field.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc index 83b1495..2b7b6dc 100644 --- a/src/compiler/objc_primitive_field.cc +++ b/src/compiler/objc_primitive_field.cc @@ -674,16 +674,9 @@ namespace google { namespace protobuf { namespace compiler { namespace objective } else { //TODO NEED TEST PRIMITIVES - printer->Print(variables_, - "for ($storage_type$ element in self.$list_name$) {\n"); - - if (ReturnsPrimitiveType(descriptor_)) { + printer->Print(variables_,"for ($storage_type$ element in self.$list_name$) {\n"); + printer->Print(variables_," [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)element)];\n"); - } - else - { - printer->Print(variables_," [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", element];\n"); - } printer->Print(variables_,"}\n"); } From ea374cb9473c95ba4ff70a5dc7d9ce45df907a8d Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 29 Apr 2014 19:17:28 +0400 Subject: [PATCH 17/18] fix fields --- src/compiler/objc_primitive_field.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc index 83b1495..4e942f0 100644 --- a/src/compiler/objc_primitive_field.cc +++ b/src/compiler/objc_primitive_field.cc @@ -674,16 +674,9 @@ namespace google { namespace protobuf { namespace compiler { namespace objective } else { //TODO NEED TEST PRIMITIVES - printer->Print(variables_, - "for ($storage_type$ element in self.$list_name$) {\n"); - - if (ReturnsPrimitiveType(descriptor_)) { - printer->Print(variables_," [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", @(($type$)element)];\n"); - } - else - { + printer->Print(variables_,"for ($storage_type$ element in self.$list_name$) {\n"); + printer->Print(variables_," [output appendFormat:@\"%@%@: %@\\n\", indent, @\"$name$\", element];\n"); - } printer->Print(variables_,"}\n"); } From cda3fe57e17fc95bdf3993dd8ffdcac95d0d0309 Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Tue, 29 Apr 2014 23:46:44 +0400 Subject: [PATCH 18/18] unit test fixes; PBArray fix; enumerators fix; code generation fix; --- Example/Person.pb.h | 27 +- Example/Person.pb.m | 169 ++++++++++--- Example/iOS/Proto/ViewController.m | 9 +- Example/person.proto | 5 +- .../Classes/ExtendableMessage_Builder.m | 2 +- src/runtime/Classes/PBArray.m | 1 - .../ProtocolBuffers.xcodeproj/project.pbxproj | 52 ++-- .../UserInterfaceState.xcuserstate | Bin 32587 -> 70803 bytes src/runtime/Tests/ArrayTests.m | 8 +- src/runtime/Tests/CodedInputStreamTests.m | 8 +- src/runtime/Tests/CodedOuputStreamTests.m | 29 ++- src/runtime/Tests/CoreTests.m | 14 +- src/runtime/Tests/TestUtilities.m | 2 +- src/runtime/Tests/Unittest.pb.h | 208 ++++++++-------- src/runtime/Tests/Unittest.pb.m | 230 +++++++++--------- src/runtime/Tests/UnittestCustomOptions.pb.m | 2 +- src/runtime/Tests/UnittestLite.pb.h | 128 +++++----- src/runtime/Tests/UnittestLite.pb.m | 138 +++++------ src/runtime/Tests/UtilitiesTests.m | 2 +- 19 files changed, 590 insertions(+), 444 deletions(-) diff --git a/Example/Person.pb.h b/Example/Person.pb.h index 841cbae..d622bc9 100644 --- a/Example/Person.pb.h +++ b/Example/Person.pb.h @@ -37,22 +37,24 @@ BOOL PersonPhoneTypeIsValidValue(PersonPhoneType value); @interface Person : PBGeneratedMessage { @private - BOOL hasPersonId_:1; BOOL hasName_:1; BOOL hasEmail_:1; - long long personId; NSString* name; NSString* email; + PBAppendableArray * personIdArray; PBAppendableArray * phonesArray; + PBAppendableArray * phoneTypesArray; } - (BOOL) hasName; -- (BOOL) hasPersonId; - (BOOL) hasEmail; @property (readonly, strong) NSString* name; -@property (readonly) long long personId; +@property (readonly, strong) PBArray * personId; @property (readonly, strong) NSString* email; @property (readonly, strong) PBArray * phones; +@property (readonly, strong) PBArray * phoneTypes; +- (long long)personIdAtIndex:(NSUInteger)index; - (PersonPhoneNumber*)phonesAtIndex:(NSUInteger)index; +- (PersonPhoneType)phoneTypesAtIndex:(NSUInteger)index; + (Person*) defaultInstance; - (Person*) defaultInstance; @@ -152,10 +154,12 @@ BOOL PersonPhoneTypeIsValidValue(PersonPhoneType value); - (PersonBuilder*) setName:(NSString*) value; - (PersonBuilder*) clearName; -- (BOOL) hasPersonId; -- (long long) personId; -- (PersonBuilder*) setPersonId:(long long) value; -- (PersonBuilder*) clearPersonId; +- (PBAppendableArray *)personId; +- (long long)personIdAtIndex:(NSUInteger)index; +- (PersonBuilder *)addPersonId:(long long)value; +- (PersonBuilder *)setPersonIdArray:(NSArray *)array; +- (PersonBuilder *)setPersonIdValues:(const long long *)values count:(NSUInteger)count; +- (PersonBuilder *)clearPersonId; - (BOOL) hasEmail; - (NSString*) email; @@ -168,6 +172,13 @@ BOOL PersonPhoneTypeIsValidValue(PersonPhoneType value); - (PersonBuilder *)setPhonesArray:(NSArray *)array; - (PersonBuilder *)setPhonesValues:(const PersonPhoneNumber* __strong *)values count:(NSUInteger)count; - (PersonBuilder *)clearPhones; + +- (PBAppendableArray *)phoneTypes; +- (PersonPhoneType)phoneTypesAtIndex:(NSUInteger)index; +- (PersonBuilder *)addPhoneTypes:(PersonPhoneType)value; +- (PersonBuilder *)setPhoneTypesArray:(NSArray *)array; +- (PersonBuilder *)setPhoneTypesValues:(const PersonPhoneType *)values count:(NSUInteger)count; +- (PersonBuilder *)clearPhoneTypes; @end diff --git a/Example/Person.pb.m b/Example/Person.pb.m index dfb6811..7f7a13b 100644 --- a/Example/Person.pb.m +++ b/Example/Person.pb.m @@ -22,9 +22,10 @@ + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry { @interface Person () @property (strong) NSString* name; -@property long long personId; +@property (strong) PBAppendableArray * personIdArray; @property (strong) NSString* email; @property (strong) PBAppendableArray * phonesArray; +@property (strong) PBAppendableArray * phoneTypesArray; @end @implementation Person @@ -36,13 +37,8 @@ - (void) setHasName:(BOOL) value_ { hasName_ = !!value_; } @synthesize name; -- (BOOL) hasPersonId { - return !!hasPersonId_; -} -- (void) setHasPersonId:(BOOL) value_ { - hasPersonId_ = !!value_; -} -@synthesize personId; +@synthesize personIdArray; +@dynamic personId; - (BOOL) hasEmail { return !!hasEmail_; } @@ -52,15 +48,18 @@ - (void) setHasEmail:(BOOL) value_ { @synthesize email; @synthesize phonesArray; @dynamic phones; +@synthesize phoneTypesArray; +@dynamic phoneTypes; - (void) dealloc { self.name = nil; + self.personIdArray = nil; self.email = nil; self.phonesArray = nil; + self.phoneTypesArray = nil; } - (id) init { if ((self = [super init])) { self.name = @""; - self.personId = 0L; self.email = @""; } return self; @@ -77,19 +76,25 @@ + (Person*) defaultInstance { - (Person*) defaultInstance { return defaultPersonInstance; } +- (PBArray *)personId { + return personIdArray; +} +- (long long)personIdAtIndex:(NSUInteger)index { + return [personIdArray int64AtIndex:index]; +} - (PBArray *)phones { return phonesArray; } - (PersonPhoneNumber*)phonesAtIndex:(NSUInteger)index { return [phonesArray objectAtIndex:index]; } +- (PBArray *)phoneTypes { + return phoneTypesArray; +} +- (PersonPhoneType)phoneTypesAtIndex:(NSUInteger)index { + return (PersonPhoneType)[phoneTypesArray enumAtIndex:index]; +} - (BOOL) isInitialized { - if (!self.hasName) { - return NO; - } - if (!self.hasPersonId) { - return NO; - } for (PersonPhoneNumber* element in self.phones) { if (!element.isInitialized) { return NO; @@ -101,8 +106,12 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { if (self.hasName) { [output writeString:1 value:self.name]; } - if (self.hasPersonId) { - [output writeInt64:2 value:self.personId]; + const NSUInteger personIdArrayCount = self.personIdArray.count; + if (personIdArrayCount > 0) { + const long long *values = (const long long *)self.personIdArray.data; + for (NSUInteger i = 0; i < personIdArrayCount; ++i) { + [output writeInt64:2 value:values[i]]; + } } if (self.hasEmail) { [output writeString:3 value:self.email]; @@ -110,6 +119,11 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { for (PersonPhoneNumber *element in self.phonesArray) { [output writeMessage:4 value:element]; } + const NSUInteger phoneTypesArrayCount = self.phoneTypesArray.count; + const PersonPhoneType *phoneTypesArrayValues = (const PersonPhoneType *)self.phoneTypesArray.data; + for (NSUInteger i = 0; i < phoneTypesArrayCount; ++i) { + [output writeEnum:5 value:phoneTypesArrayValues[i]]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (long) serializedSize { @@ -122,8 +136,15 @@ - (long) serializedSize { if (self.hasName) { size_ += computeStringSize(1, self.name); } - if (self.hasPersonId) { - size_ += computeInt64Size(2, self.personId); + { + NSInteger dataSize = 0; + const NSUInteger count = self.personIdArray.count; + const long long *values = (const long long *)self.personIdArray.data; + for (NSUInteger i = 0; i < count; ++i) { + dataSize += computeInt64SizeNoTag(values[i]); + } + size_ += dataSize; + size_ += 1 * count; } if (self.hasEmail) { size_ += computeStringSize(3, self.email); @@ -131,6 +152,16 @@ - (long) serializedSize { for (PersonPhoneNumber *element in self.phonesArray) { size_ += computeMessageSize(4, element); } + { + NSInteger dataSize = 0; + const NSUInteger count = self.phoneTypesArray.count; + const PersonPhoneType *values = (const PersonPhoneType *)self.phoneTypesArray.data; + for (NSUInteger i = 0; i < count; ++i) { + dataSize += computeEnumSizeNoTag(values[i]); + } + size_ += dataSize; + size_ += 1 * count; + } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; @@ -169,8 +200,8 @@ - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) ind if (self.hasName) { [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; } - if (self.hasPersonId) { - [output appendFormat:@"%@%@: %@\n", indent, @"personId", [NSNumber numberWithLongLong:self.personId]]; + for (NSNumber* value in self.personIdArray) { + [output appendFormat:@"%@%@: %@\n", indent, @"personId", @((long long)value)]; } if (self.hasEmail) { [output appendFormat:@"%@%@: %@\n", indent, @"email", self.email]; @@ -181,6 +212,9 @@ - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) ind withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; } + for (id element in self.phoneTypesArray) { + [output appendFormat:@"%@%@: %@\n", indent, @"phoneTypes", @((PersonPhoneType)element)]; + } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (BOOL) isEqual:(id)other { @@ -194,11 +228,11 @@ - (BOOL) isEqual:(id)other { return self.hasName == otherMessage.hasName && (!self.hasName || [self.name isEqual:otherMessage.name]) && - self.hasPersonId == otherMessage.hasPersonId && - (!self.hasPersonId || self.personId == otherMessage.personId) && + [self.personIdArray isEqualToArray:otherMessage.personIdArray] && self.hasEmail == otherMessage.hasEmail && (!self.hasEmail || [self.email isEqual:otherMessage.email]) && [self.phonesArray isEqualToArray:otherMessage.phonesArray] && + [self.phoneTypesArray isEqualToArray:otherMessage.phoneTypesArray] && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { @@ -206,8 +240,8 @@ - (NSUInteger) hash { if (self.hasName) { hashCode = hashCode * 31 + [self.name hash]; } - if (self.hasPersonId) { - hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.personId] hash]; + for (NSNumber* value in self.personIdArray) { + hashCode = hashCode * 31 + [value longValue]; } if (self.hasEmail) { hashCode = hashCode * 31 + [self.email hash]; @@ -215,6 +249,9 @@ - (NSUInteger) hash { for (PersonPhoneNumber* element in self.phonesArray) { hashCode = hashCode * 31 + [element hash]; } + for (NSNumber* element in self.phoneTypesArray) { + hashCode = hashCode * 31 + element.longValue; + } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -445,7 +482,7 @@ - (PersonPhoneNumberBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) in break; } case 16: { - NSInteger value = [input readEnum]; + PersonPhoneType value = (PersonPhoneType)[input readEnum]; if (PersonPhoneTypeIsValidValue(value)) { [self setType:value]; } else { @@ -534,8 +571,12 @@ - (PersonBuilder*) mergeFrom:(Person*) other { if (other.hasName) { [self setName:other.name]; } - if (other.hasPersonId) { - [self setPersonId:other.personId]; + if (other.personIdArray.count > 0) { + if (result.personIdArray == nil) { + result.personIdArray = [other.personIdArray copy]; + } else { + [result.personIdArray appendArray:other.personIdArray]; + } } if (other.hasEmail) { [self setEmail:other.email]; @@ -547,6 +588,13 @@ - (PersonBuilder*) mergeFrom:(Person*) other { [result.phonesArray appendArray:other.phonesArray]; } } + if (other.phoneTypesArray.count > 0) { + if (result.phoneTypesArray == nil) { + result.phoneTypesArray = [other.phoneTypesArray copy]; + } else { + [result.phoneTypesArray appendArray:other.phoneTypesArray]; + } + } [self mergeUnknownFields:other.unknownFields]; return self; } @@ -573,7 +621,7 @@ - (PersonBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensi break; } case 16: { - [self setPersonId:[input readInt64]]; + [self addPersonId:[input readInt64]]; break; } case 26: { @@ -586,6 +634,15 @@ - (PersonBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensi [self addPhones:[subBuilder buildPartial]]; break; } + case 40: { + PersonPhoneType value = (PersonPhoneType)[input readEnum]; + if (PersonPhoneTypeIsValidValue(value)) { + [self addPhoneTypes:value]; + } else { + [unknownFields mergeVarintField:5 value:value]; + } + break; + } } } } @@ -605,20 +662,29 @@ - (PersonBuilder*) clearName { result.name = @""; return self; } -- (BOOL) hasPersonId { - return result.hasPersonId; +- (PBAppendableArray *)personId { + return result.personIdArray; } -- (long long) personId { - return result.personId; +- (long long)personIdAtIndex:(NSUInteger)index { + return [result personIdAtIndex:index]; } -- (PersonBuilder*) setPersonId:(long long) value { - result.hasPersonId = YES; - result.personId = value; +- (PersonBuilder *)addPersonId:(long long)value { + if (result.personIdArray == nil) { + result.personIdArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt64]; + } + [result.personIdArray addInt64:value]; return self; } -- (PersonBuilder*) clearPersonId { - result.hasPersonId = NO; - result.personId = 0L; +- (PersonBuilder *)setPersonIdArray:(NSArray *)array { + result.personIdArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt64]; + return self; +} +- (PersonBuilder *)setPersonIdValues:(const long long *)values count:(NSUInteger)count { + result.personIdArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt64]; + return self; +} +- (PersonBuilder *)clearPersonId { + result.personIdArray = nil; return self; } - (BOOL) hasEmail { @@ -662,6 +728,31 @@ - (PersonBuilder *)clearPhones { result.phonesArray = nil; return self; } +- (PBAppendableArray *)phoneTypes { + return result.phoneTypesArray; +} +- (PersonPhoneType)phoneTypesAtIndex:(NSUInteger)index { + return [result phoneTypesAtIndex:index]; +} +- (PersonBuilder *)addPhoneTypes:(PersonPhoneType)value { + if (result.phoneTypesArray == nil) { + result.phoneTypesArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32]; + } + [result.phoneTypesArray addEnum:value]; + return self; +} +- (PersonBuilder *)setPhoneTypesArray:(NSArray *)array { + result.phoneTypesArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32]; + return self; +} +- (PersonBuilder *)setPhoneTypesValues:(const PersonPhoneType *)values count:(NSUInteger)count { + result.phoneTypesArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32]; + return self; +} +- (PersonBuilder *)clearPhoneTypes { + result.phoneTypesArray = nil; + return self; +} @end diff --git a/Example/iOS/Proto/ViewController.m b/Example/iOS/Proto/ViewController.m index 9654db3..5277718 100644 --- a/Example/iOS/Proto/ViewController.m +++ b/Example/iOS/Proto/ViewController.m @@ -22,8 +22,15 @@ - (void)viewDidLoad { [super viewDidLoad]; - [self proto]; +// [self proto]; // [self json]; + + PersonBuilder *builder = [[PersonBuilder alloc] init]; + [builder setPhoneTypesArray:@[@(PersonPhoneTypeHome),@(PersonPhoneTypeMobile)]]; + [builder setPersonIdArray:@[[NSNumber numberWithLongLong:12323412],[NSNumber numberWithLongLong:11111111111]]]; + Person *pp = [builder build]; + NSLog(@"%lld",[pp.personId int64AtIndex:1]); + } diff --git a/Example/person.proto b/Example/person.proto index e141d45..1f21bb8 100644 --- a/Example/person.proto +++ b/Example/person.proto @@ -1,7 +1,7 @@ message Person { - required string name = 1; - required int64 personId = 2; + optional string name = 1; + repeated int64 personId = 2; optional string email = 3; enum PhoneType { @@ -16,4 +16,5 @@ message Person { } repeated PhoneNumber phones = 4; + repeated PhoneType phoneTypes = 5; } diff --git a/src/runtime/Classes/ExtendableMessage_Builder.m b/src/runtime/Classes/ExtendableMessage_Builder.m index 804a0c6..c5e014b 100644 --- a/src/runtime/Classes/ExtendableMessage_Builder.m +++ b/src/runtime/Classes/ExtendableMessage_Builder.m @@ -97,7 +97,7 @@ - (PBExtendableMessage_Builder*) addExtension:(id) extension if (message.extensionMap == nil) { message.extensionMap = [NSMutableDictionary dictionary]; } - NSNumber* fieldNumber = ([extension fieldNumber]); + NSNumber* fieldNumber = @([extension fieldNumber]); NSMutableArray* list = [message.extensionMap objectForKey:fieldNumber]; if (list == nil) { list = [NSMutableArray array]; diff --git a/src/runtime/Classes/PBArray.m b/src/runtime/Classes/PBArray.m index 118054e..1327568 100644 --- a/src/runtime/Classes/PBArray.m +++ b/src/runtime/Classes/PBArray.m @@ -376,7 +376,6 @@ -(NSUInteger)indexOfObjectPassingTest:(BOOL (^)(id obj, NSUInteger, BOOL *stop)) index = idx; } }]; - if (bb) { return index; } diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj b/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj index ee24df2..c60fa66 100644 --- a/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj +++ b/src/runtime/ProtocolBuffers.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 3F887B4919102C6000AFDD46 /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* libProtocolBuffers.a */; }; + 3F887B4F1910325D00AFDD46 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F887B4E1910325D00AFDD46 /* SenTestingKit.framework */; }; 8B0444601469EFD500BB156C /* UnittestEmpty.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0444571469EFD500BB156C /* UnittestEmpty.pb.m */; }; 8B0444611469EFD500BB156C /* UnittestEnormousDescriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0444591469EFD500BB156C /* UnittestEnormousDescriptor.pb.m */; }; 8B0444621469EFD500BB156C /* UnittestImportLite.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B04445B1469EFD500BB156C /* UnittestImportLite.pb.m */; }; @@ -77,8 +79,6 @@ C5B03FD612517AD90087887C /* UnknownFieldSetTest.m in Sources */ = {isa = PBXBuildFile; fileRef = C5B03F9912517A1A0087887C /* UnknownFieldSetTest.m */; }; C5B03FD712517AD90087887C /* UtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5B03F9B12517A1A0087887C /* UtilitiesTests.m */; }; C5B03FD812517AD90087887C /* WireFormatTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5B03F9D12517A1A0087887C /* WireFormatTests.m */; }; - C5B03FF512517C6A0087887C /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* libProtocolBuffers.a */; }; - C5B03FF712517CA00087887C /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5B03FF612517CA00087887C /* SenTestingKit.framework */; }; C5B0406312517D0A0087887C /* Main.m in Sources */ = {isa = PBXBuildFile; fileRef = C5B03F8312517A1A0087887C /* Main.m */; }; C5CBB7FD126CBD5100354923 /* Descriptor.pb.h in Headers */ = {isa = PBXBuildFile; fileRef = C5CBB7FB126CBD5100354923 /* Descriptor.pb.h */; }; C5CBB7FE126CBD5100354923 /* Descriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = C5CBB7FC126CBD5100354923 /* Descriptor.pb.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; @@ -97,6 +97,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 3F887B4E1910325D00AFDD46 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; 8B0444561469EFD500BB156C /* UnittestEmpty.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnittestEmpty.pb.h; path = Tests/UnittestEmpty.pb.h; sourceTree = ""; }; 8B0444571469EFD500BB156C /* UnittestEmpty.pb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UnittestEmpty.pb.m; path = Tests/UnittestEmpty.pb.m; sourceTree = ""; }; 8B0444581469EFD500BB156C /* UnittestEnormousDescriptor.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnittestEnormousDescriptor.pb.h; path = Tests/UnittestEnormousDescriptor.pb.h; sourceTree = ""; }; @@ -192,7 +193,6 @@ C5B03F9B12517A1A0087887C /* UtilitiesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UtilitiesTests.m; path = Tests/UtilitiesTests.m; sourceTree = ""; }; C5B03F9C12517A1A0087887C /* WireFormatTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WireFormatTests.h; path = Tests/WireFormatTests.h; sourceTree = ""; }; C5B03F9D12517A1A0087887C /* WireFormatTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WireFormatTests.m; path = Tests/WireFormatTests.m; sourceTree = ""; }; - C5B03FF612517CA00087887C /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; C5CBB7FB126CBD5100354923 /* Descriptor.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Descriptor.pb.h; sourceTree = ""; }; C5CBB7FC126CBD5100354923 /* Descriptor.pb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Descriptor.pb.m; sourceTree = ""; }; C5D8D6E912767BC300F0BAE4 /* ArrayTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArrayTests.h; path = Tests/ArrayTests.h; sourceTree = ""; }; @@ -207,8 +207,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C5B03FF512517C6A0087887C /* libProtocolBuffers.a in Frameworks */, - C5B03FF712517CA00087887C /* SenTestingKit.framework in Frameworks */, + 3F887B4F1910325D00AFDD46 /* SenTestingKit.framework in Frameworks */, + 3F887B4919102C6000AFDD46 /* libProtocolBuffers.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -247,8 +247,8 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( + 3F887B4E1910325D00AFDD46 /* SenTestingKit.framework */, AACBBE490F95108600F1A2B1 /* Foundation.framework */, - C5B03FF612517CA00087887C /* SenTestingKit.framework */, ); name = Frameworks; sourceTree = ""; @@ -537,6 +537,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0510; + TargetAttributes = { + C5B03F75125179F30087887C = { + TestTargetID = D2AAC07D0554694100DB518D; + }; + }; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ProtocolBuffers" */; compatibilityVersion = "Xcode 3.2"; @@ -669,10 +674,12 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ProtocolBuffers_Prefix.pch; INSTALL_PATH = /usr/local/lib; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = ProtocolBuffers; - VALID_ARCHS = "i386 x86_64"; - "VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7 armv7s arm64"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + VALID_ARCHS = "i386 x86_64 arm64 armv7s armv7 armv6"; + "VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7 armv7s arm64 i386"; }; name = Debug; }; @@ -687,8 +694,10 @@ INSTALL_PATH = /usr/local/lib; ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = ProtocolBuffers; - VALID_ARCHS = "i386 x86_64"; - "VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7 arm64 armv7s"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + VALID_ARCHS = "i386 x86_64 arm64 armv7s armv7 armv6"; + "VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7 arm64 armv7s i386"; }; name = Release; }; @@ -707,6 +716,7 @@ PUBLIC_HEADERS_FOLDER_PATH = ../ProtocolBuffers; SDKROOT = iphoneos; SYMROOT = Build/Products; + VALID_ARCHS = "arm64 armv7 armv7s i386"; }; name = Debug; }; @@ -723,6 +733,7 @@ PUBLIC_HEADERS_FOLDER_PATH = ../ProtocolBuffers; SDKROOT = iphoneos; SYMROOT = Build/Products; + VALID_ARCHS = "arm64 armv7 armv7s i386"; }; name = Release; }; @@ -732,7 +743,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_LIBRARY_DIR)/Frameworks", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -741,6 +755,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h"; INFOPLIST_FILE = "UnitTests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -749,8 +764,9 @@ "-all_load", ); PRODUCT_NAME = UnitTests; - SDKROOT = ""; - VALID_ARCHS = "i386 x86_64"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = macosx; + VALID_ARCHS = "i386 x86_64 arm64 armv7s armv6"; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -762,7 +778,10 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_LIBRARY_DIR)/Frameworks", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -777,7 +796,8 @@ "-all_load", ); PRODUCT_NAME = UnitTests; - SDKROOT = ""; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = macosx; VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; diff --git a/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/UserInterfaceState.xcuserstate b/src/runtime/ProtocolBuffers.xcodeproj/project.xcworkspace/xcuserdata/alexeyxo.xcuserdatad/UserInterfaceState.xcuserstate index ff0035e9151da6a7cccdd8e31f6d5e73cb6e5a13..597caac8b11aa3a7d51eabb485035f5240832f02 100644 GIT binary patch literal 70803 zcmd442YeI9^FDmLdnf6tBokT+m|k7vZbA}dSvC%Cv24IJ#n=K&jP1Bk0wlNTz4uBB zq?6uz@4ffld+&MY_H-(iY;55B|Ggm}u%+E+XJ=<;XWO%j+gqADyD~Fh<`9QD!ttEI z*-}=ete!h|WvHXGxvh2X*tW&XLycXX^c&N;Y2 z+#cLuE{#j)GPq36!)0;VTn?AZ<#G930awKNxMI%FHE>J0Wn3HA$#rq7xi#E+?r`o% z?kMg!?s)EG?iB6}?o94n?mX@y?qY5Ow~@P?+sa+TUCUk1-NfC--NQY^JyJ&m46FQ8Y@tLRPi7J3i8k3L49pfAvu=v(w1`U(Aven)?x zf6%`eV}kA2ffcM`H%`Gr@KC%L-W#XlQFt64k0;|PI0I+m9Gr^_@ie?YJ^=f0F`kLb za0RZ!H8_Ch;JJ7KUWgm;V!Q+|#hthdcjJ|K6<*CfhY!PR@p1Tgd;&fZpM+1wr{GiZ zh4>VNn`9b_1{9t|vKbjxIkL5FY51+;F&mX|g;LG_6 zzLKxv=kp8rh5RCZ3BQ~_gm2^9d7Y>Hk^E8o(fl#|vHWrTDg3GYS^P!(#r!4wrTk_5 zM*d3vD*kHzI{tqC0scY$A^u_h5&lvBG5#t3IsPU7W&U;kZT@}!WBzmgTmC!#d;U-U zFaB@-AO2tdKY<8#K@nVnTi8b!A&eAKg;Bx;VWN;G+qt$2Y!}-uvu(0nZo9&Ewe33F4Yr$Yx7qHr-DA7o_K@vS+Y`2@ZO_?W zw7p_`-S(F4UE2q?k8PjXzO;Q~``-4G?N{3$w!dxv*|A-)JM6Muv%Bqk*oWHpwC`h2 zwU4onw@+K8dLHlBR$iB>eh`rT* zsJ+X+%6^!Ay{aX9=_M7at+V8O6 zZNJa{p#2g1dNqruVSSn62rSm9`QbUIc#);QKVj&L05IL2|j<0Qwajx!u*JI-@l=(xnO!Liw~ z)p4cc8pn3WjgDI!w>$1~-0OJ2@v!4D$CHj{9M3yma=hwz!|}G`J;#TRPaK~+zH)r) z_`&hB<2T2jj(B%)0eMMZRqDdJ!>NE{;WDW-~}#L?npaf&!qOcT?^0ChjX1 ziREI2SSePC)#5>7jkrKuC@vC%VzanhJVb024;PORb&-lkibsjZi6@FDi6@JvilOp_=xzZ_?Y;P_^$Y#_`djo_@Vfb__6qj_^J4r_@Bf{ zNWv14cuA0Kl3j90qU4lZ(qL&HX@oRVN|i=QlcdSg6v-oHNd;1&X}C@qi{ zN{ghRbg(ANS8}nrESvH(p}Qs z(mm3>(tXnX(gV^X(&O^=@=fxs@*VQs@_q7y@+0!&@>BA&@(c3I@@w*&@;mbT@<;Ng z@)z>g@^|u&@-Oo5@?Y}53Q~B*u1JcixRgQ45M{Wsw=z;0t&CG9DpQnn#iQgX`N}k9 zKV^pEQ%aOFrCg~}YLq%EjB>nkl5(nY zhH|!Yo^qjbiLyc2tZY@TRIX9BD>o{)D7PzjDfcQ5C=V--DNicTD9qTC_gK|DSs;esGLevn<}b`>QqzI!Rjz|FLi`EN*$|CP$#QtYNnd4 z=Bb71boBtWNcF2T)mdt#dXQSH&Qa&73)O?wMsJSiMZ$q+YIGpgtZABC+d~_w?WygfrD|ie@!BM9 zs+OT;X}MZ~wy(Co=GBU|Qtd#kLaWvS+H9>}Tc8ECMs0=Gs&!~9wZpWv+B$8$Mzv$K zW3^MY)3npIGqek|3$=^1%eAfAHth=S8tq=~KJ9+(0qsHUA?;!95$#d!MeQZ+W$hL1 zE$t)iGwpNjYwbJjd+jIfXYFt8AMIc5KPTt3Iqgn|Q*o+Jw=>1Lw=>n5<=o$SfOCe^ z>nwH7bXGZQoB`)-=N#ue=R)Tq=VE80v&p&4+2UN`T;n{(qj2`<&;at(3~agA_|bd7UOa;3REu6);YSFy|QDsff1s$31O#jZwIlPly};#%rj z=F(l%b)@Sk*U_$HT*tbOa~o?b*uK(Pe8@cUnhg)&0?lJDM?s4w%?g{RR z?n&;+?kVo6?lgC%JKLS-E_6?Km$*yaGr7OqW$rodx$b)RJokL}0{3F~GIz6^x{q`p zYC%8{^pX5H-eWv?-_oeR3+?Ttzy0^J+bKma1!+odwF8AH;d)yDX zpKw3ve$)My`)&6-?swhayMJ*1=>Ez5v-=nKukL@{|E0(&?v%kPLsIrmNlnR0$xg{h z$xX>i$xkUrDNH#a#h+4=Qkqhc5=fb!vLIz)N+@MX%F>j!l=hTEQ#w*Q>&CWrx3s*( ziJZjAoWeP|lsT1w^g}{xI_JT^;n;EZ*v6KI&dyDo%4s^*$tKRlxnWetmryh#=-Q*K z*gvPOr3|!ncQl5402OrQn+e(9+0`9w#;hdJ-ELI8 zX900(EU`za60#Xxfz_ozsWvLxQfX)oH5@HKnz*EuEH;QJ9yLlUJNw zlIAZgHq5;+E6wXE&Q8nC%+B(ahnb~Ps znZ^FJoUDS(w8C8Y34{TV?Cg@_T<{{%COeklj7q@q<`?Ebqj=J?@_bOQoZQT`f;?Yd zT3(U2s3fPjs5n2bI2Pw5hBGDsCo8+SAlH}gNz3*YWv1m6Wap(7dGfN;@(K!}^$YSc zi#&1lI-TK+OTfv@&&w??$uCUv=jRor<@iC*MMYWOw2~aZFS8`u=ksUf#L9CH!fcHurlyC9(2c#&D)2;1uSAG`Zfwv|P|fT8_7)HttGp z>PGGgJ!2zxm7ZyMu;GDF3wW4NljW+)+Zvf;?tGDrb=Ps*H|QR-KismK(b2GG z6L$mGYJPe%cT3PUs4`H|-PN$TB~;uDqefe6L&uuU+|AsrTRt+PSF@SBzKJyKxB3BkmT5*m7;W^UJ|kHht>gYM z6~2$|eTg%5_ZRm!_qq$~MV40nF zmUxp4@h0oDl8A>gk;fFTT(3y5yZ(7Wt4=wfyZos5`KT}=%rw2q5@tU`nEmzYB*Jj# zSh|{E=!$s{REo+XFbC>27EFZ!Q>h1%!CZ*y%sNfdYojWk1L74##hZr~L~s}Cvn||% z4crEOPBPrfP`Hmy(dR~SmjmwJQQQ@%ErQ#w&$Dnl4csn$elpxGR<+Zj)n1P-nIb1eDHIK%Xitjvp(vH2F%(UR3k1<4 zY?N9Qbd@b>ZV5rOmr>UV5q(BOOK5dy&FZ#{_Kvo$w#D5`(qPWin6|XJYgzZ=jLwe6 zjE?SB!%=7Wj44#8Go!kQ4K(S?Vg^C`Ly)Sxq? zGT?8832R3KO#kBBSb-Mp{hWyHL?=qr+ZkHx;r~Enp+!Nx|>3V zGHTbfLzBiC%ezc47;R@-g7syKamG>$0Yhg-U2Ag}%yYZSo4Z2k?Th1^@gs)5d^cKp zoIQTd;9GWH_&LoTA()}BXy{^>35qA&qNFkOMOIJWoz?V~?GWXFd|ThYs{s?IQNf>n5?G{)cyC?Bl2T)UCOY}+?g1bX*Cj-7$He)z=O*f z^4Yt?&&9?f_#lRR?m$hiH*I)gmyYpl27dl7nqF0R#J43ez4@$+3wKv@#`(8{8TQ4y zr#a))ZZ4o-8gw0Gb(n$13E}wF*WKCGwxX)ti1Itbfh?QS<7IdSH+2hc#>?>`xJBQf zZ`3#Go44Rr+{R7Dhw5AO%VAq+o3RQvth%Fl1xy~Sg`e8!s@m8dU(IgrY=&8oZ&`!k z%|abD4XsN<3uiVrg}f~-Wu2YfA=t4Q*CUg)4jG?ojQ92z{!Bga_-p5{&C4p7nwpiB zRk+?UZ*5j#UjEe7?85co#Rt;sp~T&T(U`VIPx zP?MYVtTEm@T%*(fF8yV}+N`X+LQqa&R_^-QYcr>&W=7C1#ha71@D_YIpl#D{(QgH` z+YB_&G(T_3$@K<+Co{8fef`?J{A_?Nh@f4IZ#2-Z!`t!o_y+wB{Z9QZ{q8OJCVVrX z-KyWC-wSB>{hw-?xH_M#JZZt&+=49>g;`)P`H`C3j~_{@#Lx66^d|xFDN{_( zKj$<#4fD!`7R<`d%Yhcm%Fgk`iueuwF)83r_-6q8Rewf*766|!0W)tMUpgDCD<{WL zUSXDDuQ{2SV6QPf?{9*VAredoH<<|f3;K(I_>ze@Wc!5|6qy#5=P3aB3i4R5wkk|y z;!29+1%tDINInUMs;i3v?aAr@U-%_EB>>hMbtx0!|_)GpT;le~(I)|IAf;?VD)eXOZ)higW?F z5Jb9I|5N`9F#a}08at-s&96;8W#=1C-IHSs7Ey^dk!?xQt{_(e+SU5M`hWUXiZ~N4 zYtRWzHQ*C6jgFh`fo=!Y_2lKi7#1~+8_2CmD|s8a-KZo*m?9EW%_piZxpDs5{45x4 zJOwc(b{}~-sc4UoM@<}oB3l$^?DFN04mQ;Vd-IVNe1^Q36y+uIGF0$YiX0U7jG&5= zS;h1d#+BN_mX(udXe`$-R8Iu(ZSp}GdXFfhQ`~ALQSpV*ST+++-e9K8T_{46z1> z>-p(1T?a3K)-y)2tQ_Y3ax!yb&6RiXYBI@qjdud3o1&o<4Kpx@o0xg$)PH-`!nK|( zW@H{XyJU$?|4d&kuG(YBl!W_=3_Bhd&yj-Q+qWePvl zL>WQR$XJxOwnAKxpKBOvcD5&CAbd7okQAtppJoD$qG)ss&{KPO-ZSkZw=mL(yq7OY zic-qY1XUeK(O8Pc8LAp@s;Xev;MP+#k)lZk?qm~pkof0@3jjAiJI4r;vkG!^4cz=(kKvZ0@&@_E+|*6{!F&Tn zQz=T{#5eLy6lGG>6t}6vHycwNis0}wTVq>GQTLK1u#b?=P6EM->GF)2 zIWgaAmXOiUxlXcuqh1RN`*HqIel<6BE8oF)@?Cs4zmi`?k%yuzin1xnp(vN4ysi8i z{xE(mzm8weA5Kv|MFkZ3DXODrF-48Wu$&fm>dHLwRoxMS^KRXpAcJvS%lwe7>I7XA zlcZ1YWCy;=;h?OJ%V6=T(?k!trY1>kO`@zxnzg47 z^Q~lZ$ASk!UB=>9pYT>aYa2S2hT^L^JVwrVC`K&_EgNQJKe1_|y0^H}R+QXHc{+MP7>F$Pt^d@@MnsaVeYlbNF*9noiMvoA~qj z3n<#3q66TNY* zQ3XYn6jf1FLs3A#iK1E-Hu`dlGP6tavpiY3Fi|PVhIl<6W-30I!iT@gN&G5odI@G$ z+}zpN(gsH`D`Cg5b5>|gR(fU>C^r$vD#Mfb)%ZhVY$Vo}1F)Lf(o$`lIfW9U@Yy{v zES){hKfz7iu)*+Brd2%6KVyEtPMh%0^Dl1XU!bU(qJ!YKxc{ zPBoW*VGo$KF#ihwDjZS@pI-vw-3*_+#ts+4FIEw6@NdSK`40bX{0ATKAI1vt37j+F zKc#54?s=L20?s8p#mW4a{8#+f{5SQT?9>&k$4~?gd@e$XYz^xDi$j ze&BzB1Figz{7?MP6wRY(K1B;Q^S|=H@xN2FkfKEt1@)}irh}PncJiPrwU<_l@hwAp zNm6fY%&_%1)-D1EDiPpF!NEFgh_RLvctNm~21h;xhad)B`tTa>9 zNl_QYZAKp)fX`3n#rtrx$&&9jr*GAGv@jMtwE(9(mTwfsQFKTjo?4g$o?4hJOrfZS zqC=yeT1Xc>;3tI)0RoB@6t!*=vIH1u+bC+^eV)4MVCHNs$)^eX#h1x%6<}Nd-`oLZ zj+t?+nH-Ki#x#2TaAjI*v0P^42t;h+>nM^SY2R-su~ z&W$zx2;lFIp}2+JKY%L;@PDgeTw{DN05r72IFrhTpj0Ry&bxH2N%g_@=+d?h@YOMA zRpS$}@5c68Wf;O>lW0u^J6%5}CYeR5(&NN;q0LMmSbDPB>mTK{!!3NjOtnFPdHz=K)6u2NVr(IM7UJAOxPf76gCN)g)PG6!d79MaD{NCaFuYi zaE)-SaGkJSxL&wHxKX%CxLLSGxK+4KxLvqIxKp@GxLdeKxL3GOxLv_*(cz_*VE%_+I!y_)+*t_*wWx_*M8#_+9uz z_*3{x_*?i#_*eMP#@Ub!+lY;~2{xO}Zgbc~n`D!1icPg?HmA*HbK6pEgKT@)2HS?% zhT4YNhTHbE?Pc5BwvTOuZKN&LHp({IHpVvAHqJKQHo-R0Hpw>GHpMp8mS#)0W!N%p z9$S_z+m>U?wdL9JZ3VVM+cew0w&}M0Z2Q{|u+6Y}ZACVpt=Q(bmDoycGi_zI18uWx z<+ci2rLD?VZ9B+TV++`7ZFRQUwmG)BwtCw<+k6{b`#6@O<0*n5_C$&xh&`F2Qz$x> zqSGikog#==&!p%qiq59!9E#4R=sb$frwAg{3n{vYqKhel%RrY>bQwh(DB4KTCWu z?x5&SiteK5Zi?=q2!g}=D7v4b2Pk@wqK7DYn4(80dX%EaD0-ZtCn$Q7qNgZ&nxbbY zdX}Q+D0-eEh?!ob=p~9?rsx%lUZv}|1D#fEH9!>EWipNqs zj^gnYPoQ`r#gizWOz{+or&63oaXQ5r6lYTGp*V};Y>IOz&ZRhy;(Uq=C@!RU8pZok zJe}hGDBhpq11O$Bv6tc^ihUFpQ|za>gyK?)XHr~7@qrZ2qPU#m3W_T!uA;b_;)5uz zp*TQsEyZ;d&!%_|#d9gHr+6O4^C@0H@j{9hQ5>ZBV2T?kUQBT##Z454C|*MGQi_*R z+)VLuiVuO&_(e{(1#Ji08tUOpIUFy5DIP_~1zjVN*Wfwmg6V2^N2qh%I&X1tS#4QW zrMEl?CkO*9GPX6^;G7~HR<~kfmVYyR9O7Ex)(spc0X(aSWej+50&tCQCcv3ufJjjI z(4J|a#G0zAS}Rp6OO@I)RaIqqebDQxEt~BRdI8l+eke;mrf2d%U3GO;O|8E;SY7U| zEvc%hh=|d}atuf2U=tY>*R2cGSHudks<(7iMF+;FJB+0pmjrL7x5f~l#_y}Ds15{+ z%W5pC*Rwn$!g<2Gv+LFs)s>YO2WNY0%Dk1e5rK7xUXtm6Vm2Rh9;QRmFZQ7x+PF z&KW&(MXFm?=_{`*_6KMBy~QAAu%xD{B52gG)&MN7^VPoaN9955&=DU5M| zx>ql#6)}begCL}w*h|W4e@#VMz^EXYg<%|40Wf4jwo!4}pd%KQRf0{H6<3!9%PPF3 z(eyB~Li*IW^u_+_@~V2n27={PKGt_Eco=^n`S{+FS62mULEAn*h*nu@WrDF9GVK|c zsjMrJX%!Fg03_ZcE^#q5c#QjnNCA=zk4s`n z7;B#pNI<%Aap@|&J~)>ij8R&xx2Dt|>2eTrB;*OZ0?1TSR>=k-@YrR6NFE4J666WY zDyxR>&(vmB4WbuFH#SZlX3ADV=82ixv9ds%16hV8$r7loFOPH*h=L$lyrBmC)n4Wr zSrHZ>gh?#rtWZa5s3jHV3*9ZDb?cxRpnC@^y%iBmh@&9o-Y9uWs8~%z0T5~R0UD^S zigZ2*#USN~UO;;c6%ejL;-Sb`A7h@csIIaYq%5y8ytP#$h~*&FxM-^4`tq_Oa6lDc z3uQ$xDAd;X9E2e3gFGV>^3>JT82zY+91t5q>V0BT!*CJyaE2$Uj_ExRK0?|F(X=oo z%>sW|To!;)zCIAF@K%ib9gE*jvYSiE|zLk6v$AbzuI33gQc&Y zg(Y#QgIM|)n~TID72W_ePY~iSzppkf&k&X;Mpe+pOc79Z%Mk3tS)vh9L1y{=)i5NM z%{Im{|6F54izMEgCC-l~2B{CKtAd1KqXW-Y$ASYEj2Jxv1|P6RfQ$4W`$&coU-z22 zO2d%`1AZfpWrKdC)X_afj5-=-LP0+S>X!P)vBWXzw<;Z{{)sHr@MuK>puBKf#zYVH zDLqB4tL)2u?dd&n=Xh&ajM1a{JuF>})-@>!nr*gU=(ztN;d#LET~&^62)AnpYK82`OBR)l7s#xkeIX7bUF4}WVfV`=w{#g0m4#7~y^!AO#*@#tKO<%>u6%>sWA|_DRS8-;mgr^}^adTOY zxOR`$E?S(Gd_GG)KDIuFA(|nzIhq85GfQAXd9jfgsShl#1GN%T*GE_F9Q?;|S6Hp*z&@ZMMm+*}>iSjwdkRJAubuePb zyUI?MYg~_9QM*s(URSa_qkH5r8^bEeXp4wptzj9)^vGb2r}as5tYbMw_Q+A=pO-ZC z5iIre9;y9v+03>$2rCD5Fu{jVC8jpPKwS|mB`_}@Go~Mz6e>JP9vIXy460{?uqNn3 zSI4tl!;rD>muhVMG51~T2b-J;lOd~DoWzoiMd5p<=Bzs$8-h1sLwkITXg`%@84;Hy zoFp-PID;h~*Lz}fRD%%2S8mC4Hp`RRdmht=Sjo@ZQSv}tNz6cSVejG_4kSRNYk1QYb7 z)dLJ6uYU;8=n&LbK+sqOOFzbWf`Ug@1GZvVYMwa#LkFneZ{mWfD6XMw7 zfVae`3Cy>nP4XmznchDbYxbGkT%KW2S^a~mtE{PlrK<9(s_KYBo@W3_x)i&41deD$ zJJ3ONq?WWaEQN7Byo4DSF22-Tb^3&;F0X@me_bFB>Qx4nq>Yn9S(6rD9LO8JRH+;; zGj#*G!@6~bjrm}GKUfwB0udQ37{juI@quL~Z!-u_f?DGt!o9^Cs0hyT*F(H+?b+C2 zj}4Xw5}PGHzb|Nb^*Y0)ShIagfDakK)Ex-mgRTyR2kI+py^)#ACoF5)4ziY2vM3&= z46(}wpR>Hvc91u^NMZTdgf)t<7*JwAi&sEcfiQM}@2ZXlZr`%piB39cZt!@}yNu=W zsxo7xmo1mn2Ys+A8?o{q`UME#7IazgJP!jsXcl zMUQ#RZwzHet(-LLpZyXbtYEfp1GDFny2|)5{vU>t*!zk4vs-2jtKD( zftj$M2g6HUWO>d(SjPQ!ph9yX2rq?Mn^I;x9c>PWjbSBvR7(gWq?$6t3Zr~;=l0t3 z93q42z3V1{GA%CLbsY)==)DhF05RjOueus0Rz81qYyjqPGN9fYrx&0aSdOq{NnsF$ zz3Lbs%yn*X?PiD>wit8O+v-1#!3<~L0pNrIg5J8?D#Kq`5)ETWzP^ymYu!LYnd&oL zbyy}?IfMu$K}~xx#KaggrtRYp&3ZB)#t>meueL0*xbGOj;P&sgfN^SLfDnCIwH?L4 z5}Odt3AUTuBWwm0t|07zc>^$2j)v6ED6qhnXPIJ-heU_HX@9PLwPVfnn&Q$ zdQn~8XMtY+}5-sk0Dp?46?TfmWzxfc^I<*wm8AbI|>IZwrSI> zfy}iEW7XaV(UKS19>NvNyr(nd@&Sk)i(KVnOYm%8mPP9@&xq*y00!NwEhW))479(Z z8g{mds*0_ZVn@+{B{ez}(?AIvU0}f>oL_-uEFVmfVQVHTsh>e7`ul!Z1q2nvRdXzD z&SXITozrGfRaLnmTm0gSV-~|K+c`|Ds!4Dw8SYMXg}j_#ZB;Nk3)b>$lOP|oD_SrD zj3k(~46}IWv|t34iHe=WAP3T8W9+l60yZ{$Pi4lH3#>2YGS(R`;3dHo5!f^ph&ZBn)kp-)kvMt2p7~)RZcwHq!EcX^g7Tz5v zGPr?^FOe=2hBFQ%Re*!GR-hcG?6QP#bh0ke3s2u=6|!@!u&r*X@GORyxJDDx%rR4L zW{@y>gE7yTY=P068xAqi^|?E)F$0XKt`b&vXP4E~*1@7g6wi|Hf_};ufrC?paHb`K zXqimJ3NL1WC4Ke8c=^oXr>v5lVGUN5l)y=WsuEaG_SIO+;*QH0XyWXy4=uv#MdsY- zK5Rt3O$@5fkSxhO*ld{MI>Wgdr!K$$$%#S&r$U;`O8cVS5s!ichncCH?vb|Pj0GgH`6F^36QEM@1ZYpZ-! z)~=i5I)*&AFT04-P6WB4uDrIa8it+dRGr0B<^kz|zntyOS@wLx&Z{V9au{h3HvcpS z9jk;`Cdkg2!%!N=W!H2fXXYHQ zGxYs-3Eh(PErwN`h{aAifF4YSL916;6$St3EoN6cj3404G@JmoAm3$>MFWPc@K;pT z)Ptw0gypQ54Q|H=3@~TFfTh03-1_6*WHPG?7n*Yz?1_KpRd{)%tVc$SMD~&%!b3oR;VGm8Tbf;KsODZGHh-QHJSTI z#<*1;tTk35;EEKy?kEo8&x8YY#V#()z90@2hs6=Shjp;-L$f+iKT^y^%@&m(i-8EO*hc(PGi3=YwPTqy&4YZnT2(;^Qek8Ct*++b5P9 zVi${k5iU?4PVo^G>zl=yVwoW}rTECO*y9sqh?5cshk;0<3kZg$^qsH>ZXN_e?Z93P z4C6u9q`p&|WiS$nF*6t&3CA6jTE`+ms|o>ePO>V@73)Q~*L@7d$5MP8u(!={nE*A@ zQhT?dgTsgUfyQ}JOVvx^ceU&(0o`3N?pPZmBH^u z{~I%7yjf|t>M~wKg`1A)<=u_VO%0{+=37&!t}Lynt)=P3@e?LaO7^y7xVTLdCr2NZ zoSG)3XJmo|bBz1)P%kD)z<9;AD3fy$T>`kQY)iyVS(D-S+`PDV?>6Nc9~Quaaw#!- zX)INxIvt*zx(yzay3f=xM&`fpC~Dk) z=z+*PZDO0a5(r|T^ByX8h$Ui|*v-1|DHNXyy_n+DC_a6wxJqah*NBG+tw0ci&j3;w ziqE9@Z1w{qh#B2?A2eS70gu>sB6vgw5>41~qCnT0mK~=w2+&!|F*6)y^9zD83Nh z30tL~MKP=~#y-(0ZeZ++_=4TVe;@mtfq1zIe$oGuz@K~GC`5<%RLz0x8u1ox>J{R( z;&tM7@p|zF@ka3`@n(uIrT8+6H&DEh;!PB9rg#g*mtP^?D&8jE&W+|Y@mlyBm_4>q z{vXQ!t2;r*_)_?Xy?wktm`3D*=GunE#sgdiGaWDq`m^C3)|`BJsI#C1{>p|2KZ{B- z{b>dHxj7}ith^i`OI~DThc_hKR+ShpX~Dg7_@Jr-p3e$3C5JUQjUt)KT1()KX?T`0 z6lyhThNi~KVc88*@g>c;#lCyC(l)SXq!fM;vS{65Sly!!=`pp5{ECXs@ z6!Vp(^v6YD(Y;c9LVQwuN_<*;MtoL$PJCW`f#PixUqSJe6kkR0)f8Vt@wF6RNAdP6 z;W6dW;w$2-;%nmT++^`hZY;&u>%i4=1LfyYARgs`f|>Gv0~3^A;&0~lXiMlH>UvO^t)5)9oNpIO|adxUT9n7;?Q7q0*Yjd?Lx?6LEh-(hX0xf{%V z5CDar5@+~kJEVp`ia!1gFMR_m4TP5FTeS0lzzg(P3w0d&tsNu~H+ zvzAHeL?t(n)JYI>P<$W74@YB5X^1o&2;-!o5|9MlPw@krq&+2|33`xXSODEIooIbT zgJWi#_BtB{Ecr%D<9Z;EmnKmB2*t4M39rFBnI?>P(@hnRnXx)G4q&R3Zd5Rh;>R~i z85G_mfXIBDsZ-Oeg1za>k|A5lH6U^*esZG(u`;|9P+QT^Y;liD)1>{ml+Dt<(sT(} zi=L+V8H%6XEFHj&m4LbEIm40&tV4mclj6!X=4hb+bj;SJ?8nIazKn`(aD3YE`@%4h ziTk`X)V3nj)v<;Ra8fBy%SkgSem+7iC(V+8^lqC}E>%dCQk7IK9VFFI4DRMdieIAm zWr|;+_*IHu+a}dYb<%8Ujx<-Qmmr>go#Hnrd5eNNGl`=lHQ{D z1B#)7Z?aYz7{{+wQis$9R$>zKN)VpC9eycQT5a^2H4@Ac-=P>TBUm#sX}zR_ZO4)D zN=F(byckwefo3txpKBFxtaL(;ZRCak2%y(QiBmvR4ObXyfZ_J5XlJ=bx(UK;>00SJX}fg2 zbb|x~$k!BuR=%b9JBq)j_=l}Rt8|OO!YJKtjKg3)KeDl61;szJ0XSaZUWg4rV2g0{ ze@(;KKUT=T$r??KJqQ7{1W`CF(psxol6eg)yC-Xyxz7&UJTn99*0C{a-MabkhU$LJ z?ZykGZJm=BnwU>8Zb#`!=_%=H=^5!+={f0n=>_RU=_To9=@sc!={4zf=?&>k=`HDP z=^g1^={@Ov=>zFQ=_Bc5=@aQw=`-nb=?m#g=_~1L=^N==={xCr=?CdY=_l!D=@;o& z={My)lby0lcFQU9AbAgY zuslQ_Di4!~%X`Xu$$QKD$Rp&Da;iK^9xacN$I9d6@$v+DqC82SEKiZA%4u@CoFQk* z9yv?SmUHA>IZw`)3*Q0 zE9EM=T0TgwkpptATqn<#=g4#AdU>8aUtS#(HA}^Jf$<6X| z`4G89ULm*2ZF0MOsN5lU%3X4|yi#5zua?)yhskT@b@F=oaQO&Xm#KWDe3X2&e2jdo ze4Ko|e1d$Ue3E>!e2RRke42c^e1?3ce3pE+e2#pse4c#1e1UwSe35*ye2ILie3`sK z-Y9R9H_Kb(%jK=|Hu(zqO8F}JYWW)ZS{dTiUnu^S;@>F#o#HEW5|I*#5}6W(5|t8-5+@}tO5BvBP%?;;Jt!GW$q-70 zQZkH^;gsx2$zGJ~P02o#jG$yBC8?B*qGU8BV<;I*$v8^JQ!;^)iIhyDWHKdFD49x0 z8YStJWKfbxiHDLbO0p@*p(K}*JWBE@DWIf~l4+FeOUZOf_M>EfN)Di81|?ofiYW0> zQcQ`Tk`hWvDVa%086^i&GK-RON-8L+q@;?HYDx~Gq=u3JCAE~)Q8Js7Ih4$$q@I#_ zl+34O0VNA5Swu;Yl7lH}pky&6jg&M|5~5@YB}*w;MoBXz%PBd8k`_uJs(|>kjgods z4yB}nl1@sxDCwqTB_*pUSxw0rN)DrBEhXzHSx?E~lpH~cP6?&tNJ@^P>O3t98 ztOY zo^da=C(B}>zch{V+YF$;G>tNZo>1O^Xd2}YS)P8=G|Hc_^gBb-D1Xkf4uqyr{)%N8 z08OK8US{0^O`~kyQ0)&*qio(i?Ja36zo2YhFpX!wi;_PYJ80n@LfO1eI#8NM*}Op7 zU)n{5W7-=S?VScm zlnc!u1`L~>GM1&B5Qkk>J+rFPUj=kbQU1<2DoSNS7(Y1yV+^aGVqQt?4^^X*)+cBT zRik3wD(oLsqms>FV|d<@Q8g;CK)@VjgwS!vRE&xldLbQM#a1j7Gp!ns2UaXPS>a?SD>My-l-augPD>BMAfJ?vOF=W zf@`PjDs>E1qq2l0iXjc`gQ`)11v0Sw{5YuxOx38gFqHVZ_d(UDwDlA*>Yfs)8kG)~ zI7aZSP%iJQII~sa`B0QASdO@MkJc_)oE1D=&63AaBJPmaQ8BM;43O7R zF>hb&h}TguuTTtx*HJO=N5oZPhrEu8c>!XeypD=_%OS3#^v3I`+|QKTlSXg{yp9U& zy|FkZo((c;_c2U})){UEcGVzH|9Kr1^Mb$tcpa6eSrPr@byUpb{kwzLQF)OS+!HFy zV>2LLN97d;)w4n1az;&rqbQM+STWD^X@ zPk(tGmCtsRJdW2<`LcKMjlngJ*HQU~CGIz`qhg*^PvjlhDPBhf_CBD4^c$^jUPt9u zhPF$*j>;blBk}%hLj6jCMI*wZ*c-2-@;8G^q{&GNXK{|j@j5F1F^I(Ls7WCr67|mO zsN#WCafiH)sxT1wj44eGBS$grN|q+$byOV;updTYG(nhPs8?P`Rc2_3EM5uf>%r@& znrFXvf!9$r4|pfx{4<_*iRC~wD$)zDqq+x^Kap=PL4E_IC$FPAl;z%4UPpCL29tQ1 zH>nVP@;a*fFsMWpvZPQ+cpcSL29TsnC1+Ah!t1Dx>8(0_LL}pLRL3)@ByF4=%9`QC z@j9xLda05{^tEGNM|CQL*lAuzHG}0(Y?dA(^vW)$W-)*rG5#gvbyRa%)}7*YR0~+% zM2@0(x!FXXJw9Ri*q*$O>b?vpv7f~Qh22e0UPpC*mOIf&C(YdtUPsm2FF**l`pN64 z7Bj$I8?o!5(O!UR;sMa&6-n(uRs5o9nbpZqDy$@LcG2?AgUPm>^fO>D7 zUVvhF9o5AQVwZUx)eytk4ZM!(GKQ3RB|oO6BDY@q#p|dZ!VnW<%-#^q+s(c4I;yP< zZujsys)sVL#3t;)q!{j|$#@;rE(Vck+C3l)Yl^OX09AXGEW(;VtE(8)|BTmBJ&fTe zwnUhuWPrSm>iS-k*9Tk=UPo1D5Q)KWa)=%9I;ux8v_6?rc8=FkJ(eN&$&=6Mfmz`m$n&roaoBCP2R)s)o2?v;H}y@?eu5NFdv8CDSq?2GEH z40<5Fq!;LT_C@uMT@~3P8cbkcRPScc1M!a$k(015s`oLtfwW&tN9h;)qWT~!;{O@@ zqWTCc@Baz=qWU;1>wm(&s6NH8cdEno&c3KV%TN>J@P3S1$=Mgx7j^}aaV1)jOL*T- zeVHNdl#M50UsPXXa03}%B3-5z_C@v0U6wGGeNla9msQw7e?q2pq^=k&2I0x%Pi@mTfs^2lFKIaf| z^WPXZ8|;&PQT>r2_Zg1#hRnF6B3yC3u`jB>>|zNq18{QoMfLXqYA0eAJ7Ql{|6<7f zCGLxPd0;^7i|W5SucDYKT%DEiuz(-)Od#4=iDPXYVYienw??x zImEi<)aUmC*xF$$ zD`VKZoqbU&XSn}s_C>9V74tu2U({+?3I8khMXip(?^@gT!oH}@W!Qc7_FZ6K)aEnv z{|)=1wupi6fPFE{uAm*PHJEgZuV_tLh?BJ?+EQ&9ca^rBYtjs2Ad5!B;!s!=rPwf8 zcp$|JU^$6?40l7zfc$NB)e5Y73leWfy>vwvn zBv3YVwKcZ26m>6I0&IRJv53Jd()V}yjDaHElzgN7u~-QM2T(UoozrC3#sPxBJc z&BD(xyH&eQyIs2j{@jJ&a{Ql^{6)!sl*jCUH}J*% z|Be`EczgF^c;PR-jnPm7|72QYT4!5#N25jkq&=oR4b(WKfE1ExWMBP#{R90&{i7|~ zGupGzzCFX>;42t5`P3up4J*vf$;@0|zqT+p*D%BNu`cFS?KQ*2 z05uBlqC9v5!zJJqra`~WZNFT5M|)R$PkUecfbxj)JmqbacTir{Juhk>gQL1b`*dE6 zV=JX!keCAep18ZfNekO*&&bCh#Zzq_(?igT(n&6%#<<%9tX+G{A~ z_oDm+%8#VHoAML&EK8Hw&Vpn;#98Q^#!Yrkr~EL=4>y?i;IOIHLynuWXsyRnkeLNt zBReN2XZ?KmwJ^6Z&+y$b9mQGX^l8hTexsv|qx?S5Q7FGRR5j=ts419gDdV09~16YP+_oSs3M7{(PL)rtTnzI#X6eHGArOEV&h+rj$me(Z)5<` zjh<;`2&WGlk2A;yeSUn{dWx3-bJ(?p~4xo~kjU zv!gMiqZ@2>MJR)Hwv0H^KcHt!TLtXHAz&74>}YN`hO^qXX{(yMmKi<1wQE|;XzC2I z(Uc!=DyZ48o8^?BY>cKc2ASo_@$@jrR%a(Sb&Ipj+3q~l*+KcKlux64I^{FAIJ=zP zLaTEX zqqrjs+Ck@$l=o0Ri}Kl&&)LFF2CAv6xY1x`K<=0c%!J@s_L|+$(QNRn0qjco?GYiit=EIY&}mNwfuApelKBn;gkd$WW+)p@$%UQVNY z9t`A$R3MQX7&SZFT0+1M2Z4Z5XDj(R&hsF-0OyyNZ*-nd`GPPln)4!{MRQ*4yoBe$zs8M4bxDIrAKlq_xbWf;3*>~(K-yVdR9{~6*|_j`Yj&;LP~d9U+& zz22|weR@6N2VTkRloln&IDKE~4^f6F|7qN9LdO5 zaMf&Bn2)-!=k`6bT9;SY)z2l6T_^k>TlZs~y`yklZn$}+)+20m*()A_0PXLU&I`oL zHKk(&0XpkSXZ3`1vQ+&DXY;*kId-~2X{jUiQ_<01ZG0zi(t7VpfCqXaJ8}tEvK|k;mcpCHv10Vpl(OwYX z4FPa?2%A?w2si}+ry&3~!~tbsAcq)u4h#a%gTe665DpPA3feX-kJD&=0b2aey3p@o|KDPAzyPK5@yL$CM!804k;NQL2 z>{zeV@46ao*K-W0pK^1pk+n%^6)od53?dB5+@ z-qfn`*!BI}>l9$OuR16{Y}ClZ*U#Tg$2kDDb!;*E_ws8ST}#>otki&oi|luU32>ox zG?)n2?LP=(ue<5^!QLDM1g`3X%itAuHCQXtz%y+BW#vP{B}xlH3P@$2|9>~xnOUv% z>H(8Ec7Q41RWKDyTL((`0U-ebV8<*50)oCh-U4RAIWtEO7^}d|_n41cK!CHynr8xL zgZZ#`59WZ^z+5m70?tD~Fa%tHfRG}v04xNHz#<3;g@B6?5Xt^#7w`qmtSn$a3lD$i zQ>&a@gDd!kc;IMeW$y3k;RyqWvGEpq!CPQCyyx2-u3#lt#qkCHG_Z=bf`K3cj=~5A z-f(qnwnc~axtSGQZpKX;t`hCV=Ex-u5P*QNRjO5kHL%mMPPHF*Pzct7ciFW2uMYpm zuKVCU)r0rI2Jkv~AAA5l1RsHq;SH@oGO)|@{s7P505`xDf4%)Y*i8@+0Ra%W1p+QX zK=@&+^8s*4Uw93+uL2(wYuFcBnWhJ90`I}=JOi7-`!JbSU>{bH9^e^PKUW+0e2snu zU>k>TFZdFC1-^y{wSygCC)fp3_5Te|!3pOWq97m|Cg4v16{{=sf_-aP6ksoh@9LWa zARW%+t&{WTGgJr;f|Q$|u)H2{^Yu7$ z0s`V!w=n@ueka@o;1q}NcdyrkeHs>a76c@&h;`DMSkJ>^?GWh8uCDIpD(vm&>#?R- z7r|fuQ>uRh->pjZWe9-%_is}DFCk^SKw&?M$e*hsvch}HD(7w4UhfL0!42OQM{Yy{ z9H@NcCJ0E*M{b6Il$ArnuF<_3oM;7nS9=_}4Y_^Q@BSaG%GwItNEk)v1`>e;kw_#8 z$%EuYqLCOR9|WX9032RqKtLu0WI;eS1mr-#H3-PP!6A*@i4;T%!M}GS_rO2*vSW7m z#OFgm0sGHF2qnc}vnfh;a{tv>bU07McZ>-x8 zc3o^(TeIKO3p&LHNpW4Zx9njnL6r9SRaLwa3x12rRy8p@lKW{oc31d4Hm(7@7_1_G z-VH2*-!H#r!oG`Z2?}tYMFCFLg@&#;&PY7aod<2OTz#SN{R_e>Skr2Y>h~=gt1s5b zzaOau*K9@-kt8G;0!ks^It1J(L~66cR0t?rjZ(i65jF`fUTnl8xCA{L5@$sOVDID` zJ8Jb*Msnjy_0;1&dw zL%?kasDOaVVx%R!8EK?7@(=`6!H5(vUmGEyh0R*FZCqy#thH98ah1qcE+^c4zJ;&< zu>2Uf8y=$X4D;4?B^&W?F0h4r%^I?W`zI+`Bb)>B*gq%32?FlGCu6P61?dJmvPf45 zsLn^aLqH9jP-ka7zE3tHPa*?hhY9J0^hWw1eUX01Q^?aue`Ej>HmtHZ*!o({avzsq z-_y<86?P2R-EDPXXJl>M%KS#YKTdD4M#&`Pm4B!V>!~N-Q8^h2Utp|J8FsawuIKrX z8OSVl6RbFz@{zFOcm`)owfy~^&#$byHhCVhfZYpL8qN7g*wuW@7Ac-H@D5=}EFbu0 z<*b_)49pY&AKQPQLKVgJbSLsUvI4F$j=X^^L*7K*LY5<8(QSi(=MeA$0$xJED+qX9 zf~-VVtq5`r5@v5Z1dOlB@+1VnW%&P7mf7Co`sw*W*0tT-VLGl0Fk4nvu~k;}%i7)4 zdWUaXZ#8vprL%Gy8yN6&^H1UqOUF;=VU2o^kd6Pa<_QFJe8-w+$QCwbn<1bx9|;FP zUF;9|9}zC{B@zZuDS>7BHL{)iS7ax$Yekg1A)sd^Qx9h@`q<6A@V|bx=&v;QulyWa z`3W=5M#tMZAiyo)2%Nigg%j!lb}L{r=luM=0vycGoPgn9R}D%hxpSBTr)Fs8kD-s@X(8%0w9pfOt zcKw(f{VpSSNIPc-HT!;@=+ovQIr@;93_F0L`gvaOla5z znuUNl2$+X}1qfIyMZroQPK-*!_$_59c?ej7kB2<`4*_3818>;^gkDq2tIrq(!1fo; zD#Q05u!O>)==v#PduZOPa=jMCz{ksFEjaw=DhfW>>M3jI;K6 zI6Q(ChTEEVuzn>2&-?S9zVkEIrd=bE25R3w^xO{t%iqzHjM9b=5=sjK-u$DY_OP{> z@J~s4VGTA`mV&B=GMiHW+|GRGG^{OXh%$yJUCrR4Od#O5Z+RA!89*yUnWHRFaK7su z1pE#Ga4DL#WDCj~W%Fb51a$;u3jyyT0Di=o9ZJDOTIT^9z($lDEdPD_1?7lx{%MBe zC^(h!5dz>xn8`l^8Htkf8h#jj0_FA7U~d$hPxuT0@Keg)mR~<^tIMAvugq`^H2D8} zNAb<-{b-f&a8x94;R1o63f}}NsIiZSf}$FHd#Wn0_RS?joq;ow+sfJCS@4|%90UFc zQ-?Z_3O=;L{}rS<0a(^$IFvawI7r*Iwj02BE%w_zw)<`m*dDn3-1d;|VcVhYkua>r zQy4>m2_qxS!l(#~Fe1WR7!Bb)jD+w9jBkK|u?=`(OoN>;mVq#gVIU6U7hqvT0tXl; zAQGdFH>m=7% zt{|>pt`M#&t_H4Vu6C|ou0gIbu34@RTpzhUaed*I=ibjv;@0BU;SS=C;*Q~tgCAsQ zgfFE#xVyM}5WgVM2tI@WLJ(nra6lYGI3rvT>4;)PDdGm=CSn}1gm{Da74Z&~0+m5k zI0>i;rz!7gV*a|)eUm`h>TyOw^fADg6GM^l z$TVaoG8>tT%tsc&wzwKui>yaBARi#n}S5vmdO95sL%MNOlYQJ+zN^X%Z^<&otf@R;(r@SNfa;0fdj z;tA#n;fdmj<%#D>y~0c7P3FDMTgH2fx16_vw~BX$_Z{yC-j8Siy%oI;&57nl zgJ=P?5PCOS7_E#}MXRGV(EHFtvl8<>(4@J^DWSA^I`87u}DhqX*Fp^ay$$y@*~$e?k9+;lOOdY{qQG zfEXSO8pDUdVelAvi~>dpqm0qU#9-nu3790z6$}-VjJb+Q!(?ExFgci9Og^R%Q;aFa z+`!z#lw&F|RhVi_Ev6204|5;$5c3%G1k;3R#6XT^7z&z8@g&ymlI z&xg;C?=;^-z88G2_}ck8`T6+8_$BzI_@((F{>%Inej0y@fTe(=fRn&+0at-}fsX>8 z1ilD--D$Y<&`z73wmXmREZteN^X|_2oehGU1yO>$f*3)5!B)Xu!G1xy;E<4nkdlzH zkgAZnP`J<)A*xWa&{d%^p+%u(p|?W6?NZ&PyGwtU;V$D{$-DA)73?b7RkG{dZjRj> zcLTe(>^9kbWVhXJ``wPaD|SEF{b+aN?x%Zr_6YA0*(0_`V$Z2Pp?fawf%Zh~dA_HA z4}H(jo?+o5!fwJI!k)rj!u7(h43Sxpd67ktWl<$jvZ%JGuBg5!MKnh=S2SO=Q1rdn2C+?I zo5i+@S%^7^9TRgFa}g^Os}s8?c3=|0@1Y{Db&M@lO&PB>;&n62C}nm*A9;lrWR9mxz=|lE{=O zmbfEvU*e&}V~HmcO%ksp+9f(Ax+Qug`X$CB7A4+Ea!78I+#$&&iI7A}?vxag+$||A zDIzH*DJ!WesU>M9X(MSXc~sIt@|ffa$&-@alD?9sB>g3mBx@v}O3q8Zlj4xtA;mAX zS4vb$TndIfl~R-|YH^QnZMZ(% zC~h1#iDTksaBpzG;@;st;6CC$$!?V8l*P!3%Hm}4vhuQuvIN=vvLsn8Ssht@SwmS% zSw~q<*|V}2Wg*!J*(li?7G$+2^t^Wnas7$kJsQvZJ!& zvXin**(KSJcmU6ZN8pio9y}Vq8^0GXhL^x&@iKSDaRuxB!`t#k|WC*$(hKR%9+bq%Gt>|$T`U!mvfWzkUJ$8CKo4{Dwivl zFIOm6ELSR5DOW9bSFT>JLGFQEvs{PVu-vp9OKwhXL2gOzcezh;f6DzO&mq52euq52 zytq7GUS6L4fT4;!NnTrCPu@V@NZv%=THaCKOa6@fS@|IOVEGXFDEV0V1o7i1iQj=1rQlAoCiJ>&EG^I47 zG^g~Du$_P>s1nEoJ;FhP4Z)7!KsZitBb*?35xfb3gfK!9A%&1ns3cSq?h@`19uOWA zo)Ve~y@Ub65MhKcPM9K06J`nX%A1vimCckrl_QnQmD`m2l>3zjln0e(lv&EN%Ja(a zlz&(Lr2MCffQpEUoQjIdJ{2PsV-*t>Qx!Xvqbl|)jw)U%-YPySekwsK7gWMjE~!ve zvQ)0Axo( z%~Q=+El@2|EmwW5+N=6rZMzzu8o!!=nxLApnzovWnwgrVnzfpZnvaOY@>L=BG)PvP8s)wsbsmH4)sZ-RG)$`SB z)amLI>dWfy)PGn1r2d!21`R-Cs|Kin(@@q>)6mq|uVJQPsbQ^QqhY5}p;52Vtno^t zL!(=xPh(hPOk+}GT7#vrtjVJ(r>UiBtZAxgp?OgAn5MU;pQgWNpk|Qf1BGus!iFNA1BJU}!j9wZ(j9w8njIuf0Uu0#*wNum$& z6fuB!mUx~RLcB-}Cq@xti3!BZL@F_bm`2Pb<`DCUg~Sr#4dN|g1@R8CmRL``Pkcmt zLVQMSCB7iOCUz2gi2cMt;xKWHI7yr)&Jq`h%fw%a?};CYpNU^d9HdR8Eu?KEP7;EI zBB4qABtg<{(q57nNs=T@k|oKLlt?Nhb<#c(iKI=^BN>uRNMyiz~#$;2n1=)&xm~2b7 zCm$mphfxMkkiE#h6m%xsCji+)nNy_mT(5L*xX_;vq(sI=D&^oCVu9cv5S?ju1l~#?`fY!Lyl=e1llr~yhL0dz6zqYOR zacwv4B<)n~4DAN(ChZn&ruLHdTOC0iF&#-AOC38M2c0~f8#=diCUoX?mUKZ~0bLDMrlTQMukRAMz4%Ij6NA}G~R4XFy3!WHa>3b zW$bHAG0rf~Hojwg-}sU7fbqETlnJK^+JxUk-bCGGpNW-;y~#0?^CsaYQ6@J`?wHh? zjF`-r%pKTxV8;RO19At{4rm?-JP>vOI#7Jz_JOJc-3J&4Mi2a9y1^7M6*k41;!G_} zZB6Y>gG?dQNYi4|+on~fgQk&OPkGZ_Ly7@kHAM>;3=go7?ubbaAA2y#hpS9q&;Ir6ivEM@9!pOqk;(|q(#dV7+ ziyDg#3%Uiva--!AOKwY5OR}YorLW~V%V5h)%RQ}4x)76c*4EZG*1^^h*3s6b)|J-P)&th#)>DVX58)3f911uTa_Hirx^+J+$~`JQKA+fhV#^7K6YeKGPt>1ya^jgM=qcbSmgb;!%n%h~IuSB+Pl*H`Z?-rKy*y^nYw^}gm^>RsmjtM_N`uRdfS zBcB64G@mS=Yd%vxi#~6B6@4{*iM|oOiN05S>An-bOg~XSoS&Rus9&^SoZpz=tlz>Z zty9LQOiyKU6{DrqeC{-2Qz2JN=#fJ^j7?Tm3uzdjezv z2mz`AR|3)lvH}(ZJ_P)6#_WvE8M`x=&!nBnJkxn*@XTv`7yY~a~jXKT;apZ$7n%eigmEYI1Ub2wLVuKwKppv^(tLC7HcAh)0s zL6t%Gf*zdTdLBH_bKd2=_j$kb_s>5&-x@3uEE9|mjtou;rUXv~F9yH4K)PUf!Q?{D zg^~+5E_@Ez6tX2mGDJQ^A%qa35~35L8=@Ct5Mmu-6Ji(Q5aJYaJmgeJc*vEIl#sNL z%#hrWf{@~n(vbThJt2RD{2j^}$`gtS6$ljy6%CaL#fIWS@uAM4A)!}8uZ5O|mW7sw zR)$uG-VJREeG&RPv@^6PbSQKrbUbt_bUKVXY+u-ku+w1yVdul5!;-=%VaZ{sVL4%W zVTEBOVb{Z|!fL`=!g|7n!bZZz!=}RK!5cb!_%@?_$(@+3(2}*(}P%@MX zWkA_bE_4g3fbKxGP(5@XdIU8>)8X603E__69^t3LgTkTk$nd1_l<)~bL)!}!; z>%;GdKMNlWXM~T2kB3i&Gs9WobKwi&OW|+B-$iglY>WURwnkV)I7A$aaE@?|sEv3U z@hqYxqAj8?VkTlPVlm=P#BUKFBL0Z@67g3gA`%sej^vNr87UOGCvtD3Xry?gdt_i_ zMr3UyGipneNYwr)<0ywHrzn>w_bAUO?ss}`#tYa8nl>m7SOHY^s3jf{6-44$2G(~k9!r@5!W5p7e|j{#Er%+#l4Mt7x#PIr?@}k{*K=m z55yzmcg3s4ABaB@A01DNzZHKk{%L%3d|Uj>`1bgL_@Vfb`0@Cu_?ZMuf@p$70yY7c zAeW$!ppigI&`!`xFibd}c6S@+55||0Bg!zP}gtv*rM1w@@#G{FhiOz|xiC&4miKi3KB%V#oN~}wKp4gq( zmqN@OLzPyCqpIq_=}N7AOGElE5{m?VKDp`<-YB1z&&l1T@WP9$APs!d`feYp%= z-g_ac}8iayr8_MbW(aK{ggqOLxos!i3S8d6QDW>ib6 zHPwb{M|Ge&QC+C+R8Oim)sN~=4WtH9FHpm%5H*q-Lye~R6luydHJT=kNYkR}(hO+E zG*g-d&5CxIW=pfD9ittmxzSG0ylB3()3h_RbF^SuDD4t0f)-7Sqb1U=&}g))v~*e) z?HVngRzxeMmC?#+m9%QwUD`d`1KMNSQ(7~vjrNk(PV1ue(gtYbw5jCH$=u1vWNflx zvU0L{@{#1D$zjPc$??gR$@h{UB-4{8l9?$SDce#wQwS;hQ^+aKDJN5WQW8>9QqoeM zro2pPPx<5OhO59;gR2%-t**virCv?BT6eYaYSYz)tM9LVOchKOOO;GLoO&$vcxqfK zE%j>Z{nTfvt*H~K^QlW|oN4GZ{xsDza+*$>bK1!?pS1L}{IsI9*0j#Fp0q#HH>dxS zE}o80S4cNYw@J54zmOi89+Q48y)?Zny(PUPy*vGL#-@xd86p`n8TgDt8IBpw86g=_ z8L=6+GwL!LGUyo-8O%)XOuo#WnQEC@nYx)SnckUxnMs+cnHiZ4nN683nd6yrnTuJx zS-Y}?v$V5Jvdpr4v(9A&XBB0YXH{mkWOZb9XK%>fp3Rjlm#vnqneCA6p6!_(o}G|= zIlC^qF}o?7k+ZqB`&p`59lnQOw= zu-9o2aqzJaj-gHJ-0Mc!lFW8Pym zs5Foov>Prrq%~wV%r*Sh@ZrANeXaYt_p|O7-7kHx;{opjz6a+XTzU}kpy$ExgRzI$ zhl&rCA6|GE`7q|;>xcah2OkMN5`QH1$nR0mqYIB7J!*aQ;xYJG;IYtS=f@`>`#i3E zeDCpt#tn_z8@U<}Hy&#|-k9H5)>z*7l243?oT|QJbu#lm74 zn_o5eHPc%-ThJ~1EoLn?Ep{y#Ed?#bEgxGsS~s=ov>s?RZ%u8@Z7pbJwZ3hA*CySj z)TYvQp)Im4rmdrm-o|(?`&{L@`tykAiO;V*A9_CZeC7rIh3X597f~-Rzo5RDcrpKC z>81Kh?U#Bl^IqO~dF$22S36#DzjA(c@|Dl4hp$>*J%26uTI{vt>!8=r>&Vx|ukXCB zeqHnW?(3JYM_(_sbF>S!?`hxLF4iv5j%`$MxSTeQ2kd$mLD@$I$k4eiq% z8#;D%*mSsdxObfB@aj0zajqk{Bc$VMM?ptvM_EUC$DNMaj{1&O^<)ckb*I>%?}dbnfpYcj|QNcbaxubXs*D?zHWU>dfh^?R?bvr1M#4YiDog zROd|RT<2ovo6g@lKXm@lwY6(|7grb9#nXl966g}_+SMi9rP5{D<<PiK=*D*|bQ8K&yVbk*b?bFobX#>F?zZi= z?>^S;+qu+D1C#fg5=T=We&z+vyp8B4Kp5~tUo{v4Bdj9PBt5>pDzE`PNrB}Vzve&WK zt@lK)SFdkxU~f?Gh2F4Us5ibhsh84A>&@-G-CNaL(_7cu(EG5rvA3zWySJ~G-plA6 z?Vadl_Og2CdVlZzyKh6^roPR6Tl>I1o<2+;f1hCA?mo#rl|Jo0n?Acfhd!r1mp=Et z^uGMQvcB@Z%D(EpyM6V2Px_wqwf6P(jrL9SG5bFDbM$ZO-_nohNA;uoCHo2es{I=M z`}!mLi~H~N*Yw}*zt{h?zq!Ay|3&{~|C|0l`oHx5HLzg-7~mQJ2Y3cB0|Enr17ZXC z0rdgP0mlK4fs+G11E&T820{kH2B3k6fvAC)f#QLu1JeV4(Ra|f=}0;+osTX+m!)ga z_tVLA9lAc8I&u=;!Dm^o#UxdKCRKJ&j&Ozd^r6ub|h^>*x*i zhxAr@Cw+uIN*|+7(0?1;I=FXm-ymsFdr)uCaL{@1jqy9 zb_{k8_6^bp8H3EhrNOs@?*@M#{51Gw2pHNrw0($Y2s0!wBr+sEBsHWkL>N*XG8#HO zWIJR(LmtnxLU|2B@GmbHiGu#;djB|`& zMkphk5ygmQ#51xPHyF1V6^uKKT1Fk?8KZ^qobi&;%lK<})3EHY%CP;g^Ki^?%5d6n z=5Wq%-f+S2&Ed-7>fyV?_l8@BUk3 z7}XuM9CaV{9Q7Xc8}%Oz91R-1Fd8-rjYf`UjAoDKjuwm-k6s_WIeL4vYP5Rv?r8n! z*x2SVg)!r?Gh>Bg4P!%N@5aT(Wydwf_mAt3+l@Pq2aaDFPa01hFB~r!zcGGmymq{P zymh>Hd}Mrld}@4Vd~W==@ekvFjDH#bYhuF$?}X5V=!D{g&V<>7-Gujq@5HHzfQgWa z)QOylx``JPV-pJ#e@t$f+&0NM$vugjP+fS8cv!_T2I=eoN|~tKIJnNJQX^1 zX)0nWaq7xc&Q#e{_0-*|ds7dl9#6GRy_{;F>YD1E8km}$nx9%?Ze(s|{=(eB(+$&2)6b?`r#q*+rhBJh_DoMq z&rdH*FHe7*{$u*f%r7&D8Pp7VhJR+yjL3}GjN}YN?12ow^$XdJFHsP3)X8^C##3m&l+S6v&LAHtZCLPYo7JT?B-d%*}bzG zvqrPdv*%`^*^JrD+0xmv+49-S+3MN5vrV%tv(IN=&34Ro&5q7a%ra+Lv-7iyvmfVx zxvg{C=eXv;IndGGnK`GooO`KJhEuJcy#f^ z;_i*bvIi&=};7V{Ph7K;{37OyYfTr6K~UYuXruq3&pvt+vzwv@1R zd5OA|vXr)zxm3DTwp6}Uxm3MWyEL%$X6etRzn3>IZ(jaodHXWY^3LU5%fic|%M!~< z%WBJ-%fw}!W&LHN>#SiZcRy>K3naAw delta 16150 zcmZ{~2SAj^^FO@%+*6K{dyd{a0@4wcB1%UPIC?#f$K;!}jh=Coj2M!-4kAD#hyuMpH0TZbfc{_rNCfF18{~i@paeBQ1!{pB z=s+WA1;fDzFcORcqrrz@5||7=0@J_@FcZuHi@;*A1grsT!8))Wd=55%&EO#T8XN+L z!4dEcI0}vd!*_5i{1Wbl``|%%7#@Y+!XMx%cozN$e}LiCL=%09I3j^aBvOcUB9q7_WJCc` zOq3Cogo3Cc)I=SjBbtd;1JOndB}NdVi4O^mm_SS>J|?CUGYOvflvqG4B9;MbAVpMQ=z*k|aY~k{^&#(vEZ_T}XG*i}WRXkU?Y!8BRu#y~!9dp6pL1 zk*Q<`nMLN1d1N73LY9+qvYJ$p8nT{jAREb6vYq6}iR2{mV{$4vgPcjuA?K0{$j``C zI(Hcb(8v&x<%cg9#H>K zZ>YC4pdn4r5}Ku@v<+=bJJ4>lJMBvc(h+nd9Yyz|qv?LMA%X5sC({GzOgfh?p-bs9 zT1nT?Dq2Uk(<5m_kEbWmQ|M{*bb1#3Dg7C}gzlo(&>QIO^bYz?H2tCiWEji2cQZ;xKWvxSu#d++Un7&JYh2=ZW*h1>!<+k+_&owj4l0 z1@hx3SZ0=ZgW$Em2{;26;0oM;JMaLWzzb1`Mhp@o3uK9`kTv>XE${)pzz_I?9v}b& zf*=rtB#1=`94z2qF$XI+SjoYD_&*Bbds=nyr>wNDeL)-u?gB9&7Dx$OSTx2lDw{AGoI#fWi`4QAuG=xvVI!wo$9@ z= z7w7;(kq`34V{j{apg~guj6Z_)W5C!dSy7r!-Jxr3QMHZi0%Jg7w;lr+_a8mu!35L; z1t7nCzobd;YncK*u9g+$4((9YHfxjH+EgQ#gDGGtD8zv@L7}th;1i{kueEWcrW?EA zRnhJ;!H-#h?*y|^2nPesfw|yQFb@yLe6Rp~1{PMdYnyR2v3(UCI=!~NL!}=q*R-mK z>a{H$INm56g`rRm1}ddkr7$-9#(0~aU@2G*f|rA3pc8bV2o#B;mV*^wC0K=ep=i__ z1(l|2bRDg2{LOf!3~V&ounG0SHgpGI3-}5IuL4`aHn1J+0AGTgs4t2^u_zA3qkgOK z1l^5){lGr3A0?pv_%{I!;9w6tlHm!yylnamK0m?FAjQEpPP*fuWf=+-zJCu|Hc4-Q zAHWH45}X33G0RzS4x9%+f(zg$@H4mwegT)jW$-Jw0Fhy0$C`9HqaK@L3`)`9ibC+hAz+*xImM!{Y%8uo^LU|$#mV__VOhy7pz><R=;mg3VA5TVN|342Qrr*bY13P&f<@ha=!fI0}x2W8hfGXE-Jka4G-2qrU+qqGXhU zQc)U8M;T}!%0yXc5Xwe5C>P049?C}rs1OyQVpM`kQ5h;n6{r%)Q5904YNSLpNQG*V z8flOg)uDRSfOM!4HKAstM=huo4Msyy8)`=#Xeb(nhNBT^BpQWAqcLbK`Vbim2q6xQ zL*vl|G!acglhH?L3i=pLMbpr9^a+}QW};bWHsaA7G#7n}=Arp$0s0IrM2pa3v;-|h z%TOokLd($#v=XgCtI-;?7Og|;(dTFb+K4uxFVJSR1#Ly!&~~%~eTjCWuh1^E8|^`R z(LMv(j}D-N=xcNc9Y#mcH|QujhK{3e(Rb*3^aDD9PNGxjG&+OMqI2jx`Vn0~KcSz| zMf3~0gf63B(G_$RT|>X2-_dn+1O0(+qCe3sbQ}GJ{ziAuU33rKM-R|H=plN99-}Ad zDSC#UqZjBUdWBvi!yELLgMfpOg9Haf93(kNaggR9!$C0zEjVb&K`RbgbMONWN;t@J zP|86Y4&q8~$3c4zI&jdDgH9ZD=Aa7)T{-B+L3a*%aL|*3UL5r1pbrOqIq1hhTo%s& zE4U4AhdU}{mPO(19c{XndX&W5B>VTq1sv{#Un!;RyYf|JYG01YyFekX3vDYZb zyNOK-4`A>~vWEZ;VIb!N1n><8AM-s0a2$g@yq5sJ$Dn_T8JxtxdQOPYat4E>IsO7T zkAZ%Uj{ttc;C@QD0Di&X#GEhz{EC4hHA4W`F!($*Rsh#AxRYu&=Oza3Y36=zW00Q~ zD6rkZ0HyU3z2nN*q`UGp>0*KPm5JahMENaBQcB(U z`=2`Tig}EQfgmu0exBd}L1FMZUFe?>V-S`RU=k&)jG_U2WQH?;cb<(PD!~l1GQ0&~ zgF)1MGqA^?a=s8R!U+TEKv#jy6@zv2g%}ea7{~_-z7yUU%;*Mw7|;vMYylXAFA#hu zdSakj;3;Se#bDP0VJL_Q3|cdN1bcfK?RDoLWIFNHp9!%b`WP8LGjqpca5vLzVm}Pr zvV<5C129O=GFz35f%n25LU(Bx$QJquU?2u3vxLDW24O%A62^+i#UN>rStcKYmTpjl z!50f%1O=rS>>K1RfC>ygSri&#oV-Mp(Rc@#qibox`7mZoZgOg-GEZ4tk)Lj!?1U2Y zCuEz0T8n`)+iboTgUH3^F>Jt~X0h3qCJb(6n>%d5K$2tje+UNsa{3FVbYQ^cm=z4i zU~@OyC=7nhG50eTgH21!LxeC0%{9x6$Dk_L+%gG+h^6L!reLr+*KE!-4E8SVEp$2q zgBMGMoFHanP#`nMc`gQHWl;j#d<{xpaN&RMlnP86j7;7pEsHuWt-1%{3(V)!6)Kpv z6@w4+>Ug2GhFCv-B$re#tk_-#r*e3d}P5F>qUMPQI@(7*$~Q`UnOeE;nmChQXx* zbJ)JaKw20ibb11V9jOcB^FVDNW0xQGF}(yaP22Kpkip;s|z zUTHS;cMO)U^cMo~hcN&>c-1O^LFif^H$*{jT>_P6o72cNUbLTI~ZQsBfd zF8)AJ@{du8&pRcjiY*1k$CxpyB!rignCJ5|6Cqt_eTjjgq@MuZV6a(b&nK;O;6E(2 z;D1Diu*MM!v*if_gNum7+U{}(LCDK!+PV~h!Pm&p%fygd!3qpL1Rt-gcj9Mu(}GMw4*b>ij+n^s7c0yr zgqTb)HVD}w3daQL=kbF2D5Lr)p4;TbCn^|z%;yq;-rL+QreCgf6lgI1~a~J=kI?`^ZE^*f>e@G3VUttVebaB=cz_I9uzbE*(Yi@cD*G{=xvxV z@SC=n?HXy6z{YOc!tyy=-Mj0NXbh$osLBK(gGp_M0LEbrweiCDiMS!E#GbFwFno2b zxxbGvaaL`CVEt61r7}M1tKR&w272~(CqeKN6HhpQN^Q+oZg&!RXBl~OFmDK^3uRt3 z$J8}`(AXX#FwN^`>dnh{mqEVD{0eyr9}=zqDX{}}$P zR;UxARVJx8KBCT6kX&n&OnWCezRp|;J~z^h4jGNK;(x3&Po_;qdJ(4g<~Qy16?)lX zQX0+=-o^3@>V-Nd+K!2;rWpQay*Vj%8YPQOlFJ$-e0GC_V8L!9-53sI=*+$BGt!Ly z7-VBg61o9=5lZtcez>R#!GjbgLt&NOTme^I^j`A^sSMu!s;V< zd1D{Jj310Ng^BiEW0XKUWu)br%t&Ywo&rQ?O@8GH3_ltfQcVnZo6HgY`CnR6v#k)J zOJ>XR_j>XN_EL5^$tmeM<~31t#VBALg5G>mGsFMcY%K`=_CG?U$vGwOVsPXAUKsvk zy_F#JCl*?w&lJF4W)0p=Brj<(SGBvCIH1MM@c@GvEja@FBO^OblF0pTyj`oEKzxdc zvueHg!H2E*idM6Z7nmp+62l*8HBW)pX2Pmn<0VxvLg=s%)=D_MVpWeqyyGia9A#=cQ%1EessH#rlgxuQpUe8d8J(_ z=AuqeKKn6Q46eKEt(VM0YE;{=ANQEq(12p{|8;-U&! zYIh70jE(8MxslHtE-Wl$qLH5Wj=pHPkf~&fkv{Mp{l#!0rO9;Mqs<7JU{dCPl-d`i z=VU0eWLd@Coo1Vu6Zw}TgteHIVZy9$i-f2YV9+`;Pf%5CR8@}q%i`@u2^m9{VTSNg z<~dP`!OT&mf~dlzCy75b%G$OtS(et_VNJI;S@uQ6g{k=!-3@AE11@EwvZSRMd4<{C z^g67F9^>O8g~Ep3R8rSv+~zYOvWaZwH^lhRq@HZSyL%gAy!l)^4-Gk(90G!uEi>-1 znl@j_4ssL-UP%rmhmpg{5#&e?;_XkogBQ-hNDlT|NscDRkYmXYNdpIabFe=L(>a*M z!QB6B(~=X6Te2JsQA)@2Gkj8bg)n4B-PMDurj)8ZSty;(>u!`r*$B62aggj~u&yn)!4gE1V8 zT|st|T_A{D!NE8V#+&x56Y$=kb--x;PM}@7xN>w%R9vr6@93DZ-P$&h+l<=2AUBg+ z$gLd2+lh%BOyXej3UWKS18dvK!4wXrnzW^vw2k8T^sq~-9NjCfZwyuz_fFZ@mcqE^=@X2eVCLIaq8~P>_MVO5XT? z2I3F$CKkKJK^X`0Ok(*c$S?UTk@VWSyK^f>M}~Sw^@;8~wqkU2bYyI(cjP-C?vW4h zZa8_LgN2>sKO8JVL5i%jbeT%86}D#Z=1qQEYX?7kjIAg6lzf4Y0LW+La}Jhpu(XSO zNxtG>83)U;nXAW?rz>F?$Y#R_9z z_1>IOn`Sd*OSysIHIyA?PdQMIloRDlxlnjhs+xmJ4%To`#lcz*syV3Ppmq)API*wC z_(VfO+2K=;AP&}XL^em{;HV(HAy$p>rWZcdP)Y}2H~IS$oVKP+AfSN?r(*Hx2^B#_ zQc+YdDw^s|^`ZJwc%s#Fuz`a*4mNVIiG$4?)N`jKD)vJ8*KDkornB3m3 z!#nUT9Rg>2j%sA<&<>?EOt96Fzc+D&L5@MOsy0Vet8F&VYbuv2Gg>dB@~C{OfGVVl zsA8&wD&^o14z_Wyor4`59Lm9A930NU5gZ)376efhM*Fb`3aXk?QaG6S$Y+$%0iz2m zIk<;|dpY=xFO}Vt1QBnYgBC-K6!F4{^Q9pJe+JF zP}ywqp}0+}?KZZVYQb}k!ciRENwsot44ym3K8hGfwNpcl4cOALofNk8Lljh;tJ1Y} z3yz{b1h&hm(bO1fEC+GDE7MQ}pk5^N3sJYaq)I4fFwSfAJgHt&; zje|2exQv5yIM~U-E^M^N>6r$0@X*?3ojP0{)}U2sv~AtCuB6rh+yA?6QR}JCaqu^C za5@J+F$H}F@)Oc^eV-5iuXH_6ZKJjWD{2SzCAE|KirPitqY*qPY5d6_WFNpq9K?>` z>NpD}@ba_0gmWKiKj2qT2dIP8*VG{n@*Mn>gY!9v{RucjeS_7_r;b%-Y4Aahu1=@L z(*(OVw<15qbf^^GU|M&m@2KzjU1z-Tk?#+9+1Yi*dw@ywBz25~^Njo@9Xfn;rqi|y zI?oy#7T|`m)MizCdpG%lk-QL-`N3oC?TiOdpHjb2mp~>57jtk40>-j$Y3}nXb&bzI z;Y3ou;V$z}I0}b>)OG3x|M7`XlKKOaKRyv+Ee}&^G$p#0j=sH32atyMYsxP|O<63I zq`SuXaF2s{wFpp3?MEAHV&vFR@6j=R@wdKxqQ`dEMCu{+3|Cs}5%rjQLOtc+Dh{sZ z;2I9DT|qskUV#17D-N#X;1~ETii2BFPz z&cO{F+_(Z4CO_H=_!w&to~@g3t_AUvFANust!O*I;|bP%Kt?;#&Nv@vCk}4z1b#Rx zgLs#p++?%|?S<*4BTU+xgIiIM$w%4`pI6fUG&X7*2fuoEVo3+lA^4<`?nwu8a61Qg zbkU)77ze-P;7-%2rH|pA2YyMT5itIk=P})zj`<(iSQ;<4yEwQT`BfC^>Kja+`z5vC z|Bu`NI`Kb`C3Fg%W^^W%gZnz^bPn!+@8s3+zelfhmeG|#G+qM_aPZK-uE^+u|1qbK zF5=)p4t|Zzc~_78l5{oyF{hlC|BqZ1t>EBc4jw^%$`C1wMUB<1ySVu!RUI%XI7ipg zYFY!VXf4R3>*)smpP#b*;3)(+c$9-@f214fCfwRg>**HEp{0kA^>iCJ%By~s8Q>`n zp5frJ_wtwSpoa?i%fXWzJl>tR!Vr$aDNB#0$IxTx4>|ZP2fyRs_Z zY4|_MXM(iF$HuHXVa~d;|0C=EV?I3_J1_)aKgtBywbMoy&miG+m7a(5hpspI9AGL8 z^g?=(QW}WkhF4KX{{AnlCA}CF{)Z$H5|>^|FXL600;n#!6KAgKQka2WPOp47hjD_P z@1DbJjRU`q#yRsN2Y>!|;5X8n|7QTV(D(uF0tbIGotTgO@ATVA@BaU>GkZucxdNPlBY*{|tC^kMo42QP8(G6#R<;FT5hQTiBtoW?_Om4k0MB9tS-a3Z!| zcI7>Owc>|dF3IiIa+>}LA86BO=(F@W`aJz3jk~+X!QVLeI|r|G@CFC}SVjL#Uo_sh zpfA%{|4j})Hmv}7<$cP*XIS(8KV0|~w<7qbw>79~rUQe^z60 z^FPL#eqw6H4DbFw#NY8%fDE0sS<_yaWtCT%KB7b0(vB}2@Qr_Y7#Ifz7ddPM<7AS0 zWVFYu23OXsmJV%Oi>muUhw)^*-^GBzW%LR1Gn>r#Gd+ZggCC?!CPp&+|H&0UUhwZ&NapiklexQt`UeOeRwdg4Z)y%pfM4$zgIC z8I#B4GX+c`Q^aph^od>1lmI`bj45X-m`X;DKNY}-Ddz}FypRyq9O20kUL4`g5x%A` zA;w2fPdw;5e;sXWgR?Y6)uC?4(6wla)UAWHeAJakK8zkO!$+AGd`G2F)l#obZ5`Uu z!4deCAD`SZgP9?`>Z(1noM~g)jcI$;+nN~)te9cUaApKElAnInNke?V5gr^NF~7qy zc>l6|sA)k~cHhupK4iw@M+rZ|w6=8c@S2@>sjSHO9bb7#ZEbFCJI8#&%wT3>Yi2RC8J?NLpEdX-S!2ES z9N~b|B0OiPTBlJBY{So_+LA26rFqPJvz{(y9ws!m1{w2!kr^rr8Gyl zaD-cF(a3guiwHlTsjHMqyE%r<5n_NA;r*P%^`1X2-4xC@|yp|Q||s2WvCe5+Sb%QSf$qDD=_A+;l_dDh#(y3Tpa0& zj_$~wVgAD0e=~P*@WM5!4pkZnD991PLNx9%_Z9ChA*A8v<;*?i0Vu@N!HA^LT+l7N zyUWRA<}H4uVxBNhnP<#%<^}VTdBwbD-tYsG+#>PIlNgE#u?YXA#5DdC8>=`G!x6C@ z5pVjAA%4WepZ#$bUcY|8@ZLkGsV4P_jU7AI6hpCt*l`(0#F=arJBwX#Mw;(?;jvqe zDXymbZx{&t?%n+O;*;3x--}OT-}f7O2*B)-K^!Cw#-+&g+$av=h(z<6D-Or6=i&%) zq&SKrk~kujBQo9%qqw*De;xqEvEn$6NalzXK-6c@aE{1m5%aUW?Mk&gU~yAA)o7yBhm{?EcJ&J<_=cO4h!i1EM=XvG_SZCh}d#ON=iBcBYL4{6c_lsAOwL zYBkAi>IQrrvF)_DQYfgBR7;fM2B>sj-xS;;8ZX-t1&*3V!RHj$byr@O{};)EfNmw-Mi(-G<-ec2Rq% zv($asl6IoQ=_FcC4>et9{R}@Yb>iovHTW@T1HFm9g|DZ2F}`?x3pB1=Of0^anuFJe ze7rUoZ<_964&f9&f$x@HW(>FSrP9ZE%06daib*jo7UK)1AKa zMe$|v74bFkWAPgckp*SJSXfv%TDVzwSa@0ZTLf4HSp-|eT4Y61fRcWQRs#a6e{a|&=T58?by2_ff9&bI(db;%t z>-iF`q+X(vG)eT5R*7MVq+K#pGF&oJGFmcLVvul>@sf#>$&x9OsgmiE8IoBNUNToQ zPqIL=P_kIERMII~E?FsAEm~xo40(kUW$;mOPa_m%Nm` zmb_&lD`F{@VJ%oI_5+q>ZCE?jfpubCSU1*#^=3q{ z9m)=8N3x^Yv8;jR*zxQ{b}~DKoytyUXRxzao}J6iV;8Us*~RQqwv%1Xu4GrUYuWYe z26hv>ncd26XTM~>Vt2E9+5PN6_7Ho7J<1+uzhi%3PqL@kv+Q~H0{b)j3wxQp!d_#4 zXK%27vVXC6*#`#p5&M*V!M>K_B~408Eu_{`R%$DCkUC4ZDE5>C#W7Yowc`JEaGuhorwquS@^10X7yk zRyN@_F*b2FN}C3oMw>}CGi+wrY_Qp3v(x6Pjp3HfU$)k^4z^CVeQXEVCfPRGcGwQH zU1q!1cD?Og+o!hA?ZWM1?BeXI?6h|Eb~Ehe+kIxY&+e$*al2>s&|YL8Y#(jk$6ju) zv9Gg7_EYSq+OM28XAP_KqHoUXDqQS&rF`wT?}WddDe_vmNI+?r}Wgc+~Np<1@z>PL57qPCibV zP6bXyPAyKuoklv%b6V!q<#fR5xYKt|x1An3J$ANpc6au4PIS(69^|ZX);qU4&vRbp z+~s`O`3L8d&i9<3Ilpl6cL{TeaH)2wchR{_b(!O0_|#>m%R!ezE=x>l>sIPk?l#+P zq1$4&gKpoteeZV1?TOnncUyNicMtbC_Z0Uu_XhVN?(Oa~+~>Q0=Dyqgu=_Xecio@5 zKlcdsi1z4X@F@3Cd8j?cdrb5A#AA=g5s#xDe|bFec;e~k>E-F;IlyzEXO`zE&+(oU zJ=c3~^W5Qi)APRPKVHsWK3;xa8D4o_1zw}P#(Pcl+T^v&3CKs9^ZYwSA75Uz3pe~=jP|(m*kh_m+jZ$H{5Te z-)DZy{Z{%N_dDZv&fn4B%iqUe?ceO*;=js&lmBM_NB*z<-}dO+Be6$vk4Zgd^qAG- zT#w5=t_1i8gat$d3^4?Z3K$cxHegG@wt(9K4+9KBw2lo2#GXj0HeK}Um51)b?>)ziMGW6#{4r9I1gPU|_h=e(ZZ_dMV8LNFc7 z2HOND2M-F)37!%>J9tj;H^C=^Plq^$c!l_c)P=N$3<+5uvMpps$c+%g-H`jC!J*Ni zeL|Z!1X9`RkIWu#rCL!>UUEwUr>%g6(fUq?QV zBBIEsjHtY*f~ciYYogXgz3fFAdeOa#dntM;du{CXWv{P#y^5xynds7JWwa`KN%ZRI zwb2ivUqrv^o!PsfcTw-o-s^gQ-uqGS*S+8N$>@{Ur=U+)pY?q<^cD5B?knkA+E>|E z)pvd0ZGCsdd=TRp;~Y~TGdQL#W?#(FnB%d|u|BbWv30Snu|r~y#h#8m8y6Fo6lX|@ z>xx?+w;}FzJRL8NFN~MRE8>^Oe;&Uv{!#qv__zI1`epaa?Kh|2;(kl}{nqcVes>b0 z6A}^zB#cj(mhef!>4b|3m-_qk5AGk@e`x;?`=kE*`ycE7?EvQiJ_Gy)j2tj-z=Q!8 z2mC(ZMq+egLgIkL1&LjWD-vHMiIS+KyrlA^N<>()y$gNe`1=CA~?mNUlxRB=1Q+ zl6*A9DAlkXrT0%Cmp(OpdiweFU(>H<^vdX$(LZBy#>|Y_8J9Eu$oO+$ z*1&56Zx8%CGd43hGc|Kb=IYF~nQybiS(aIfth%g*tesg0vknb% z800y~d(eKdC7cb{<1__ovcH)NVZb8MYdJ8 zPxhVcoa}<^qU^Hls_d5RZ`nQBKeETNr+Kz{ad`vtTJuKaO~{*(wE9`HuN6`R@6i`GNVp^Aq!P z@=Nl|^X2)~`KtWJe0~1l{Pz4|`6KeV{HghK^Skm_=C8?LpT9Bxi~N20r}8i7|CWCv z|Ihq8`S2t1>Wiin ztt>iF^h43rqTh@DD7sbjchS9~e~KO#Ju7-yEGf1rwkvihb}n`+_AK@;_A3r34l3?j zoK;*~JiB;h@wsBd&Eh8|Ls3fE$ydgOX-H{!X;f+N(wNe?QdMb7>5$Tn(&43} zO2?FPrJt0}EuCMwuyjf3%F;EZ>qJopq?{(isKchD=t=CuDDw9PsQ6x zqLQj)Dsw7JDw`??S5B&&QMs#ff937UCvq=&s61RADUX&X$P?u$@^pEXTqkdn50#IQ zkCuNZpDh1aK3zUj&dcY@m&n)1x5~eh|0KUAzb?Nizb(IGkUx<>m%o(1sRC6*m3LMD zs+y{iRpYA0S52zot3It-P_?LPN!7BdZB+-W4p)6sb-e2PsuNWgsxDPssrs$zdewuf zCsog@UMZl0R4@t)g_9y!5v@p2WGQ5d0!6W+LQ$nqDpZOlMTde@j8lwPOjOKP%vH=+ zEL1E}EK?Y^DfTM9Rvb|rQ+%tqptz*CqWDd5Q*m2yM{!T_yqc(HtL>|us$HwSs(q__ zR0meaRi{)JRX0?Rt6p5ath%duW%ZisgVo3xjnu9fmYmU|&uQ^k5q2^-E z<(exsf7d*yc~tYX=2gvG6`>+kluDvbuC+KTkBBkT^0yEdjazBZw@ zsCHa!XYG;NbG3ieKCFFG`@Hs5?OQce+o`?Pe(C^qPjx6h-%C>GsteU6>TP_k`>h0>C>fP$S>ci@z>NDzJ)i>3T z)X&wg)NeJUhS6ARtThfAUri59kS0VEu8Gw2*9_1kYLYdTntDy6Mz0yHY1a(ZjMGfi ze59GG`9w2QvsklCvs|-EvsSZSvs1HMvrltSb6E3@=B(yN&Ci-knkyQ^HO*g|XIfTk zt98&iYu&V-S|6>yHc%U^4bw(y2WkgtbF_KdLT!n*Tr1aBYgJmcwocoiouS>Xy{3I! zC#j3AtFQa8Zb{vjb$`}9sC!cn>n-a&>wDD4)u+`L)K}Km*EiPd>j&45tRG!Jp?+5V zXZ4Hgm(?$?Usb=Uev6@gd;QM(-SvCxzpuYi|404Z`nL^q1KZ%(;ML&U(4!%!A-*BC zVNgR}Lrp_d!|;YF4O1JYH_U99-LSA>d&8cF9~*8pywO?eoOC^OLAnrKm@ZNmt&7*? z>MC`$IxXH4Y}B>uM(dDnif*OubKNoBW!+8PE!{u5$GSI-7L5i;qf29OV?twMV@hLs zV`gJPV^O1`v97VHv88cHV|ycN9N##paZ2N~#!ng-Hg+|xY+Td0zHv+A_Qsu!yBqg5 zo@qSa_*3IAjlVYj+4!LGdE=WV*ksw{+~n01&=k~^-BjMx)YQ^6q^YB6c+;q+u}!FH zeAA?+1x<^ZmNs=Ytu!>PXp_TuQlIp{;TUPt|AWGxc)4Mn6P9Og~aTM$hRd=<_D)r|9SDm+3d?x9GR) zck1`*59kl+kLZ8WUu*Gd>DiLflHDR}DQGEfscUI!8DiR~0R$oZ6;}y=yFXjn|39~@ Br 0) { - const ulong *values = (const ulong *)self.repeatedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedUint32Array.data; for (unsigned long i = 0; i < repeatedUint32ArrayCount; ++i) { [output writeUInt32:33 value:values[i]]; } } const unsigned long repeatedUint64ArrayCount = self.repeatedUint64Array.count; if (repeatedUint64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedUint64Array.data; for (unsigned long i = 0; i < repeatedUint64ArrayCount; ++i) { [output writeUInt64:34 value:values[i]]; } @@ -2066,14 +2066,14 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const ulong *values = (const ulong *)self.repeatedFixed32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedFixed32Array.data; for (unsigned long i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:37 value:values[i]]; } } const unsigned long repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; if (repeatedFixed64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.repeatedFixed64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedFixed64Array.data; for (unsigned long i = 0; i < repeatedFixed64ArrayCount; ++i) { [output writeFixed64:38 value:values[i]]; } @@ -2332,7 +2332,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.repeatedUint32Array.count; - const ulong *values = (const ulong *)self.repeatedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedUint32Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -2342,7 +2342,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.repeatedUint64Array.count; - const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedUint64Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } @@ -4607,10 +4607,10 @@ - (TestAllTypes_Builder*) clearOptionalInt64 { - (BOOL) hasOptionalUint32 { return result.hasOptionalUint32; } -- (ulong) optionalUint32 { +- (unsigned long) optionalUint32 { return result.optionalUint32; } -- (TestAllTypes_Builder*) setOptionalUint32:(ulong) value { +- (TestAllTypes_Builder*) setOptionalUint32:(unsigned long) value { result.hasOptionalUint32 = YES; result.optionalUint32 = value; return self; @@ -4623,10 +4623,10 @@ - (TestAllTypes_Builder*) clearOptionalUint32 { - (BOOL) hasOptionalUint64 { return result.hasOptionalUint64; } -- (ulong long) optionalUint64 { +- (unsigned long long) optionalUint64 { return result.optionalUint64; } -- (TestAllTypes_Builder*) setOptionalUint64:(ulong long) value { +- (TestAllTypes_Builder*) setOptionalUint64:(unsigned long long) value { result.hasOptionalUint64 = YES; result.optionalUint64 = value; return self; @@ -4671,10 +4671,10 @@ - (TestAllTypes_Builder*) clearOptionalSint64 { - (BOOL) hasOptionalFixed32 { return result.hasOptionalFixed32; } -- (ulong) optionalFixed32 { +- (unsigned long) optionalFixed32 { return result.optionalFixed32; } -- (TestAllTypes_Builder*) setOptionalFixed32:(ulong) value { +- (TestAllTypes_Builder*) setOptionalFixed32:(unsigned long) value { result.hasOptionalFixed32 = YES; result.optionalFixed32 = value; return self; @@ -4687,10 +4687,10 @@ - (TestAllTypes_Builder*) clearOptionalFixed32 { - (BOOL) hasOptionalFixed64 { return result.hasOptionalFixed64; } -- (ulong long) optionalFixed64 { +- (unsigned long long) optionalFixed64 { return result.optionalFixed64; } -- (TestAllTypes_Builder*) setOptionalFixed64:(ulong long) value { +- (TestAllTypes_Builder*) setOptionalFixed64:(unsigned long long) value { result.hasOptionalFixed64 = YES; result.optionalFixed64 = value; return self; @@ -5065,10 +5065,10 @@ - (TestAllTypes_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedUint32 { return result.repeatedUint32Array; } -- (ulong)repeatedUint32AtIndex:(unsigned long)index { +- (unsigned long)repeatedUint32AtIndex:(unsigned long)index { return [result repeatedUint32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedUint32:(ulong)value { +- (TestAllTypes_Builder *)addRepeatedUint32:(unsigned long)value { if (result.repeatedUint32Array == nil) { result.repeatedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5079,7 +5079,7 @@ - (TestAllTypes_Builder *)setRepeatedUint32Array:(NSArray *)array { result.repeatedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count { +- (TestAllTypes_Builder *)setRepeatedUint32Values:(const unsigned long *)values count:(unsigned long)count { result.repeatedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5090,10 +5090,10 @@ - (TestAllTypes_Builder *)clearRepeatedUint32 { - (PBAppendableArray *)repeatedUint64 { return result.repeatedUint64Array; } -- (ulong long)repeatedUint64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index { return [result repeatedUint64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedUint64:(ulong long)value { +- (TestAllTypes_Builder *)addRepeatedUint64:(unsigned long long)value { if (result.repeatedUint64Array == nil) { result.repeatedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5104,7 +5104,7 @@ - (TestAllTypes_Builder *)setRepeatedUint64Array:(NSArray *)array { result.repeatedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count { +- (TestAllTypes_Builder *)setRepeatedUint64Values:(const unsigned long long *)values count:(unsigned long)count { result.repeatedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5165,10 +5165,10 @@ - (TestAllTypes_Builder *)clearRepeatedSint64 { - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (ulong)repeatedFixed32AtIndex:(unsigned long)index { +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index { return [result repeatedFixed32AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedFixed32:(ulong)value { +- (TestAllTypes_Builder *)addRepeatedFixed32:(unsigned long)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5179,7 +5179,7 @@ - (TestAllTypes_Builder *)setRepeatedFixed32Array:(NSArray *)array { result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count { +- (TestAllTypes_Builder *)setRepeatedFixed32Values:(const unsigned long *)values count:(unsigned long)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5190,10 +5190,10 @@ - (TestAllTypes_Builder *)clearRepeatedFixed32 { - (PBAppendableArray *)repeatedFixed64 { return result.repeatedFixed64Array; } -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index { return [result repeatedFixed64AtIndex:index]; } -- (TestAllTypes_Builder *)addRepeatedFixed64:(ulong long)value { +- (TestAllTypes_Builder *)addRepeatedFixed64:(unsigned long long)value { if (result.repeatedFixed64Array == nil) { result.repeatedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5204,7 +5204,7 @@ - (TestAllTypes_Builder *)setRepeatedFixed64Array:(NSArray *)array { result.repeatedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypes_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count { +- (TestAllTypes_Builder *)setRepeatedFixed64Values:(const unsigned long long *)values count:(unsigned long)count { result.repeatedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5647,10 +5647,10 @@ - (TestAllTypes_Builder*) clearDefaultInt64 { - (BOOL) hasDefaultUint32 { return result.hasDefaultUint32; } -- (ulong) defaultUint32 { +- (unsigned long) defaultUint32 { return result.defaultUint32; } -- (TestAllTypes_Builder*) setDefaultUint32:(ulong) value { +- (TestAllTypes_Builder*) setDefaultUint32:(unsigned long) value { result.hasDefaultUint32 = YES; result.defaultUint32 = value; return self; @@ -5663,10 +5663,10 @@ - (TestAllTypes_Builder*) clearDefaultUint32 { - (BOOL) hasDefaultUint64 { return result.hasDefaultUint64; } -- (ulong long) defaultUint64 { +- (unsigned long long) defaultUint64 { return result.defaultUint64; } -- (TestAllTypes_Builder*) setDefaultUint64:(ulong long) value { +- (TestAllTypes_Builder*) setDefaultUint64:(unsigned long long) value { result.hasDefaultUint64 = YES; result.defaultUint64 = value; return self; @@ -5711,10 +5711,10 @@ - (TestAllTypes_Builder*) clearDefaultSint64 { - (BOOL) hasDefaultFixed32 { return result.hasDefaultFixed32; } -- (ulong) defaultFixed32 { +- (unsigned long) defaultFixed32 { return result.defaultFixed32; } -- (TestAllTypes_Builder*) setDefaultFixed32:(ulong) value { +- (TestAllTypes_Builder*) setDefaultFixed32:(unsigned long) value { result.hasDefaultFixed32 = YES; result.defaultFixed32 = value; return self; @@ -5727,10 +5727,10 @@ - (TestAllTypes_Builder*) clearDefaultFixed32 { - (BOOL) hasDefaultFixed64 { return result.hasDefaultFixed64; } -- (ulong long) defaultFixed64 { +- (unsigned long long) defaultFixed64 { return result.defaultFixed64; } -- (TestAllTypes_Builder*) setDefaultFixed64:(ulong long) value { +- (TestAllTypes_Builder*) setDefaultFixed64:(unsigned long long) value { result.hasDefaultFixed64 = YES; result.defaultFixed64 = value; return self; @@ -13511,8 +13511,8 @@ - (TestFieldOrderings_Builder*) clearMyFloat { @interface TestExtremeDefaultValues () @property (retain) NSData* escapedBytes; -@property ulong largeUint32; -@property ulong long largeUint64; +@property unsigned long largeUint32; +@property unsigned long long largeUint64; @property long smallInt32; @property long long smallInt64; @property (retain) NSString* utf8String; @@ -14310,10 +14310,10 @@ - (TestExtremeDefaultValues_Builder*) clearEscapedBytes { - (BOOL) hasLargeUint32 { return result.hasLargeUint32; } -- (ulong) largeUint32 { +- (unsigned long) largeUint32 { return result.largeUint32; } -- (TestExtremeDefaultValues_Builder*) setLargeUint32:(ulong) value { +- (TestExtremeDefaultValues_Builder*) setLargeUint32:(unsigned long) value { result.hasLargeUint32 = YES; result.largeUint32 = value; return self; @@ -14326,10 +14326,10 @@ - (TestExtremeDefaultValues_Builder*) clearLargeUint32 { - (BOOL) hasLargeUint64 { return result.hasLargeUint64; } -- (ulong long) largeUint64 { +- (unsigned long long) largeUint64 { return result.largeUint64; } -- (TestExtremeDefaultValues_Builder*) setLargeUint64:(ulong long) value { +- (TestExtremeDefaultValues_Builder*) setLargeUint64:(unsigned long long) value { result.hasLargeUint64 = YES; result.largeUint64 = value; return self; @@ -15340,13 +15340,13 @@ - (long long)packedInt64AtIndex:(unsigned long)index { - (PBArray *)packedUint32 { return packedUint32Array; } -- (ulong)packedUint32AtIndex:(unsigned long)index { +- (unsigned long)packedUint32AtIndex:(unsigned long)index { return [packedUint32Array uint32AtIndex:index]; } - (PBArray *)packedUint64 { return packedUint64Array; } -- (ulong long)packedUint64AtIndex:(unsigned long)index { +- (unsigned long long)packedUint64AtIndex:(unsigned long)index { return [packedUint64Array uint64AtIndex:index]; } - (PBArray *)packedSint32 { @@ -15364,13 +15364,13 @@ - (long long)packedSint64AtIndex:(unsigned long)index { - (PBArray *)packedFixed32 { return packedFixed32Array; } -- (ulong)packedFixed32AtIndex:(unsigned long)index { +- (unsigned long)packedFixed32AtIndex:(unsigned long)index { return [packedFixed32Array uint32AtIndex:index]; } - (PBArray *)packedFixed64 { return packedFixed64Array; } -- (ulong long)packedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)packedFixed64AtIndex:(unsigned long)index { return [packedFixed64Array uint64AtIndex:index]; } - (PBArray *)packedSfixed32 { @@ -15433,7 +15433,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedUint32ArrayCount = self.packedUint32Array.count; if (packedUint32ArrayCount > 0) { - const ulong *values = (const ulong *)self.packedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.packedUint32Array.data; [output writeRawVarint32:738]; [output writeRawVarint32:packedUint32MemoizedSerializedSize]; for (unsigned long i = 0; i < packedUint32ArrayCount; ++i) { @@ -15442,7 +15442,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedUint64ArrayCount = self.packedUint64Array.count; if (packedUint64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.packedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.packedUint64Array.data; [output writeRawVarint32:746]; [output writeRawVarint32:packedUint64MemoizedSerializedSize]; for (unsigned long i = 0; i < packedUint64ArrayCount; ++i) { @@ -15469,7 +15469,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedFixed32ArrayCount = self.packedFixed32Array.count; if (packedFixed32ArrayCount > 0) { - const ulong *values = (const ulong *)self.packedFixed32Array.data; + const unsigned long *values = (const unsigned long *)self.packedFixed32Array.data; [output writeRawVarint32:770]; [output writeRawVarint32:packedFixed32MemoizedSerializedSize]; for (unsigned long i = 0; i < packedFixed32ArrayCount; ++i) { @@ -15478,7 +15478,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedFixed64ArrayCount = self.packedFixed64Array.count; if (packedFixed64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.packedFixed64Array.data; + const unsigned long long *values = (const unsigned long long *)self.packedFixed64Array.data; [output writeRawVarint32:778]; [output writeRawVarint32:packedFixed64MemoizedSerializedSize]; for (unsigned long i = 0; i < packedFixed64ArrayCount; ++i) { @@ -15579,7 +15579,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.packedUint32Array.count; - const ulong *values = (const ulong *)self.packedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.packedUint32Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -15593,7 +15593,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.packedUint64Array.count; - const ulong long *values = (const ulong long *)self.packedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.packedUint64Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } @@ -16277,10 +16277,10 @@ - (TestPackedTypes_Builder *)clearPackedInt64 { - (PBAppendableArray *)packedUint32 { return result.packedUint32Array; } -- (ulong)packedUint32AtIndex:(unsigned long)index { +- (unsigned long)packedUint32AtIndex:(unsigned long)index { return [result packedUint32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedUint32:(ulong)value { +- (TestPackedTypes_Builder *)addPackedUint32:(unsigned long)value { if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16291,7 +16291,7 @@ - (TestPackedTypes_Builder *)setPackedUint32Array:(NSArray *)array { result.packedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count { +- (TestPackedTypes_Builder *)setPackedUint32Values:(const unsigned long *)values count:(unsigned long)count { result.packedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -16302,10 +16302,10 @@ - (TestPackedTypes_Builder *)clearPackedUint32 { - (PBAppendableArray *)packedUint64 { return result.packedUint64Array; } -- (ulong long)packedUint64AtIndex:(unsigned long)index { +- (unsigned long long)packedUint64AtIndex:(unsigned long)index { return [result packedUint64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedUint64:(ulong long)value { +- (TestPackedTypes_Builder *)addPackedUint64:(unsigned long long)value { if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16316,7 +16316,7 @@ - (TestPackedTypes_Builder *)setPackedUint64Array:(NSArray *)array { result.packedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count { +- (TestPackedTypes_Builder *)setPackedUint64Values:(const unsigned long long *)values count:(unsigned long)count { result.packedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -16377,10 +16377,10 @@ - (TestPackedTypes_Builder *)clearPackedSint64 { - (PBAppendableArray *)packedFixed32 { return result.packedFixed32Array; } -- (ulong)packedFixed32AtIndex:(unsigned long)index { +- (unsigned long)packedFixed32AtIndex:(unsigned long)index { return [result packedFixed32AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedFixed32:(ulong)value { +- (TestPackedTypes_Builder *)addPackedFixed32:(unsigned long)value { if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -16391,7 +16391,7 @@ - (TestPackedTypes_Builder *)setPackedFixed32Array:(NSArray *)array { result.packedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypes_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count { +- (TestPackedTypes_Builder *)setPackedFixed32Values:(const unsigned long *)values count:(unsigned long)count { result.packedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -16402,10 +16402,10 @@ - (TestPackedTypes_Builder *)clearPackedFixed32 { - (PBAppendableArray *)packedFixed64 { return result.packedFixed64Array; } -- (ulong long)packedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)packedFixed64AtIndex:(unsigned long)index { return [result packedFixed64AtIndex:index]; } -- (TestPackedTypes_Builder *)addPackedFixed64:(ulong long)value { +- (TestPackedTypes_Builder *)addPackedFixed64:(unsigned long long)value { if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -16416,7 +16416,7 @@ - (TestPackedTypes_Builder *)setPackedFixed64Array:(NSArray *)array { result.packedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypes_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count { +- (TestPackedTypes_Builder *)setPackedFixed64Values:(const unsigned long long *)values count:(unsigned long)count { result.packedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -16672,13 +16672,13 @@ - (long long)unpackedInt64AtIndex:(unsigned long)index { - (PBArray *)unpackedUint32 { return unpackedUint32Array; } -- (ulong)unpackedUint32AtIndex:(unsigned long)index { +- (unsigned long)unpackedUint32AtIndex:(unsigned long)index { return [unpackedUint32Array uint32AtIndex:index]; } - (PBArray *)unpackedUint64 { return unpackedUint64Array; } -- (ulong long)unpackedUint64AtIndex:(unsigned long)index { +- (unsigned long long)unpackedUint64AtIndex:(unsigned long)index { return [unpackedUint64Array uint64AtIndex:index]; } - (PBArray *)unpackedSint32 { @@ -16696,13 +16696,13 @@ - (long long)unpackedSint64AtIndex:(unsigned long)index { - (PBArray *)unpackedFixed32 { return unpackedFixed32Array; } -- (ulong)unpackedFixed32AtIndex:(unsigned long)index { +- (unsigned long)unpackedFixed32AtIndex:(unsigned long)index { return [unpackedFixed32Array uint32AtIndex:index]; } - (PBArray *)unpackedFixed64 { return unpackedFixed64Array; } -- (ulong long)unpackedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)unpackedFixed64AtIndex:(unsigned long)index { return [unpackedFixed64Array uint64AtIndex:index]; } - (PBArray *)unpackedSfixed32 { @@ -16761,14 +16761,14 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long unpackedUint32ArrayCount = self.unpackedUint32Array.count; if (unpackedUint32ArrayCount > 0) { - const ulong *values = (const ulong *)self.unpackedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.unpackedUint32Array.data; for (unsigned long i = 0; i < unpackedUint32ArrayCount; ++i) { [output writeUInt32:92 value:values[i]]; } } const unsigned long unpackedUint64ArrayCount = self.unpackedUint64Array.count; if (unpackedUint64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.unpackedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.unpackedUint64Array.data; for (unsigned long i = 0; i < unpackedUint64ArrayCount; ++i) { [output writeUInt64:93 value:values[i]]; } @@ -16789,14 +16789,14 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long unpackedFixed32ArrayCount = self.unpackedFixed32Array.count; if (unpackedFixed32ArrayCount > 0) { - const ulong *values = (const ulong *)self.unpackedFixed32Array.data; + const unsigned long *values = (const unsigned long *)self.unpackedFixed32Array.data; for (unsigned long i = 0; i < unpackedFixed32ArrayCount; ++i) { [output writeFixed32:96 value:values[i]]; } } const unsigned long unpackedFixed64ArrayCount = self.unpackedFixed64Array.count; if (unpackedFixed64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.unpackedFixed64Array.data; + const unsigned long long *values = (const unsigned long long *)self.unpackedFixed64Array.data; for (unsigned long i = 0; i < unpackedFixed64ArrayCount; ++i) { [output writeFixed64:97 value:values[i]]; } @@ -16873,7 +16873,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.unpackedUint32Array.count; - const ulong *values = (const ulong *)self.unpackedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.unpackedUint32Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -16883,7 +16883,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.unpackedUint64Array.count; - const ulong long *values = (const ulong long *)self.unpackedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.unpackedUint64Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } @@ -17414,10 +17414,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedInt64 { - (PBAppendableArray *)unpackedUint32 { return result.unpackedUint32Array; } -- (ulong)unpackedUint32AtIndex:(unsigned long)index { +- (unsigned long)unpackedUint32AtIndex:(unsigned long)index { return [result unpackedUint32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedUint32:(ulong)value { +- (TestUnpackedTypes_Builder *)addUnpackedUint32:(unsigned long)value { if (result.unpackedUint32Array == nil) { result.unpackedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -17428,7 +17428,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedUint32Array:(NSArray *)array { result.unpackedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const ulong *)values count:(unsigned long)count { +- (TestUnpackedTypes_Builder *)setUnpackedUint32Values:(const unsigned long *)values count:(unsigned long)count { result.unpackedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -17439,10 +17439,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedUint32 { - (PBAppendableArray *)unpackedUint64 { return result.unpackedUint64Array; } -- (ulong long)unpackedUint64AtIndex:(unsigned long)index { +- (unsigned long long)unpackedUint64AtIndex:(unsigned long)index { return [result unpackedUint64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedUint64:(ulong long)value { +- (TestUnpackedTypes_Builder *)addUnpackedUint64:(unsigned long long)value { if (result.unpackedUint64Array == nil) { result.unpackedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -17453,7 +17453,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedUint64Array:(NSArray *)array { result.unpackedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedUint64Values:(const ulong long *)values count:(unsigned long)count { +- (TestUnpackedTypes_Builder *)setUnpackedUint64Values:(const unsigned long long *)values count:(unsigned long)count { result.unpackedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -17514,10 +17514,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedSint64 { - (PBAppendableArray *)unpackedFixed32 { return result.unpackedFixed32Array; } -- (ulong)unpackedFixed32AtIndex:(unsigned long)index { +- (unsigned long)unpackedFixed32AtIndex:(unsigned long)index { return [result unpackedFixed32AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(ulong)value { +- (TestUnpackedTypes_Builder *)addUnpackedFixed32:(unsigned long)value { if (result.unpackedFixed32Array == nil) { result.unpackedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -17528,7 +17528,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedFixed32Array:(NSArray *)array { result.unpackedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const ulong *)values count:(unsigned long)count { +- (TestUnpackedTypes_Builder *)setUnpackedFixed32Values:(const unsigned long *)values count:(unsigned long)count { result.unpackedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -17539,10 +17539,10 @@ - (TestUnpackedTypes_Builder *)clearUnpackedFixed32 { - (PBAppendableArray *)unpackedFixed64 { return result.unpackedFixed64Array; } -- (ulong long)unpackedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)unpackedFixed64AtIndex:(unsigned long)index { return [result unpackedFixed64AtIndex:index]; } -- (TestUnpackedTypes_Builder *)addUnpackedFixed64:(ulong long)value { +- (TestUnpackedTypes_Builder *)addUnpackedFixed64:(unsigned long long)value { if (result.unpackedFixed64Array == nil) { result.unpackedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -17553,7 +17553,7 @@ - (TestUnpackedTypes_Builder *)setUnpackedFixed64Array:(NSArray *)array { result.unpackedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestUnpackedTypes_Builder *)setUnpackedFixed64Values:(const ulong long *)values count:(unsigned long)count { +- (TestUnpackedTypes_Builder *)setUnpackedFixed64Values:(const unsigned long long *)values count:(unsigned long)count { result.unpackedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -17890,7 +17890,7 @@ - (TestPackedExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream* @end @interface TestDynamicExtensions () -@property ulong scalarExtension; +@property unsigned long scalarExtension; @property ForeignEnum enumExtension; @property TestDynamicExtensions_DynamicEnumType dynamicEnumExtension; @property (retain) ForeignMessage* messageExtension; @@ -18558,10 +18558,10 @@ - (TestDynamicExtensions_Builder*) mergeFromCodedInputStream:(PBCodedInputStream - (BOOL) hasScalarExtension { return result.hasScalarExtension; } -- (ulong) scalarExtension { +- (unsigned long) scalarExtension { return result.scalarExtension; } -- (TestDynamicExtensions_Builder*) setScalarExtension:(ulong) value { +- (TestDynamicExtensions_Builder*) setScalarExtension:(unsigned long) value { result.hasScalarExtension = YES; result.scalarExtension = value; return self; @@ -18767,7 +18767,7 @@ - (TestRepeatedScalarDifferentTagSizes*) defaultInstance { - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (ulong)repeatedFixed32AtIndex:(unsigned long)index { +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedInt32 { @@ -18779,7 +18779,7 @@ - (long)repeatedInt32AtIndex:(unsigned long)index { - (PBArray *)repeatedFixed64 { return repeatedFixed64Array; } -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index { return [repeatedFixed64Array uint64AtIndex:index]; } - (PBArray *)repeatedInt64 { @@ -18797,7 +18797,7 @@ - (Float32)repeatedFloatAtIndex:(unsigned long)index { - (PBArray *)repeatedUint64 { return repeatedUint64Array; } -- (ulong long)repeatedUint64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index { return [repeatedUint64Array uint64AtIndex:index]; } - (BOOL) isInitialized { @@ -18806,7 +18806,7 @@ - (BOOL) isInitialized { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { const unsigned long repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const ulong *values = (const ulong *)self.repeatedFixed32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedFixed32Array.data; for (unsigned long i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:12 value:values[i]]; } @@ -18820,7 +18820,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; if (repeatedFixed64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.repeatedFixed64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedFixed64Array.data; for (unsigned long i = 0; i < repeatedFixed64ArrayCount; ++i) { [output writeFixed64:2046 value:values[i]]; } @@ -18841,7 +18841,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long repeatedUint64ArrayCount = self.repeatedUint64Array.count; if (repeatedUint64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedUint64Array.data; for (unsigned long i = 0; i < repeatedUint64ArrayCount; ++i) { [output writeUInt64:262143 value:values[i]]; } @@ -18899,7 +18899,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.repeatedUint64Array.count; - const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedUint64Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } @@ -19144,10 +19144,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder*) mergeFromCodedInputStream:(PBCo - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (ulong)repeatedFixed32AtIndex:(unsigned long)index { +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index { return [result repeatedFixed32AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(ulong)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed32:(unsigned long)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -19158,7 +19158,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Array:(NSArra result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed32Values:(const unsigned long *)values count:(unsigned long)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -19194,10 +19194,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedInt32 { - (PBAppendableArray *)repeatedFixed64 { return result.repeatedFixed64Array; } -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index { return [result repeatedFixed64AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed64:(ulong long)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedFixed64:(unsigned long long)value { if (result.repeatedFixed64Array == nil) { result.repeatedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -19208,7 +19208,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Array:(NSArra result.repeatedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedFixed64Values:(const unsigned long long *)values count:(unsigned long)count { result.repeatedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -19269,10 +19269,10 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)clearRepeatedFloat { - (PBAppendableArray *)repeatedUint64 { return result.repeatedUint64Array; } -- (ulong long)repeatedUint64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index { return [result repeatedUint64AtIndex:index]; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedUint64:(ulong long)value { +- (TestRepeatedScalarDifferentTagSizes_Builder *)addRepeatedUint64:(unsigned long long)value { if (result.repeatedUint64Array == nil) { result.repeatedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -19283,7 +19283,7 @@ - (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Array:(NSArray result.repeatedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count { +- (TestRepeatedScalarDifferentTagSizes_Builder *)setRepeatedUint64Values:(const unsigned long long *)values count:(unsigned long)count { result.repeatedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } diff --git a/src/runtime/Tests/UnittestCustomOptions.pb.m b/src/runtime/Tests/UnittestCustomOptions.pb.m index 30486af..d536a54 100644 --- a/src/runtime/Tests/UnittestCustomOptions.pb.m +++ b/src/runtime/Tests/UnittestCustomOptions.pb.m @@ -4785,7 +4785,7 @@ - (Aggregate_Builder*) mergeFromCodedInputStream:(PBCodedInputStream*) input ext break; } case 34: { - PBFileOptions_Builder* subBuilder = [PBFileOptions builder]; + PBFileOptionsBuilder * subBuilder = [PBFileOptions builder]; if (self.hasFile) { [subBuilder mergeFrom:self.file]; } diff --git a/src/runtime/Tests/UnittestLite.pb.h b/src/runtime/Tests/UnittestLite.pb.h index cfeb768..f720086 100644 --- a/src/runtime/Tests/UnittestLite.pb.h +++ b/src/runtime/Tests/UnittestLite.pb.h @@ -201,14 +201,14 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); Float32 optionalFloat; long long optionalInt64; long long defaultInt64; - ulong long optionalUint64; - ulong long defaultUint64; + unsigned long long optionalUint64; + unsigned long long defaultUint64; long defaultInt32; long optionalInt32; - ulong long optionalFixed64; - ulong long defaultFixed64; - ulong optionalFixed32; - ulong defaultFixed32; + unsigned long long optionalFixed64; + unsigned long long defaultFixed64; + unsigned long optionalFixed32; + unsigned long defaultFixed32; NSString* defaultString; NSString* defaultStringPiece; NSString* defaultCord; @@ -221,8 +221,8 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); ImportMessageLite* optionalImportMessage; NSData* defaultBytes; NSData* optionalBytes; - ulong optionalUint32; - ulong defaultUint32; + unsigned long optionalUint32; + unsigned long defaultUint32; ImportEnumLite defaultImportEnum; ForeignEnumLite defaultForeignEnum; TestAllTypesLite_NestedEnum defaultNestedEnum; @@ -308,12 +308,12 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (BOOL) hasDefaultCord; @property (readonly) long optionalInt32; @property (readonly) long long optionalInt64; -@property (readonly) ulong optionalUint32; -@property (readonly) ulong long optionalUint64; +@property (readonly) unsigned long optionalUint32; +@property (readonly) unsigned long long optionalUint64; @property (readonly) long optionalSint32; @property (readonly) long long optionalSint64; -@property (readonly) ulong optionalFixed32; -@property (readonly) ulong long optionalFixed64; +@property (readonly) unsigned long optionalFixed32; +@property (readonly) unsigned long long optionalFixed64; @property (readonly) long optionalSfixed32; @property (readonly) long long optionalSfixed64; @property (readonly) Float32 optionalFloat; @@ -356,12 +356,12 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) PBArray * repeatedCord; @property (readonly) long defaultInt32; @property (readonly) long long defaultInt64; -@property (readonly) ulong defaultUint32; -@property (readonly) ulong long defaultUint64; +@property (readonly) unsigned long defaultUint32; +@property (readonly) unsigned long long defaultUint64; @property (readonly) long defaultSint32; @property (readonly) long long defaultSint64; -@property (readonly) ulong defaultFixed32; -@property (readonly) ulong long defaultFixed64; +@property (readonly) unsigned long defaultFixed32; +@property (readonly) unsigned long long defaultFixed64; @property (readonly) long defaultSfixed32; @property (readonly) long long defaultSfixed64; @property (readonly) Float32 defaultFloat; @@ -376,12 +376,12 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) NSString* defaultCord; - (long)repeatedInt32AtIndex:(unsigned long)index; - (long long)repeatedInt64AtIndex:(unsigned long)index; -- (ulong)repeatedUint32AtIndex:(unsigned long)index; -- (ulong long)repeatedUint64AtIndex:(unsigned long)index; +- (unsigned long)repeatedUint32AtIndex:(unsigned long)index; +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index; - (long)repeatedSint32AtIndex:(unsigned long)index; - (long long)repeatedSint64AtIndex:(unsigned long)index; -- (ulong)repeatedFixed32AtIndex:(unsigned long)index; -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index; +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index; - (long)repeatedSfixed32AtIndex:(unsigned long)index; - (long long)repeatedSfixed64AtIndex:(unsigned long)index; - (Float32)repeatedFloatAtIndex:(unsigned long)index; @@ -592,13 +592,13 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalInt64; - (BOOL) hasOptionalUint32; -- (ulong) optionalUint32; -- (TestAllTypesLite_Builder*) setOptionalUint32:(ulong) value; +- (unsigned long) optionalUint32; +- (TestAllTypesLite_Builder*) setOptionalUint32:(unsigned long) value; - (TestAllTypesLite_Builder*) clearOptionalUint32; - (BOOL) hasOptionalUint64; -- (ulong long) optionalUint64; -- (TestAllTypesLite_Builder*) setOptionalUint64:(ulong long) value; +- (unsigned long long) optionalUint64; +- (TestAllTypesLite_Builder*) setOptionalUint64:(unsigned long long) value; - (TestAllTypesLite_Builder*) clearOptionalUint64; - (BOOL) hasOptionalSint32; @@ -612,13 +612,13 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearOptionalSint64; - (BOOL) hasOptionalFixed32; -- (ulong) optionalFixed32; -- (TestAllTypesLite_Builder*) setOptionalFixed32:(ulong) value; +- (unsigned long) optionalFixed32; +- (TestAllTypesLite_Builder*) setOptionalFixed32:(unsigned long) value; - (TestAllTypesLite_Builder*) clearOptionalFixed32; - (BOOL) hasOptionalFixed64; -- (ulong long) optionalFixed64; -- (TestAllTypesLite_Builder*) setOptionalFixed64:(ulong long) value; +- (unsigned long long) optionalFixed64; +- (TestAllTypesLite_Builder*) setOptionalFixed64:(unsigned long long) value; - (TestAllTypesLite_Builder*) clearOptionalFixed64; - (BOOL) hasOptionalSfixed32; @@ -724,17 +724,17 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedInt64; - (PBAppendableArray *)repeatedUint32; -- (ulong)repeatedUint32AtIndex:(unsigned long)index; -- (TestAllTypesLite_Builder *)addRepeatedUint32:(ulong)value; +- (unsigned long)repeatedUint32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedUint32:(unsigned long)value; - (TestAllTypesLite_Builder *)setRepeatedUint32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count; +- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const unsigned long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedUint32; - (PBAppendableArray *)repeatedUint64; -- (ulong long)repeatedUint64AtIndex:(unsigned long)index; -- (TestAllTypesLite_Builder *)addRepeatedUint64:(ulong long)value; +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedUint64:(unsigned long long)value; - (TestAllTypesLite_Builder *)setRepeatedUint64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count; +- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const unsigned long long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedUint64; - (PBAppendableArray *)repeatedSint32; @@ -752,17 +752,17 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder *)clearRepeatedSint64; - (PBAppendableArray *)repeatedFixed32; -- (ulong)repeatedFixed32AtIndex:(unsigned long)index; -- (TestAllTypesLite_Builder *)addRepeatedFixed32:(ulong)value; +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedFixed32:(unsigned long)value; - (TestAllTypesLite_Builder *)setRepeatedFixed32Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count; +- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const unsigned long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedFixed32; - (PBAppendableArray *)repeatedFixed64; -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index; -- (TestAllTypesLite_Builder *)addRepeatedFixed64:(ulong long)value; +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index; +- (TestAllTypesLite_Builder *)addRepeatedFixed64:(unsigned long long)value; - (TestAllTypesLite_Builder *)setRepeatedFixed64Array:(NSArray *)array; -- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count; +- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const unsigned long long *)values count:(unsigned long)count; - (TestAllTypesLite_Builder *)clearRepeatedFixed64; - (PBAppendableArray *)repeatedSfixed32; @@ -888,13 +888,13 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearDefaultInt64; - (BOOL) hasDefaultUint32; -- (ulong) defaultUint32; -- (TestAllTypesLite_Builder*) setDefaultUint32:(ulong) value; +- (unsigned long) defaultUint32; +- (TestAllTypesLite_Builder*) setDefaultUint32:(unsigned long) value; - (TestAllTypesLite_Builder*) clearDefaultUint32; - (BOOL) hasDefaultUint64; -- (ulong long) defaultUint64; -- (TestAllTypesLite_Builder*) setDefaultUint64:(ulong long) value; +- (unsigned long long) defaultUint64; +- (TestAllTypesLite_Builder*) setDefaultUint64:(unsigned long long) value; - (TestAllTypesLite_Builder*) clearDefaultUint64; - (BOOL) hasDefaultSint32; @@ -908,13 +908,13 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestAllTypesLite_Builder*) clearDefaultSint64; - (BOOL) hasDefaultFixed32; -- (ulong) defaultFixed32; -- (TestAllTypesLite_Builder*) setDefaultFixed32:(ulong) value; +- (unsigned long) defaultFixed32; +- (TestAllTypesLite_Builder*) setDefaultFixed32:(unsigned long) value; - (TestAllTypesLite_Builder*) clearDefaultFixed32; - (BOOL) hasDefaultFixed64; -- (ulong long) defaultFixed64; -- (TestAllTypesLite_Builder*) setDefaultFixed64:(ulong long) value; +- (unsigned long long) defaultFixed64; +- (TestAllTypesLite_Builder*) setDefaultFixed64:(unsigned long long) value; - (TestAllTypesLite_Builder*) clearDefaultFixed64; - (BOOL) hasDefaultSfixed32; @@ -1074,12 +1074,12 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); @property (readonly, retain) PBArray * packedEnum; - (long)packedInt32AtIndex:(unsigned long)index; - (long long)packedInt64AtIndex:(unsigned long)index; -- (ulong)packedUint32AtIndex:(unsigned long)index; -- (ulong long)packedUint64AtIndex:(unsigned long)index; +- (unsigned long)packedUint32AtIndex:(unsigned long)index; +- (unsigned long long)packedUint64AtIndex:(unsigned long)index; - (long)packedSint32AtIndex:(unsigned long)index; - (long long)packedSint64AtIndex:(unsigned long)index; -- (ulong)packedFixed32AtIndex:(unsigned long)index; -- (ulong long)packedFixed64AtIndex:(unsigned long)index; +- (unsigned long)packedFixed32AtIndex:(unsigned long)index; +- (unsigned long long)packedFixed64AtIndex:(unsigned long)index; - (long)packedSfixed32AtIndex:(unsigned long)index; - (long long)packedSfixed64AtIndex:(unsigned long)index; - (Float32)packedFloatAtIndex:(unsigned long)index; @@ -1137,17 +1137,17 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder *)clearPackedInt64; - (PBAppendableArray *)packedUint32; -- (ulong)packedUint32AtIndex:(unsigned long)index; -- (TestPackedTypesLite_Builder *)addPackedUint32:(ulong)value; +- (unsigned long)packedUint32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedUint32:(unsigned long)value; - (TestPackedTypesLite_Builder *)setPackedUint32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count; +- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const unsigned long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedUint32; - (PBAppendableArray *)packedUint64; -- (ulong long)packedUint64AtIndex:(unsigned long)index; -- (TestPackedTypesLite_Builder *)addPackedUint64:(ulong long)value; +- (unsigned long long)packedUint64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedUint64:(unsigned long long)value; - (TestPackedTypesLite_Builder *)setPackedUint64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count; +- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const unsigned long long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedUint64; - (PBAppendableArray *)packedSint32; @@ -1165,17 +1165,17 @@ BOOL TestAllTypesLite_NestedEnumIsValidValue(TestAllTypesLite_NestedEnum value); - (TestPackedTypesLite_Builder *)clearPackedSint64; - (PBAppendableArray *)packedFixed32; -- (ulong)packedFixed32AtIndex:(unsigned long)index; -- (TestPackedTypesLite_Builder *)addPackedFixed32:(ulong)value; +- (unsigned long)packedFixed32AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedFixed32:(unsigned long)value; - (TestPackedTypesLite_Builder *)setPackedFixed32Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count; +- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const unsigned long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedFixed32; - (PBAppendableArray *)packedFixed64; -- (ulong long)packedFixed64AtIndex:(unsigned long)index; -- (TestPackedTypesLite_Builder *)addPackedFixed64:(ulong long)value; +- (unsigned long long)packedFixed64AtIndex:(unsigned long)index; +- (TestPackedTypesLite_Builder *)addPackedFixed64:(unsigned long long)value; - (TestPackedTypesLite_Builder *)setPackedFixed64Array:(NSArray *)array; -- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count; +- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const unsigned long long *)values count:(unsigned long)count; - (TestPackedTypesLite_Builder *)clearPackedFixed64; - (PBAppendableArray *)packedSfixed32; diff --git a/src/runtime/Tests/UnittestLite.pb.m b/src/runtime/Tests/UnittestLite.pb.m index 255ef9d..218c457 100644 --- a/src/runtime/Tests/UnittestLite.pb.m +++ b/src/runtime/Tests/UnittestLite.pb.m @@ -1192,12 +1192,12 @@ BOOL ForeignEnumLiteIsValidValue(ForeignEnumLite value) { @interface TestAllTypesLite () @property long optionalInt32; @property long long optionalInt64; -@property ulong optionalUint32; -@property ulong long optionalUint64; +@property unsigned long optionalUint32; +@property unsigned long long optionalUint64; @property long optionalSint32; @property long long optionalSint64; -@property ulong optionalFixed32; -@property ulong long optionalFixed64; +@property unsigned long optionalFixed32; +@property unsigned long long optionalFixed64; @property long optionalSfixed32; @property long long optionalSfixed64; @property Float32 optionalFloat; @@ -1240,12 +1240,12 @@ @interface TestAllTypesLite () @property (retain) PBAppendableArray * repeatedCordArray; @property long defaultInt32; @property long long defaultInt64; -@property ulong defaultUint32; -@property ulong long defaultUint64; +@property unsigned long defaultUint32; +@property unsigned long long defaultUint64; @property long defaultSint32; @property long long defaultSint64; -@property ulong defaultFixed32; -@property ulong long defaultFixed64; +@property unsigned long defaultFixed32; +@property unsigned long long defaultFixed64; @property long defaultSfixed32; @property long long defaultSfixed64; @property Float32 defaultFloat; @@ -1743,13 +1743,13 @@ - (long long)repeatedInt64AtIndex:(unsigned long)index { - (PBArray *)repeatedUint32 { return repeatedUint32Array; } -- (ulong)repeatedUint32AtIndex:(unsigned long)index { +- (unsigned long)repeatedUint32AtIndex:(unsigned long)index { return [repeatedUint32Array uint32AtIndex:index]; } - (PBArray *)repeatedUint64 { return repeatedUint64Array; } -- (ulong long)repeatedUint64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index { return [repeatedUint64Array uint64AtIndex:index]; } - (PBArray *)repeatedSint32 { @@ -1767,13 +1767,13 @@ - (long long)repeatedSint64AtIndex:(unsigned long)index { - (PBArray *)repeatedFixed32 { return repeatedFixed32Array; } -- (ulong)repeatedFixed32AtIndex:(unsigned long)index { +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index { return [repeatedFixed32Array uint32AtIndex:index]; } - (PBArray *)repeatedFixed64 { return repeatedFixed64Array; } -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index { return [repeatedFixed64Array uint64AtIndex:index]; } - (PBArray *)repeatedSfixed32 { @@ -1964,14 +1964,14 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long repeatedUint32ArrayCount = self.repeatedUint32Array.count; if (repeatedUint32ArrayCount > 0) { - const ulong *values = (const ulong *)self.repeatedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedUint32Array.data; for (unsigned long i = 0; i < repeatedUint32ArrayCount; ++i) { [output writeUInt32:33 value:values[i]]; } } const unsigned long repeatedUint64ArrayCount = self.repeatedUint64Array.count; if (repeatedUint64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedUint64Array.data; for (unsigned long i = 0; i < repeatedUint64ArrayCount; ++i) { [output writeUInt64:34 value:values[i]]; } @@ -1992,14 +1992,14 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long repeatedFixed32ArrayCount = self.repeatedFixed32Array.count; if (repeatedFixed32ArrayCount > 0) { - const ulong *values = (const ulong *)self.repeatedFixed32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedFixed32Array.data; for (unsigned long i = 0; i < repeatedFixed32ArrayCount; ++i) { [output writeFixed32:37 value:values[i]]; } } const unsigned long repeatedFixed64ArrayCount = self.repeatedFixed64Array.count; if (repeatedFixed64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.repeatedFixed64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedFixed64Array.data; for (unsigned long i = 0; i < repeatedFixed64ArrayCount; ++i) { [output writeFixed64:38 value:values[i]]; } @@ -2258,7 +2258,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.repeatedUint32Array.count; - const ulong *values = (const ulong *)self.repeatedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.repeatedUint32Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -2268,7 +2268,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.repeatedUint64Array.count; - const ulong long *values = (const ulong long *)self.repeatedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.repeatedUint64Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } @@ -4533,10 +4533,10 @@ - (TestAllTypesLite_Builder*) clearOptionalInt64 { - (BOOL) hasOptionalUint32 { return result.hasOptionalUint32; } -- (ulong) optionalUint32 { +- (unsigned long) optionalUint32 { return result.optionalUint32; } -- (TestAllTypesLite_Builder*) setOptionalUint32:(ulong) value { +- (TestAllTypesLite_Builder*) setOptionalUint32:(unsigned long) value { result.hasOptionalUint32 = YES; result.optionalUint32 = value; return self; @@ -4549,10 +4549,10 @@ - (TestAllTypesLite_Builder*) clearOptionalUint32 { - (BOOL) hasOptionalUint64 { return result.hasOptionalUint64; } -- (ulong long) optionalUint64 { +- (unsigned long long) optionalUint64 { return result.optionalUint64; } -- (TestAllTypesLite_Builder*) setOptionalUint64:(ulong long) value { +- (TestAllTypesLite_Builder*) setOptionalUint64:(unsigned long long) value { result.hasOptionalUint64 = YES; result.optionalUint64 = value; return self; @@ -4597,10 +4597,10 @@ - (TestAllTypesLite_Builder*) clearOptionalSint64 { - (BOOL) hasOptionalFixed32 { return result.hasOptionalFixed32; } -- (ulong) optionalFixed32 { +- (unsigned long) optionalFixed32 { return result.optionalFixed32; } -- (TestAllTypesLite_Builder*) setOptionalFixed32:(ulong) value { +- (TestAllTypesLite_Builder*) setOptionalFixed32:(unsigned long) value { result.hasOptionalFixed32 = YES; result.optionalFixed32 = value; return self; @@ -4613,10 +4613,10 @@ - (TestAllTypesLite_Builder*) clearOptionalFixed32 { - (BOOL) hasOptionalFixed64 { return result.hasOptionalFixed64; } -- (ulong long) optionalFixed64 { +- (unsigned long long) optionalFixed64 { return result.optionalFixed64; } -- (TestAllTypesLite_Builder*) setOptionalFixed64:(ulong long) value { +- (TestAllTypesLite_Builder*) setOptionalFixed64:(unsigned long long) value { result.hasOptionalFixed64 = YES; result.optionalFixed64 = value; return self; @@ -4991,10 +4991,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedInt64 { - (PBAppendableArray *)repeatedUint32 { return result.repeatedUint32Array; } -- (ulong)repeatedUint32AtIndex:(unsigned long)index { +- (unsigned long)repeatedUint32AtIndex:(unsigned long)index { return [result repeatedUint32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedUint32:(ulong)value { +- (TestAllTypesLite_Builder *)addRepeatedUint32:(unsigned long)value { if (result.repeatedUint32Array == nil) { result.repeatedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5005,7 +5005,7 @@ - (TestAllTypesLite_Builder *)setRepeatedUint32Array:(NSArray *)array { result.repeatedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const ulong *)values count:(unsigned long)count { +- (TestAllTypesLite_Builder *)setRepeatedUint32Values:(const unsigned long *)values count:(unsigned long)count { result.repeatedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5016,10 +5016,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedUint32 { - (PBAppendableArray *)repeatedUint64 { return result.repeatedUint64Array; } -- (ulong long)repeatedUint64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedUint64AtIndex:(unsigned long)index { return [result repeatedUint64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedUint64:(ulong long)value { +- (TestAllTypesLite_Builder *)addRepeatedUint64:(unsigned long long)value { if (result.repeatedUint64Array == nil) { result.repeatedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5030,7 +5030,7 @@ - (TestAllTypesLite_Builder *)setRepeatedUint64Array:(NSArray *)array { result.repeatedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const ulong long *)values count:(unsigned long)count { +- (TestAllTypesLite_Builder *)setRepeatedUint64Values:(const unsigned long long *)values count:(unsigned long)count { result.repeatedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5091,10 +5091,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedSint64 { - (PBAppendableArray *)repeatedFixed32 { return result.repeatedFixed32Array; } -- (ulong)repeatedFixed32AtIndex:(unsigned long)index { +- (unsigned long)repeatedFixed32AtIndex:(unsigned long)index { return [result repeatedFixed32AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedFixed32:(ulong)value { +- (TestAllTypesLite_Builder *)addRepeatedFixed32:(unsigned long)value { if (result.repeatedFixed32Array == nil) { result.repeatedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -5105,7 +5105,7 @@ - (TestAllTypesLite_Builder *)setRepeatedFixed32Array:(NSArray *)array { result.repeatedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const ulong *)values count:(unsigned long)count { +- (TestAllTypesLite_Builder *)setRepeatedFixed32Values:(const unsigned long *)values count:(unsigned long)count { result.repeatedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -5116,10 +5116,10 @@ - (TestAllTypesLite_Builder *)clearRepeatedFixed32 { - (PBAppendableArray *)repeatedFixed64 { return result.repeatedFixed64Array; } -- (ulong long)repeatedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)repeatedFixed64AtIndex:(unsigned long)index { return [result repeatedFixed64AtIndex:index]; } -- (TestAllTypesLite_Builder *)addRepeatedFixed64:(ulong long)value { +- (TestAllTypesLite_Builder *)addRepeatedFixed64:(unsigned long long)value { if (result.repeatedFixed64Array == nil) { result.repeatedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -5130,7 +5130,7 @@ - (TestAllTypesLite_Builder *)setRepeatedFixed64Array:(NSArray *)array { result.repeatedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const ulong long *)values count:(unsigned long)count { +- (TestAllTypesLite_Builder *)setRepeatedFixed64Values:(const unsigned long long *)values count:(unsigned long)count { result.repeatedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -5573,10 +5573,10 @@ - (TestAllTypesLite_Builder*) clearDefaultInt64 { - (BOOL) hasDefaultUint32 { return result.hasDefaultUint32; } -- (ulong) defaultUint32 { +- (unsigned long) defaultUint32 { return result.defaultUint32; } -- (TestAllTypesLite_Builder*) setDefaultUint32:(ulong) value { +- (TestAllTypesLite_Builder*) setDefaultUint32:(unsigned long) value { result.hasDefaultUint32 = YES; result.defaultUint32 = value; return self; @@ -5589,10 +5589,10 @@ - (TestAllTypesLite_Builder*) clearDefaultUint32 { - (BOOL) hasDefaultUint64 { return result.hasDefaultUint64; } -- (ulong long) defaultUint64 { +- (unsigned long long) defaultUint64 { return result.defaultUint64; } -- (TestAllTypesLite_Builder*) setDefaultUint64:(ulong long) value { +- (TestAllTypesLite_Builder*) setDefaultUint64:(unsigned long long) value { result.hasDefaultUint64 = YES; result.defaultUint64 = value; return self; @@ -5637,10 +5637,10 @@ - (TestAllTypesLite_Builder*) clearDefaultSint64 { - (BOOL) hasDefaultFixed32 { return result.hasDefaultFixed32; } -- (ulong) defaultFixed32 { +- (unsigned long) defaultFixed32 { return result.defaultFixed32; } -- (TestAllTypesLite_Builder*) setDefaultFixed32:(ulong) value { +- (TestAllTypesLite_Builder*) setDefaultFixed32:(unsigned long) value { result.hasDefaultFixed32 = YES; result.defaultFixed32 = value; return self; @@ -5653,10 +5653,10 @@ - (TestAllTypesLite_Builder*) clearDefaultFixed32 { - (BOOL) hasDefaultFixed64 { return result.hasDefaultFixed64; } -- (ulong long) defaultFixed64 { +- (unsigned long long) defaultFixed64 { return result.defaultFixed64; } -- (TestAllTypesLite_Builder*) setDefaultFixed64:(ulong long) value { +- (TestAllTypesLite_Builder*) setDefaultFixed64:(unsigned long long) value { result.hasDefaultFixed64 = YES; result.defaultFixed64 = value; return self; @@ -5970,7 +5970,7 @@ - (BOOL) isEqual:(id)other { - (unsigned long) hash { unsigned long hashCode = 7; if (self.hasC) { - hashCode = hashCode * 31 + [[NSNumber numberWithInt:self.c] hash]; + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.c] hash]; } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; @@ -6164,13 +6164,13 @@ - (long long)packedInt64AtIndex:(unsigned long)index { - (PBArray *)packedUint32 { return packedUint32Array; } -- (ulong)packedUint32AtIndex:(unsigned long)index { +- (unsigned long)packedUint32AtIndex:(unsigned long)index { return [packedUint32Array uint32AtIndex:index]; } - (PBArray *)packedUint64 { return packedUint64Array; } -- (ulong long)packedUint64AtIndex:(unsigned long)index { +- (unsigned long long)packedUint64AtIndex:(unsigned long)index { return [packedUint64Array uint64AtIndex:index]; } - (PBArray *)packedSint32 { @@ -6188,13 +6188,13 @@ - (long long)packedSint64AtIndex:(unsigned long)index { - (PBArray *)packedFixed32 { return packedFixed32Array; } -- (ulong)packedFixed32AtIndex:(unsigned long)index { +- (unsigned long)packedFixed32AtIndex:(unsigned long)index { return [packedFixed32Array uint32AtIndex:index]; } - (PBArray *)packedFixed64 { return packedFixed64Array; } -- (ulong long)packedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)packedFixed64AtIndex:(unsigned long)index { return [packedFixed64Array uint64AtIndex:index]; } - (PBArray *)packedSfixed32 { @@ -6257,7 +6257,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedUint32ArrayCount = self.packedUint32Array.count; if (packedUint32ArrayCount > 0) { - const ulong *values = (const ulong *)self.packedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.packedUint32Array.data; [output writeRawVarint32:738]; [output writeRawVarint32:packedUint32MemoizedSerializedSize]; for (unsigned long i = 0; i < packedUint32ArrayCount; ++i) { @@ -6266,7 +6266,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedUint64ArrayCount = self.packedUint64Array.count; if (packedUint64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.packedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.packedUint64Array.data; [output writeRawVarint32:746]; [output writeRawVarint32:packedUint64MemoizedSerializedSize]; for (unsigned long i = 0; i < packedUint64ArrayCount; ++i) { @@ -6293,7 +6293,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedFixed32ArrayCount = self.packedFixed32Array.count; if (packedFixed32ArrayCount > 0) { - const ulong *values = (const ulong *)self.packedFixed32Array.data; + const unsigned long *values = (const unsigned long *)self.packedFixed32Array.data; [output writeRawVarint32:770]; [output writeRawVarint32:packedFixed32MemoizedSerializedSize]; for (unsigned long i = 0; i < packedFixed32ArrayCount; ++i) { @@ -6302,7 +6302,7 @@ - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { } const unsigned long packedFixed64ArrayCount = self.packedFixed64Array.count; if (packedFixed64ArrayCount > 0) { - const ulong long *values = (const ulong long *)self.packedFixed64Array.data; + const unsigned long long *values = (const unsigned long long *)self.packedFixed64Array.data; [output writeRawVarint32:778]; [output writeRawVarint32:packedFixed64MemoizedSerializedSize]; for (unsigned long i = 0; i < packedFixed64ArrayCount; ++i) { @@ -6403,7 +6403,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.packedUint32Array.count; - const ulong *values = (const ulong *)self.packedUint32Array.data; + const unsigned long *values = (const unsigned long *)self.packedUint32Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt32SizeNoTag(values[i]); } @@ -6417,7 +6417,7 @@ - (long) serializedSize { { long dataSize = 0; const unsigned long count = self.packedUint64Array.count; - const ulong long *values = (const ulong long *)self.packedUint64Array.data; + const unsigned long long *values = (const unsigned long long *)self.packedUint64Array.data; for (unsigned long i = 0; i < count; ++i) { dataSize += computeUInt64SizeNoTag(values[i]); } @@ -7101,10 +7101,10 @@ - (TestPackedTypesLite_Builder *)clearPackedInt64 { - (PBAppendableArray *)packedUint32 { return result.packedUint32Array; } -- (ulong)packedUint32AtIndex:(unsigned long)index { +- (unsigned long)packedUint32AtIndex:(unsigned long)index { return [result packedUint32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedUint32:(ulong)value { +- (TestPackedTypesLite_Builder *)addPackedUint32:(unsigned long)value { if (result.packedUint32Array == nil) { result.packedUint32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -7115,7 +7115,7 @@ - (TestPackedTypesLite_Builder *)setPackedUint32Array:(NSArray *)array { result.packedUint32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const ulong *)values count:(unsigned long)count { +- (TestPackedTypesLite_Builder *)setPackedUint32Values:(const unsigned long *)values count:(unsigned long)count { result.packedUint32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -7126,10 +7126,10 @@ - (TestPackedTypesLite_Builder *)clearPackedUint32 { - (PBAppendableArray *)packedUint64 { return result.packedUint64Array; } -- (ulong long)packedUint64AtIndex:(unsigned long)index { +- (unsigned long long)packedUint64AtIndex:(unsigned long)index { return [result packedUint64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedUint64:(ulong long)value { +- (TestPackedTypesLite_Builder *)addPackedUint64:(unsigned long long)value { if (result.packedUint64Array == nil) { result.packedUint64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -7140,7 +7140,7 @@ - (TestPackedTypesLite_Builder *)setPackedUint64Array:(NSArray *)array { result.packedUint64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const ulong long *)values count:(unsigned long)count { +- (TestPackedTypesLite_Builder *)setPackedUint64Values:(const unsigned long long *)values count:(unsigned long)count { result.packedUint64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } @@ -7201,10 +7201,10 @@ - (TestPackedTypesLite_Builder *)clearPackedSint64 { - (PBAppendableArray *)packedFixed32 { return result.packedFixed32Array; } -- (ulong)packedFixed32AtIndex:(unsigned long)index { +- (unsigned long)packedFixed32AtIndex:(unsigned long)index { return [result packedFixed32AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedFixed32:(ulong)value { +- (TestPackedTypesLite_Builder *)addPackedFixed32:(unsigned long)value { if (result.packedFixed32Array == nil) { result.packedFixed32Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt32]; } @@ -7215,7 +7215,7 @@ - (TestPackedTypesLite_Builder *)setPackedFixed32Array:(NSArray *)array { result.packedFixed32Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt32]; return self; } -- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const ulong *)values count:(unsigned long)count { +- (TestPackedTypesLite_Builder *)setPackedFixed32Values:(const unsigned long *)values count:(unsigned long)count { result.packedFixed32Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt32]; return self; } @@ -7226,10 +7226,10 @@ - (TestPackedTypesLite_Builder *)clearPackedFixed32 { - (PBAppendableArray *)packedFixed64 { return result.packedFixed64Array; } -- (ulong long)packedFixed64AtIndex:(unsigned long)index { +- (unsigned long long)packedFixed64AtIndex:(unsigned long)index { return [result packedFixed64AtIndex:index]; } -- (TestPackedTypesLite_Builder *)addPackedFixed64:(ulong long)value { +- (TestPackedTypesLite_Builder *)addPackedFixed64:(unsigned long long)value { if (result.packedFixed64Array == nil) { result.packedFixed64Array = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } @@ -7240,7 +7240,7 @@ - (TestPackedTypesLite_Builder *)setPackedFixed64Array:(NSArray *)array { result.packedFixed64Array = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const ulong long *)values count:(unsigned long)count { +- (TestPackedTypesLite_Builder *)setPackedFixed64Values:(const unsigned long long *)values count:(unsigned long)count { result.packedFixed64Array = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } diff --git a/src/runtime/Tests/UtilitiesTests.m b/src/runtime/Tests/UtilitiesTests.m index 20de96e..7d6519e 100644 --- a/src/runtime/Tests/UtilitiesTests.m +++ b/src/runtime/Tests/UtilitiesTests.m @@ -26,7 +26,7 @@ - (void) testRightShiftFunctions { STAssertEquals((1ULL << 63) >> 63, 1ULL, nil); STAssertEquals((1LL << 63) >> 63, -1LL, nil); - STAssertEquals(logicalRightShift32((1 << 31), 31), 1, nil); + STAssertEquals(logicalRightShift32(((long)1 << 31), 31), (long)1, nil); STAssertEquals(logicalRightShift64((1LL << 63), 63), 1LL, nil); }