Differences From Artifact [55b9badbf0]:
- File
src/OFArray.m
— part of check-in
[2a27cf3000]
at
2016-01-03 00:41:26
on branch trunk
— Update copyright
While at it, also update the mail address. (user: js, size: 17568) [annotate] [blame] [check-ins using]
To Artifact [20c7045513]:
- File src/OFArray.m — part of check-in [cb0fd980f9] at 2016-01-03 01:14:27 on branch trunk — Make more use of fast enumeration (user: js, size: 16960) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
275 276 277 278 279 280 281 |
- (id)objectAtIndexedSubscript: (size_t)index
{
return [self objectAtIndex: index];
}
- (size_t)indexOfObject: (id)object
{
| | < | < | > > > | < | < | > > > | 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 |
- (id)objectAtIndexedSubscript: (size_t)index
{
return [self objectAtIndex: index];
}
- (size_t)indexOfObject: (id)object
{
size_t i = 0;
if (object == nil)
return OF_NOT_FOUND;
for (id objectIter in self) {
if ([objectIter isEqual: object])
return i;
i++;
}
return OF_NOT_FOUND;
}
- (size_t)indexOfObjectIdenticalTo: (id)object
{
size_t i = 0;
if (object == nil)
return OF_NOT_FOUND;
for (id objectIter in self) {
if (objectIter == object)
return i;
i++;
}
return OF_NOT_FOUND;
}
- (bool)containsObject: (id)object
{
return ([self indexOfObject: object] != OF_NOT_FOUND);
|
| ︙ | ︙ | |||
389 390 391 392 393 394 395 |
options: 0];
}
- (OFString*)componentsJoinedByString: (OFString*)separator
usingSelector: (SEL)selector
options: (int)options
{
| < < < | < < | < < < | | | | | | > | < | | < < < | 391 392 393 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 |
options: 0];
}
- (OFString*)componentsJoinedByString: (OFString*)separator
usingSelector: (SEL)selector
options: (int)options
{
OFMutableString *ret;
if (separator == nil)
@throw [OFInvalidArgumentException exception];
if ([self count] == 0)
return @"";
if ([self count] == 1)
return [[self firstObject] performSelector: selector];
ret = [OFMutableString string];
if (options & OF_ARRAY_SKIP_EMPTY) {
for (id object in self) {
void *pool = objc_autoreleasePoolPush();
OFString *component =
[object performSelector: selector];
if ([component length] > 0) {
if ([ret length] > 0)
[ret appendString: separator];
[ret appendString: component];
}
objc_autoreleasePoolPop(pool);
}
} else {
for (id object in self) {
void *pool = objc_autoreleasePoolPush();
if ([ret length] > 0)
[ret appendString: separator];
[ret appendString: [object performSelector: selector]];
objc_autoreleasePoolPop(pool);
}
}
[ret makeImmutable];
return ret;
}
- (bool)isEqual: (id)object
{
/* FIXME: Optimize (for example, buffer of 16 for each) */
|
| ︙ | ︙ | |||
469 470 471 472 473 474 475 |
return false;
return true;
}
- (uint32_t)hash
{
| < < | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 |
return false;
return true;
}
- (uint32_t)hash
{
uint32_t hash;
OF_HASH_INIT(hash);
for (id object in self)
OF_HASH_ADD_HASH(hash, [object hash]);
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
|
| ︙ | ︙ | |||
515 516 517 518 519 520 521 |
return [ret autorelease];
}
- (OFXMLElement*)XMLElementBySerializing
{
void *pool = objc_autoreleasePoolPush();
OFXMLElement *element;
| < < | | | 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 |
return [ret autorelease];
}
- (OFXMLElement*)XMLElementBySerializing
{
void *pool = objc_autoreleasePoolPush();
OFXMLElement *element;
if ([self isKindOfClass: [OFMutableArray class]])
element = [OFXMLElement elementWithName: @"OFMutableArray"
namespace: OF_SERIALIZATION_NS];
else
element = [OFXMLElement elementWithName: @"OFArray"
namespace: OF_SERIALIZATION_NS];
for (id object in self) {
void *pool2 = objc_autoreleasePoolPush();
[element addChild: [object XMLElementBySerializing]];
objc_autoreleasePoolPop(pool2);
}
[element retain];
objc_autoreleasePoolPop(pool);
|
| ︙ | ︙ | |||
664 665 666 667 668 669 670 |
objc_autoreleasePoolPop(pool);
return data;
}
- (void)makeObjectsPerformSelector: (SEL)selector
{
| < < | < | < < | < | | | 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 |
objc_autoreleasePoolPop(pool);
return data;
}
- (void)makeObjectsPerformSelector: (SEL)selector
{
for (id object in self)
[object performSelector: selector];
}
- (void)makeObjectsPerformSelector: (SEL)selector
withObject: (id)object
{
for (id object in self)
[object performSelector: selector
withObject: object];
}
- (OFArray*)sortedArray
{
OFMutableArray *new = [[self mutableCopy] autorelease];
[new sort];
|
| ︙ | ︙ |