Merge branch 'workingonmsvs'

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

README.md

@@ -88,6 +88,11 @@ 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)
 

amalgamation.sh

@@ -0,0 +1,136 @@
+#!/bin/bash
+########################################################################
+# Generates an "amalgamation build" for roaring. Inspired by similar
+# script used by whefs.
+########################################################################
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+
+echo "We are about to amalgamate all simdjson files into one source file. "
+echo "See https://www.sqlite.org/amalgamation.html and https://en.wikipedia.org/wiki/Single_Compilation_Unit for rationale. "
+
+AMAL_H="simdjson.h"
+AMAL_C="simdjson.cpp"
+
+# order does not matter
+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="
+$SCRIPTPATH/include/simdjson/portability.h
+$SCRIPTPATH/include/simdjson/common_defs.h
+$SCRIPTPATH/include/simdjson/jsoncharutils.h
+$SCRIPTPATH/include/simdjson/jsonformatutils.h
+$SCRIPTPATH/include/simdjson/jsonioutil.h
+$SCRIPTPATH/include/simdjson/simdprune_tables.h
+$SCRIPTPATH/include/simdjson/simdutf8check.h
+$SCRIPTPATH/include/simdjson/jsonminifier.h
+$SCRIPTPATH/include/simdjson/parsedjson.h
+$SCRIPTPATH/include/simdjson/stage1_find_marks.h
+$SCRIPTPATH/include/simdjson/stage2_flatten.h
+$SCRIPTPATH/include/simdjson/stringparsing.h
+$SCRIPTPATH/include/simdjson/numberparsing.h
+$SCRIPTPATH/include/simdjson/stage34_unified.h
+$SCRIPTPATH/include/simdjson/jsonparser.h
+"
+
+for i in ${ALLCHEADERS} ${ALLCFILES}; do
+    test -e $i && continue
+    echo "FATAL: source file [$i] not found."
+    exit 127
+done
+
+
+function stripinc()
+{
+    sed -e '/# *include *"/d' -e '/# *include *<simdjson\//d'
+}
+function dofile()
+{
+    echo "/* begin file $1 */"
+    # echo "#line 8 \"$1\"" ## redefining the line/file is not nearly as useful as it sounds for debugging. It breaks IDEs.
+    stripinc < $1
+    echo "/* end file $1 */"
+}
+
+timestamp=$(date)
+echo "Creating ${AMAL_H}..."
+echo "/* auto-generated on ${timestamp}. Do not edit! */" > "${AMAL_H}"
+{
+    for h in ${ALLCHEADERS}; do
+        dofile $h
+    done
+} >> "${AMAL_H}"
+
+
+echo "Creating ${AMAL_C}..."
+echo "/* auto-generated on ${timestamp}. Do not edit! */" > "${AMAL_C}"
+{
+    echo "#include \"${AMAL_H}\""
+
+    echo ""
+    echo "/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */"
+    echo "#ifdef DMALLOC"
+    echo "#include \"dmalloc.h\""
+    echo "#endif"
+    echo ""
+
+    for h in ${ALLCFILES}; do
+        dofile $h
+    done
+} >> "${AMAL_C}"
+
+
+
+DEMOCPP="amalgamation_demo.cpp"
+echo "Creating ${DEMOCPP}..."
+echo "/* auto-generated on ${timestamp}. Do not edit! */" > "${DEMOCPP}"
+cat <<< '
+#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;
+}
+' >>  "${DEMOCPP}"
+
+echo "Done with all files generation. "
+
+echo "Files have been written to  directory: $PWD "
+ls -la ${AMAL_C} ${AMAL_H}  ${DEMOCPP}
+
+echo "Giving final instructions:"
+
+
+CPPBIN=${DEMOCPP%%.*}
+
+echo "Try :"
+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'
+}
+
+OS=`lowercase \`uname\``
+

singleheader/README.md

@@ -0,0 +1 @@
+c++ -march=native -O3 -std=c++11 -o amalgamation_demo amalgamation_demo.cpp  && ./amalgamation_demo ../jsonexamples/twitter.json 

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;
+}
+