From d5a185b13e2b1dc05f28729aba29cb61b840fce9 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Wed, 13 Mar 2019 20:02:18 -0400 Subject: [PATCH] new release. --- CMakeLists.txt | 6 +++--- include/simdjson/simdjson_version.h | 6 +++--- include/simdjson/simdutf8check.h | 2 +- singleheader/amalgamation_demo.cpp | 2 +- singleheader/simdjson.cpp | 2 +- singleheader/simdjson.h | 18 +++++++----------- tools/release.py | 8 ++++---- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01c2e300d..ffd047a52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,9 @@ endif() project(simdjson) set(SIMDJSON_LIB_NAME simdjson) set(PROJECT_VERSION_MAJOR 0) -set(PROJECT_VERSION_MINOR 0) -set(PROJECT_VERSION_PATCH 1) -set(SIMDJSON_LIB_VERSION "0.0.1" CACHE STRING "simdjson library version") +set(PROJECT_VERSION_MINOR 1) +set(PROJECT_VERSION_PATCH 0) +set(SIMDJSON_LIB_VERSION "0.1.0" CACHE STRING "simdjson library version") set(SIMDJSON_LIB_SOVERSION "0" CACHE STRING "simdjson library soversion") if(NOT MSVC) diff --git a/include/simdjson/simdjson_version.h b/include/simdjson/simdjson_version.h index 7299791de..639ba72b7 100644 --- a/include/simdjson/simdjson_version.h +++ b/include/simdjson/simdjson_version.h @@ -1,10 +1,10 @@ // /include/simdjson/simdjson_version.h automatically generated by release.py, do not change by hand #ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION #define SIMDJSON_INCLUDE_SIMDJSON_VERSION -#define SIMDJSON_VERSION = 0.0.1, +#define SIMDJSON_VERSION 0.1.0 enum { SIMDJSON_VERSION_MAJOR = 0, - SIMDJSON_VERSION_MINOR = 0, - SIMDJSON_VERSION_REVISION = 1 + SIMDJSON_VERSION_MINOR = 1, + SIMDJSON_VERSION_REVISION = 0 }; #endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION diff --git a/include/simdjson/simdutf8check.h b/include/simdjson/simdutf8check.h index 49e54eb52..469864225 100644 --- a/include/simdjson/simdutf8check.h +++ b/include/simdjson/simdutf8check.h @@ -164,7 +164,7 @@ static inline void avx_count_nibbles(__m256i bytes, // check whether the current bytes are valid UTF-8 // at the end of the function, previous gets updated -static struct avx_processed_utf_bytes +static inline struct avx_processed_utf_bytes avxcheckUTF8Bytes(__m256i current_bytes, struct avx_processed_utf_bytes *previous, __m256i *has_error) { diff --git a/singleheader/amalgamation_demo.cpp b/singleheader/amalgamation_demo.cpp index 1f4241f91..64a8421a8 100644 --- a/singleheader/amalgamation_demo.cpp +++ b/singleheader/amalgamation_demo.cpp @@ -1,4 +1,4 @@ -/* auto-generated on Fri Mar 8 19:04:53 PST 2019. Do not edit! */ +/* auto-generated on Wed 13 Mar 2019 20:02:04 EDT. Do not edit! */ #include #include "simdjson.h" diff --git a/singleheader/simdjson.cpp b/singleheader/simdjson.cpp index 07cc9bb19..dca49ed2e 100644 --- a/singleheader/simdjson.cpp +++ b/singleheader/simdjson.cpp @@ -1,4 +1,4 @@ -/* auto-generated on Fri Mar 8 19:04:53 PST 2019. Do not edit! */ +/* auto-generated on Wed 13 Mar 2019 20:02:04 EDT. Do not edit! */ #include "simdjson.h" /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */ diff --git a/singleheader/simdjson.h b/singleheader/simdjson.h index 9e8f8a6e0..96d4f222a 100644 --- a/singleheader/simdjson.h +++ b/singleheader/simdjson.h @@ -1,13 +1,13 @@ -/* auto-generated on Fri Mar 8 19:04:53 PST 2019. Do not edit! */ +/* auto-generated on Wed 13 Mar 2019 20:02:04 EDT. Do not edit! */ /* begin file include/simdjson/simdjson_version.h */ // /include/simdjson/simdjson_version.h automatically generated by release.py, do not change by hand #ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION #define SIMDJSON_INCLUDE_SIMDJSON_VERSION -#define SIMDJSON_VERSION = 0.0.1, +#define SIMDJSON_VERSION 0.1.0 enum { SIMDJSON_VERSION_MAJOR = 0, - SIMDJSON_VERSION_MINOR = 0, - SIMDJSON_VERSION_REVISION = 1 + SIMDJSON_VERSION_MINOR = 1, + SIMDJSON_VERSION_REVISION = 0 }; #endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION /* end file include/simdjson/simdjson_version.h */ @@ -27,7 +27,8 @@ struct simdjson { static const std::string& errorMsg(const int); }; -#endif/* end file include/simdjson/simdjson.h */ +#endif +/* end file include/simdjson/simdjson.h */ /* begin file include/simdjson/portability.h */ #ifndef SIMDJSON_PORTABILITY_H #define SIMDJSON_PORTABILITY_H @@ -35727,7 +35728,7 @@ static inline void avx_count_nibbles(__m256i bytes, // check whether the current bytes are valid UTF-8 // at the end of the function, previous gets updated -static struct avx_processed_utf_bytes +static inline struct avx_processed_utf_bytes avxcheckUTF8Bytes(__m256i current_bytes, struct avx_processed_utf_bytes *previous, __m256i *has_error) { @@ -36687,11 +36688,6 @@ static really_inline bool parse_number(const uint8_t *const buf, unsigned char digit = *p - '0'; expnumber = digit; p++; - while (is_integer(*p)) { - digit = *p - '0'; - expnumber = 10 * expnumber + digit; - ++p; - } if (is_integer(*p)) { digit = *p - '0'; expnumber = 10 * expnumber + digit; diff --git a/tools/release.py b/tools/release.py index e21428529..a5a4105d3 100755 --- a/tools/release.py +++ b/tools/release.py @@ -85,7 +85,7 @@ 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("#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") @@ -107,9 +107,9 @@ cmakefile = maindir + os.sep + "CMakeLists.txt" for line in fileinput.input(cmakefile, inplace=1, backup='.bak'): line = re.sub('SIMDJSON_LIB_VERSION "\d+\.\d+\.\d+','SIMDJSON_LIB_VERSION "'+newversionstring, line.rstrip()) line = re.sub('SIMDJSON_LIB_SOVERSION "\d+','SIMDJSON_LIB_SOVERSION "'+newmajorversionstring, line) - line = re.sub('set(PROJECT_VERSION_MAJOR \d+','set(PROJECT_VERSION_MAJOR '+newmajorversionstring, line) - line = re.sub('set(PROJECT_VERSION_MINOR \d+','set(PROJECT_VERSION_MINOR '+mewminorversionstring, line) - line = re.sub('set(PROJECT_VERSION_PATCH \d+','set(PROJECT_VERSION_PATCH '+newrevversionstring, line) + line = re.sub('set\(PROJECT_VERSION_MAJOR \d+','set(PROJECT_VERSION_MAJOR '+newmajorversionstring, line) + line = re.sub('set\(PROJECT_VERSION_MINOR \d+','set(PROJECT_VERSION_MINOR '+mewminorversionstring, line) + line = re.sub('set\(PROJECT_VERSION_PATCH \d+','set(PROJECT_VERSION_PATCH '+newrevversionstring, line) print(line)