Commit 4755bdc5 authored by Thomas Van Lenten's avatar Thomas Van Lenten

Declare an init and avoid passing NULL to initWithValue:count:

Fixes https://github.com/google/protobuf/issues/1189
parent d392ed45
...@@ -53,9 +53,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -53,9 +53,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBInt32Array *)array; + (instancetype)arrayWithValueArray:(GPBInt32Array *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const int32_t [])values - (instancetype)initWithValues:(const int32_t [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBInt32Array *)array; - (instancetype)initWithValueArray:(GPBInt32Array *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -92,9 +93,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -92,9 +93,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBUInt32Array *)array; + (instancetype)arrayWithValueArray:(GPBUInt32Array *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const uint32_t [])values - (instancetype)initWithValues:(const uint32_t [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBUInt32Array *)array; - (instancetype)initWithValueArray:(GPBUInt32Array *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -131,9 +133,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -131,9 +133,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBInt64Array *)array; + (instancetype)arrayWithValueArray:(GPBInt64Array *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const int64_t [])values - (instancetype)initWithValues:(const int64_t [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBInt64Array *)array; - (instancetype)initWithValueArray:(GPBInt64Array *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -170,9 +173,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -170,9 +173,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBUInt64Array *)array; + (instancetype)arrayWithValueArray:(GPBUInt64Array *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const uint64_t [])values - (instancetype)initWithValues:(const uint64_t [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBUInt64Array *)array; - (instancetype)initWithValueArray:(GPBUInt64Array *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -209,9 +213,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -209,9 +213,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBFloatArray *)array; + (instancetype)arrayWithValueArray:(GPBFloatArray *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const float [])values - (instancetype)initWithValues:(const float [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBFloatArray *)array; - (instancetype)initWithValueArray:(GPBFloatArray *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -248,9 +253,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -248,9 +253,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBDoubleArray *)array; + (instancetype)arrayWithValueArray:(GPBDoubleArray *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const double [])values - (instancetype)initWithValues:(const double [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBDoubleArray *)array; - (instancetype)initWithValueArray:(GPBDoubleArray *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -287,9 +293,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -287,9 +293,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValueArray:(GPBBoolArray *)array; + (instancetype)arrayWithValueArray:(GPBBoolArray *)array;
+ (instancetype)arrayWithCapacity:(NSUInteger)count; + (instancetype)arrayWithCapacity:(NSUInteger)count;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValues:(const BOOL [])values - (instancetype)initWithValues:(const BOOL [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBBoolArray *)array; - (instancetype)initWithValueArray:(GPBBoolArray *)array;
- (instancetype)initWithCapacity:(NSUInteger)count; - (instancetype)initWithCapacity:(NSUInteger)count;
...@@ -330,12 +337,13 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -330,12 +337,13 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func + (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func
capacity:(NSUInteger)count; capacity:(NSUInteger)count;
- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func; - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
NS_DESIGNATED_INITIALIZER;
// Initializes the array, copying the values. // Initializes the array, copying the values.
- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
rawValues:(const int32_t [])values rawValues:(const int32_t [])values
count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; count:(NSUInteger)count;
- (instancetype)initWithValueArray:(GPBEnumArray *)array; - (instancetype)initWithValueArray:(GPBEnumArray *)array;
- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func - (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
capacity:(NSUInteger)count; capacity:(NSUInteger)count;
...@@ -422,9 +430,10 @@ NS_ASSUME_NONNULL_END ...@@ -422,9 +430,10 @@ NS_ASSUME_NONNULL_END
//%+ (instancetype)arrayWithValueArray:(GPB##NAME##Array *)array; //%+ (instancetype)arrayWithValueArray:(GPB##NAME##Array *)array;
//%+ (instancetype)arrayWithCapacity:(NSUInteger)count; //%+ (instancetype)arrayWithCapacity:(NSUInteger)count;
//% //%
//%- (instancetype)init NS_DESIGNATED_INITIALIZER;
//%// Initializes the array, copying the values. //%// Initializes the array, copying the values.
//%- (instancetype)initWithValues:(const TYPE [])values //%- (instancetype)initWithValues:(const TYPE [])values
//% count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; //% count:(NSUInteger)count;
//%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array; //%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array;
//%- (instancetype)initWithCapacity:(NSUInteger)count; //%- (instancetype)initWithCapacity:(NSUInteger)count;
//% //%
...@@ -455,12 +464,13 @@ NS_ASSUME_NONNULL_END ...@@ -455,12 +464,13 @@ NS_ASSUME_NONNULL_END
//%+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func //%+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func
//% capacity:(NSUInteger)count; //% capacity:(NSUInteger)count;
//% //%
//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func; //%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
//% NS_DESIGNATED_INITIALIZER;
//% //%
//%// Initializes the array, copying the values. //%// Initializes the array, copying the values.
//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func //%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
//% rawValues:(const TYPE [])values //% rawValues:(const TYPE [])values
//% count:(NSUInteger)count NS_DESIGNATED_INITIALIZER; //% count:(NSUInteger)count;
//%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array; //%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array;
//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func //%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
//% capacity:(NSUInteger)count; //% capacity:(NSUInteger)count;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment