Skip to content

Commit 0317287

Browse files
lemirelemire
committed
Minor fix
1 parent c5a396e commit 0317287

File tree

4 files changed

+47
-47
lines changed

4 files changed

+47
-47
lines changed

‎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 Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
1+
/* auto-generated on Mon Dec 31 11:59:09 EST 2018. Do not edit! */
22

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

‎singleheader/simdjson.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/* auto-generated on Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
1+
/* auto-generated on Mon Dec 31 11:59:09 EST 2018. Do not edit! */
22
#include "simdjson.h"
33

44
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
55
#ifdef DMALLOC
66
#include "dmalloc.h"
77
#endif
88

9-
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonioutil.cpp */
9+
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonioutil.cpp */
1010
#include <cstring>
1111
#include <stdlib.h>
1212

@@ -47,8 +47,8 @@ std::string_view get_corpus(std::string filename) {
4747
}
4848
throw std::runtime_error("could not load corpus");
4949
}
50-
/* end file /Users/lemire/CVS/github/simdjson/src/jsonioutil.cpp */
51-
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonminifier.cpp */
50+
/* end file /home/dlemire/CVS/github/simdjson/src/jsonioutil.cpp */
51+
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonminifier.cpp */
5252
#include <cstdint>
5353
#ifndef __AVX2__
5454

@@ -147,7 +147,7 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
147147
uint64_t even_carries = bs_bits + even_starts;
148148
uint64_t odd_carries;
149149
bool iter_ends_odd_backslash = add_overflow(
150-
bs_bits, odd_starts, (unsigned long long *)&odd_carries);
150+
bs_bits, odd_starts, &odd_carries);
151151
odd_carries |= prev_iter_ends_odd_backslash;
152152
prev_iter_ends_odd_backslash = iter_ends_odd_backslash ? 0x1ULL : 0x0ULL;
153153
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) {
298298
}
299299

300300
#endif
301-
/* end file /Users/lemire/CVS/github/simdjson/src/jsonminifier.cpp */
302-
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonparser.cpp */
301+
/* end file /home/dlemire/CVS/github/simdjson/src/jsonminifier.cpp */
302+
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonparser.cpp */
303303
#ifdef _MSC_VER
304304
#include <windows.h>
305305
#include <sysinfoapi.h>
@@ -369,8 +369,8 @@ ParsedJson build_parsed_json(const uint8_t *buf, size_t len, bool reallocifneede
369369
}
370370
return pj;
371371
}
372-
/* end file /Users/lemire/CVS/github/simdjson/src/jsonparser.cpp */
373-
/* begin file /Users/lemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
372+
/* end file /home/dlemire/CVS/github/simdjson/src/jsonparser.cpp */
373+
/* begin file /home/dlemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
374374
#include <cassert>
375375

376376
#ifndef SIMDJSON_SKIPUTF8VALIDATION
@@ -731,8 +731,8 @@ WARN_UNUSED
731731
return true;
732732
#endif
733733
}
734-
/* end file /Users/lemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
735-
/* begin file /Users/lemire/CVS/github/simdjson/src/stage2_flatten.cpp */
734+
/* end file /home/dlemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
735+
/* begin file /home/dlemire/CVS/github/simdjson/src/stage2_flatten.cpp */
736736

737737
#include <cassert>
738738

@@ -855,8 +855,8 @@ bool flatten_indexes(size_t len, ParsedJson &pj) {
855855
base_ptr[pj.n_structural_indexes] = 0; // make it safe to dereference one beyond this array
856856
return true;
857857
}
858-
/* end file /Users/lemire/CVS/github/simdjson/src/stage2_flatten.cpp */
859-
/* begin file /Users/lemire/CVS/github/simdjson/src/stage34_unified.cpp */
858+
/* end file /home/dlemire/CVS/github/simdjson/src/stage2_flatten.cpp */
859+
/* begin file /home/dlemire/CVS/github/simdjson/src/stage34_unified.cpp */
860860
#ifdef _MSC_VER
861861
/* Microsoft C/C++-compatible compiler */
862862
#include <intrin.h>
@@ -1363,4 +1363,4 @@ bool unified_machine(const uint8_t *buf, size_t len, ParsedJson &pj) {
13631363
fail:
13641364
return false;
13651365
}
1366-
/* end file /Users/lemire/CVS/github/simdjson/src/stage34_unified.cpp */
1366+
/* end file /home/dlemire/CVS/github/simdjson/src/stage34_unified.cpp */

‎singleheader/simdjson.h‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* auto-generated on Sun 30 Dec 2018 21:47:24 EST. Do not edit! */
2-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
1+
/* auto-generated on Mon Dec 31 11:59:09 EST 2018. Do not edit! */
2+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/portability.h */
33
#ifndef SIMDJSON_PORTABILITY_H
44
#define SIMDJSON_PORTABILITY_H
55

@@ -122,8 +122,8 @@ static inline void aligned_free(void *memblock) {
122122
}
123123

124124
#endif /* end of include PORTABILITY_H */
125-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
126-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/common_defs.h */
125+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/portability.h */
126+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/common_defs.h */
127127
#ifndef SIMDJSON_COMMON_DEFS_H
128128
#define SIMDJSON_COMMON_DEFS_H
129129

@@ -182,8 +182,8 @@ static inline void aligned_free(void *memblock) {
182182
#endif // MSC_VER
183183

184184
#endif // COMMON_DEFS_H
185-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/common_defs.h */
186-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
185+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/common_defs.h */
186+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
187187
#ifndef SIMDJSON_JSONCHARUTILS_H
188188
#define SIMDJSON_JSONCHARUTILS_H
189189

@@ -312,8 +312,8 @@ inline size_t codepoint_to_utf8(uint32_t cp, uint8_t *c) {
312312
}
313313

314314
#endif
315-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
316-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
315+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
316+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
317317
#ifndef SIMDJSON_JSONFORMATUTILS_H
318318
#define SIMDJSON_JSONFORMATUTILS_H
319319

@@ -410,8 +410,8 @@ static inline void print_with_escapes(const char *src, std::ostream &os) {
410410
}
411411

412412
#endif
413-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
414-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
413+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
414+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
415415
#ifndef SIMDJSON_JSONIOUTIL_H
416416
#define SIMDJSON_JSONIOUTIL_H
417417

@@ -451,8 +451,8 @@ std::string_view get_corpus(std::string filename);
451451

452452

453453
#endif
454-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
455-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
454+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
455+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
456456
#ifndef SIMDJSON_SIMDPRUNE_TABLES_H
457457
#define SIMDJSON_SIMDPRUNE_TABLES_H
458458

@@ -35531,8 +35531,8 @@ static const uint32_t mask256_epi32[] = {
3553135531
#endif //__AVX2__
3553235532

3553335533
#endif
35534-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
35535-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
35534+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
35535+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
3553635536

3553735537
#ifndef SIMDJSON_SIMDUTF8CHECK_H
3553835538
#define SIMDJSON_SIMDUTF8CHECK_H
@@ -35727,8 +35727,8 @@ avxcheckUTF8Bytes(__m256i current_bytes,
3572735727
#warning "We require AVX2 support!"
3572835728
#endif // __AVX2__
3572935729
#endif
35730-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
35731-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
35730+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
35731+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
3573235732
#ifndef SIMDJSON_JSONMINIFIER_H
3573335733
#define SIMDJSON_JSONMINIFIER_H
3573435734

@@ -35751,8 +35751,8 @@ static inline size_t jsonminify(const std::string_view & p, char *out) {
3575135751
}
3575235752

3575335753
#endif
35754-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
35755-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
35754+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
35755+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
3575635756
#ifndef SIMDJSON_PARSEDJSON_H
3575735757
#define SIMDJSON_PARSEDJSON_H
3575835758

@@ -36511,8 +36511,8 @@ inline void dumpbits32_always(uint32_t v, const std::string &msg) {
3651136511

3651236512

3651336513
#endif
36514-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
36515-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
36514+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
36515+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
3651636516
#ifndef SIMDJSON_STAGE1_FIND_MARKS_H
3651736517
#define SIMDJSON_STAGE1_FIND_MARKS_H
3651836518

@@ -36526,8 +36526,8 @@ static inline bool find_structural_bits(const char *buf, size_t len, ParsedJson
3652636526
}
3652736527

3652836528
#endif
36529-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
36530-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
36529+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
36530+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
3653136531
#ifndef SIMDJSON_STAGE2_FLATTEN_H
3653236532
#define SIMDJSON_STAGE2_FLATTEN_H
3653336533

@@ -36536,8 +36536,8 @@ WARN_UNUSED
3653636536
bool flatten_indexes(size_t len, ParsedJson &pj);
3653736537

3653836538
#endif
36539-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
36540-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
36539+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage2_flatten.h */
36540+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
3654136541
#ifndef SIMDJSON_STRINGPARSING_H
3654236542
#define SIMDJSON_STRINGPARSING_H
3654336543

@@ -36715,8 +36715,8 @@ really_inline bool parse_string(const uint8_t *buf, UNUSED size_t len,
3671536715

3671636716

3671736717
#endif
36718-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
36719-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
36718+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
36719+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
3672036720
#ifndef SIMDJSON_NUMBERPARSING_H
3672136721
#define SIMDJSON_NUMBERPARSING_H
3672236722

@@ -37213,8 +37213,8 @@ static really_inline bool parse_number(const uint8_t *const buf,
3721337213
}
3721437214

3721537215
#endif
37216-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
37217-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
37216+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
37217+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
3721837218
#ifndef SIMDJSON_STAGE34_UNIFIED_H
3721937219
#define SIMDJSON_STAGE34_UNIFIED_H
3722037220

@@ -37230,8 +37230,8 @@ static inline bool unified_machine(const char *buf, size_t len, ParsedJson &pj)
3723037230
}
3723137231

3723237232
#endif
37233-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
37234-
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
37233+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage34_unified.h */
37234+
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
3723537235
#ifndef SIMDJSON_JSONPARSER_H
3723637236
#define SIMDJSON_JSONPARSER_H
3723737237

@@ -37311,4 +37311,4 @@ inline ParsedJson build_parsed_json(const std::string_view &s, bool reallocifnee
3731137311
}
3731237312

3731337313
#endif
37314-
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
37314+
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonparser.h */

‎src/jsonminifier.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
9898
uint64_t even_carries = bs_bits + even_starts;
9999
uint64_t odd_carries;
100100
bool iter_ends_odd_backslash = add_overflow(
101-
bs_bits, odd_starts, (unsigned long long *)&odd_carries);
101+
bs_bits, odd_starts, &odd_carries);
102102
odd_carries |= prev_iter_ends_odd_backslash;
103103
prev_iter_ends_odd_backslash = iter_ends_odd_backslash ? 0x1ULL : 0x0ULL;
104104
uint64_t even_carry_ends = even_carries & ~bs_bits;

0 commit comments

Comments
 (0)