diff options
| author | ZipCPU <dgisselq@ieee.org> | 2018-06-07 15:54:23 -0400 |
|---|---|---|
| committer | ZipCPU <dgisselq@ieee.org> | 2018-06-07 15:54:23 -0400 |
| commit | cbd0622fb852781250986ca69c7eb57c008a933a (patch) | |
| tree | 4c74aab15ecdbece368c65c0d9ff837a4bd4464f | |
| parent | 87775d3c6f56bcaaf47e169822ae97b8370ac44f (diff) | |
| download | nextpnr-cbd0622fb852781250986ca69c7eb57c008a933a.tar.gz nextpnr-cbd0622fb852781250986ca69c7eb57c008a933a.tar.bz2 nextpnr-cbd0622fb852781250986ca69c7eb57c008a933a.zip | |
Merged log_ lines in the JSON parser
| -rw-r--r-- | frontend/json/jsonparse.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/frontend/json/jsonparse.cc b/frontend/json/jsonparse.cc index 91da07dd..7c87bc8f 100644 --- a/frontend/json/jsonparse.cc +++ b/frontend/json/jsonparse.cc @@ -70,8 +70,7 @@ struct JsonNode ch = f.get(); if (ch == EOF) - log_error("Unexpected EOF " - "in JSON string.\n"); + log_error("Unexpected EOF in JSON string.\n"); if (ch == '\"') break; @@ -80,8 +79,7 @@ struct JsonNode int ch = f.get(); if (ch == EOF) - log_error("Unexpected EOF " - "in JSON string.\n"); + log_error("Unexpected EOF in JSON string.\n"); } data_string += ch; @@ -145,8 +143,7 @@ struct JsonNode ch = f.get(); if (ch == EOF) - log_error("Unexpected EOF " - "in JSON file.\n"); + log_error("Unexpected EOF in JSON file.\n"); if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == ',') @@ -169,8 +166,7 @@ struct JsonNode ch = f.get(); if (ch == EOF) - log_error("Unexpected EOF " - "in JSON file.\n"); + log_error("Unexpected EOF in JSON file.\n"); if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == ',') @@ -186,8 +182,7 @@ struct JsonNode ch = f.get(); if (ch == EOF) - log_error("Unexpected EOF " - "in JSON file.\n"); + log_error("Unexpected EOF in JSON file.\n"); if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == ':') @@ -200,9 +195,7 @@ struct JsonNode JsonNode *value = new JsonNode(f); if (key.type != 'S') - log_error("Unexpected " - "non-string key " - "in JSON dict.\n"); + log_error("Unexpected non-string key in JSON dict.\n"); data_dict[key.data_string] = value; data_dict_keys.push_back(key.data_string); |