diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Maybe the right way to handle empty arrays?

Browse Source 
The previous check for the array length being 0 didn't work
for the case of an array that contains only an empty array.

The tricky part is that the current node is the array when
the array has just begun or just after a comma, but also
when the completed array has been passed off to the caller.
This commit is contained in:
Eric Fischer
2014-02-06 00:30:25 -08:00
parent 68e0784cc3
commit f8465828e5
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jsonpull.c
+20 -9
View File
@@ -110,7 +110,10 @@ static void string_free(struct string *s) {
} }
json_object *json_parse(FILE *f, json_object *current) { json_object *json_parse(FILE *f, json_object *current) {
int c = getc(f); int current_is_container = 0;
int c;
again:
c = getc(f);
if (c == EOF) { if (c == EOF) {
return NULL; return NULL;
} }
@@ -127,14 +130,16 @@ json_object *json_parse(FILE *f, json_object *current) {
/////////////////////////// Arrays /////////////////////////// Arrays
if (c == '[') { if (c == '[') {
return json_parse(f, add_object(JSON_ARRAY, current)); current = add_object(JSON_ARRAY, current);
current_is_container = 1;
goto again;
} else if (c == ']') { } else if (c == ']') {
if (current == NULL) { if (current == NULL) {
json_error("] at top level"); json_error("] at top level");
} }
if (current->type == JSON_ARRAY && current->length == 0) { if (current_is_container) { // Empty array
return current; // Empty array return current;
} }
if (current->parent == NULL || current->parent->type != JSON_ARRAY) { if (current->parent == NULL || current->parent->type != JSON_ARRAY) {
@@ -147,14 +152,16 @@ json_object *json_parse(FILE *f, json_object *current) {
/////////////////////////// Hashes /////////////////////////// Hashes
if (c == '{') { if (c == '{') {
return json_parse(f, add_object(JSON_HASH, current)); current = add_object(JSON_HASH, current);
current_is_container = 1;
goto again;
} else if (c == '}') { } else if (c == '}') {
if (current == NULL) { if (current == NULL) {
json_error("} at top level"); json_error("} at top level");
} }
if (current->type == JSON_HASH && current->length == 0) { if (current_is_container) { // Empty hash
return current; // Empty hash return current;
} }
if (current->parent == NULL || current->parent->type != JSON_HASH) { if (current->parent == NULL || current->parent->type != JSON_HASH) {
@@ -210,7 +217,9 @@ json_object *json_parse(FILE *f, json_object *current) {
json_error(", not in array or hash\n"); json_error(", not in array or hash\n");
} }
return json_parse(f, current->parent); current = current->parent;
current_is_container = 1;
goto again;
} }
/////////////////////////// Colon /////////////////////////// Colon
@@ -227,7 +236,9 @@ json_object *json_parse(FILE *f, json_object *current) {
json_error(": without key\n"); json_error(": without key\n");
} }
return json_parse(f, current->parent); current = current->parent;
current_is_container = 1;
goto again;
} }
/////////////////////////// Numbers /////////////////////////// Numbers