Skip to content

Commit d5a185b

Browse files
lemirelemire
committed
new release.
1 parent 40ad3d6 commit d5a185b

7 files changed

Lines changed: 20 additions & 24 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ endif()
1010
project(simdjson)
1111
set(SIMDJSON_LIB_NAME simdjson)
1212
set(PROJECT_VERSION_MAJOR 0)
13-
set(PROJECT_VERSION_MINOR 0)
14-
set(PROJECT_VERSION_PATCH 1)
15-
set(SIMDJSON_LIB_VERSION "0.0.1" CACHE STRING "simdjson library version")
13+
set(PROJECT_VERSION_MINOR 1)
14+
set(PROJECT_VERSION_PATCH 0)
15+
set(SIMDJSON_LIB_VERSION "0.1.0" CACHE STRING "simdjson library version")
1616
set(SIMDJSON_LIB_SOVERSION "0" CACHE STRING "simdjson library soversion")
1717

1818
if(NOT MSVC)

‎include/simdjson/simdjson_version.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// /include/simdjson/simdjson_version.h automatically generated by release.py, do not change by hand
22
#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION
33
#define SIMDJSON_INCLUDE_SIMDJSON_VERSION
4-
#define SIMDJSON_VERSION = 0.0.1,
4+
#define SIMDJSON_VERSION 0.1.0
55
enum {
66
SIMDJSON_VERSION_MAJOR = 0,
7-
SIMDJSON_VERSION_MINOR = 0,
8-
SIMDJSON_VERSION_REVISION = 1
7+
SIMDJSON_VERSION_MINOR = 1,
8+
SIMDJSON_VERSION_REVISION = 0
99
};
1010
#endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION

‎include/simdjson/simdutf8check.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static inline void avx_count_nibbles(__m256i bytes,
164164

165165
// check whether the current bytes are valid UTF-8
166166
// at the end of the function, previous gets updated
167-
static struct avx_processed_utf_bytes
167+
static inline struct avx_processed_utf_bytes
168168
avxcheckUTF8Bytes(__m256i current_bytes,
169169
struct avx_processed_utf_bytes *previous,
170170
__m256i *has_error) {

‎singleheader/amalgamation_demo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Fri Mar 8 19:04:53 PST 2019. Do not edit! */
1+
/* auto-generated on Wed 13 Mar 2019 20:02:04 EDT. Do not edit! */
22

33
#include <iostream>
44
#include "simdjson.h"

‎singleheader/simdjson.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Fri Mar 8 19:04:53 PST 2019. Do not edit! */
1+
/* auto-generated on Wed 13 Mar 2019 20:02:04 EDT. Do not edit! */
22
#include "simdjson.h"
33

44
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */

‎singleheader/simdjson.h‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
/* auto-generated on Fri Mar 8 19:04:53 PST 2019. Do not edit! */
1+
/* auto-generated on Wed 13 Mar 2019 20:02:04 EDT. Do not edit! */
22
/* begin file include/simdjson/simdjson_version.h */
33
// /include/simdjson/simdjson_version.h automatically generated by release.py, do not change by hand
44
#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION
55
#define SIMDJSON_INCLUDE_SIMDJSON_VERSION
6-
#define SIMDJSON_VERSION = 0.0.1,
6+
#define SIMDJSON_VERSION 0.1.0
77
enum {
88
SIMDJSON_VERSION_MAJOR = 0,
9-
SIMDJSON_VERSION_MINOR = 0,
10-
SIMDJSON_VERSION_REVISION = 1
9+
SIMDJSON_VERSION_MINOR = 1,
10+
SIMDJSON_VERSION_REVISION = 0
1111
};
1212
#endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION
1313
/* end file include/simdjson/simdjson_version.h */
@@ -27,7 +27,8 @@ struct simdjson {
2727
static const std::string& errorMsg(const int);
2828
};
2929

30-
#endif/* end file include/simdjson/simdjson.h */
30+
#endif
31+
/* end file include/simdjson/simdjson.h */
3132
/* begin file include/simdjson/portability.h */
3233
#ifndef SIMDJSON_PORTABILITY_H
3334
#define SIMDJSON_PORTABILITY_H
@@ -35727,7 +35728,7 @@ static inline void avx_count_nibbles(__m256i bytes,
3572735728

3572835729
// check whether the current bytes are valid UTF-8
3572935730
// at the end of the function, previous gets updated
35730-
static struct avx_processed_utf_bytes
35731+
static inline struct avx_processed_utf_bytes
3573135732
avxcheckUTF8Bytes(__m256i current_bytes,
3573235733
struct avx_processed_utf_bytes *previous,
3573335734
__m256i *has_error) {
@@ -36687,11 +36688,6 @@ static really_inline bool parse_number(const uint8_t *const buf,
3668736688
unsigned char digit = *p - '0';
3668836689
expnumber = digit;
3668936690
p++;
36690-
while (is_integer(*p)) {
36691-
digit = *p - '0';
36692-
expnumber = 10 * expnumber + digit;
36693-
++p;
36694-
}
3669536691
if (is_integer(*p)) {
3669636692
digit = *p - '0';
3669736693
expnumber = 10 * expnumber + digit;

‎tools/release.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def topaddedversionstring(major, minor, rev):
8585
file.write("// "+versionfilerel+" automatically generated by release.py, do not change by hand \n")
8686
file.write("#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION \n")
8787
file.write("#define SIMDJSON_INCLUDE_SIMDJSON_VERSION \n")
88-
file.write("#define SIMDJSON_VERSION = "+toversionstring(*newversion)+", \n")
88+
file.write("#define SIMDJSON_VERSION "+toversionstring(*newversion)+" \n")
8989
file.write("enum { \n")
9090
file.write(" SIMDJSON_VERSION_MAJOR = "+str(newversion[0])+", \n")
9191
file.write(" SIMDJSON_VERSION_MINOR = "+str(newversion[1])+", \n")
@@ -107,9 +107,9 @@ def topaddedversionstring(major, minor, rev):
107107
for line in fileinput.input(cmakefile, inplace=1, backup='.bak'):
108108
line = re.sub('SIMDJSON_LIB_VERSION "\d+\.\d+\.\d+','SIMDJSON_LIB_VERSION "'+newversionstring, line.rstrip())
109109
line = re.sub('SIMDJSON_LIB_SOVERSION "\d+','SIMDJSON_LIB_SOVERSION "'+newmajorversionstring, line)
110-
line = re.sub('set(PROJECT_VERSION_MAJOR \d+','set(PROJECT_VERSION_MAJOR '+newmajorversionstring, line)
111-
line = re.sub('set(PROJECT_VERSION_MINOR \d+','set(PROJECT_VERSION_MINOR '+mewminorversionstring, line)
112-
line = re.sub('set(PROJECT_VERSION_PATCH \d+','set(PROJECT_VERSION_PATCH '+newrevversionstring, line)
110+
line = re.sub('set\(PROJECT_VERSION_MAJOR \d+','set(PROJECT_VERSION_MAJOR '+newmajorversionstring, line)
111+
line = re.sub('set\(PROJECT_VERSION_MINOR \d+','set(PROJECT_VERSION_MINOR '+mewminorversionstring, line)
112+
line = re.sub('set\(PROJECT_VERSION_PATCH \d+','set(PROJECT_VERSION_PATCH '+newrevversionstring, line)
113113
print(line)
114114

115115

0 commit comments

Comments
 (0)