Skip to content

Commit 90a7503

Browse files
jkeiserjkeiser
committed
Rename pj -> doc, fix a few other idioms
1 parent e3efbcd commit 90a7503

5 files changed

Lines changed: 16 additions & 34 deletions

File tree

‎tests/integer_tests.cpp‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,15 @@ static void parse_and_validate(const std::string src, T expected) {
3333
std::cout << "src: " << src << ", ";
3434
const padded_string pstr{src};
3535
simdjson::document::parser parser;
36-
auto [pj, error] = parser.parse(pstr);
37-
if(error) {
38-
printf("could not parse\n");
39-
abort();
40-
}
41-
4236

4337
bool result;
4438
if constexpr (std::is_same<int64_t, T>::value) {
45-
int64_t actual = pj.root().as_object()["key"].as_int64_t();
39+
auto [actual, error] = parser.parse(pstr).as_object()["key"].as_int64_t();
40+
if (error) { std::cerr << error << std::endl; abort(); }
4641
result = (expected == actual);
4742
} else {
48-
uint64_t actual = pj.root().as_object()["key"].as_uint64_t();
43+
auto [actual, error] = parser.parse(pstr).as_object()["key"].as_uint64_t();
44+
if (error) { std::cerr << error << std::endl; abort(); }
4945
result = (expected == actual);
5046
}
5147
std::cout << std::boolalpha << "test: " << result << std::endl;
@@ -59,31 +55,20 @@ static bool parse_and_check_signed(const std::string src) {
5955
std::cout << "src: " << src << ", expecting signed" << std::endl;
6056
const padded_string pstr{src};
6157
simdjson::document::parser parser;
62-
auto [pj, error] = parser.parse(pstr);
63-
if(error) {
64-
printf("could not parse\n");
65-
abort();
66-
}
67-
auto [v,e] = pj.root().as_object()["key"];
68-
return v.is_integer() && v.is_number();
58+
auto [value, error] = parser.parse(pstr).as_object()["key"];
59+
if (error) { std::cerr << error << std::endl; abort(); }
60+
return value.is_integer() && value.is_number();
6961
}
7062

71-
7263
static bool parse_and_check_unsigned(const std::string src) {
7364
std::cout << "src: " << src << ", expecting signed" << std::endl;
7465
const padded_string pstr{src};
7566
simdjson::document::parser parser;
76-
auto [pj, error] = parser.parse(pstr);
77-
if(error) {
78-
printf("could not parse\n");
79-
abort();
80-
}
81-
auto [v,e] = pj.root().as_object()["key"];
82-
return v.is_unsigned_integer() && v.is_number();
67+
auto [value, error] = parser.parse(pstr).as_object()["key"];
68+
if (error) { std::cerr << error << std::endl; abort(); }
69+
return value.is_unsigned_integer() && value.is_number();
8370
}
8471

85-
86-
8772
int main() {
8873
using std::numeric_limits;
8974
constexpr auto int64_max = numeric_limits<int64_t>::max();

‎tests/jsoncheck.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ bool validate(const char *dirname) {
7070
return EXIT_FAILURE;
7171
}
7272
simdjson::document::parser parser;
73-
auto [pj, errorcode] = parser.parse(p);
73+
auto [doc, errorcode] = parser.parse(p);
7474
++how_many;
7575
printf("%s\n", errorcode == simdjson::error_code::SUCCESS ? "ok" : "invalid");
7676
if (contains("EXCLUDE", name)) {

‎tests/numberparsingcheck.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ bool validate(const char *dirname) {
179179
invalid_count = 0;
180180
total_count += float_count + int_count + invalid_count;
181181
simdjson::document::parser parser;
182-
auto [pj, err] = parser.parse(p);
182+
auto [doc, err] = parser.parse(p);
183183
bool isok = (err == simdjson::error_code::SUCCESS);
184184
if (int_count + float_count + invalid_count > 0) {
185185
printf("File %40s %s --- integers: %10zu floats: %10zu invalid: %10zu "

‎tests/singleheadertest.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ int main() {
88
const char *filename = JSON_TEST_PATH;
99
padded_string p = get_corpus(filename);
1010
document::parser parser;
11-
auto [pj, errorcode] = parser.parse(p);
12-
if(errorcode != error_code::SUCCESS) {
13-
std::cerr << error_message(errorcode) << std::endl;
14-
return EXIT_FAILURE;
15-
}
16-
if(!pj.is_valid()) {
11+
auto [doc, error] = parser.parse(p);
12+
if(error) {
13+
std::cerr << error << std::endl;
1714
return EXIT_FAILURE;
1815
}
1916
return EXIT_SUCCESS;

‎tests/stringparsingcheck.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ bool validate(const char *dirname) {
348348
total_string_length = 0;
349349
empty_string = 0;
350350
simdjson::document::parser parser;
351-
auto [pj, err] = parser.parse(p);
351+
auto [doc, err] = parser.parse(p);
352352
bool isok = (err == simdjson::error_code::SUCCESS);
353353
free(big_buffer);
354354
if (good_string > 0) {

0 commit comments

Comments
 (0)