Differences From Artifact [2b7acb7d08]:
- File src/OFSet.m — part of check-in [cfd374b906] at 2015-01-03 20:57:18 on branch trunk — Update copyright (user: js, size: 8215) [annotate] [blame] [check-ins using]
To Artifact [c1fc0fd847]:
- File
src/OFSet.m
— part of check-in
[6b13727ce0]
at
2015-11-29 14:02:11
on branch trunk
— Make use of fast enumeration
Now that we require GCC >= 4.6 anyway, there's no more reason to not use
it anymore. (user: js, size: 7393) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
244 245 246 247 248 249 250 |
return [otherSet isSubsetOfSet: self];
}
- (uint32_t)hash
{
void *pool = objc_autoreleasePoolPush();
| < < | < < < | | 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 272 273 274 275 276 277 278 279 280 281 282 |
return [otherSet isSubsetOfSet: self];
}
- (uint32_t)hash
{
void *pool = objc_autoreleasePoolPush();
uint32_t hash = 0;
for (id object in self)
hash += [object hash];
objc_autoreleasePoolPop(pool);
return hash;
}
- (OFString*)description
{
void *pool;
OFMutableString *ret;
size_t i, count = [self count];
if (count == 0)
return @"{()}";
ret = [OFMutableString stringWithString: @"{(\n"];
pool = objc_autoreleasePoolPush();
i = 0;
for (id object in self) {
void *pool2 = objc_autoreleasePoolPush();
[ret appendString: [object description]];
if (++i < count)
[ret appendString: @",\n"];
|
| ︙ | ︙ | |||
306 307 308 309 310 311 312 |
- mutableCopy
{
return [[OFMutableSet alloc] initWithSet: self];
}
- (bool)isSubsetOfSet: (OFSet*)set
{
| < < | < < < | < < < < < < < | < < < | < < < < < < < < | < | 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 |
- 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];
else
element = [OFXMLElement elementWithName: @"OFSet"
namespace: OF_SERIALIZATION_NS];
for (id <OFSerialization> object in self) {
void *pool2 = objc_autoreleasePoolPush();
[element addChild: [object XMLElementBySerializing]];
objc_autoreleasePoolPop(pool2);
}
|
| ︙ | ︙ | |||
427 428 429 430 431 432 433 | void *pool = objc_autoreleasePoolPush(); id ret = [[[self objectEnumerator] nextObject] retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } | | < < | 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 |
void *pool = objc_autoreleasePoolPush();
id ret = [[[self objectEnumerator] nextObject] retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_set_enumeration_block_t)block
{
bool stop = false;
for (id object in self) {
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];
|
| ︙ | ︙ |