Skip to content

Commit c924aae

Browse files
lemirelemire
authored
Fix issue472: make JsonStream a template. (simdjson#473)
* Fix issue472: make JsonStream a template. * Adding missing include. * Tweaking headers and some minor formatting. * Removing file from aggregation. * Moving jsoncharutils * Adding new header. * Trying another header. * Let us try to route around Visual Studio's nonesense.
1 parent 28710f8 commit c924aae

15 files changed

Lines changed: 1159 additions & 1121 deletions

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ endif # ifeq ($(DEBUG),1)
5858
endif # ifeq ($(SANITIZE),1)
5959
endif # ifeq ($(MEMSANITIZE),1)
6060

61-
MAINEXECUTABLES=parse minify json2json jsonstats statisticalmodel jsonpointer
62-
TESTEXECUTABLES=jsoncheck jsoncheck_noavx integer_tests numberparsingcheck stringparsingcheck pointercheck jsonstream_test
61+
MAINEXECUTABLES=parse minify json2json jsonstats statisticalmodel jsonpointer get_corpus_benchmark
62+
TESTEXECUTABLES=jsoncheck jsoncheck_noavx integer_tests numberparsingcheck stringparsingcheck pointercheck jsonstream_test basictests
6363
COMPARISONEXECUTABLES=minifiercompetition parsingcompetition parseandstatcompetition distinctuseridcompetition allparserscheckfile allparsingcompetition
6464
SUPPLEMENTARYEXECUTABLES=parse_noutf8validation parse_nonumberparsing parse_nostringparsing
6565

@@ -73,7 +73,7 @@ LIBHEADERS=src/jsoncharutils.h src/simdprune_tables.h $(LIBHEADERS_GENERIC) $(LI
7373
PUBHEADERS=include/simdjson/common_defs.h include/simdjson/isadetection.h include/simdjson/jsonformatutils.h include/simdjson/jsonioutil.h include/simdjson/jsonminifier.h include/simdjson/jsonparser.h include/simdjson/padded_string.h include/simdjson/parsedjson.h include/simdjson/parsedjsoniterator.h include/simdjson/portability.h include/simdjson/simdjson.h include/simdjson/simdjson_version.h include/simdjson/stage1_find_marks.h include/simdjson/stage2_build_tape.h
7474
HEADERS=$(PUBHEADERS) $(LIBHEADERS)
7575

76-
LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/jsonstream.cpp src/simdjson.cpp src/stage1_find_marks.cpp src/stage2_build_tape.cpp src/parsedjson.cpp src/parsedjsoniterator.cpp
76+
LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/simdjson.cpp src/stage1_find_marks.cpp src/stage2_build_tape.cpp src/parsedjson.cpp src/parsedjsoniterator.cpp
7777
MINIFIERHEADERS=include/simdjson/jsonminifier.h
7878
MINIFIERLIBFILES=src/jsonminifier.cpp
7979

‎amalgamation.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ ALLCFILES="
1616
$SCRIPTPATH/src/arm64/intrinsics.h
1717
$SCRIPTPATH/src/haswell/intrinsics.h
1818
$SCRIPTPATH/src/westmere/intrinsics.h
19-
$SCRIPTPATH/src/jsoncharutils.h
2019
$SCRIPTPATH/src/simdprune_tables.h
2120
$SCRIPTPATH/src/simdjson.cpp
2221
$SCRIPTPATH/src/jsonioutil.cpp
2322
$SCRIPTPATH/src/jsonminifier.cpp
2423
$SCRIPTPATH/src/jsonparser.cpp
25-
$SCRIPTPATH/src/jsonstream.cpp
2624
$SCRIPTPATH/src/arm64/bitmanipulation.h
2725
$SCRIPTPATH/src/haswell/bitmanipulation.h
2826
$SCRIPTPATH/src/westmere/bitmanipulation.h
@@ -66,6 +64,7 @@ $SCRIPTPATH/include/simdjson/parsedjsoniterator.h
6664
$SCRIPTPATH/include/simdjson/stage1_find_marks.h
6765
$SCRIPTPATH/include/simdjson/stage2_build_tape.h
6866
$SCRIPTPATH/include/simdjson/jsonparser.h
67+
$SCRIPTPATH/src/jsoncharutils.h
6968
$SCRIPTPATH/include/simdjson/jsonstream.h
7069
"
7170

‎include/simdjson/common_defs.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#ifndef SIMDJSON_COMMON_DEFS_H
22
#define SIMDJSON_COMMON_DEFS_H
33

4-
#include "simdjson/portability.h"
5-
64
#include <cassert>
5+
#include "simdjson/portability.h"
76

87
// we support documents up to 4GB
98
#define SIMDJSON_MAXSIZE_BYTES 0xFFFFFFFF

‎include/simdjson/jsonioutil.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#ifndef SIMDJSON_JSONIOUTIL_H
22
#define SIMDJSON_JSONIOUTIL_H
33

4-
#include "simdjson/common_defs.h"
54
#include <exception>
65
#include <fstream>
76
#include <iostream>
87
#include <sstream>
8+
#include <stdexcept>
99
#include <string>
1010

11+
#include "simdjson/common_defs.h"
1112
#include "simdjson/padded_string.h"
1213

1314
namespace simdjson {

0 commit comments

Comments
 (0)