Differences From Artifact [9471862e0a]:
- File src/OFString+JSONValue.m — part of check-in [509ab0affd] at 2012-06-05 14:51:43 on branch trunk — Add a warning to -[OFString JSONValue]. (user: js, size: 9306) [annotate] [blame] [check-ins using]
To Artifact [e03da095af]:
- File
src/OFString+JSONValue.m
— part of check-in
[c9a3ac1a03]
at
2012-06-05 15:03:16
on branch trunk
— JSON5: Allow identifiers as dictionary keys.
This completes the JSON5 support. (user: js, size: 11553) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
263 264 265 266 267 268 269 270 271 272 273 274 275 276 | (*pointer)++; } } free(buffer); return nil; } static inline OFMutableArray* parseArray(const char *restrict *pointer, const char *stop) { OFMutableArray *array = [OFMutableArray array]; if (++(*pointer) >= stop) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 | (*pointer)++; } } free(buffer); return nil; } static inline OFString* parseIdentifier(const char *restrict *pointer, const char *stop) { char *buffer; size_t i = 0; if ((buffer = malloc(stop - *pointer)) == NULL) return nil; while (*pointer < stop) { if ((**pointer >= 'a' && **pointer <= 'z') || (**pointer >= 'A' && **pointer <= 'Z') || (**pointer >= '0' && **pointer <= '9') || **pointer == '_' || **pointer == '$' || (**pointer & 0x80)) { buffer[i++] = **pointer; (*pointer)++; } else if (**pointer == '\\') { uint16_t c1, c2; of_unichar_t c; size_t l; if (++(*pointer) >= stop || **pointer != 'u') { free(buffer); return nil; } c1 = parseUnicodeEscape(*pointer - 1, stop); if (c1 == 0xFFFF) { free(buffer); return nil; } /* Low surrogate */ if ((c1 & 0xFC00) == 0xDC00) { free(buffer); return nil; } /* Normal character */ if ((c1 & 0xFC00) != 0xD800) { l = of_string_unicode_to_utf8(c1, buffer + i); if (l == 0) { free(buffer); return nil; } i += l; *pointer += 5; continue; } /* * If we are still here, we only got one UTF-16 * surrogate and now need to get the other one in order * to produce UTF-8 and not CESU-8. */ c2 = parseUnicodeEscape(*pointer + 5, stop); if (c2 == 0xFFFF) { free(buffer); return nil; } c = (((c1 & 0x3FF) << 10) | (c2 & 0x3FF)) + 0x10000; l = of_string_unicode_to_utf8(c, buffer + i); if (l == 0) { free(buffer); return nil; } i += l; *pointer += 11; } else { OFString *ret; if (i == 0 || (buffer[0] >= '0' && buffer[0] <= '9')) { free(buffer); return nil; } @try { ret = [OFString stringWithUTF8String: buffer length: i]; } @finally { free(buffer); } return ret; } } /* * It is never possible to end with an identifier, thus we should never * reach stop. */ return nil; } static inline OFMutableArray* parseArray(const char *restrict *pointer, const char *stop) { OFMutableArray *array = [OFMutableArray array]; if (++(*pointer) >= stop) |
︙ | ︙ | |||
344 345 346 347 348 349 350 | if (*pointer >= stop || **pointer != '}') return nil; break; } | > > > > > > > > > | > > | 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 | if (*pointer >= stop || **pointer != '}') return nil; break; } skipWhitespacesAndComments(pointer, stop); if (*pointer + 1 >= stop) return nil; if ((**pointer >= 'a' && **pointer <= 'z') || (**pointer >= 'A' && **pointer <= 'Z') || **pointer == '_' || **pointer == '$' || **pointer == '\\') key = parseIdentifier(pointer, stop); else key = nextObject(pointer, stop); if (key == nil) return nil; skipWhitespacesAndComments(pointer, stop); if (*pointer + 1 >= stop || **pointer != ':') return nil; (*pointer)++; |
︙ | ︙ |