Overview
| Comment: | OFSet: Add designated initializers |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
d0205355f50edc4099533133cf396b92 |
| User & Date: | js on 2023-08-13 22:02:37 |
| Other Links: | manifest | tags |
Context
|
2023-08-17
| ||
| 14:30 | OFString: Add designated initializer check-in: 03339575cb user: js tags: trunk | |
|
2023-08-13
| ||
| 22:02 | OFSet: Add designated initializers check-in: d0205355f5 user: js tags: trunk | |
|
2023-08-12
| ||
| 17:31 | OFDictionary: Add designated initializers check-in: 4fa963805b user: js tags: trunk | |
Changes
Modified src/OFArray.m from [0cc4510ea3] to [c1836ceb46].
| ︙ | ︙ | |||
183 184 185 186 187 188 189 190 191 192 193 194 195 |
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
size_t count = 1;
va_list argumentsCopy;
id *objects;
va_copy(argumentsCopy, arguments);
while (va_arg(argumentsCopy, id) != nil)
count++;
@try {
| > > > < < < | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 |
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
size_t count = 1;
va_list argumentsCopy;
id *objects;
if (firstObject == nil)
return [self init];
va_copy(argumentsCopy, arguments);
while (va_arg(argumentsCopy, id) != nil)
count++;
@try {
objects = OFAllocMemory(count, sizeof(id));
} @catch (id e) {
[self release];
@throw e;
}
@try {
|
| ︙ | ︙ |
Modified src/OFCountedSet.m from [3de39a28c5] to [e146ed9623].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
Class isa;
} placeholder;
@interface OFPlaceholderCountedSet: OFCountedSet
@end
@implementation OFPlaceholderCountedSet
- (instancetype)init
{
return (id)[[OFConcreteCountedSet alloc] init];
}
- (instancetype)initWithSet: (OFSet *)set
{
| > > > > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
Class isa;
} placeholder;
@interface OFPlaceholderCountedSet: OFCountedSet
@end
@implementation OFPlaceholderCountedSet
#ifdef __clang__
/* We intentionally don't call into super, so silence the warning. */
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunknown-pragmas"
# pragma clang diagnostic ignored "-Wobjc-designated-initializers"
#endif
- (instancetype)init
{
return (id)[[OFConcreteCountedSet alloc] init];
}
- (instancetype)initWithSet: (OFSet *)set
{
|
| ︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
return (id)[[OFConcreteCountedSet alloc] initWithObject: firstObject
arguments: arguments];
}
OF_SINGLETON_METHODS
@end
@implementation OFCountedSet
+ (void)initialize
{
| > > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 |
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
return (id)[[OFConcreteCountedSet alloc] initWithObject: firstObject
arguments: arguments];
}
#ifdef __clang__
# pragma clang diagnostic pop
#endif
OF_SINGLETON_METHODS
@end
@implementation OFCountedSet
+ (void)initialize
{
|
| ︙ | ︙ |
Modified src/OFDictionary.m from [e8124fd5c4] to [e134f53095].
| ︙ | ︙ | |||
254 255 256 257 258 259 260 |
objects = objects_.objects;
keys = keys_.objects;
} @catch (id e) {
[self release];
@throw e;
}
| < | | < < | | > | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 |
objects = objects_.objects;
keys = keys_.objects;
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithObjects: objects forKeys: keys count: count];
objc_autoreleasePoolPop(pool);
return self;
}
#ifdef __clang__
/* We intentionally don't call into super, so silence the warning. */
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunknown-pragmas"
# pragma clang diagnostic ignored "-Wobjc-designated-initializers"
|
| ︙ | ︙ | |||
296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 |
}
- (instancetype)initWithKey: (id)firstKey arguments: (va_list)arguments
{
size_t count = 1;
id *objects = NULL, *keys = NULL;
va_list argumentsCopy;
va_copy(argumentsCopy, arguments);
while (va_arg(argumentsCopy, id) != nil)
count++;
@try {
size_t i = 0;
id key, object;
| > > > | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 |
}
- (instancetype)initWithKey: (id)firstKey arguments: (va_list)arguments
{
size_t count = 1;
id *objects = NULL, *keys = NULL;
va_list argumentsCopy;
if (firstKey == nil)
return [self init];
va_copy(argumentsCopy, arguments);
while (va_arg(argumentsCopy, id) != nil)
count++;
@try {
size_t i = 0;
id key, object;
if (count % 2 != 0)
@throw [OFInvalidArgumentException exception];
count /= 2;
objects = OFAllocMemory(count, sizeof(id));
keys = OFAllocMemory(count, sizeof(id));
|
| ︙ | ︙ |
Modified src/OFMutableSet.h from [3d35e08a82] to [6b1991592b].
| ︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | * number of objects. * * @param capacity The initial capacity for the OFMutableSet * @return A new autoreleased OFMutableSet */ + (instancetype)setWithCapacity: (size_t)capacity; /** * @brief Initializes an already allocated OFMutableSet with enough memory to * hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableSet * @return An initialized OFMutableSet */ | > > > > > > > | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | * number of objects. * * @param capacity The initial capacity for the OFMutableSet * @return A new autoreleased OFMutableSet */ + (instancetype)setWithCapacity: (size_t)capacity; /** * @brief Initializes an already allocated OFMutableSet to be empty. * * @return An initialized OFMutableSet */ - (instancetype)init OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated OFMutableSet with enough memory to * hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableSet * @return An initialized OFMutableSet */ - (instancetype)initWithCapacity: (size_t)capacity OF_DESIGNATED_INITIALIZER; /** * @brief Adds the specified object to the set. * * @param object The object to add to the set */ - (void)addObject: (ObjectType)object; |
| ︙ | ︙ |
Modified src/OFMutableSet.m from [c4dda1aa5f] to [ddcd040e35].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
Class isa;
} placeholder;
@interface OFPlaceholderMutableSet: OFMutableSet
@end
@implementation OFPlaceholderMutableSet
- (instancetype)init
{
return (id)[[OFConcreteMutableSet alloc] init];
}
- (instancetype)initWithSet: (OFSet *)set
{
| > > > > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 |
Class isa;
} placeholder;
@interface OFPlaceholderMutableSet: OFMutableSet
@end
@implementation OFPlaceholderMutableSet
#ifdef __clang__
/* We intentionally don't call into super, so silence the warning. */
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunknown-pragmas"
# pragma clang diagnostic ignored "-Wobjc-designated-initializers"
#endif
- (instancetype)init
{
return (id)[[OFConcreteMutableSet alloc] init];
}
- (instancetype)initWithSet: (OFSet *)set
{
|
| ︙ | ︙ | |||
69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
arguments: arguments];
}
- (instancetype)initWithCapacity: (size_t)capacity
{
return (id)[[OFConcreteMutableSet alloc] initWithCapacity: capacity];
}
OF_SINGLETON_METHODS
@end
@implementation OFMutableSet
+ (void)initialize
{
| > > > | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 |
arguments: arguments];
}
- (instancetype)initWithCapacity: (size_t)capacity
{
return (id)[[OFConcreteMutableSet alloc] initWithCapacity: capacity];
}
#ifdef __clang__
# pragma clang diagnostic pop
#endif
OF_SINGLETON_METHODS
@end
@implementation OFMutableSet
+ (void)initialize
{
|
| ︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 |
return [super alloc];
}
+ (instancetype)setWithCapacity: (size_t)capacity
{
return [[[self alloc] initWithCapacity: capacity] autorelease];
}
- (instancetype)initWithCapacity: (size_t)capacity
{
OF_INVALID_INIT_METHOD
}
- (id)copy
{
return [[OFSet alloc] initWithSet: self];
}
- (void)addObject: (id)object
| > > > > > > > > > > > > > > > > > > > | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 |
return [super alloc];
}
+ (instancetype)setWithCapacity: (size_t)capacity
{
return [[[self alloc] initWithCapacity: capacity] autorelease];
}
- (instancetype)init
{
return [super init];
}
#ifdef __clang__
/* We intentionally don't call into super, so silence the warning. */
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunknown-pragmas"
# pragma clang diagnostic ignored "-Wobjc-designated-initializers"
#endif
- (instancetype)initWithObjects: (id const *)objects count: (size_t)count
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithCapacity: (size_t)capacity
{
OF_INVALID_INIT_METHOD
}
#ifdef __clang__
# pragma clang diagnostic pop
#endif
- (id)copy
{
return [[OFSet alloc] initWithSet: self];
}
- (void)addObject: (id)object
|
| ︙ | ︙ |
Modified src/OFSet.h from [b6b0fc8990] to [27d5fba5ea].
| ︙ | ︙ | |||
113 114 115 116 117 118 119 120 121 122 123 124 125 126 | * @param objects An array of objects for the set * @param count The number of objects in the specified array * @return A new, autoreleased set with the specified objects */ + (instancetype)setWithObjects: (ObjectType const _Nonnull *_Nonnull)objects count: (size_t)count; /** * @brief Initializes an already allocated set with the specified set. * * @param set The set to initialize the set with * @return An initialized set with the specified set */ - (instancetype)initWithSet: (OFSet OF_GENERIC(ObjectType) *)set; | > > > > > > > | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | * @param objects An array of objects for the set * @param count The number of objects in the specified array * @return A new, autoreleased set with the specified objects */ + (instancetype)setWithObjects: (ObjectType const _Nonnull *_Nonnull)objects count: (size_t)count; /** * @brief Initializes an already allocated set to be empty. * * @return An initialized set */ - (instancetype)init OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated set with the specified set. * * @param set The set to initialize the set with * @return An initialized set with the specified set */ - (instancetype)initWithSet: (OFSet OF_GENERIC(ObjectType) *)set; |
| ︙ | ︙ | |||
156 157 158 159 160 161 162 | * @brief Initializes an already allocated set with the specified objects. * * @param objects An array of objects for the set * @param count The number of objects in the specified array * @return An initialized set with the specified objects */ - (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | * @brief Initializes an already allocated set with the specified objects. * * @param objects An array of objects for the set * @param count The number of objects in the specified array * @return An initialized set with the specified objects */ - (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects count: (size_t)count OF_DESIGNATED_INITIALIZER; /** * @brief Returns an OFEnumerator to enumerate through all objects of the set. * * @return An OFEnumerator to enumerate through all objects of the set */ - (OFEnumerator OF_GENERIC(ObjectType) *)objectEnumerator; |
| ︙ | ︙ |
Modified src/OFSet.m from [cf7d351eda] to [8d2f3f00f2].
| ︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 |
Class isa;
} placeholder;
@interface OFPlaceholderSet: OFSet
@end
@implementation OFPlaceholderSet
- (instancetype)init
{
return (id)[[OFConcreteSet alloc] init];
}
- (instancetype)initWithSet: (OFSet *)set
{
| > > > > > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 |
Class isa;
} placeholder;
@interface OFPlaceholderSet: OFSet
@end
@implementation OFPlaceholderSet
#ifdef __clang__
/* We intentionally don't call into super, so silence the warning. */
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunknown-pragmas"
# pragma clang diagnostic ignored "-Wobjc-designated-initializers"
#endif
- (instancetype)init
{
return (id)[[OFConcreteSet alloc] init];
}
- (instancetype)initWithSet: (OFSet *)set
{
|
| ︙ | ︙ | |||
67 68 69 70 71 72 73 74 75 76 77 78 79 80 |
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
return (id)[[OFConcreteSet alloc] initWithObject: firstObject
arguments: arguments];
}
OF_SINGLETON_METHODS
@end
@implementation OFSet
+ (void)initialize
{
| > > > | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 |
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
return (id)[[OFConcreteSet alloc] initWithObject: firstObject
arguments: arguments];
}
#ifdef __clang__
# pragma clang diagnostic pop
#endif
OF_SINGLETON_METHODS
@end
@implementation OFSet
+ (void)initialize
{
|
| ︙ | ︙ | |||
140 141 142 143 144 145 146 |
}
return [super init];
}
- (instancetype)initWithSet: (OFSet *)set
{
| > > | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > | > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 |
}
return [super init];
}
- (instancetype)initWithSet: (OFSet *)set
{
id *objects = NULL;
size_t count;
@try {
void *pool = objc_autoreleasePoolPush();
size_t i = 0;
count = set.count;
objects = OFAllocMemory(count, sizeof(id));
for (id object in set) {
OFEnsure(i < count);
objects[i++] = object;
}
objc_autoreleasePoolPop(pool);
} @catch (id e) {
OFFreeMemory(objects);
[self release];
@throw e;
}
@try {
return [self initWithObjects: objects count: count];
} @finally {
OFFreeMemory(objects);
}
}
- (instancetype)initWithArray: (OFArray *)array
{
void *pool = objc_autoreleasePoolPush();
size_t count;
const id *objects;
@try {
count = array.count;
objects = array.objects;
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithObjects: objects count: count];
objc_autoreleasePoolPop(pool);
return self;
}
#ifdef __clang__
/* We intentionally don't call into super, so silence the warning. */
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunknown-pragmas"
# pragma clang diagnostic ignored "-Wobjc-designated-initializers"
#endif
- (instancetype)initWithObjects: (id const *)objects count: (size_t)count
{
OF_INVALID_INIT_METHOD
}
#ifdef __clang__
# pragma clang diagnostic pop
#endif
- (instancetype)initWithObjects: (id)firstObject, ...
{
id ret;
va_list arguments;
va_start(arguments, firstObject);
ret = [self initWithObject: firstObject arguments: arguments];
va_end(arguments);
return ret;
}
- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
{
size_t count = 1;
va_list argumentsCopy;
id *objects;
if (firstObject == nil)
return [self init];
va_copy(argumentsCopy, arguments);
while (va_arg(argumentsCopy, id) != nil)
count++;
@try {
objects = OFAllocMemory(count, sizeof(id));
} @catch (id e) {
[self release];
@throw e;
}
@try {
objects[0] = firstObject;
for (size_t i = 1; i < count; i++) {
objects[i] = va_arg(arguments, id);
OFEnsure(objects[i] != nil);
}
return [self initWithObjects: objects count: count];
} @finally {
OFFreeMemory(objects);
}
}
- (size_t)count
{
OF_UNRECOGNIZED_SELECTOR
}
|
| ︙ | ︙ |