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

Switch instead of ifs in json parsing

Browse Source
This commit is contained in:
Erica Fischer
2024-02-02 13:54:41 -08:00
parent 5383bb2062
commit 353cdf16e6
2 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -91,7 +91,7 @@ clean:
rm -f ./tippecanoe ./tippecanoe-* ./tile-join ./unit *.o *.d */*.o */*.d tests/**/*.mbtiles tests/**/*.check rm -f ./tippecanoe ./tippecanoe-* ./tile-join ./unit *.o *.d */*.o */*.d tests/**/*.mbtiles tests/**/*.check
indent: indent:
clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" $(filter-out flatgeobuf.cpp,$(C)) $(H) clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" $(filter-out flatgeobuf.cpp,$(C)) $(H) jsonpull/*.[ch]
TESTS = $(wildcard tests/*/out/*.json) TESTS = $(wildcard tests/*/out/*.json)
SPACE = $(NULL) $(NULL) SPACE = $(NULL) $(NULL)
jsonpull/jsonpull.c
+42 -20
View File
@@ -292,9 +292,6 @@ json_object *json_read_separators(json_pull *j, json_separator_callback cb, void
} }
again: again:
/////////////////////////// Whitespace
do {
c = read_wrap(j); c = read_wrap(j);
if (c == EOF) { if (c == EOF) {
if (j->container != NULL) { if (j->container != NULL) {
@@ -304,8 +301,10 @@ again:
return NULL; return NULL;
} }
// Byte-order mark switch (c) {
if (c == 0xEF) { /////////////////////////// Byte order mark
case 0xEF: {
int c2 = peek(j); int c2 = peek(j);
if (c2 == 0xBB) { if (c2 == 0xBB) {
c2 = read_wrap(j); c2 = read_wrap(j);
@@ -313,17 +312,25 @@ again:
if (c2 == 0xBF) { if (c2 == 0xBF) {
c2 = read_wrap(j); c2 = read_wrap(j);
c = ' '; c = ' ';
continue; goto again;
} }
} }
j->error = "Corrupt byte-order mark found"; j->error = "Corrupt byte-order mark found";
return NULL; return NULL;
} }
} while (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 0x1E);
/////////////////////////// Whitespace
case ' ':
case '\t':
case '\r':
case '\n':
case 0x1E:
goto again;
/////////////////////////// Arrays /////////////////////////// Arrays
if (c == '[') { case '[': {
json_object *o = add_object(j, JSON_ARRAY); json_object *o = add_object(j, JSON_ARRAY);
if (o == NULL) { if (o == NULL) {
return NULL; return NULL;
@@ -336,7 +343,9 @@ again:
} }
goto again; goto again;
} else if (c == ']') { }
case ']': {
if (j->container == NULL) { if (j->container == NULL) {
j->error = "Found ] at top level"; j->error = "Found ] at top level";
return NULL; return NULL;
@@ -361,7 +370,7 @@ again:
/////////////////////////// Hashes /////////////////////////// Hashes
if (c == '{') { case '{': {
json_object *o = add_object(j, JSON_HASH); json_object *o = add_object(j, JSON_HASH);
if (o == NULL) { if (o == NULL) {
return NULL; return NULL;
@@ -374,7 +383,9 @@ again:
} }
goto again; goto again;
} else if (c == '}') { }
case '}': {
if (j->container == NULL) { if (j->container == NULL) {
j->error = "Found } at top level"; j->error = "Found } at top level";
return NULL; return NULL;
@@ -399,7 +410,7 @@ again:
/////////////////////////// Null /////////////////////////// Null
if (c == 'n') { case 'n': {
if (read_wrap(j) != 'u' || read_wrap(j) != 'l' || read_wrap(j) != 'l') { if (read_wrap(j) != 'u' || read_wrap(j) != 'l' || read_wrap(j) != 'l') {
j->error = "Found misspelling of null"; j->error = "Found misspelling of null";
return NULL; return NULL;
@@ -410,7 +421,7 @@ again:
/////////////////////////// NaN /////////////////////////// NaN
if (c == 'N') { case 'N': {
if (read_wrap(j) != 'a' || read_wrap(j) != 'N') { if (read_wrap(j) != 'a' || read_wrap(j) != 'N') {
j->error = "Found misspelling of NaN"; j->error = "Found misspelling of NaN";
return NULL; return NULL;
@@ -422,7 +433,7 @@ again:
/////////////////////////// Infinity /////////////////////////// Infinity
if (c == 'I') { case 'I': {
if (read_wrap(j) != 'n' || read_wrap(j) != 'f' || read_wrap(j) != 'i' || if (read_wrap(j) != 'n' || read_wrap(j) != 'f' || read_wrap(j) != 'i' ||
read_wrap(j) != 'n' || read_wrap(j) != 'i' || read_wrap(j) != 't' || read_wrap(j) != 'n' || read_wrap(j) != 'i' || read_wrap(j) != 't' ||
read_wrap(j) != 'y') { read_wrap(j) != 'y') {
@@ -436,7 +447,7 @@ again:
/////////////////////////// True /////////////////////////// True
if (c == 't') { case 't': {
if (read_wrap(j) != 'r' || read_wrap(j) != 'u' || read_wrap(j) != 'e') { if (read_wrap(j) != 'r' || read_wrap(j) != 'u' || read_wrap(j) != 'e') {
j->error = "Found misspelling of true"; j->error = "Found misspelling of true";
return NULL; return NULL;
@@ -447,7 +458,7 @@ again:
/////////////////////////// False /////////////////////////// False
if (c == 'f') { case 'f': {
if (read_wrap(j) != 'a' || read_wrap(j) != 'l' || read_wrap(j) != 's' || read_wrap(j) != 'e') { if (read_wrap(j) != 'a' || read_wrap(j) != 'l' || read_wrap(j) != 's' || read_wrap(j) != 'e') {
j->error = "Found misspelling of false"; j->error = "Found misspelling of false";
return NULL; return NULL;
@@ -458,7 +469,7 @@ again:
/////////////////////////// Comma /////////////////////////// Comma
if (c == ',') { case ',': {
if (j->container != NULL) { if (j->container != NULL) {
if (j->container->expect != JSON_COMMA) { if (j->container->expect != JSON_COMMA) {
j->error = "Found unexpected comma"; j->error = "Found unexpected comma";
@@ -481,7 +492,7 @@ again:
/////////////////////////// Colon /////////////////////////// Colon
if (c == ':') { case ':': {
if (j->container == NULL) { if (j->container == NULL) {
j->error = "Found colon at top level"; j->error = "Found colon at top level";
return NULL; return NULL;
@@ -503,7 +514,17 @@ again:
/////////////////////////// Numbers /////////////////////////// Numbers
if (c == '-' || (c >= '0' && c <= '9')) { case '-':
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9': {
struct string val; struct string val;
string_init(&val); string_init(&val);
int decimal = 0; int decimal = 0;
@@ -598,7 +619,7 @@ again:
/////////////////////////// Strings /////////////////////////// Strings
if (c == '"') { case '"': {
struct string val; struct string val;
string_init(&val); string_init(&val);
@@ -731,6 +752,7 @@ again:
} }
return s; return s;
} }
}
j->error = "Found unexpected character"; j->error = "Found unexpected character";
return NULL; return NULL;