8000 Various fixes. · JavaScriptExpert/simdjson@6a8ec95 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6a8ec95

Browse files
lemirelemire
committed
Various fixes.
1 parent b6c6680 commit 6a8ec95

File tree

4 files changed

+14
-42
lines changed

4 files changed

+14
-42
lines changed

‎scripts/testjson2json.sh

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
TMPDIR1=$(mktemp -d -t simdjsonXXXXXXXX)
44
TMPDIR2=$(mktemp -d -t simdjsonXXXXXXXX)
5-
TMPDIR3=$(mktemp -d -t simdjsonXXXXXXXX)
6-
TMPDIR4=$(mktemp -d -t simdjsonXXXXXXXX)
75
trap "exit 1" HUP INT PIPE QUIT TERM
8-
trap "rm -rf $TMPDIR1 $TMPDIR2 $TMPDIR3 $TMPDIR4" EXIT
6+
trap "rm -rf $TMPDIR1 $TMPDIR2" EXIT
97

108
function founderror() {
119
echo "code is wrong"
@@ -16,33 +14,19 @@ make minify json2json
1614
for i in `cd jsonexamples && ls -1 *.json`; do
1715
echo $i
1816
./json2json jsonexamples/$i > $TMPDIR1/$i
19-
./json2json -a jsonexamples/$i > $TMPDIR3/$i
2017
./json2json $TMPDIR1/$i > $TMPDIR2/$i
21-
./json2json -a $TMPDIR3/$i > $TMPDIR4/$i
2218
cmp $TMPDIR1/$i $TMPDIR2/$i
2319
retVal=$?
2420
if [ $retVal -ne 0 ]; then
2521
founderror
2622
fi
27-
cmp $TMPDIR3/$i $TMPDIR4/$i
28-
retVal=$?
29-
if [ $retVal -ne 0 ]; then
30-
founderror
31-
fi
3223
./minify $TMPDIR1/$i > $TMPDIR1/minify$i
3324
./minify $TMPDIR2/$i > $TMPDIR2/minify$i
34-
./minify $TMPDIR3/$i > $TMPDIR3/minify$i
35-
./minify $TMPDIR4/$i > $TMPDIR4/minify$i
3625
cmp $TMPDIR1/minify$i $TMPDIR2/minify$i
3726
retVal=$?
3827
if [ $retVal -ne 0 ]; then
3928
founderror
4029
fi
41-
cmp $TMPDIR3/minify$i $TMPDIR4/minify$i
42-
retVal=$?
43-
if [ $retVal -ne 0 ]; then
44-
founderror
45-
fi
4630
./json2json $TMPDIR1/minify$i > $TMPDIR2/bisminify$i
4731
cmp $TMPDIR1/$i $TMPDIR2/bisminify$i
4832
retVal=$?
@@ -54,37 +38,22 @@ done
5438
for i in `cd jsonchecker && ls -1 pass*.json`; do
5539
echo $i
5640
./json2json jsonchecker/$i > $TMPDIR1/$i
57-
./json2json -a jsonchecker/$i > $TMPDIR3/$i
5841
./json2json $TMPDIR1/$i > $TMPDIR2/$i
59-
./json2json -a $TMPDIR3/$i > $TMPDIR4/$i
6042
cmp $TMPDIR1/$i $TMPDIR2/$i
6143
retVal=$?
6244
if [ $retVal -ne 0 ]; then
6345
echo "reg failure"
6446
founderror
6547
fi
66-
cmp $TMPDIR3/$i $TMPDIR4/$i
67-
retVal=$?
68-
if [ $retVal -ne 0 ]; then
69-
echo "-a failure"
70-
founderror
71-
fi
48+
7249
./minify $TMPDIR1/$i > $TMPDIR1/minify$i
7350
./minify $TMPDIR2/$i > $TMPDIR2/minify$i
74-
./minify $TMPDIR3/$i > $TMPDIR3/minify$i
75-
./minify $TMPDIR4/$i > $TMPDIR4/minify$i
7651
cmp $TMPDIR1/minify$i $TMPDIR2/minify$i
7752
retVal=$?
7853
if [ $retVal -ne 0 ]; then
7954
echo "reg failure, step 2"
8055
founderror
8156
fi
82-
cmp $TMPDIR3/minify$i $TMPDIR4/minify$i
83-
retVal=$?
84-
if [ $retVal -ne 0 ]; then
85-
echo "-a failure, step 2"
86-
founderror
87-
fi
8857
./json2json $TMPDIR1/minify$i > $TMPDIR2/bisminify$i
8958
cmp $TMPDIR1/$i $TMPDIR2/bisminify$i
9059
retVal=$?

‎tests/numberparsingcheck.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,13 @@ bool validate(const char *dirname) {
174174
return EXIT_FAILURE;
175175
}
176176
// terrible hack but just to get it working
177-
simdjson::ParsedJson pj;
178177
float_count = 0;
179178
int_count = 0;
180179
invalid_count = 0;
181180
total_count += float_count + int_count + invalid_count;
182-
bool isok = json_parse(p, pj);
181+
simdjson::document::parser parser;
182+
auto [pj, err] = parser.parse(p);
183+
bool isok = (err == simdjson::error_code::SUCCESS);
183184
if (int_count + float_count + invalid_count > 0) {
184185
printf("File %40s %s --- integers: %10zu floats: %10zu invalid: %10zu "
185186
"total numbers: %10zu \n",

‎tests/singleheadertest.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// This file is not part of our main, regular tests.
12
#include "../singleheader/simdjson.h"
23
#include <iostream>
34

@@ -6,13 +7,13 @@ using namespace simdjson;
67
int main() {
78
const char *filename = JSON_TEST_PATH;
89
padded_string p = get_corpus(filename);
9-
ParsedJson pj = build_parsed_json(p); // do the parsing
10-
if (!pj.is_valid()) {
10+
document::parser parser;
11+
auto [pj, errorcode] = parser.parse(p);
12+
if(errorcode != error_code::SUCCESS) {
13+
std::cerr << error_message(errorcode) << std::endl;
1114
return EXIT_FAILURE;
1215
}
13-
const int res = json_parse(p, pj);
14-
if (res) {
15-
std::cerr << error_message(res) << std::endl;
16+
if(!pj.is_valid()) {
1617
return EXIT_FAILURE;
1718
}
1819
return EXIT_SUCCESS;

‎tests/stringparsingcheck.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ bool validate(const char *dirname) {
338338
std::cerr << "Could not load the file " << fullpath << std::endl;
339339
return EXIT_FAILURE;
340340
}
341-
simdjson::ParsedJson pj;
342341
big_buffer = (char *)malloc(p.size());
343342
if (big_buffer == NULL) {
344343
std::cerr << "can't allocate memory" << std::endl;
@@ -348,7 +347,9 @@ bool validate(const char *dirname) {
348347
good_string = 0;
349348
total_string_length = 0;
350349
empty_string = 0;
351-
bool isok = json_parse(p, pj);
350+
simdjson::document::parser parser;
351+
auto [pj, err] = parser.parse(p);
352+
bool isok = (err == simdjson::error_code::SUCCESS);
352353
free(big_buffer);
353354
if (good_string > 0) {
354355
printf("File %40s %s --- bad strings: %10zu \tgood strings: %10zu\t "

0 commit comments

Comments
 (0)
0