Overview
Comment: | Add JSON parsing. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8ba0a62c0debfa8fe72d89e41c5d9109 |
User & Date: | js on 2011-12-10 21:46:28 |
Other Links: | manifest | tags |
Context
2011-12-10
| ||
21:50 | Rename OFJSON to OFJSONEncoding. check-in: 0b98b3a093 user: js tags: trunk | |
21:46 | Add JSON parsing. check-in: 8ba0a62c0d user: js tags: trunk | |
18:17 | Fix wrong -[description] for an empty OFDictionary. check-in: 4e87bc9862 user: js tags: trunk | |
Changes
Modified src/Makefile from [c5a6ef9f8f] to [270710a3f5].
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 | OFSet.m \ OFSHA1Hash.m \ OFStream.m \ OFStreamObserver.m \ OFStreamSocket.m \ OFString.m \ OFString+Hashing.m \ OFString+Serialization.m \ OFString+URLEncoding.m \ OFString+XMLEscaping.m \ OFString+XMLUnescaping.m \ OFTCPSocket.m \ ${OFTHREAD_M} \ OFURL.m \ | > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | OFSet.m \ OFSHA1Hash.m \ OFStream.m \ OFStreamObserver.m \ OFStreamSocket.m \ OFString.m \ OFString+Hashing.m \ OFString+JSONValue.m \ OFString+Serialization.m \ OFString+URLEncoding.m \ OFString+XMLEscaping.m \ OFString+XMLUnescaping.m \ OFTCPSocket.m \ ${OFTHREAD_M} \ OFURL.m \ |
︙ | ︙ |
Added src/OFString+JSONValue.h version [2679cf1a3f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | /* * Copyright (c) 2008, 2009, 2010, 2011 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFString.h" #ifdef __cplusplus extern "C" { #endif extern int _OFString_JSONValue_reference; #ifdef __cplusplus } #endif @interface OFString (JSONValue) /** * \brief Creates an object from the JSON value of the string. * * \return An object */ - (id)JSONValue; @end |
Added src/OFString+JSONValue.m version [5f77e1f7f1].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 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 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 | /* * Copyright (c) 2008, 2009, 2010, 2011 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdlib.h> #include <string.h> #include <assert.h> #import "OFString+JSONValue.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFNull.h" #import "OFInvalidEncodingException.h" #import "macros.h" int _OFString_JSONValue_reference; static id nextObject(const char *restrict *, const char*); static void skipWhitespaces(const char *restrict *pointer, const char *stop) { while (*pointer < stop && (**pointer == ' ' || **pointer == '\t' || **pointer == '\r' || **pointer == '\n')) (*pointer)++; } static OF_INLINE uint16_t parseUnicodeEscape(const char *pointer, const char *stop) { uint16_t ret = 0; char i; if (pointer + 5 >= stop) return 0xFFFF; if (pointer[0] != '\\' || pointer[1] != 'u') return 0xFFFF; for (i = 0; i < 4; i++) { char c = pointer[i + 2]; ret <<= 4; if (c >= '0' && c <= '9') ret |= c - '0'; else if (c >= 'a' && c <= 'f') ret |= c + 10 - 'a'; else if (c >= 'A' && c <= 'F') ret |= c + 10 - 'A'; else return 0xFFFF; } return ret; } static OF_INLINE OFString* parseString(const char *restrict *pointer, const char *stop) { char *buffer; size_t i = 0; if (++(*pointer) + 1 >= stop) return nil; if ((buffer = malloc(stop - *pointer)) == NULL) return nil; while (*pointer < stop) { /* Parse escape codes */ if (**pointer == '\\') { if (++(*pointer) >= stop) { free(buffer); return nil; } switch (**pointer) { case '"': case '\\': case '/': buffer[i++] = **pointer; (*pointer)++; break; case 'b': buffer[i++] = '\b'; (*pointer)++; break; case 'f': buffer[i++] = '\f'; (*pointer)++; break; case 'n': buffer[i++] = '\n'; (*pointer)++; break; case 'r': buffer[i++] = '\r'; (*pointer)++; break; case 't': buffer[i++] = '\t'; (*pointer)++; break; /* Parse unicode escape sequence */ case 'u':; uint16_t c1, c2; of_unichar_t c; size_t l; 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; break; } /* * 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; break; default: free(buffer); return nil; } /* End of string found */ } else if (**pointer == '"') { OFString *ret; @try { ret = [OFString stringWithUTF8String: buffer length: i]; } @finally { free(buffer); } (*pointer)++; return ret; } else { buffer[i++] = **pointer; (*pointer)++; } } free(buffer); return nil; } static OF_INLINE OFArray* parseArray(const char *restrict *pointer, const char *stop) { OFMutableArray *array = [OFMutableArray array]; if (++(*pointer) >= stop) return nil; while (**pointer != ']') { id object; skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; if (**pointer == ']') break; if ((object = nextObject(pointer, stop)) == nil) return nil; [array addObject: object]; skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; if (**pointer == ',') { (*pointer)++; skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; } else if (**pointer != ']') return nil; } [array makeImmutable]; (*pointer)++; return array; } static OF_INLINE OFDictionary* parseDictionary(const char *restrict *pointer, const char *stop) { OFMutableDictionary *dictionary = [OFMutableDictionary dictionary]; if (++(*pointer) >= stop) return nil; while (**pointer != '}') { id key, object; skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; if (**pointer == '}') break; if ((key = nextObject(pointer, stop)) == nil) return nil; skipWhitespaces(pointer, stop); if (*pointer + 1 >= stop || **pointer != ':') return nil; (*pointer)++; if ((object = nextObject(pointer, stop)) == nil) return nil; [dictionary setObject: object forKey: key]; skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; if (**pointer == ',') { (*pointer)++; skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; } else if (**pointer != '}') return nil; } [dictionary makeImmutable]; (*pointer)++; return dictionary; } static OF_INLINE OFNumber* parseNumber(const char *restrict *pointer, const char *stop) { BOOL hasDecimal = NO; size_t i; OFString *string; OFNumber *number; for (i = 1; *pointer + i < stop; i++) { if ((*pointer)[i] == '.') hasDecimal = YES; if ((*pointer)[i] == ' ' || (*pointer)[i] == '\t' || (*pointer)[i] == '\r' || (*pointer)[i] == '\n' || (*pointer)[i] == ',' || (*pointer)[i] == ']' || (*pointer)[i] == '}') break; } string = [[OFString alloc] initWithUTF8String: *pointer length: i]; *pointer += i; @try { if (hasDecimal) number = [OFNumber numberWithDouble: [string doubleValue]]; else number = [OFNumber numberWithIntMax: [string decimalValue]]; } @finally { [string release]; } return number; } static id nextObject(const char *restrict *pointer, const char *stop) { skipWhitespaces(pointer, stop); if (*pointer >= stop) return nil; switch (**pointer) { case '"': return parseString(pointer, stop); case '[': return parseArray(pointer, stop); case '{': return parseDictionary(pointer, stop); case 't': if (*pointer + 3 >= stop) return nil; if (memcmp(*pointer, "true", 4)) return nil; (*pointer) += 4; return [OFNumber numberWithBool: YES]; case 'f': if (*pointer + 4 >= stop) return nil; if (memcmp(*pointer, "false", 5)) return nil; (*pointer) += 5; return [OFNumber numberWithBool: NO]; case 'n': if (*pointer + 3 >= stop) return nil; if (memcmp(*pointer, "null", 4)) return nil; (*pointer) += 4; return [OFNull null]; case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '-': return parseNumber(pointer, stop); default: return nil; } } @implementation OFString (JSONValue) - (id)JSONValue { const char *pointer = [self UTF8String]; const char *stop = pointer + [self UTF8StringLength]; id object; object = nextObject(&pointer, stop); skipWhitespaces(&pointer, stop); if (pointer < stop || object == nil) @throw [OFInvalidEncodingException exceptionWithClass: isa]; return object; } @end |
Modified src/OFString.h from [63071797b5] to [0ad45bcf47].
︙ | ︙ | |||
812 813 814 815 816 817 818 819 820 821 822 | - (void)enumerateLinesUsingBlock: (of_string_line_enumeration_block_t)block; #endif @end #import "OFConstantString.h" #import "OFMutableString.h" #import "OFString+Hashing.h" #import "OFString+Serialization.h" #import "OFString+URLEncoding.h" #import "OFString+XMLEscaping.h" #import "OFString+XMLUnescaping.h" | > | 812 813 814 815 816 817 818 819 820 821 822 823 | - (void)enumerateLinesUsingBlock: (of_string_line_enumeration_block_t)block; #endif @end #import "OFConstantString.h" #import "OFMutableString.h" #import "OFString+Hashing.h" #import "OFString+JSONValue.h" #import "OFString+Serialization.h" #import "OFString+URLEncoding.h" #import "OFString+XMLEscaping.h" #import "OFString+XMLUnescaping.h" |
Modified src/OFString.m from [ff90d8d582] to [eb1dd81502].
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 | #import "of_asprintf.h" #import "unicode.h" /* References for static linking */ void _references_to_categories_of_OFString(void) { _OFString_Hashing_reference = 1; _OFString_Serialization_reference = 1; _OFString_URLEncoding_reference = 1; _OFString_XMLEscaping_reference = 1; _OFString_XMLUnescaping_reference = 1; } int | > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | #import "of_asprintf.h" #import "unicode.h" /* References for static linking */ void _references_to_categories_of_OFString(void) { _OFString_Hashing_reference = 1; _OFString_JSONValue_reference = 1; _OFString_Serialization_reference = 1; _OFString_URLEncoding_reference = 1; _OFString_XMLEscaping_reference = 1; _OFString_XMLUnescaping_reference = 1; } int |
︙ | ︙ |