jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Minor fix

This commit is contained in:
Daniel Lemire 2018-12-31 11:59:12 -05:00
parent c5a396e788
commit 0317287071
4 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
singleheader/amalgamation_demo.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
/* auto-generated on Mon Dec 31 11:59:09 EST 2018. Do not edit! */
#include <iostream>
#include "simdjson.h"

28
singleheader/simdjson.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
/* auto-generated on Mon Dec 31 11:59:09 EST 2018. Do not edit! */
#include "simdjson.h"
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@ -6,7 +6,7 @@
#include "dmalloc.h"
#endif
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonioutil.cpp */
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonioutil.cpp */
#include <cstring>
#include <stdlib.h>
@ -47,8 +47,8 @@ std::string_view get_corpus(std::string filename) {
}
throw std::runtime_error("could not load corpus");
}
/* end file /Users/lemire/CVS/github/simdjson/src/jsonioutil.cpp */
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonminifier.cpp */
/* end file /home/dlemire/CVS/github/simdjson/src/jsonioutil.cpp */
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonminifier.cpp */
#include <cstdint>
#ifndef __AVX2__
@ -147,7 +147,7 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
uint64_t even_carries = bs_bits + even_starts;
uint64_t odd_carries;
bool iter_ends_odd_backslash = add_overflow(
bs_bits, odd_starts, (unsigned long long *)&odd_carries);
bs_bits, odd_starts, &odd_carries);
odd_carries |= prev_iter_ends_odd_backslash;
prev_iter_ends_odd_backslash = iter_ends_odd_backslash ? 0x1ULL : 0x0ULL;
uint64_t even_carry_ends = even_carries & ~bs_bits;
@ -298,8 +298,8 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/src/jsonminifier.cpp */
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonparser.cpp */
/* end file /home/dlemire/CVS/github/simdjson/src/jsonminifier.cpp */
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonparser.cpp */
#ifdef _MSC_VER
#include <windows.h>
#include <sysinfoapi.h>
@ -369,8 +369,8 @@ ParsedJson build_parsed_json(const uint8_t *buf, size_t len, bool reallocifneede
}
return pj;
}
/* end file /Users/lemire/CVS/github/simdjson/src/jsonparser.cpp */
/* begin file /Users/lemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
/* end file /home/dlemire/CVS/github/simdjson/src/jsonparser.cpp */
/* begin file /home/dlemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
#include <cassert>
#ifndef SIMDJSON_SKIPUTF8VALIDATION
@ -731,8 +731,8 @@ WARN_UNUSED
return true;
#endif
}
/* end file /Users/lemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
/* begin file /Users/lemire/CVS/github/simdjson/src/stage2_flatten.cpp */
/* end file /home/dlemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
/* begin file /home/dlemire/CVS/github/simdjson/src/stage2_flatten.cpp */
#include <cassert>
@ -855,8 +855,8 @@ bool flatten_indexes(size_t len, ParsedJson &pj) {
base_ptr[pj.n_structural_indexes] = 0; // make it safe to dereference one beyond this array
return true;
}
/* end file /Users/lemire/CVS/github/simdjson/src/stage2_flatten.cpp */
/* begin file /Users/lemire/CVS/github/simdjson/src/stage34_unified.cpp */
/* end file /home/dlemire/CVS/github/simdjson/src/stage2_flatten.cpp */
/* begin file /home/dlemire/CVS/github/simdjson/src/stage34_unified.cpp */
#ifdef _MSC_VER
/* Microsoft C/C++-compatible compiler */
#include <intrin.h>
@ -1363,4 +1363,4 @@ succeed:
fail:
return false;
}
/* end file /Users/lemire/CVS/github/simdjson/src/stage34_unified.cpp */
/* end file /home/dlemire/CVS/github/simdjson/src/stage34_unified.cpp */

62
singleheader/simdjson.h
View File

@ -1,5 +1,5 @@
/* auto-generated on Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
/* auto-generated on Mon Dec 31 11:59:09 EST 2018. Do not edit! */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/portability.h */
#ifndef SIMDJSON_PORTABILITY_H
#define SIMDJSON_PORTABILITY_H
@ -122,8 +122,8 @@ static inline void aligned_free(void *memblock) {
}
#endif /* end of include PORTABILITY_H */
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/common_defs.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/portability.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/common_defs.h */
#ifndef SIMDJSON_COMMON_DEFS_H
#define SIMDJSON_COMMON_DEFS_H
@ -182,8 +182,8 @@ static inline void aligned_free(void *memblock) {
#endif // MSC_VER
#endif // COMMON_DEFS_H
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/common_defs.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/common_defs.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
#ifndef SIMDJSON_JSONCHARUTILS_H
#define SIMDJSON_JSONCHARUTILS_H
@ -312,8 +312,8 @@ inline size_t codepoint_to_utf8(uint32_t cp, uint8_t *c) {
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
#ifndef SIMDJSON_JSONFORMATUTILS_H
#define SIMDJSON_JSONFORMATUTILS_H
@ -410,8 +410,8 @@ static inline void print_with_escapes(const char *src, std::ostream &os) {
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
#ifndef SIMDJSON_JSONIOUTIL_H
#define SIMDJSON_JSONIOUTIL_H
@ -451,8 +451,8 @@ std::string_view get_corpus(std::string filename);
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
#ifndef SIMDJSON_SIMDPRUNE_TABLES_H
#define SIMDJSON_SIMDPRUNE_TABLES_H
@ -35531,8 +35531,8 @@ static const uint32_t mask256_epi32[] = {
#endif //__AVX2__
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
#ifndef SIMDJSON_SIMDUTF8CHECK_H
#define SIMDJSON_SIMDUTF8CHECK_H
@ -35727,8 +35727,8 @@ avxcheckUTF8Bytes(__m256i current_bytes,
#warning "We require AVX2 support!"
#endif // __AVX2__
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
#ifndef SIMDJSON_JSONMINIFIER_H
#define SIMDJSON_JSONMINIFIER_H
@ -35751,8 +35751,8 @@ static inline size_t jsonminify(const std::string_view & p, char *out) {
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
#ifndef SIMDJSON_PARSEDJSON_H
#define SIMDJSON_PARSEDJSON_H
@ -36511,8 +36511,8 @@ inline void dumpbits32_always(uint32_t v, const std::string &msg) {
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
#ifndef SIMDJSON_STAGE1_FIND_MARKS_H
#define SIMDJSON_STAGE1_FIND_MARKS_H
@ -36526,8 +36526,8 @@ static inline bool find_structural_bits(const char *buf, size_t len, ParsedJson
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
#ifndef SIMDJSON_STAGE2_FLATTEN_H
#define SIMDJSON_STAGE2_FLATTEN_H
@ -36536,8 +36536,8 @@ WARN_UNUSED
bool flatten_indexes(size_t len, ParsedJson &pj);
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
#ifndef SIMDJSON_STRINGPARSING_H
#define SIMDJSON_STRINGPARSING_H
@ -36715,8 +36715,8 @@ really_inline bool parse_string(const uint8_t *buf, UNUSED size_t len,
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
#ifndef SIMDJSON_NUMBERPARSING_H
#define SIMDJSON_NUMBERPARSING_H
@ -37213,8 +37213,8 @@ static really_inline bool parse_number(const uint8_t *const buf,
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
#ifndef SIMDJSON_STAGE34_UNIFIED_H
#define SIMDJSON_STAGE34_UNIFIED_H
@ -37230,8 +37230,8 @@ static inline bool unified_machine(const char *buf, size_t len, ParsedJson &pj)
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
#ifndef SIMDJSON_JSONPARSER_H
#define SIMDJSON_JSONPARSER_H
@ -37311,4 +37311,4 @@ inline ParsedJson build_parsed_json(const std::string_view &s, bool reallocifnee
}
#endif
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonparser.h */

2
src/jsonminifier.cpp
View File

@ -98,7 +98,7 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
uint64_t even_carries = bs_bits + even_starts;
uint64_t odd_carries;
bool iter_ends_odd_backslash = add_overflow(
bs_bits, odd_starts, (unsigned long long *)&odd_carries);
bs_bits, odd_starts, &odd_carries);
odd_carries |= prev_iter_ends_odd_backslash;
prev_iter_ends_odd_backslash = iter_ends_odd_backslash ? 0x1ULL : 0x0ULL;
uint64_t even_carry_ends = even_carries & ~bs_bits;