Skip to content

Commit 94ea7ce

Browse files
lemirelemire
committed
Moving include files into a sensible subdirectory.
1 parent 262a68b commit 94ea7ce

24 files changed

+27
-37
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ CXXFLAGS = -std=c++11 -O2 -march=native -Wall -Wextra -Wshadow -Iinclude -Iben
1010
LIBFLAGS = -ldouble-conversion
1111

1212
EXECUTABLES=parse jsoncheck minifiercompetition parsingcompetition
13-
HEADERS=include/jsonparser.h include/common_defs.h include/jsonioutil.h benchmark/benchmark.h benchmark/linux/linux-perf-events.h include/simdjson_internal.h include/stage1_find_marks.h include/stage2_flatten.h include/stage3_ape_machine.h include/stage4_shovel_machine.h
13+
HEADERS=include/jsonparser/jsonparser.h include/jsonparser/common_defs.h include/jsonparser/jsonioutil.h benchmark/benchmark.h benchmark/linux/linux-perf-events.h include/jsonparser/simdjson_internal.h include/jsonparser/stage1_find_marks.h include/jsonparser/stage2_flatten.h include/jsonparser/stage3_ape_machine.h include/jsonparser/stage4_shovel_machine.h
1414
LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/stage1_find_marks.cpp src/stage2_flatten.cpp src/stage3_ape_machine.cpp src/stage4_shovel_machine.cpp
15-
MINIFIERHEADERS=include/jsonminifier.h include/simdprune_tables.h
15+
MINIFIERHEADERS=include/jsonparser/jsonminifier.h include/jsonparser/simdprune_tables.h
1616
MINIFIERLIBFILES=src/jsonminifier.cpp
1717

1818
EXTRA_EXECUTABLES=parsenocheesy parsenodep8

‎benchmark/minifiercompetition.cpp‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
1-
//#include "avxprocessing.h"
2-
3-
//#include "avxminifier.h"
4-
//#include "scalarminifier.h"
51
#include <iostream>
62

73
#include "benchmark.h"
8-
#include "jsonioutil.h"
9-
#include "jsonminifier.h"
4+
#include "jsonparser/jsonioutil.h"
5+
#include "jsonparser/jsonminifier.h"
106

11-
#include "jsonminifier.h"
12-
//#include "jsonstruct.h"
137
// #define RAPIDJSON_SSE2 // bad
148
// #define RAPIDJSON_SSE42 // bad
159
#include "rapidjson/document.h"
1610
#include "rapidjson/reader.h" // you have to check in the submodule
1711
#include "rapidjson/stringbuffer.h"
1812
#include "rapidjson/writer.h"
19-
//#include "util.h"
20-
21-
// colorfuldisplay(ParsedJson & pj, const u8 * buf)
2213

2314
using namespace rapidjson;
2415
using namespace std;

‎benchmark/parse.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "common_defs.h"
1+
#include "jsonparser/common_defs.h"
22
#include "double-conversion/double-conversion.h"
33
#include "linux-perf-events.h"
44
#include <algorithm>
@@ -33,12 +33,12 @@ using namespace double_conversion;
3333

3434
//#define DEBUG
3535

36-
#include "jsonioutil.h"
37-
#include "simdjson_internal.h"
38-
#include "stage1_find_marks.h"
39-
#include "stage2_flatten.h"
40-
#include "stage3_ape_machine.h"
41-
#include "stage4_shovel_machine.h"
36+
#include "jsonparser/jsonioutil.h"
37+
#include "jsonparser/simdjson_internal.h"
38+
#include "jsonparser/stage1_find_marks.h"
39+
#include "jsonparser/stage2_flatten.h"
40+
#include "jsonparser/stage3_ape_machine.h"
41+
#include "jsonparser/stage4_shovel_machine.h"
4242
using namespace std;
4343

4444
// https://stackoverflow.com/questions/2616906/how-do-i-output-coloured-text-to-a-linux-terminal

‎benchmark/parsingcompetition.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11

2-
#include "jsonparser.h"
2+
#include "jsonparser/jsonparser.h"
33

44
#include "benchmark.h"
5-
//#include "jsonstruct.h"
5+
66
// #define RAPIDJSON_SSE2 // bad
77
// #define RAPIDJSON_SSE42 // bad
88
#include "rapidjson/document.h"
99
#include "rapidjson/reader.h" // you have to check in the submodule
1010
#include "rapidjson/stringbuffer.h"
1111
#include "rapidjson/writer.h"
1212

13-
// colorfuldisplay(ParsedJson & pj, const u8 * buf)
1413

1514
using namespace rapidjson;
1615
using namespace std;

include/common_defs.h renamed to include/jsonparser/common_defs.h

File renamed without changes.

include/jsonioutil.h renamed to include/jsonparser/jsonioutil.h

File renamed without changes.

include/jsonminifier.h renamed to include/jsonparser/jsonminifier.h

File renamed without changes.

include/jsonparser.h renamed to include/jsonparser/jsonparser.h

File renamed without changes.

include/simdjson_internal.h renamed to include/jsonparser/simdjson_internal.h

File renamed without changes.

include/simdprune_tables.h renamed to include/jsonparser/simdprune_tables.h

File renamed without changes.

0 commit comments

Comments
 (0)