Single-header version.

lemire · lemire · commit 3803c844520b · 2018-12-30T21:50:10.000-05:00
diff --git a/Makefile b/Makefile
@@ -62,6 +62,8 @@ test: jsoncheck numberparsingcheck stringparsingcheck
 	@echo "It looks like the code is good!"
 	@tput sgr0
 
+amalgamate:
+	./amalgamation.sh
 
 $(SAJSON_INCLUDE):
 	git submodule update --init --recursive
diff --git a/README.md b/README.md
@@ -88,6 +88,13 @@ if( ! pj.isValid() ) {
 }
 ```
 
+## Usage: easy single-header version
+
+See the "singleheader" repository for a single header version. See the included
+file "amalgamation_demo.cpp" for usage. This requires no specific build system: just
+copy the files in your project.
+
+
 
 ## Usage (old-school Makefile on platforms like Linux or macOS)
 
diff --git a/amalgamation.sh b/amalgamation.sh
@@ -12,7 +12,14 @@ AMAL_H="simdjson.h"
 AMAL_C="simdjson.cpp"
 
 # order does not matter
-ALLCFILES=$( ( [ -d $SCRIPTPATH/.git ] && ( type git >/dev/null 2>&1 ) &&  ( git ls-files $SCRIPTPATH/src/*.c $SCRIPTPATH/src/**/*c ) ) ||  ( find $SCRIPTPATH/src -name '*.c' ) )
+ALLCFILES="
+$SCRIPTPATH/src/jsonioutil.cpp
+$SCRIPTPATH/src/jsonminifier.cpp
+$SCRIPTPATH/src/jsonparser.cpp
+$SCRIPTPATH/src/stage1_find_marks.cpp
+$SCRIPTPATH/src/stage2_flatten.cpp
+$SCRIPTPATH/src/stage34_unified.cpp
+"
 
 # order matters
 ALLCHEADERS="
@@ -112,7 +119,14 @@ echo "Giving final instructions:"
 CPPBIN=${DEMOCPP%%.*}
 
 echo "Try :"
-echo "c++ -march=native -O3 -std=c++11 -o ${CPPBIN} ${DEMOCPP}  && ./${CPPBIN} "
+echo "c++ -march=native -O3 -std=c++11 -o ${CPPBIN} ${DEMOCPP}  && ./${CPPBIN} jsonexamples/twitter.json "
+
+SINGLEHDR=$SCRIPTPATH/singleheader
+echo "Copying files to $SCRIPTPATH/singleheader "
+mkdir -p $SINGLEHDR
+echo "c++ -march=native -O3 -std=c++11 -o ${CPPBIN} ${DEMOCPP}  && ./${CPPBIN} ../jsonexamples/twitter.json " > $SINGLEHDR/README.md
+cp ${AMAL_C} ${AMAL_H}  ${DEMOCPP} $SINGLEHDR
+ls $SINGLEHDR
 
 lowercase(){
     echo "$1" | tr 'A-Z' 'a-z'
diff --git a/singleheader/README.md b/singleheader/README.md
@@ -0,0 +1 @@
+c++ -march=native -O3 -std=c++11 -o amalgamation_demo amalgamation_demo.cpp  && ./amalgamation_demo ../jsonexamples/twitter.json 
diff --git a/singleheader/amalgamation_demo.cpp b/singleheader/amalgamation_demo.cpp
@@ -0,0 +1,17 @@
+/* auto-generated on Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
+
+#include <iostream>
+#include "simdjson.h"
+#include "simdjson.cpp"
+int main(int argc, char *argv[]) {
+  const char * filename = argv[1]; 
+  std::string_view p = get_corpus(filename);
+  ParsedJson pj = build_parsed_json(p); // do the parsing
+  if( ! pj.isValid() ) {
+    std::cout << "not valid" << std::endl;
+  } else {
+    std::cout << "valid" << std::endl;
+  }
+  return EXIT_SUCCESS;
+}
+
diff --git a/singleheader/simdjson.cpp b/singleheader/simdjson.cpp
diff --git a/singleheader/simdjson.h b/singleheader/simdjson.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+c++ -march=native -O3 -std=c++11 -o amalgamation_demo amalgamation_demo.cpp && ./amalgamation_demo ../jsonexamples/twitter.json`