diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2017-02-13 14:19:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 14:19:37 -0800 |
| commit | 82c7017891c54f80da7ca9be2a5eef2b49f66376 (patch) | |
| tree | 1e2ed23b10192237f4bcb1ee89132d73d93fa060 | |
| parent | f27647986040828ec9c3f00450232611e8819e2d (diff) | |
| parent | 124a2f6dbc4741ceb7eac129864977a13f6702cc (diff) | |
| download | protobuf-82c7017891c54f80da7ca9be2a5eef2b49f66376.tar.gz protobuf-82c7017891c54f80da7ca9be2a5eef2b49f66376.tar.bz2 protobuf-82c7017891c54f80da7ca9be2a5eef2b49f66376.zip | |
Merge branch '3.2.x' into ruby24
29 files changed, 473 insertions, 357 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index 3e721fe6..4b88a4df 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,7 +5,7 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.2.0-rc.2' + s.version = '3.2.0' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/google/protobuf' s.license = 'New BSD' diff --git a/configure.ac b/configure.ac index c1083223..6d9c2a01 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.2.0rc2],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.2.0],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index a79eef73..0b9cbcf4 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ <title>Google Protocol Buffers tools</title> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <description>See project site for more info.</description> - <version>3.2.0-rc2</version> + <version>3.2.0</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl> diff --git a/csharp/src/Google.Protobuf/project.json b/csharp/src/Google.Protobuf/project.json index 59a76908..961e037e 100644 --- a/csharp/src/Google.Protobuf/project.json +++ b/csharp/src/Google.Protobuf/project.json @@ -1,5 +1,5 @@ { - "version": "3.2.0-rc2", + "version": "3.2.0", "title": "Google Protocol Buffers", "description": "See project site for more info.", "authors": [ "Google Inc." ], diff --git a/java/core/pom.xml b/java/core/pom.xml index 7891412a..14a4bf6c 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.2.0rc2</version> + <version>3.2.0</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/pom.xml b/java/pom.xml index 05c2ec2e..41c9b9da 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.2.0rc2</version> + <version>3.2.0</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/util/pom.xml b/java/util/pom.xml index e28557c5..ac771f6e 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.2.0rc2</version> + <version>3.2.0</version> </parent> <artifactId>protobuf-java-util</artifactId> diff --git a/javanano/pom.xml b/javanano/pom.xml index 31b5aa78..6cb8c17d 100644 --- a/javanano/pom.xml +++ b/javanano/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>com.google.protobuf.nano</groupId> <artifactId>protobuf-javanano</artifactId> - <version>3.2.0rc2</version> + <version>3.2.0</version> <packaging>bundle</packaging> <name>Protocol Buffer JavaNano API</name> <description> diff --git a/js/package.json b/js/package.json index f5e192cc..dd6373de 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.2.0-rc.2", + "version": "3.2.0", "description": "Protocol Buffers for JavaScript", "main": "google-protobuf.js", "files": [ diff --git a/objectivec/GPBArray.h b/objectivec/GPBArray.h index 781cfb6f..b26f509b 100644 --- a/objectivec/GPBArray.h +++ b/objectivec/GPBArray.h @@ -96,7 +96,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBInt32Array with a copy of the values. **/ -- (instancetype)initWithValues:(const int32_t [])values +- (instancetype)initWithValues:(const int32_t [__nullable])values count:(NSUInteger)count; /** @@ -161,7 +161,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const int32_t [])values count:(NSUInteger)count; +- (void)addValues:(const int32_t [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -268,7 +268,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBUInt32Array with a copy of the values. **/ -- (instancetype)initWithValues:(const uint32_t [])values +- (instancetype)initWithValues:(const uint32_t [__nullable])values count:(NSUInteger)count; /** @@ -333,7 +333,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const uint32_t [])values count:(NSUInteger)count; +- (void)addValues:(const uint32_t [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -440,7 +440,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBInt64Array with a copy of the values. **/ -- (instancetype)initWithValues:(const int64_t [])values +- (instancetype)initWithValues:(const int64_t [__nullable])values count:(NSUInteger)count; /** @@ -505,7 +505,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const int64_t [])values count:(NSUInteger)count; +- (void)addValues:(const int64_t [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -612,7 +612,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBUInt64Array with a copy of the values. **/ -- (instancetype)initWithValues:(const uint64_t [])values +- (instancetype)initWithValues:(const uint64_t [__nullable])values count:(NSUInteger)count; /** @@ -677,7 +677,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const uint64_t [])values count:(NSUInteger)count; +- (void)addValues:(const uint64_t [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -784,7 +784,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBFloatArray with a copy of the values. **/ -- (instancetype)initWithValues:(const float [])values +- (instancetype)initWithValues:(const float [__nullable])values count:(NSUInteger)count; /** @@ -849,7 +849,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const float [])values count:(NSUInteger)count; +- (void)addValues:(const float [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -956,7 +956,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBDoubleArray with a copy of the values. **/ -- (instancetype)initWithValues:(const double [])values +- (instancetype)initWithValues:(const double [__nullable])values count:(NSUInteger)count; /** @@ -1021,7 +1021,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const double [])values count:(NSUInteger)count; +- (void)addValues:(const double [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -1128,7 +1128,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized GPBBoolArray with a copy of the values. **/ -- (instancetype)initWithValues:(const BOOL [])values +- (instancetype)initWithValues:(const BOOL [__nullable])values count:(NSUInteger)count; /** @@ -1193,7 +1193,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const BOOL [])values count:(NSUInteger)count; +- (void)addValues:(const BOOL [__nullable])values count:(NSUInteger)count; /** * Adds the values from the given array to this array. @@ -1325,7 +1325,7 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized GPBEnumArray with a copy of the values. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values + rawValues:(const int32_t [__nullable])values count:(NSUInteger)count; /** @@ -1435,7 +1435,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values The values to add to this array. * @param count The number of elements to add. **/ -- (void)addValues:(const int32_t [])values count:(NSUInteger)count; +- (void)addValues:(const int32_t [__nullable])values count:(NSUInteger)count; /** @@ -1486,7 +1486,7 @@ NS_ASSUME_NONNULL_BEGIN * @param values Array containing the raw enum values to add to this array. * @param count The number of raw values to add. **/ -- (void)addRawValues:(const int32_t [])values count:(NSUInteger)count; +- (void)addRawValues:(const int32_t [__nullable])values count:(NSUInteger)count; /** * Inserts a raw enum value at the given index. @@ -1613,7 +1613,7 @@ NS_ASSUME_NONNULL_END //% * //% * @return A newly initialized GPB##NAME##Array with a copy of the values. //% **/ -//%- (instancetype)initWithValues:(const TYPE [])values +//%- (instancetype)initWithValues:(const TYPE [__nullable])values //% count:(NSUInteger)count; //% //%/** @@ -1730,7 +1730,7 @@ NS_ASSUME_NONNULL_END //% * @return A newly initialized GPB##NAME##Array with a copy of the values. //% **/ //%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func -//% rawValues:(const TYPE [])values +//% rawValues:(const TYPE [__nullable])values //% count:(NSUInteger)count; //% //%/** @@ -1849,7 +1849,7 @@ NS_ASSUME_NONNULL_END //% * @param values The values to add to this array. //% * @param count The number of elements to add. //% **/ -//%- (void)addValues:(const TYPE [])values count:(NSUInteger)count; +//%- (void)addValues:(const TYPE [__nullable])values count:(NSUInteger)count; //% //%ARRAY_EXTRA_MUTABLE_METHODS1_##HELPER_NAME(NAME, TYPE) //%/** @@ -1939,7 +1939,7 @@ NS_ASSUME_NONNULL_END //% * @param values Array containing the raw enum values to add to this array. //% * @param count The number of raw values to add. //% **/ -//%- (void)addRawValues:(const TYPE [])values count:(NSUInteger)count; +//%- (void)addRawValues:(const TYPE [__nullable])values count:(NSUInteger)count; //% //%/** //% * Inserts a raw enum value at the given index. diff --git a/objectivec/GPBDictionary.h b/objectivec/GPBDictionary.h index 4b2b9ff3..fd952bad 100644 --- a/objectivec/GPBDictionary.h +++ b/objectivec/GPBDictionary.h @@ -84,8 +84,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt32s:(const uint32_t [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -117,8 +117,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt32s:(const uint32_t [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -228,8 +228,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt32s:(const int32_t [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithInt32s:(const int32_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -261,8 +261,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt32s:(const int32_t [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithInt32s:(const int32_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -372,8 +372,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt64s:(const uint64_t [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -405,8 +405,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt64s:(const uint64_t [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -516,8 +516,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt64s:(const int64_t [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithInt64s:(const int64_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -549,8 +549,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt64s:(const int64_t [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithInt64s:(const int64_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -660,8 +660,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithBools:(const BOOL [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithBools:(const BOOL [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -693,8 +693,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithBools:(const BOOL [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithBools:(const BOOL [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -804,8 +804,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithFloats:(const float [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithFloats:(const float [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -837,8 +837,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithFloats:(const float [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithFloats:(const float [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -948,8 +948,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithDoubles:(const double [])values - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithDoubles:(const double [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -981,8 +981,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithDoubles:(const double [])values - forKeys:(const uint32_t [])keys +- (instancetype)initWithDoubles:(const double [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -1107,8 +1107,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly instanced dictionary with the keys and values in it. **/ + (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const uint32_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -1153,8 +1153,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized dictionary with the keys and values in it. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const uint32_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -1318,8 +1318,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const uint32_t [])keys ++ (instancetype)dictionaryWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count; /** @@ -1351,8 +1351,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const uint32_t [])keys +- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const uint32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -1461,8 +1461,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt32s:(const uint32_t [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -1494,8 +1494,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt32s:(const uint32_t [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -1605,8 +1605,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt32s:(const int32_t [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithInt32s:(const int32_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -1638,8 +1638,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt32s:(const int32_t [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithInt32s:(const int32_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -1749,8 +1749,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt64s:(const uint64_t [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -1782,8 +1782,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt64s:(const uint64_t [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -1893,8 +1893,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt64s:(const int64_t [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithInt64s:(const int64_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -1926,8 +1926,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt64s:(const int64_t [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithInt64s:(const int64_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2037,8 +2037,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithBools:(const BOOL [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithBools:(const BOOL [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -2070,8 +2070,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithBools:(const BOOL [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithBools:(const BOOL [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2181,8 +2181,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithFloats:(const float [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithFloats:(const float [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -2214,8 +2214,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithFloats:(const float [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithFloats:(const float [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2325,8 +2325,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithDoubles:(const double [])values - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithDoubles:(const double [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -2358,8 +2358,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithDoubles:(const double [])values - forKeys:(const int32_t [])keys +- (instancetype)initWithDoubles:(const double [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2484,8 +2484,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly instanced dictionary with the keys and values in it. **/ + (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const int32_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -2530,8 +2530,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized dictionary with the keys and values in it. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const int32_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2695,8 +2695,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const int32_t [])keys ++ (instancetype)dictionaryWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count; /** @@ -2728,8 +2728,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const int32_t [])keys +- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const int32_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2838,8 +2838,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt32s:(const uint32_t [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -2871,8 +2871,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt32s:(const uint32_t [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -2982,8 +2982,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt32s:(const int32_t [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithInt32s:(const int32_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3015,8 +3015,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt32s:(const int32_t [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithInt32s:(const int32_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -3126,8 +3126,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt64s:(const uint64_t [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3159,8 +3159,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt64s:(const uint64_t [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -3270,8 +3270,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt64s:(const int64_t [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithInt64s:(const int64_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3303,8 +3303,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt64s:(const int64_t [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithInt64s:(const int64_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -3414,8 +3414,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithBools:(const BOOL [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithBools:(const BOOL [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3447,8 +3447,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithBools:(const BOOL [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithBools:(const BOOL [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -3558,8 +3558,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithFloats:(const float [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithFloats:(const float [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3591,8 +3591,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithFloats:(const float [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithFloats:(const float [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -3702,8 +3702,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithDoubles:(const double [])values - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithDoubles:(const double [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3735,8 +3735,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithDoubles:(const double [])values - forKeys:(const uint64_t [])keys +- (instancetype)initWithDoubles:(const double [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -3861,8 +3861,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly instanced dictionary with the keys and values in it. **/ + (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const uint64_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -3907,8 +3907,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized dictionary with the keys and values in it. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const uint64_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4072,8 +4072,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const uint64_t [])keys ++ (instancetype)dictionaryWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4105,8 +4105,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const uint64_t [])keys +- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const uint64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4215,8 +4215,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt32s:(const uint32_t [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4248,8 +4248,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt32s:(const uint32_t [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4359,8 +4359,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt32s:(const int32_t [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithInt32s:(const int32_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4392,8 +4392,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt32s:(const int32_t [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithInt32s:(const int32_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4503,8 +4503,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt64s:(const uint64_t [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4536,8 +4536,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt64s:(const uint64_t [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4647,8 +4647,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt64s:(const int64_t [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithInt64s:(const int64_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4680,8 +4680,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt64s:(const int64_t [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithInt64s:(const int64_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4791,8 +4791,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithBools:(const BOOL [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithBools:(const BOOL [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4824,8 +4824,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithBools:(const BOOL [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithBools:(const BOOL [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -4935,8 +4935,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithFloats:(const float [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithFloats:(const float [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -4968,8 +4968,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithFloats:(const float [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithFloats:(const float [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -5079,8 +5079,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithDoubles:(const double [])values - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithDoubles:(const double [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -5112,8 +5112,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithDoubles:(const double [])values - forKeys:(const int64_t [])keys +- (instancetype)initWithDoubles:(const double [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -5238,8 +5238,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly instanced dictionary with the keys and values in it. **/ + (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const int64_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -5284,8 +5284,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized dictionary with the keys and values in it. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const int64_t [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -5449,8 +5449,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const int64_t [])keys ++ (instancetype)dictionaryWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count; /** @@ -5482,8 +5482,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const int64_t [])keys +- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const int64_t [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -5592,8 +5592,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt32s:(const uint32_t [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -5625,8 +5625,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt32s:(const uint32_t [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -5736,8 +5736,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt32s:(const int32_t [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithInt32s:(const int32_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -5769,8 +5769,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt32s:(const int32_t [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithInt32s:(const int32_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -5880,8 +5880,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt64s:(const uint64_t [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -5913,8 +5913,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt64s:(const uint64_t [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6024,8 +6024,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt64s:(const int64_t [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithInt64s:(const int64_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -6057,8 +6057,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt64s:(const int64_t [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithInt64s:(const int64_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6168,8 +6168,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithBools:(const BOOL [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithBools:(const BOOL [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -6201,8 +6201,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithBools:(const BOOL [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithBools:(const BOOL [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6312,8 +6312,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithFloats:(const float [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithFloats:(const float [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -6345,8 +6345,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithFloats:(const float [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithFloats:(const float [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6456,8 +6456,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithDoubles:(const double [])values - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithDoubles:(const double [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -6489,8 +6489,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithDoubles:(const double [])values - forKeys:(const BOOL [])keys +- (instancetype)initWithDoubles:(const double [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6615,8 +6615,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly instanced dictionary with the keys and values in it. **/ + (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const BOOL [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -6661,8 +6661,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized dictionary with the keys and values in it. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const BOOL [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6826,8 +6826,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const BOOL [])keys ++ (instancetype)dictionaryWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count; /** @@ -6859,8 +6859,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithObjects:(const ObjectType GPB_UNSAFE_UNRETAINED [])objects - forKeys:(const BOOL [])keys +- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects + forKeys:(const BOOL [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -6969,8 +6969,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt32s:(const uint32_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7002,8 +7002,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt32s:(const uint32_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7113,8 +7113,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt32s:(const int32_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithInt32s:(const int32_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7146,8 +7146,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt32s:(const int32_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithInt32s:(const int32_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7257,8 +7257,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithUInt64s:(const uint64_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7290,8 +7290,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithUInt64s:(const uint64_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7401,8 +7401,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithInt64s:(const int64_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithInt64s:(const int64_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7434,8 +7434,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithInt64s:(const int64_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithInt64s:(const int64_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7545,8 +7545,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithBools:(const BOOL [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithBools:(const BOOL [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7578,8 +7578,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithBools:(const BOOL [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithBools:(const BOOL [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7689,8 +7689,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithFloats:(const float [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithFloats:(const float [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7722,8 +7722,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithFloats:(const float [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithFloats:(const float [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7833,8 +7833,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly instanced dictionary with the keys and values in it. **/ -+ (instancetype)dictionaryWithDoubles:(const double [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys ++ (instancetype)dictionaryWithDoubles:(const double [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -7866,8 +7866,8 @@ NS_ASSUME_NONNULL_BEGIN * * @return A newly initialized dictionary with a copy of the values and keys. **/ -- (instancetype)initWithDoubles:(const double [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys +- (instancetype)initWithDoubles:(const double [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -7992,8 +7992,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly instanced dictionary with the keys and values in it. **/ + (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count; /** @@ -8038,8 +8038,8 @@ NS_ASSUME_NONNULL_BEGIN * @return A newly initialized dictionary with the keys and values in it. **/ - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - rawValues:(const int32_t [])values - forKeys:(const NSString * GPB_UNSAFE_UNRETAINED [])keys + rawValues:(const int32_t [__nullable])values + forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; /** @@ -8218,7 +8218,7 @@ NS_ASSUME_NONNULL_END //%PDDM-DEFINE ARRAY_ARG_MODIFIEREnum() // Nothing //%PDDM-DEFINE ARRAY_ARG_MODIFIEROBJECT() -//%GPB_UNSAFE_UNRETAINED ## +//%__nonnull GPB_UNSAFE_UNRETAINED ## //%PDDM-DEFINE DICTIONARY_CLASS_DECLPOD(KEY_NAME, VALUE_NAME, VALUE_TYPE) //%GPB##KEY_NAME##VALUE_NAME##Dictionary //%PDDM-DEFINE DICTIONARY_CLASS_DECLEnum(KEY_NAME, VALUE_NAME, VALUE_TYPE) @@ -8264,8 +8264,8 @@ NS_ASSUME_NONNULL_END //% * //% * @return A newly instanced dictionary with the keys and values in it. //% **/ -//%+ (instancetype)dictionaryWith##VNAME##s:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[])##VNAME_VAR##s -//% ##VNAME$S## forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[])keys +//%+ (instancetype)dictionaryWith##VNAME##s:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[__nullable])##VNAME_VAR##s +//% ##VNAME$S## forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[__nullable])keys //% ##VNAME$S## count:(NSUInteger)count; //% //%/** @@ -8297,8 +8297,8 @@ NS_ASSUME_NONNULL_END //% * //% * @return A newly initialized dictionary with a copy of the values and keys. //% **/ -//%- (instancetype)initWith##VNAME##s:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[])##VNAME_VAR##s -//% ##VNAME$S## forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[])keys +//%- (instancetype)initWith##VNAME##s:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[__nullable])##VNAME_VAR##s +//% ##VNAME$S## forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[__nullable])keys //% ##VNAME$S## count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; //% //%/** @@ -8390,8 +8390,8 @@ NS_ASSUME_NONNULL_END //% * @return A newly instanced dictionary with the keys and values in it. //% **/ //%+ (instancetype)dictionaryWithValidationFunction:(nullable GPBEnumValidationFunc)func -//% rawValues:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[])values -//% forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[])keys +//% rawValues:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[__nullable])values +//% forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[__nullable])keys //% count:(NSUInteger)count; //% //%/** @@ -8436,8 +8436,8 @@ NS_ASSUME_NONNULL_END //% * @return A newly initialized dictionary with the keys and values in it. //% **/ //%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func -//% rawValues:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[])values -//% forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[])keys +//% rawValues:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[__nullable])values +//% forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[__nullable])keys //% count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; //% //%/** diff --git a/objectivec/GPBWellKnownTypes.h b/objectivec/GPBWellKnownTypes.h index 90d96c6f..04df4178 100644 --- a/objectivec/GPBWellKnownTypes.h +++ b/objectivec/GPBWellKnownTypes.h @@ -112,16 +112,27 @@ typedef NS_ENUM(NSInteger, GPBWellKnownTypesErrorCode) { * @note: Not all second/nanos combinations can be represented in a * NSTimeInterval, so getting this could be a lossy transform. **/ -@property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970; +@property(nonatomic, readwrite) NSTimeInterval timeInterval; /** * Initializes a GPBDuration with the given NSTimeInterval. * - * @param timeIntervalSince1970 Time interval to configure the GPBDuration with. + * @param timeInterval Time interval to configure the GPBDuration with. * * @return A newly initialized GPBDuration. **/ -- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970; +- (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval; + +// These next two methods are deprecated because GBPDuration has no need of a +// "base" time. The older methods were about symmetry with GBPTimestamp, but +// the unix epoch usage is too confusing. + +/** Deprecated, use timeInterval instead. */ +@property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970 + __attribute__((deprecated("Use timeInterval"))); +/** Deprecated, use initWithTimeInterval: instead. */ +- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 + __attribute__((deprecated("Use initWithTimeInterval:"))); @end diff --git a/objectivec/GPBWellKnownTypes.m b/objectivec/GPBWellKnownTypes.m index ed798a2e..2808afeb 100644 --- a/objectivec/GPBWellKnownTypes.m +++ b/objectivec/GPBWellKnownTypes.m @@ -41,15 +41,25 @@ NSString *const GPBWellKnownTypesErrorDomain = static NSString *kTypePrefixGoogleApisCom = @"type.googleapis.com/"; -static NSTimeInterval TimeIntervalSince1970FromSecondsAndNanos(int64_t seconds, - int32_t nanos) { +static NSTimeInterval TimeIntervalFromSecondsAndNanos(int64_t seconds, + int32_t nanos) { return seconds + (NSTimeInterval)nanos / 1e9; } -static int32_t SecondsAndNanosFromTimeIntervalSince1970(NSTimeInterval time, - int64_t *outSeconds) { +static int32_t SecondsAndNanosFromTimeInterval(NSTimeInterval time, + int64_t *outSeconds, + BOOL nanosMustBePositive) { NSTimeInterval seconds; NSTimeInterval nanos = modf(time, &seconds); + + if (nanosMustBePositive && (nanos < 0)) { + // Per Timestamp.proto, nanos is non-negative and "Negative second values with + // fractions must still have non-negative nanos values that count forward in + // time. Must be from 0 to 999,999,999 inclusive." + --seconds; + nanos = 1.0 + nanos; + } + nanos *= 1e9; *outSeconds = (int64_t)seconds; return (int32_t)nanos; @@ -88,8 +98,8 @@ static NSString *ParseTypeFromURL(NSString *typeURLString) { - (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 { if ((self = [super init])) { int64_t seconds; - int32_t nanos = SecondsAndNanosFromTimeIntervalSince1970( - timeIntervalSince1970, &seconds); + int32_t nanos = SecondsAndNanosFromTimeInterval( + timeIntervalSince1970, &seconds, YES); self.seconds = seconds; self.nanos = nanos; } @@ -105,13 +115,13 @@ static NSString *ParseTypeFromURL(NSString *typeURLString) { } - (NSTimeInterval)timeIntervalSince1970 { - return TimeIntervalSince1970FromSecondsAndNanos(self.seconds, self.nanos); + return TimeIntervalFromSecondsAndNanos(self.seconds, self.nanos); } - (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 { int64_t seconds; int32_t nanos = - SecondsAndNanosFromTimeIntervalSince1970(timeIntervalSince1970, &seconds); + SecondsAndNanosFromTimeInterval(timeIntervalSince1970, &seconds, YES); self.seconds = seconds; self.nanos = nanos; } @@ -122,29 +132,41 @@ static NSString *ParseTypeFromURL(NSString *typeURLString) { @implementation GPBDuration (GBPWellKnownTypes) -- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 { +- (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval { if ((self = [super init])) { int64_t seconds; - int32_t nanos = SecondsAndNanosFromTimeIntervalSince1970( - timeIntervalSince1970, &seconds); + int32_t nanos = SecondsAndNanosFromTimeInterval( + timeInterval, &seconds, NO); self.seconds = seconds; self.nanos = nanos; } return self; } -- (NSTimeInterval)timeIntervalSince1970 { - return TimeIntervalSince1970FromSecondsAndNanos(self.seconds, self.nanos); +- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 { + return [self initWithTimeInterval:timeIntervalSince1970]; } -- (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 { +- (NSTimeInterval)timeInterval { + return TimeIntervalFromSecondsAndNanos(self.seconds, self.nanos); +} + +- (void)setTimeInterval:(NSTimeInterval)timeInterval { int64_t seconds; int32_t nanos = - SecondsAndNanosFromTimeIntervalSince1970(timeIntervalSince1970, &seconds); + SecondsAndNanosFromTimeInterval(timeInterval, &seconds, NO); self.seconds = seconds; self.nanos = nanos; } +- (NSTimeInterval)timeIntervalSince1970 { + return self.timeInterval; +} + +- (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 { + self.timeInterval = timeIntervalSince1970; +} + @end #pragma mark - GPBAny diff --git a/objectivec/Tests/GPBWellKnownTypesTest.m b/objectivec/Tests/GPBWellKnownTypesTest.m index 041841dd..592d5afd 100644 --- a/objectivec/Tests/GPBWellKnownTypesTest.m +++ b/objectivec/Tests/GPBWellKnownTypesTest.m @@ -32,11 +32,9 @@ #import <XCTest/XCTest.h> +#import "GPBTestUtilities.h" #import "google/protobuf/AnyTest.pbobjc.h" -// A basically random interval into the future for testing with. -static const NSTimeInterval kFutureOffsetInterval = 15000; - // Nanosecond time accuracy static const NSTimeInterval kTimeAccuracy = 1e-9; @@ -46,59 +44,117 @@ static const NSTimeInterval kTimeAccuracy = 1e-9; @implementation WellKnownTypesTest - (void)testTimeStamp { - // Test Creation. - NSDate *date = [NSDate date]; - GPBTimestamp *timeStamp = [[GPBTimestamp alloc] initWithDate:date]; - NSDate *timeStampDate = timeStamp.date; - - // Comparing timeIntervals instead of directly comparing dates because date - // equality requires the time intervals to be exactly the same, and the - // timeintervals go through a bit of floating point error as they are - // converted back and forth from the internal representation. - XCTAssertEqualWithAccuracy(date.timeIntervalSince1970, - timeStampDate.timeIntervalSince1970, - kTimeAccuracy); - - NSTimeInterval time = [date timeIntervalSince1970]; - GPBTimestamp *timeStamp2 = - [[GPBTimestamp alloc] initWithTimeIntervalSince1970:time]; - NSTimeInterval durationTime = timeStamp2.timeIntervalSince1970; - XCTAssertEqualWithAccuracy(time, durationTime, kTimeAccuracy); - [timeStamp release]; - - // Test Mutation. - date = [NSDate dateWithTimeIntervalSinceNow:kFutureOffsetInterval]; - timeStamp2.date = date; - timeStampDate = timeStamp2.date; - XCTAssertEqualWithAccuracy(date.timeIntervalSince1970, - timeStampDate.timeIntervalSince1970, - kTimeAccuracy); - - time = date.timeIntervalSince1970; - timeStamp2.timeIntervalSince1970 = time; - durationTime = timeStamp2.timeIntervalSince1970; - XCTAssertEqualWithAccuracy(time, durationTime, kTimeAccuracy); - [timeStamp2 release]; + // Test negative and positive values. + NSTimeInterval values[] = { + -428027599.483999967, -1234567.0, -0.5, 0, 0.75, 54321.0, 2468086,483999967 + }; + for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) { + NSTimeInterval value = values[i]; + + // Test Creation - date. + NSDate *date = [NSDate dateWithTimeIntervalSince1970:value]; + GPBTimestamp *timeStamp = [[GPBTimestamp alloc] initWithDate:date]; + + XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0, + @"Offset %f - Date: %@", (double)value, date); + XCTAssertLessThan(timeStamp.nanos, 1e9, + @"Offset %f - Date: %@", (double)value, date); + + // Comparing timeIntervals instead of directly comparing dates because date + // equality requires the time intervals to be exactly the same, and the + // timeintervals go through a bit of floating point error as they are + // converted back and forth from the internal representation. + XCTAssertEqualWithAccuracy(value, timeStamp.date.timeIntervalSince1970, + kTimeAccuracy, + @"Offset %f - Date: %@", (double)value, date); + [timeStamp release]; + + // Test Creation - timeIntervalSince1970. + timeStamp = [[GPBTimestamp alloc] initWithTimeIntervalSince1970:value]; + + XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0, + @"Offset %f - Date: %@", (double)value, date); + XCTAssertLessThan(timeStamp.nanos, 1e9, + @"Offset %f - Date: %@", (double)value, date); + + XCTAssertEqualWithAccuracy(value, timeStamp.timeIntervalSince1970, + kTimeAccuracy, + @"Offset %f - Date: %@", (double)value, date); + [timeStamp release]; + + // Test Mutation - date. + timeStamp = [[GPBTimestamp alloc] init]; + timeStamp.date = date; + + XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0, + @"Offset %f - Date: %@", (double)value, date); + XCTAssertLessThan(timeStamp.nanos, 1e9, + @"Offset %f - Date: %@", (double)value, date); + + XCTAssertEqualWithAccuracy(value, timeStamp.date.timeIntervalSince1970, + kTimeAccuracy, + @"Offset %f - Date: %@", (double)value, date); + [timeStamp release]; + + // Test Mutation - timeIntervalSince1970. + timeStamp = [[GPBTimestamp alloc] init]; + timeStamp.timeIntervalSince1970 = value; + + XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0, + @"Offset %f - Date: %@", (double)value, date); + XCTAssertLessThan(timeStamp.nanos, 1e9, + @"Offset %f - Date: %@", (double)value, date); + + XCTAssertEqualWithAccuracy(value, timeStamp.date.timeIntervalSince1970, + kTimeAccuracy, + @"Offset %f - Date: %@", (double)value, date); + + [timeStamp release]; + } } - (void)testDuration { - // Test Creation. - NSTimeInterval time = [[NSDate date] timeIntervalSince1970]; - GPBDuration *duration = - [[GPBDuration alloc] initWithTimeIntervalSince1970:time]; - NSTimeInterval durationTime = duration.timeIntervalSince1970; - XCTAssertEqualWithAccuracy(time, durationTime, kTimeAccuracy); - [duration release]; - - // Test Mutation. - GPBDuration *duration2 = - [[GPBDuration alloc] initWithTimeIntervalSince1970:time]; - NSDate *date = [NSDate dateWithTimeIntervalSinceNow:kFutureOffsetInterval]; - time = date.timeIntervalSince1970; - duration2.timeIntervalSince1970 = time; - durationTime = duration2.timeIntervalSince1970; - XCTAssertEqualWithAccuracy(time, durationTime, kTimeAccuracy); - [duration2 release]; + // Test negative and positive values. + NSTimeInterval values[] = { -1000.0001, -500.0, -0.5, 0, 0.75, 1000.0, 2000.0002 }; + for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) { + NSTimeInterval value = values[i]; + + // Test Creation. + GPBDuration *duration = + [[GPBDuration alloc] initWithTimeInterval:value]; + XCTAssertEqualWithAccuracy(value, duration.timeInterval, kTimeAccuracy, + @"For interval %f", (double)value); + if (value > 0) { + XCTAssertGreaterThanOrEqual(duration.seconds, 0, + @"For interval %f", (double)value); + XCTAssertGreaterThanOrEqual(duration.nanos, 0, + @"For interval %f", (double)value); + } else { + XCTAssertLessThanOrEqual(duration.seconds, 0, + @"For interval %f", (double)value); + XCTAssertLessThanOrEqual(duration.nanos, 0, + @"For interval %f", (double)value); + } + [duration release]; + + // Test Mutation. + duration = [[GPBDuration alloc] init]; + duration.timeInterval = value; + XCTAssertEqualWithAccuracy(value, duration.timeInterval, kTimeAccuracy, + @"For interval %f", (double)value); + if (value > 0) { + XCTAssertGreaterThanOrEqual(duration.seconds, 0, + @"For interval %f", (double)value); + XCTAssertGreaterThanOrEqual(duration.nanos, 0, + @"For interval %f", (double)value); + } else { + XCTAssertLessThanOrEqual(duration.seconds, 0, + @"For interval %f", (double)value); + XCTAssertLessThanOrEqual(duration.nanos, 0, + @"For interval %f", (double)value); + } + [duration release]; + } } - (void)testAnyHelpers { diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index 0ec32d4c..3067bdbb 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -13,8 +13,8 @@ <date>2017-01-13</date> <time>16:06:07</time> <version> - <release>3.2.0a1rc2</release> - <api>3.2.0a1rc2</api> + <release>3.2.0a1</release> + <api>3.2.0a1</api> </version> <stability> <release>alpha</release> @@ -73,8 +73,8 @@ First alpha release </release> <release> <version> - <release>3.2.0a1rc2</release> - <api>3.2.0a1rc2</api> + <release>3.2.0a1</release> + <api>3.2.0a1</api> </version> <stability> <release>alpha</release> diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index ac2d3f01..36c81963 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -37,7 +37,7 @@ #include "upb.h" #define PHP_PROTOBUF_EXTNAME "protobuf" -#define PHP_PROTOBUF_VERSION "3.2.0a1rc2" +#define PHP_PROTOBUF_VERSION "3.2.0a1" #define MAX_LENGTH_OF_INT64 20 #define SIZEOF_INT64 8 diff --git a/php/ext/google/protobuf/upb.c b/php/ext/google/protobuf/upb.c index 98daafc0..a497c8e1 100644 --- a/php/ext/google/protobuf/upb.c +++ b/php/ext/google/protobuf/upb.c @@ -9728,7 +9728,7 @@ static size_t encode_strbuf(void *c, const void *hd, const char *buf, T(double, double, dbl2uint64, encode_fixed64) T(float, float, flt2uint32, encode_fixed32) T(int64, int64_t, uint64_t, encode_varint) -T(int32, int32_t, uint32_t, encode_varint) +T(int32, int32_t, int64_t, encode_varint) T(fixed64, uint64_t, uint64_t, encode_fixed64) T(fixed32, uint32_t, uint32_t, encode_fixed32) T(bool, bool, bool, encode_varint) diff --git a/php/src/Google/Protobuf/Internal/GPBWire.php b/php/src/Google/Protobuf/Internal/GPBWire.php index f75e0861..67eb1bee 100644 --- a/php/src/Google/Protobuf/Internal/GPBWire.php +++ b/php/src/Google/Protobuf/Internal/GPBWire.php @@ -403,10 +403,14 @@ class GPBWire return self::varint32Size($tag); } - public static function varint32Size($value) + public static function varint32Size($value, $sign_extended = false) { if ($value < 0) { - return 5; + if ($sign_extended) { + return 10; + } else { + return 5; + } } if ($value < (1 << 7)) { return 1; diff --git a/php/src/Google/Protobuf/Internal/InputStream.php b/php/src/Google/Protobuf/Internal/InputStream.php index bf052c2f..de5ca978 100644 --- a/php/src/Google/Protobuf/Internal/InputStream.php +++ b/php/src/Google/Protobuf/Internal/InputStream.php @@ -70,7 +70,6 @@ class InputStream private $total_bytes_read; const MAX_VARINT_BYTES = 10; - const MAX_VARINT32_BYTES = 5; const DEFAULT_RECURSION_LIMIT = 100; const DEFAULT_TOTAL_BYTES_LIMIT = 33554432; // 32 << 20, 32MB diff --git a/php/src/Google/Protobuf/Internal/Message.php b/php/src/Google/Protobuf/Internal/Message.php index f6be8500..43525c58 100644 --- a/php/src/Google/Protobuf/Internal/Message.php +++ b/php/src/Google/Protobuf/Internal/Message.php @@ -582,9 +582,11 @@ class Message case GPBType::SFIXED64: $size += 8; break; - case GPBType::UINT32: case GPBType::INT32: case GPBType::ENUM: + $size += GPBWire::varint32Size($value, true); + break; + case GPBType::UINT32: $size += GPBWire::varint32Size($value); break; case GPBType::UINT64: diff --git a/php/src/Google/Protobuf/Internal/OutputStream.php b/php/src/Google/Protobuf/Internal/OutputStream.php index 587ac352..8c6d9b68 100644 --- a/php/src/Google/Protobuf/Internal/OutputStream.php +++ b/php/src/Google/Protobuf/Internal/OutputStream.php @@ -39,7 +39,6 @@ class OutputStream private $buffer_size; private $current; - const MAX_VARINT32_BYTES = 5; const MAX_VARINT64_BYTES = 10; public function __construct($size) @@ -56,8 +55,8 @@ class OutputStream public function writeVarint32($value) { - $bytes = str_repeat(chr(0), self::MAX_VARINT32_BYTES); - $size = self::writeVarintToArray($value, $bytes, true); + $bytes = str_repeat(chr(0), self::MAX_VARINT64_BYTES); + $size = self::writeVarintToArray($value, $bytes); return $this->writeRaw($bytes, $size); } @@ -102,20 +101,16 @@ class OutputStream return true; } - private static function writeVarintToArray($value, &$buffer, $trim = false) + private static function writeVarintToArray($value, &$buffer) { $current = 0; $high = 0; $low = 0; if (PHP_INT_SIZE == 4) { - GPBUtil::divideInt64ToInt32($value, $high, $low, $trim); + GPBUtil::divideInt64ToInt32($value, $high, $low); } else { - if ($trim) { - $low = $value & 0xFFFFFFFF; - } else { - $low = $value; - } + $low = $value; } while ($low >= 0x80 || $low < 0) { diff --git a/php/tests/encode_decode_test.php b/php/tests/encode_decode_test.php index 992f1631..dfe3b353 100644 --- a/php/tests/encode_decode_test.php +++ b/php/tests/encode_decode_test.php @@ -22,7 +22,8 @@ class EncodeDecodeTest extends TestBase $this->expectFields($from); $data = $from->encode(); - $this->assertSame(TestUtil::getGoldenTestMessage(), $data); + $this->assertSame(bin2hex(TestUtil::getGoldenTestMessage()), + bin2hex($data)); } public function testDecode() @@ -173,4 +174,25 @@ class EncodeDecodeTest extends TestBase $m = new TestMessage(); $m->decode($data); } + + public function testEncodeNegativeInt32() + { + $m = new TestMessage(); + $m->setOptionalInt32(-1); + $data = $m->encode(); + $this->assertSame("08ffffffffffffffffff01", bin2hex($data)); + } + + public function testDecodeNegativeInt32() + { + $m = new TestMessage(); + $this->assertEquals(0, $m->getOptionalInt32()); + $m->decode(hex2bin("08ffffffffffffffffff01")); + $this->assertEquals(-1, $m->getOptionalInt32()); + + $m = new TestMessage(); + $this->assertEquals(0, $m->getOptionalInt32()); + $m->decode(hex2bin("08ffffffff0f")); + $this->assertEquals(-1, $m->getOptionalInt32()); + } } diff --git a/php/tests/php_implementation_test.php b/php/tests/php_implementation_test.php index ac7c13dc..46d3e5b6 100644 --- a/php/tests/php_implementation_test.php +++ b/php/tests/php_implementation_test.php @@ -469,6 +469,11 @@ class ImplementationTest extends TestBase $output = new OutputStream(3); $output->writeVarint32(16384); $this->assertSame(hex2bin('808001'), $output->getData()); + + // Negative numbers are padded to be compatible with int64. + $output = new OutputStream(10); + $output->writeVarint32(-43); + $this->assertSame(hex2bin('D5FFFFFFFFFFFFFFFF01'), $output->getData()); } public function testWriteVarint64() @@ -496,13 +501,13 @@ class ImplementationTest extends TestBase { $m = new TestMessage(); TestUtil::setTestMessage($m); - $this->assertSame(447, $m->byteSize()); + $this->assertSame(472, $m->byteSize()); } public function testPackedByteSize() { $m = new TestPackedMessage(); TestUtil::setTestPackedMessage($m); - $this->assertSame(156, $m->byteSize()); + $this->assertSame(166, $m->byteSize()); } } diff --git a/php/tests/test_util.php b/php/tests/test_util.php index 7f2aae15..07df5502 100644 --- a/php/tests/test_util.php +++ b/php/tests/test_util.php @@ -235,7 +235,7 @@ class TestUtil public static function getGoldenTestMessage() { return hex2bin( - "08D6FFFFFF0F" . + "08D6FFFFFFFFFFFFFFFF01" . "10D5FFFFFFFFFFFFFFFF01" . "182A" . "202B" . @@ -253,8 +253,8 @@ class TestUtil "800101" . "8A01020821" . - "F801D6FFFFFF0F" . - "F801CCFFFFFF0F" . + "F801D6FFFFFFFFFFFFFFFF01" . + "F801CCFFFFFFFFFFFFFFFF01" . "8002D5FFFFFFFFFFFFFFFF01" . "8002CBFFFFFFFFFFFFFFFF01" . "88022A" . @@ -288,7 +288,7 @@ class TestUtil "FA02020822" . "FA02020823" . - "BA040C08C2FFFFFF0F10C2FFFFFF0F" . + "BA041608C2FFFFFFFFFFFFFFFF0110C2FFFFFFFFFFFFFFFF01" . "C2041608C1FFFFFFFFFFFFFFFF0110C1FFFFFFFFFFFFFFFF01" . "CA0404083E103E" . "D20404083F103F" . @@ -401,7 +401,7 @@ class TestUtil public static function getGoldenTestPackedMessage() { return hex2bin( - "D2050AD6FFFFFF0FCCFFFFFF0F" . + "D20514D6FFFFFFFFFFFFFFFF01CCFFFFFFFFFFFFFFFF01" . "DA0514D5FFFFFFFFFFFFFFFF01CBFFFFFFFFFFFFFFFF01" . "E205022A34" . "EA05022B35" . @@ -421,7 +421,7 @@ class TestUtil public static function getGoldenTestUnpackedMessage() { return hex2bin( - "D005D6FFFFFF0FD005CCFFFFFF0F" . + "D005D6FFFFFFFFFFFFFFFF01D005CCFFFFFFFFFFFFFFFF01" . "D805D5FFFFFFFFFFFFFFFF01D805CBFFFFFFFFFFFFFFFF01" . "E0052AE00534" . "E8052BE80535" . diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 9d8c4744..19c68629 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protoc</artifactId> - <version>3.2.0rc2</version> + <version>3.2.0</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 6f01488e..7fd9e5a4 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.2.0rc2' +__version__ = '3.2.0' if __name__ != '__main__': try: diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 774d81b4..ff787916 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.2.0.rc2" + s.version = "3.2.0" s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." diff --git a/src/google/protobuf/wire_format_lite.cc b/src/google/protobuf/wire_format_lite.cc index ebc29f1f..e46ac400 100644 --- a/src/google/protobuf/wire_format_lite.cc +++ b/src/google/protobuf/wire_format_lite.cc @@ -357,11 +357,11 @@ void EncodeFixedSizeValue(uint64 v, uint8* dest) { WireFormatLite::WriteFixed64NoTagToArray(v, dest); } -void EncodeSFixedSizeValue(int32 v, uint8* dest) { +void EncodeFixedSizeValue(int32 v, uint8* dest) { WireFormatLite::WriteSFixed32NoTagToArray(v, dest); } -void EncodeSFixedSizeValue(int64 v, uint8* dest) { +void EncodeFixedSizeValue(int64 v, uint8* dest) { WireFormatLite::WriteSFixed64NoTagToArray(v, dest); } @@ -444,7 +444,7 @@ build_php5.6_mac() { export PATH="$PHP_FOLDER/bin:$PATH" # Install phpunit - curl https://phar.phpunit.de/phpunit.phar -L -o phpunit.phar + curl https://phar.phpunit.de/phpunit-5.6.10.phar -L -o phpunit.phar chmod +x phpunit.phar sudo mv phpunit.phar /usr/local/bin/phpunit |