| OLD | NEW | 
|---|
| 1 // Protocol Buffers - Google's data interchange format | 1 // Protocol Buffers - Google's data interchange format | 
| 2 // Copyright 2008 Google Inc.  All rights reserved. | 2 // Copyright 2008 Google Inc.  All rights reserved. | 
| 3 // http://code.google.com/p/protobuf/ | 3 // https://developers.google.com/protocol-buffers/ | 
| 4 // | 4 // | 
| 5 // Redistribution and use in source and binary forms, with or without | 5 // Redistribution and use in source and binary forms, with or without | 
| 6 // modification, are permitted provided that the following conditions are | 6 // modification, are permitted provided that the following conditions are | 
| 7 // met: | 7 // met: | 
| 8 // | 8 // | 
| 9 //     * Redistributions of source code must retain the above copyright | 9 //     * Redistributions of source code must retain the above copyright | 
| 10 // notice, this list of conditions and the following disclaimer. | 10 // notice, this list of conditions and the following disclaimer. | 
| 11 //     * Redistributions in binary form must reproduce the above | 11 //     * Redistributions in binary form must reproduce the above | 
| 12 // copyright notice, this list of conditions and the following disclaimer | 12 // copyright notice, this list of conditions and the following disclaimer | 
| 13 // in the documentation and/or other materials provided with the | 13 // in the documentation and/or other materials provided with the | 
| 14 // distribution. | 14 // distribution. | 
| 15 //     * Neither the name of Google Inc. nor the names of its | 15 //     * Neither the name of Google Inc. nor the names of its | 
| 16 // contributors may be used to endorse or promote products derived from | 16 // contributors may be used to endorse or promote products derived from | 
| 17 // this software without specific prior written permission. | 17 // this software without specific prior written permission. | 
| 18 // | 18 // | 
| 19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 
| 20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 
| 21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
| 22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 
| 23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
| 24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
| 25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
| 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
| 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 30 | 30 | 
| 31 // Author: robinson@google.com (Will Robinson) | 31 #import <Foundation/Foundation.h> | 
| 32 | 32 | 
|  | 33 #import "GPBUnknownFieldSet.h" | 
| 33 | 34 | 
| 34 package google.protobuf.internal; | 35 @class GPBCodedOutputStream; | 
|  | 36 @class GPBCodedInputStream; | 
| 35 | 37 | 
|  | 38 @interface GPBUnknownFieldSet () | 
| 36 | 39 | 
| 37 message TopLevelMessage { | 40 + (BOOL)isFieldTag:(int32_t)tag; | 
| 38   optional ExtendedMessage submessage = 1; |  | 
| 39 } |  | 
| 40 | 41 | 
|  | 42 - (NSData *)data; | 
| 41 | 43 | 
| 42 message ExtendedMessage { | 44 - (size_t)serializedSize; | 
| 43   extensions 1 to max; | 45 - (size_t)serializedSizeAsMessageSet; | 
| 44 } |  | 
| 45 | 46 | 
|  | 47 - (void)writeToCodedOutputStream:(GPBCodedOutputStream *)output; | 
|  | 48 - (void)writeAsMessageSetTo:(GPBCodedOutputStream *)output; | 
| 46 | 49 | 
| 47 message ForeignMessage { | 50 - (void)mergeUnknownFields:(GPBUnknownFieldSet *)other; | 
| 48   optional int32 foreign_message_int = 1; |  | 
| 49 } |  | 
| 50 | 51 | 
|  | 52 - (void)mergeFromCodedInputStream:(GPBCodedInputStream *)input; | 
|  | 53 - (void)mergeFromData:(NSData *)data; | 
| 51 | 54 | 
| 52 extend ExtendedMessage { | 55 - (void)mergeVarintField:(int32_t)number value:(int32_t)value; | 
| 53   optional int32 optional_int_extension = 1; | 56 - (BOOL)mergeFieldFrom:(int32_t)tag input:(GPBCodedInputStream *)input; | 
| 54   optional ForeignMessage optional_message_extension = 2; | 57 - (void)mergeMessageSetMessage:(int32_t)number data:(NSData *)messageData; | 
| 55 | 58 | 
| 56   repeated int32 repeated_int_extension = 3; | 59 - (void)addUnknownMapEntry:(int32_t)fieldNum value:(NSData *)data; | 
| 57   repeated ForeignMessage repeated_message_extension = 4; | 60 | 
| 58 } | 61 @end | 
| OLD | NEW | 
|---|