X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fdump.c;h=42eb256073a73b4eee20504d6e49ca3cc0bf0de7;hb=781bda140418821ad79ef513b0fd8cfbc0ce552e;hp=57de80c5498646bed7e038c5771d42ad9b68e702;hpb=4cd777712b1e4ec17dc9efcced80a90f83ec1915;p=jansson.git diff --git a/src/dump.c b/src/dump.c index 57de80c..42eb256 100644 --- a/src/dump.c +++ b/src/dump.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Petri Lehtinen + * Copyright (c) 2009, 2010 Petri Lehtinen * * Jansson is free software; you can redistribute it and/or modify * it under the terms of the MIT license. See LICENSE for details. @@ -9,10 +9,12 @@ #include #include #include +#include #include #include "jansson_private.h" #include "strbuffer.h" +#include "utf.h" #define MAX_INTEGER_STR_LENGTH 100 #define MAX_REAL_STR_LENGTH 100 @@ -39,10 +41,10 @@ static int dump_to_file(const char *buffer, int size, void *data) return 0; } -/* 256 spaces (the maximum indentation size) */ -static char whitespace[] = " "; +/* 32 spaces (the maximum indentation size) */ +static char whitespace[] = " "; -static int dump_indent(unsigned long flags, int depth, dump_func dump, void *data) +static int dump_indent(size_t flags, int depth, int space, dump_func dump, void *data) { if(JSON_INDENT(flags) > 0) { @@ -57,37 +59,56 @@ static int dump_indent(unsigned long flags, int depth, dump_func dump, void *dat return -1; } } + else if(space && !(flags & JSON_COMPACT)) + { + return dump(" ", 1, data); + } return 0; } -static int dump_string(const char *str, dump_func dump, void *data) +static int dump_string(const char *str, int ascii, dump_func dump, void *data) { - const char *end; + const char *pos, *end; + int32_t codepoint; if(dump("\"", 1, data)) return -1; - end = str; + end = pos = str; while(1) { const char *text; - char seq[7]; + char seq[13]; int length; - while(*end && *end != '\\' && *end != '"' && (unsigned char)*end > 0x1F) - end++; + while(*end) + { + end = utf8_iterate(pos, &codepoint); + if(!end) + return -1; - if(end != str) { - if(dump(str, end - str, data)) + /* mandatory escape or control char */ + if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20) + break; + + /* non-ASCII */ + if(ascii && codepoint > 0x7F) + break; + + pos = end; + } + + if(pos != str) { + if(dump(str, pos - str, data)) return -1; } - if(!*end) + if(end == pos) break; /* handle \, ", and control codes */ length = 2; - switch(*end) + switch(codepoint) { case '\\': text = "\\\\"; break; case '\"': text = "\\\""; break; @@ -98,9 +119,27 @@ static int dump_string(const char *str, dump_func dump, void *data) case '\t': text = "\\t"; break; default: { - sprintf(seq, "\\u00%02x", *end); + /* codepoint is in BMP */ + if(codepoint < 0x10000) + { + sprintf(seq, "\\u%04x", codepoint); + length = 6; + } + + /* not in BMP -> construct a UTF-16 surrogate pair */ + else + { + int32_t first, last; + + codepoint -= 0x10000; + first = 0xD800 | ((codepoint & 0xffc00) >> 10); + last = 0xDC00 | (codepoint & 0x003ff); + + sprintf(seq, "\\u%04x\\u%04x", first, last); + length = 12; + } + text = seq; - length = 6; break; } } @@ -108,16 +147,29 @@ static int dump_string(const char *str, dump_func dump, void *data) if(dump(text, length, data)) return -1; - end++; - str = end; + str = pos = end; } return dump("\"", 1, data); } -static int do_dump(const json_t *json, unsigned long flags, int depth, +static int object_key_compare_keys(const void *key1, const void *key2) +{ + return strcmp((*(const object_key_t **)key1)->key, + (*(const object_key_t **)key2)->key); +} + +static int object_key_compare_serials(const void *key1, const void *key2) +{ + return (*(const object_key_t **)key1)->serial - + (*(const object_key_t **)key2)->serial; +} + +static int do_dump(const json_t *json, size_t flags, int depth, dump_func dump, void *data) { + int ascii = flags & JSON_ENSURE_ASCII ? 1 : 0; + switch(json_typeof(json)) { case JSON_NULL: return dump("null", 4, data); @@ -133,7 +185,9 @@ static int do_dump(const json_t *json, unsigned long flags, int depth, char buffer[MAX_INTEGER_STR_LENGTH]; int size; - size = snprintf(buffer, MAX_INTEGER_STR_LENGTH, "%d", json_integer_value(json)); + size = snprintf(buffer, MAX_INTEGER_STR_LENGTH, + "%" JSON_INTEGER_FORMAT, + json_integer_value(json)); if(size >= MAX_INTEGER_STR_LENGTH) return -1; @@ -145,15 +199,30 @@ static int do_dump(const json_t *json, unsigned long flags, int depth, char buffer[MAX_REAL_STR_LENGTH]; int size; - size = snprintf(buffer, MAX_REAL_STR_LENGTH, "%0.17f", json_real_value(json)); + size = snprintf(buffer, MAX_REAL_STR_LENGTH, "%.17g", + json_real_value(json)); if(size >= MAX_REAL_STR_LENGTH) return -1; + /* Make sure there's a dot or 'e' in the output. Otherwise + a real is converted to an integer when decoding */ + if(strchr(buffer, '.') == NULL && + strchr(buffer, 'e') == NULL) + { + if(size + 2 >= MAX_REAL_STR_LENGTH) { + /* No space to append ".0" */ + return -1; + } + buffer[size] = '.'; + buffer[size + 1] = '0'; + size += 2; + } + return dump(buffer, size, data); } case JSON_STRING: - return dump_string(json_string_value(json), dump, data); + return dump_string(json_string_value(json), ascii, dump, data); case JSON_ARRAY: { @@ -164,87 +233,180 @@ static int do_dump(const json_t *json, unsigned long flags, int depth, /* detect circular references */ array = json_to_array(json); if(array->visited) - return -1; + goto array_error; array->visited = 1; n = json_array_size(json); if(dump("[", 1, data)) - return -1; - if(n == 0) + goto array_error; + if(n == 0) { + array->visited = 0; return dump("]", 1, data); - if(dump_indent(flags, depth + 1, dump, data)) - return -1; + } + if(dump_indent(flags, depth + 1, 0, dump, data)) + goto array_error; for(i = 0; i < n; ++i) { if(do_dump(json_array_get(json, i), flags, depth + 1, dump, data)) - return -1; + goto array_error; if(i < n - 1) { if(dump(",", 1, data) || - dump_indent(flags, depth + 1, dump, data)) - return -1; + dump_indent(flags, depth + 1, 1, dump, data)) + goto array_error; } else { - if(dump_indent(flags, depth, dump, data)) - return -1; + if(dump_indent(flags, depth, 0, dump, data)) + goto array_error; } } array->visited = 0; return dump("]", 1, data); + + array_error: + array->visited = 0; + return -1; } case JSON_OBJECT: { json_object_t *object; void *iter; + const char *separator; + int separator_length; + + if(flags & JSON_COMPACT) { + separator = ":"; + separator_length = 1; + } + else { + separator = ": "; + separator_length = 2; + } /* detect circular references */ object = json_to_object(json); if(object->visited) - return -1; + goto object_error; object->visited = 1; iter = json_object_iter((json_t *)json); if(dump("{", 1, data)) - return -1; - if(!iter) + goto object_error; + if(!iter) { + object->visited = 0; return dump("}", 1, data); - if(dump_indent(flags, depth + 1, dump, data)) - return -1; + } + if(dump_indent(flags, depth + 1, 0, dump, data)) + goto object_error; - while(iter) + if(flags & JSON_SORT_KEYS || flags & JSON_PRESERVE_ORDER) { - void *next = json_object_iter_next((json_t *)json, iter); + const object_key_t **keys; + size_t size, i; + int (*cmp_func)(const void *, const void *); - dump_string(json_object_iter_key(iter), dump, data); - if(dump(": ", 2, data) || - do_dump(json_object_iter_value(iter), flags, depth + 1, - dump, data)) - return -1; + size = json_object_size(json); + keys = malloc(size * sizeof(object_key_t *)); + if(!keys) + goto object_error; - if(next) + i = 0; + while(iter) { - if(dump(",", 1, data) || - dump_indent(flags, depth + 1, dump, data)) - return -1; + keys[i] = jsonp_object_iter_fullkey(iter); + iter = json_object_iter_next((json_t *)json, iter); + i++; } + assert(i == size); + + if(flags & JSON_SORT_KEYS) + cmp_func = object_key_compare_keys; else + cmp_func = object_key_compare_serials; + + qsort(keys, size, sizeof(object_key_t *), cmp_func); + + for(i = 0; i < size; i++) { - if(dump_indent(flags, depth, dump, data)) - return -1; + const char *key; + json_t *value; + + key = keys[i]->key; + value = json_object_get(json, key); + assert(value); + + dump_string(key, ascii, dump, data); + if(dump(separator, separator_length, data) || + do_dump(value, flags, depth + 1, dump, data)) + { + free(keys); + goto object_error; + } + + if(i < size - 1) + { + if(dump(",", 1, data) || + dump_indent(flags, depth + 1, 1, dump, data)) + { + free(keys); + goto object_error; + } + } + else + { + if(dump_indent(flags, depth, 0, dump, data)) + { + free(keys); + goto object_error; + } + } } - iter = next; + free(keys); + } + else + { + /* Don't sort keys */ + + while(iter) + { + void *next = json_object_iter_next((json_t *)json, iter); + + dump_string(json_object_iter_key(iter), ascii, dump, data); + if(dump(separator, separator_length, data) || + do_dump(json_object_iter_value(iter), flags, depth + 1, + dump, data)) + goto object_error; + + if(next) + { + if(dump(",", 1, data) || + dump_indent(flags, depth + 1, 1, dump, data)) + goto object_error; + } + else + { + if(dump_indent(flags, depth, 0, dump, data)) + goto object_error; + } + + iter = next; + } } object->visited = 0; return dump("}", 1, data); + + object_error: + object->visited = 0; + return -1; } default: @@ -254,7 +416,7 @@ static int do_dump(const json_t *json, unsigned long flags, int depth, } -char *json_dumps(const json_t *json, unsigned long flags) +char *json_dumps(const json_t *json, size_t flags) { strbuffer_t strbuff; char *result; @@ -263,14 +425,9 @@ char *json_dumps(const json_t *json, unsigned long flags) return NULL; if(strbuffer_init(&strbuff)) - return NULL; - - if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff)) { - strbuffer_close(&strbuff); return NULL; - } - if(dump_to_strbuffer("\n", 1, (void *)&strbuff)) { + if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff)) { strbuffer_close(&strbuff); return NULL; } @@ -281,17 +438,15 @@ char *json_dumps(const json_t *json, unsigned long flags) return result; } -int json_dumpf(const json_t *json, FILE *output, unsigned long flags) +int json_dumpf(const json_t *json, FILE *output, size_t flags) { if(!json_is_array(json) && !json_is_object(json)) return -1; - if(do_dump(json, flags, 0, dump_to_file, (void *)output)) - return -1; - return dump_to_file("\n", 1, (void *)output); + return do_dump(json, flags, 0, dump_to_file, (void *)output); } -int json_dump_file(const json_t *json, const char *path, unsigned long flags) +int json_dump_file(const json_t *json, const char *path, size_t flags) { int result;