ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-25 13:30:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a reader abstraction

Browse Source
This commit is contained in:
Eric Fischer 2014-02-06 19:22:37 -08:00
parent 979b9243d8
commit ed079e37a9
3 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsoncat.c
View File

@ -76,7 +76,7 @@ void json_print(json_object *j, int depth) {
} }
void process(FILE *f) { void process(FILE *f) {
json_pull *jp = json_begin(f); json_pull *jp = json_begin_file(f);
json_object *j = NULL; json_object *j = NULL;
while ((j = json_parse(jp)) != NULL) { while ((j = json_parse(jp)) != NULL) {

71
jsonpull.c
View File

@ -9,10 +9,24 @@ typedef enum json_expect {
JSON_ITEM, JSON_COMMA, JSON_COLON, JSON_KEY, JSON_VALUE, JSON_ITEM, JSON_COMMA, JSON_COLON, JSON_KEY, JSON_VALUE,
} json_expect; } json_expect;
json_pull *json_begin(FILE *f) { int read_file(json_pull *p) {
return fgetc(p->source);
}
int peek_file(json_pull *p) {
int c = getc(p->source);
ungetc(c, p->source);
return c;
}
json_pull *json_begin_file(FILE *f) {
json_pull *j = malloc(sizeof(json_pull)); json_pull *j = malloc(sizeof(json_pull));
j->container = NULL; j->container = NULL;
j->f = f;
j->read = read_file;
j->peek = peek_file;
j->source = f;
return j; return j;
} }
@ -79,12 +93,6 @@ json_object *json_hash_get(json_object *o, char *s) {
return NULL; return NULL;
} }
static int peek(FILE *f) {
int c = getc(f);
ungetc(c, f);
return c;
}
struct string { struct string {
char *buf; char *buf;
int n; int n;
@ -114,12 +122,11 @@ static void string_free(struct string *s) {
json_object *json_parse(json_pull *j) { json_object *json_parse(json_pull *j) {
int c; int c;
FILE *f = j->f;
again: again:
/////////////////////////// Whitespace /////////////////////////// Whitespace
do { do {
c = getc(f); c = j->read(j);
if (c == EOF) { if (c == EOF) {
if (j->container != NULL) { if (j->container != NULL) {
j->error = "Reached EOF without all containers being closed"; j->error = "Reached EOF without all containers being closed";
@ -190,7 +197,7 @@ again:
/////////////////////////// Null /////////////////////////// Null
if (c == 'n') { if (c == 'n') {
if (getc(f) != 'u' || getc(f) != 'l' || getc(f) != 'l') { if (j->read(j) != 'u' || j->read(j) != 'l' || j->read(j) != 'l') {
j->error = "Found misspelling of null"; j->error = "Found misspelling of null";
return NULL; return NULL;
} }
@ -201,7 +208,7 @@ again:
/////////////////////////// True /////////////////////////// True
if (c == 't') { if (c == 't') {
if (getc(f) != 'r' || getc(f) != 'u' || getc(f) != 'e') { if (j->read(j) != 'r' || j->read(j) != 'u' || j->read(j) != 'e') {
j->error = "Found misspelling of true"; j->error = "Found misspelling of true";
return NULL; return NULL;
} }
@ -212,7 +219,7 @@ again:
/////////////////////////// False /////////////////////////// False
if (c == 'f') { if (c == 'f') {
if (getc(f) != 'a' || getc(f) != 'l' || getc(f) != 's' || getc(f) != 'e') { if (j->read(j) != 'a' || j->read(j) != 'l' || j->read(j) != 's' || j->read(j) != 'e') {
j->error = "Found misspelling of false"; j->error = "Found misspelling of false";
return NULL; return NULL;
} }
@ -267,48 +274,48 @@ again:
if (c == '-') { if (c == '-') {
string_append(&val, c); string_append(&val, c);
c = getc(f); c = j->read(j);
} }
if (c == '0') { if (c == '0') {
string_append(&val, c); string_append(&val, c);
} else if (c >= '1' && c <= '9') { } else if (c >= '1' && c <= '9') {
string_append(&val, c); string_append(&val, c);
c = peek(f); c = j->peek(j);
while (c >= '0' && c <= '9') { while (c >= '0' && c <= '9') {
string_append(&val, getc(f)); string_append(&val, j->read(j));
c = peek(f); c = j->peek(j);
} }
} }
if (peek(f) == '.') { if (j->peek(j) == '.') {
string_append(&val, getc(f)); string_append(&val, j->read(j));
c = peek(f); c = j->peek(j);
while (c >= '0' && c <= '9') { while (c >= '0' && c <= '9') {
string_append(&val, getc(f)); string_append(&val, j->read(j));
c = peek(f); c = j->peek(j);
} }
} }
c = peek(f); c = j->peek(j);
if (c == 'e' || c == 'E') { if (c == 'e' || c == 'E') {
string_append(&val, getc(f)); string_append(&val, j->read(j));
c = peek(f); c = j->peek(j);
if (c == '+' || c == '-') { if (c == '+' || c == '-') {
string_append(&val, getc(f)); string_append(&val, j->read(j));
} }
c = peek(f); c = j->peek(j);
if (c < '0' || c > '9') { if (c < '0' || c > '9') {
j->error = "Exponent without digits"; j->error = "Exponent without digits";
return NULL; return NULL;
} }
while (c >= '0' && c <= '9') { while (c >= '0' && c <= '9') {
string_append(&val, getc(f)); string_append(&val, j->read(j));
c = peek(f); c = j->peek(j);
} }
} }
@ -324,11 +331,11 @@ again:
struct string val; struct string val;
string_init(&val); string_init(&val);
while ((c = getc(f)) != EOF) { while ((c = j->read(j)) != EOF) {
if (c == '"') { if (c == '"') {
break; break;
} else if (c == '\\') { } else if (c == '\\') {
c = getc(f); c = j->read(j);
if (c == '"') { if (c == '"') {
string_append(&val, '"'); string_append(&val, '"');
@ -350,7 +357,7 @@ again:
char hex[5] = "aaaa"; char hex[5] = "aaaa";
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
hex[i] = getc(f); hex[i] = j->read(j);
} }
unsigned long ch = strtoul(hex, NULL, 16); unsigned long ch = strtoul(hex, NULL, 16);
if (ch <= 0x7F) { if (ch <= 0x7F) {

7
jsonpull.h
View File

@ -20,11 +20,14 @@ typedef struct json_object {
struct json_pull { struct json_pull {
json_object *container; json_object *container;
char *error; char *error;
FILE *f;
int (*read)(struct json_pull *);
int (*peek)(struct json_pull *);
void *source;
}; };
typedef struct json_pull json_pull; typedef struct json_pull json_pull;
json_pull *json_begin(FILE *f); json_pull *json_begin_file(FILE *f);
json_object *json_parse(json_pull *j); json_object *json_parse(json_pull *j);
json_object *json_hash_get(json_object *o, char *s); json_object *json_hash_get(json_object *o, char *s);