Version 0.2.0.

This commit is contained in:
Daniel Lemire
2019-08-01 16:23:30 -04:00
parent ea212e4b50
commit d720ea8303
6 changed files with 3215 additions and 2679 deletions
+4 -4
View File
@@ -7,7 +7,7 @@ endif()
# usage: cmake -DSIMDJSON_DISABLE_AVX=on ..
option(SIMDJSON_DISABLE_AVX "Forcefully disable AVX even if hardware supports it" OFF)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_MACOSX_RPATH OFF)
@@ -19,9 +19,9 @@ endif()
project(simdjson)
set(SIMDJSON_LIB_NAME simdjson)
set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 1)
set(PROJECT_VERSION_PATCH 2)
set(SIMDJSON_LIB_VERSION "0.1.2" CACHE STRING "simdjson library version")
set(PROJECT_VERSION_MINOR 2)
set(PROJECT_VERSION_PATCH 0)
set(SIMDJSON_LIB_VERSION "0.2.0" CACHE STRING "simdjson library version")
set(SIMDJSON_LIB_SOVERSION "0" CACHE STRING "simdjson library soversion")
if(NOT MSVC)
+4 -4
View File
@@ -2,12 +2,12 @@
// do not change by hand
#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION
#define SIMDJSON_INCLUDE_SIMDJSON_VERSION
#define SIMDJSON_VERSION 0.1.2
#define SIMDJSON_VERSION 0.2.0
namespace simdjson {
enum {
SIMDJSON_VERSION_MAJOR = 0,
SIMDJSON_VERSION_MINOR = 1,
SIMDJSON_VERSION_REVISION = 2
SIMDJSON_VERSION_MAJOR = 0,
SIMDJSON_VERSION_MINOR = 2,
SIMDJSON_VERSION_REVISION = 0
};
}
#endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION
+5 -2
View File
@@ -1,13 +1,16 @@
/* auto-generated on Sun 28 Jul 2019 18:08:49 EDT. Do not edit! */
/* auto-generated on Thu 1 Aug 2019 16:18:07 EDT. Do not edit! */
#include <iostream>
#include "simdjson.h"
#include "simdjson.cpp"
int main(int argc, char *argv[]) {
if(argc < 2) {
std::cerr << "Please specify a filename " << std::endl;
}
const char * filename = argv[1];
simdjson::padded_string p = simdjson::get_corpus(filename);
simdjson::ParsedJson pj = simdjson::build_parsed_json(p); // do the parsing
if( ! pj.isValid() ) {
if( ! pj.is_valid() ) {
std::cout << "not valid" << std::endl;
} else {
std::cout << "valid" << std::endl;
+1196 -971
View File
File diff suppressed because it is too large Load Diff
+1993 -1688
View File
File diff suppressed because it is too large Load Diff
+13 -10
View File
@@ -82,16 +82,19 @@ versionfilerel = os.sep + "include" + os.sep + "simdjson" + os.sep + "simdjson_v
versionfile = maindir + versionfilerel
with open(versionfile, 'w') as file:
file.write("// "+versionfilerel+" automatically generated by release.py, do not change by hand \n")
file.write("#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION \n")
file.write("#define SIMDJSON_INCLUDE_SIMDJSON_VERSION \n")
file.write("#define SIMDJSON_VERSION "+toversionstring(*newversion)+" \n")
file.write("enum { \n")
file.write(" SIMDJSON_VERSION_MAJOR = "+str(newversion[0])+", \n")
file.write(" SIMDJSON_VERSION_MINOR = "+str(newversion[1])+", \n")
file.write(" SIMDJSON_VERSION_REVISION = "+str(newversion[2])+" \n")
file.write("}; \n")
file.write("#endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION \n")
file.write("// "+versionfilerel+" automatically generated by release.py,\n")
file.write("// do not change by hand\n")
file.write("#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION\n")
file.write("#define SIMDJSON_INCLUDE_SIMDJSON_VERSION\n")
file.write("#define SIMDJSON_VERSION "+toversionstring(*newversion)+"\n")
file.write("namespace simdjson {\n")
file.write("enum {\n")
file.write(" SIMDJSON_VERSION_MAJOR = "+str(newversion[0])+",\n")
file.write(" SIMDJSON_VERSION_MINOR = "+str(newversion[1])+",\n")
file.write(" SIMDJSON_VERSION_REVISION = "+str(newversion[2])+"\n")
file.write("};\n")
file.write("}\n")
file.write("#endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION\n")
print(versionfile + " modified")