Differences From Artifact [006b401a4b]:
- File
src/OFString.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: 55435) [annotate] [blame] [check-ins using]
To Artifact [ab5f534f76]:
- File src/OFString.m — part of check-in [e07fa89b44] at 2014-02-08 18:04:30 on branch trunk — Add JSON5 output option (user: js, size: 55977) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> #import "OFString.h" #import "OFString_UTF8.h" #import "OFString_UTF8+Private.h" #import "OFArray.h" | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | */ #include "config.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <sys/stat.h> #import "OFString.h" #import "OFString_UTF8.h" #import "OFString_UTF8+Private.h" #import "OFArray.h" |
| ︙ | ︙ | |||
1456 1457 1458 1459 1460 1461 1462 | withString: @"\\\\"]; [JSON replaceOccurrencesOfString: @"\"" withString: @"\\\""]; [JSON replaceOccurrencesOfString: @"\b" withString: @"\\b"]; [JSON replaceOccurrencesOfString: @"\f" withString: @"\\f"]; | < < > > > > > > > > > > | | > > > > > > > > > > > > | 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 |
withString: @"\\\\"];
[JSON replaceOccurrencesOfString: @"\""
withString: @"\\\""];
[JSON replaceOccurrencesOfString: @"\b"
withString: @"\\b"];
[JSON replaceOccurrencesOfString: @"\f"
withString: @"\\f"];
[JSON replaceOccurrencesOfString: @"\r"
withString: @"\\r"];
[JSON replaceOccurrencesOfString: @"\t"
withString: @"\\t"];
if (options & OF_JSON_REPRESENTATION_JSON5) {
[JSON replaceOccurrencesOfString: @"\n"
withString: @"\\\n"];
if (options & OF_JSON_REPRESENTATION_IDENTIFIER) {
const char *cString = [self UTF8String];
if ((!isalpha(cString[0]) && cString[0] != '_' &&
cString[0] != '$') ||
strpbrk(cString, " \n\r\t\b\f\\\"'") != NULL) {
[JSON prependString: @"\""];
[JSON appendString: @"\""];
}
} else {
[JSON prependString: @"\""];
[JSON appendString: @"\""];
}
} else {
[JSON replaceOccurrencesOfString: @"\n"
withString: @"\\n"];
[JSON prependString: @"\""];
[JSON appendString: @"\""];
}
[JSON makeImmutable];
return JSON;
}
- (OFDataArray*)messagePackRepresentation
|
| ︙ | ︙ |