Differences From Artifact [0d9de1d0b0]:
- File
src/OFString+JSONValue.m
— part of check-in
[505137f25f]
at
2018-02-25 04:31:30
on branch trunk
— Reintroduce of_char{16,32}_t
There is no reliable way to check if C++ already defined those, as Clang
now defines char{16,32}_t even when it is not in C++ 11 mode. So we
cannot check if we are not in C++ 11 and then define them and otherwise
rely on the C++ 11 types. (user: js, size: 12995) [annotate] [blame] [check-ins using]
To Artifact [5af43d3b89]:
- File src/OFString+JSONValue.m — part of check-in [b090b5ce92] at 2018-11-17 22:59:10 on branch trunk — Various minor style improvements (user: js, size: 13035) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
455 456 457 458 459 460 461 |
if (++(*pointer) >= stop)
return nil;
if (--depthLimit == 0)
return nil;
while (**pointer != '}') {
| > | | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 |
if (++(*pointer) >= stop)
return nil;
if (--depthLimit == 0)
return nil;
while (**pointer != '}') {
OFString *key;
id object;
skipWhitespacesAndComments(pointer, stop, line);
if (*pointer >= stop)
return nil;
if (**pointer == '}')
break;
|
| ︙ | ︙ | |||
485 486 487 488 489 490 491 | if ((**pointer >= 'a' && **pointer <= 'z') || (**pointer >= 'A' && **pointer <= 'Z') || **pointer == '_' || **pointer == '$' || **pointer == '\\') key = parseIdentifier(pointer, stop); else key = nextObject(pointer, stop, line, depthLimit); | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | if ((**pointer >= 'a' && **pointer <= 'z') || (**pointer >= 'A' && **pointer <= 'Z') || **pointer == '_' || **pointer == '$' || **pointer == '\\') key = parseIdentifier(pointer, stop); else key = nextObject(pointer, stop, line, depthLimit); if (![key isKindOfClass: [OFString class]]) return nil; skipWhitespacesAndComments(pointer, stop, line); if (*pointer + 1 >= stop || **pointer != ':') return nil; (*pointer)++; |
| ︙ | ︙ |