Differences From Artifact [ac5ec4c8c9]:
- File src/OFArray.m — part of check-in [cfd374b906] at 2015-01-03 20:57:18 on branch trunk — Update copyright (user: js, size: 17847) [annotate] [blame] [check-ins using]
To Artifact [2be2e1c20f]:
- File
src/OFArray.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: 17583) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
557 558 559 560 561 562 563 |
}
- (OFString*)OF_JSONRepresentationWithOptions: (int)options
depth: (size_t)depth
{
OFMutableString *JSON = [OFMutableString stringWithString: @"["];
void *pool = objc_autoreleasePoolPush();
| < < | | | 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 |
}
- (OFString*)OF_JSONRepresentationWithOptions: (int)options
depth: (size_t)depth
{
OFMutableString *JSON = [OFMutableString stringWithString: @"["];
void *pool = objc_autoreleasePoolPush();
size_t i, count = [self count];
if (options & OF_JSON_REPRESENTATION_PRETTY) {
OFMutableString *indentation = [OFMutableString string];
for (i = 0; i < depth; i++)
[indentation appendString: @"\t"];
[JSON appendString: @"\n"];
i = 0;
for (id object in self) {
void *pool2 = objc_autoreleasePoolPush();
[JSON appendString: indentation];
[JSON appendString: @"\t"];
[JSON appendString: [object
OF_JSONRepresentationWithOptions: options
depth: depth + 1]];
if (++i < count)
[JSON appendString: @",\n"];
else
[JSON appendString: @"\n"];
objc_autoreleasePoolPop(pool2);
}
[JSON appendString: indentation];
} else {
i = 0;
for (id object in self) {
void *pool2 = objc_autoreleasePoolPush();
[JSON appendString: [object
OF_JSONRepresentationWithOptions: options
depth: depth + 1]];
if (++i < count)
|
| ︙ | ︙ | |||
617 618 619 620 621 622 623 |
}
- (OFDataArray*)messagePackRepresentation
{
OFDataArray *data;
size_t i, count;
void *pool;
| < < | 615 616 617 618 619 620 621 622 623 624 625 626 627 628 |
}
- (OFDataArray*)messagePackRepresentation
{
OFDataArray *data;
size_t i, count;
void *pool;
data = [OFDataArray dataArray];
count = [self count];
if (count <= 15) {
uint8_t tmp = 0x90 | ((uint8_t)count & 0xF);
[data addItem: &tmp];
|
| ︙ | ︙ | |||
646 647 648 649 650 651 652 | count: sizeof(tmp)]; } else @throw [OFOutOfRangeException exception]; pool = objc_autoreleasePoolPush(); i = 0; | | < | 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 |
count: sizeof(tmp)];
} else
@throw [OFOutOfRangeException exception];
pool = objc_autoreleasePoolPush();
i = 0;
for (id object in self) {
void *pool2 = objc_autoreleasePoolPush();
OFDataArray *child;
i++;
child = [object messagePackRepresentation];
[data addItems: [child items]
|
| ︙ | ︙ | |||
751 752 753 754 755 756 757 |
- (OFEnumerator*)objectEnumerator
{
return [[[OFArrayEnumerator alloc] initWithArray: self
mutationsPtr: NULL] autorelease];
}
| | | 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 |
- (OFEnumerator*)objectEnumerator
{
return [[[OFArrayEnumerator alloc] initWithArray: self
mutationsPtr: NULL] autorelease];
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
{
size_t i = 0;
bool stop = false;
for (id object in self) {
block(object, i++, &stop);
|
| ︙ | ︙ |