Differences From Artifact [4282ae8fc5]:
- File
src/OFSet.m
— part of check-in
[44f45c2e35]
at
2017-01-09 17:36:36
on branch trunk
— Update copyright
Forgot to add 2017, even though I already did quite some changes in
2017. (user: js, size: 8298) [annotate] [blame] [check-ins using]
To Artifact [62db370766]:
- File
src/OFSet.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 8326) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
34 35 36 37 38 39 40 | @implementation OFSet_placeholder - init { return (id)[[OFSet_hashtable alloc] init]; } | | | | | | 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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | @implementation OFSet_placeholder - init { return (id)[[OFSet_hashtable alloc] init]; } - initWithSet: (OFSet *)set { return (id)[[OFSet_hashtable alloc] initWithSet: set]; } - initWithArray: (OFArray *)array { return (id)[[OFSet_hashtable alloc] initWithArray: array]; } - initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[OFSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - initWithObjects: (id const *)objects count: (size_t)count { return (id)[[OFSet_hashtable alloc] initWithObjects: objects count: count]; } - initWithObject: (id)firstObject arguments: (va_list)arguments { return (id)[[OFSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; } - initWithSerialization: (OFXMLElement *)element { return (id)[[OFSet_hashtable alloc] initWithSerialization: element]; } - retain { return self; |
︙ | ︙ | |||
116 117 118 119 120 121 122 | } + (instancetype)set { return [[[self alloc] init] autorelease]; } | | | | | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | } + (instancetype)set { return [[[self alloc] init] autorelease]; } + (instancetype)setWithSet: (OFSet *)set { return [[[self alloc] initWithSet: set] autorelease]; } + (instancetype)setWithArray: (OFArray *)array { return [[[self alloc] initWithArray: array] autorelease]; } + (instancetype)setWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[[self alloc] initWithObject: firstObject arguments: arguments] autorelease]; va_end(arguments); return ret; } + (instancetype)setWithObjects: (id const *)objects count: (size_t)count { return [[[self alloc] initWithObjects: objects count: count] autorelease]; } - init |
︙ | ︙ | |||
162 163 164 165 166 167 168 | abort(); } return [super init]; } | | | | | 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 | abort(); } return [super init]; } - initWithSet: (OFSet *)set { OF_INVALID_INIT_METHOD } - initWithArray: (OFArray *)array { OF_INVALID_INIT_METHOD } - initWithObjects: (id const *)objects count: (size_t)count { OF_INVALID_INIT_METHOD } - (id)initWithObjects: (id)firstObject, ... { |
︙ | ︙ | |||
197 198 199 200 201 202 203 | - initWithObject: (id)firstObject arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } | | | | 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 | - initWithObject: (id)firstObject arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } - initWithSerialization: (OFXMLElement *)element { OF_INVALID_INIT_METHOD } - (size_t)count { OF_UNRECOGNIZED_SELECTOR } - (id)valueForKey: (OFString *)key { OFMutableSet *ret; if ([key hasPrefix: @"@"]) { void *pool = objc_autoreleasePoolPush(); id ret; |
︙ | ︙ | |||
238 239 240 241 242 243 244 | [ret makeImmutable]; return ret; } - (void)setValue: (id)value | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | [ret makeImmutable]; return ret; } - (void)setValue: (id)value forKey: (OFString *)key { if ([key hasPrefix: @"@"]) { void *pool = objc_autoreleasePoolPush(); key = [key substringWithRange: of_range(1, [key length] - 1)]; [super setValue: value forKey: key]; |
︙ | ︙ | |||
264 265 266 267 268 269 270 | } - (bool)containsObject: (id)object { OF_UNRECOGNIZED_SELECTOR } | | | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | } - (bool)containsObject: (id)object { OF_UNRECOGNIZED_SELECTOR } - (OFEnumerator *)objectEnumerator { OF_UNRECOGNIZED_SELECTOR } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state objects: (id *)objects count: (int)count { OF_UNRECOGNIZED_SELECTOR } - (bool)isEqual: (id)object { |
︙ | ︙ | |||
304 305 306 307 308 309 310 | hash += [object hash]; objc_autoreleasePoolPop(pool); return hash; } | | | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 | hash += [object hash]; objc_autoreleasePoolPop(pool); return hash; } - (OFString *)description { void *pool; OFMutableString *ret; size_t i, count = [self count]; if (count == 0) return @"{()}"; |
︙ | ︙ | |||
349 350 351 352 353 354 355 | } - mutableCopy { return [[OFMutableSet alloc] initWithSet: self]; } | | | | | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 | } - mutableCopy { return [[OFMutableSet alloc] initWithSet: self]; } - (bool)isSubsetOfSet: (OFSet *)set { for (id object in self) if (![set containsObject: object]) return false; return true; } - (bool)intersectsSet: (OFSet *)set { for (id object in self) if ([set containsObject: object]) return true; return false; } - (OFXMLElement *)XMLElementBySerializing { void *pool = objc_autoreleasePoolPush(); OFXMLElement *element; if ([self isKindOfClass: [OFMutableSet class]]) element = [OFXMLElement elementWithName: @"OFMutableSet" namespace: OF_SERIALIZATION_NS]; |
︙ | ︙ | |||
394 395 396 397 398 399 400 | [element retain]; objc_autoreleasePoolPop(pool); return [element autorelease]; } | | | | | | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | [element retain]; objc_autoreleasePoolPop(pool); return [element autorelease]; } - (OFSet *)setBySubtractingSet: (OFSet *)set { OFMutableSet *new; new = [[self mutableCopy] autorelease]; [new minusSet: set]; [new makeImmutable]; return new; } - (OFSet *)setByIntersectingWithSet: (OFSet *)set { OFMutableSet *new; new = [[self mutableCopy] autorelease]; [new intersectSet: set]; [new makeImmutable]; return new; } - (OFSet *)setByAddingSet: (OFSet *)set { OFMutableSet *new; new = [[self mutableCopy] autorelease]; [new unionSet: set]; [new makeImmutable]; return new; } - (OFArray *)allObjects { void *pool = objc_autoreleasePoolPush(); OFArray *ret = [[[self objectEnumerator] allObjects] retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } |
︙ | ︙ | |||
461 462 463 464 465 466 467 | block(object, &stop); if (stop) break; } } | | | 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | block(object, &stop); if (stop) break; } } - (OFSet *)filteredSetUsingBlock: (of_set_filter_block_t)block { OFMutableSet *ret = [OFMutableSet set]; [self enumerateObjectsUsingBlock: ^ (id object, bool *stop) { if (block(object)) [ret addObject: object]; }]; |
︙ | ︙ |