Differences From Artifact [a7500a2644]:
- File
src/OFDictionary.m
— part of check-in
[eaa612ad50]
at
2014-02-08 09:26:40
on branch trunk
— Add -[JSONRepresentationWithOptions:]
This also adds OF_JSON_REPRESENTATION_PRETTY. (user: js, size: 15018) [annotate] [blame] [check-ins using]
To Artifact [a9ccdce0b3]:
- File src/OFDictionary.m — part of check-in [e07fa89b44] at 2014-02-08 18:04:30 on branch trunk — Add JSON5 output option (user: js, size: 15394) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
613 614 615 616 617 618 619 620 621 622 623 |
[JSON appendString: @"\n"];
i = 0;
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
void *pool2 = objc_autoreleasePoolPush();
[JSON appendString: indentation];
[JSON appendString: @"\t"];
[JSON appendString: [key
| > > > > > | > > > > > | | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 |
[JSON appendString: @"\n"];
i = 0;
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
void *pool2 = objc_autoreleasePoolPush();
int identifierOptions =
options | OF_JSON_REPRESENTATION_IDENTIFIER;
if (![key isKindOfClass: [OFString class]])
@throw [OFInvalidArgumentException exception];
[JSON appendString: indentation];
[JSON appendString: @"\t"];
[JSON appendString: [key
OF_JSONRepresentationWithOptions: identifierOptions
depth: depth + 1]];
[JSON appendString: @": "];
[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;
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
void *pool2 = objc_autoreleasePoolPush();
int identifierOptions =
options | OF_JSON_REPRESENTATION_IDENTIFIER;
if (![key isKindOfClass: [OFString class]])
@throw [OFInvalidArgumentException exception];
[JSON appendString: [key
OF_JSONRepresentationWithOptions: identifierOptions
depth: depth + 1]];
[JSON appendString: @":"];
[JSON appendString: [object
OF_JSONRepresentationWithOptions: options
depth: depth + 1]];
if (++i < count)
|
| ︙ | ︙ |