|
840 | 840 | static NSMutableCharacterSet *escapeSet; |
841 | 841 |
|
842 | 842 | static inline void |
843 | | -writeTabs(NSMutableString *output, NSInteger tabs) |
| 843 | +writeTabs(NSMutableString *output, NSInteger tabs, NSUInteger opt) |
844 | 844 | { |
845 | | - NSInteger i; |
846 | | - |
847 | | - for (i = 0 ; i < tabs ; i++) |
| 845 | + if (opt & NSJSONWritingPrettyPrinted) |
848 | 846 | { |
849 | | - [output appendString: @"\t"]; |
| 847 | + NSInteger i; |
| 848 | + |
| 849 | + for (i = 0 ; i < tabs ; i++) |
| 850 | + { |
| 851 | +// [output appendString: @"\t"]; |
| 852 | + [output appendString: @" "]; // One tabstop is two spaces |
| 853 | + } |
850 | 854 | } |
851 | 855 | } |
852 | 856 |
|
|
873 | 877 | } |
874 | 878 | writeComma = YES; |
875 | 879 | writeNewline(output, tabs); |
876 | | - writeTabs(output, tabs); |
| 880 | + writeTabs(output, tabs, opt); |
877 | 881 | writeObject(o, output, tabs + 1, opt); |
878 | 882 | END_FOR_IN(obj) |
879 | 883 | writeNewline(output, tabs); |
880 | | - writeTabs(output, tabs); |
| 884 | + writeTabs(output, tabs, opt); |
881 | 885 | [output appendString: @"]"]; |
882 | 886 | } |
883 | 887 | else if ([obj isKindOfClass: NSDictionaryClass]) |
|
900 | 904 | } |
901 | 905 | writeComma = YES; |
902 | 906 | writeNewline(output, tabs); |
903 | | - writeTabs(output, tabs); |
| 907 | + writeTabs(output, tabs, opt); |
904 | 908 | writeObject(o, output, tabs + 1, opt); |
905 | 909 | [output appendString: @":"]; |
906 | 910 | writeObject([obj objectForKey: o], output, tabs + 1, opt); |
907 | 911 | END_FOR_IN(keys) |
908 | 912 |
|
909 | 913 | writeNewline(output, tabs); |
910 | | - writeTabs(output, tabs); |
| 914 | + writeTabs(output, tabs, opt); |
911 | 915 | [output appendString: @"}"]; |
912 | 916 | } |
913 | 917 | else if ([obj isKindOfClass: NSStringClass]) |
|
0 commit comments