Fix the shuffle.
This commit is contained in:
Daniel Lemire
parent
e90c0f4296
commit
3e74059cc3
|
|
@ -0,0 +1,39 @@
|
|||
#table1=[16, 0, 0, 0, 0, 0, 0, 0, 0, 8, 12, 1, 2, 9, 0, 0]
|
||||
#table2=[8, 0, 18, 4, 0, 1, 0, 1, 0, 0, 0, 3, 2, 1, 0, 0]
|
||||
table1=[0 for i in range(16)]
|
||||
table2=[0 for i in range(16)]
|
||||
spaces0=[0x0a,0x09,0x0d]
|
||||
spaces2=[0x20]
|
||||
struct2=[0x2c]
|
||||
struct3=[0x3a]
|
||||
struct57=[0x5b,0x5d,0x7b,0x7d]
|
||||
|
||||
for s in struct2:
|
||||
table1[s&0xF]|=1
|
||||
table2[(s>>4)&0xF]|=1
|
||||
for s in struct3:
|
||||
table1[s&0xF]|=2
|
||||
table2[(s>>4)&0xF]|=2
|
||||
for s in struct57:
|
||||
table1[s&0xF]|=4
|
||||
table2[(s>>4)&0xF]|=4
|
||||
|
||||
for s in spaces0:
|
||||
table1[s&0xF]|=8
|
||||
table2[(s>>4)&0xF]|=8
|
||||
for s in spaces2:
|
||||
table1[s&0xF]|=16
|
||||
table2[(s>>4)&0xF]|=16
|
||||
|
||||
print(len(table1), len(table2))
|
||||
print(table1)
|
||||
print(table2)
|
||||
for i in range(256):
|
||||
low = i & 0xF
|
||||
high = (i >> 4) & 0xF
|
||||
m = table1[low] & table2[high]
|
||||
if(m!=0):
|
||||
if(i>=0x20):
|
||||
print(hex(i), chr(i), bin(m))
|
||||
else:
|
||||
print(hex(i), bin(m))
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* auto-generated on Fri Jan 4 17:36:46 EST 2019. Do not edit! */
|
||||
/* auto-generated on Fri 4 Jan 2019 20:12:48 EST. Do not edit! */
|
||||
|
||||
#include <iostream>
|
||||
#include "simdjson.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* auto-generated on Fri Jan 4 17:36:46 EST 2019. Do not edit! */
|
||||
/* auto-generated on Fri 4 Jan 2019 20:12:48 EST. 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 /home/dlemire/CVS/github/simdjson/src/jsonioutil.cpp */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/src/jsonioutil.cpp */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonminifier.cpp */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/src/jsonioutil.cpp */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/src/jsonminifier.cpp */
|
||||
#include <cstdint>
|
||||
#ifndef __AVX2__
|
||||
|
||||
|
|
@ -298,8 +298,8 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
|
|||
}
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/src/jsonminifier.cpp */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/src/jsonparser.cpp */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/src/jsonminifier.cpp */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/src/jsonparser.cpp */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/src/jsonparser.cpp */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
|
||||
#include <cassert>
|
||||
|
||||
#ifndef SIMDJSON_SKIPUTF8VALIDATION
|
||||
|
|
@ -814,8 +814,8 @@ WARN_UNUSED
|
|||
return true;
|
||||
#endif
|
||||
}
|
||||
/* end file /home/dlemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/src/stage2_build_tape.cpp */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/src/stage1_find_marks.cpp */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/src/stage2_build_tape.cpp */
|
||||
#ifdef _MSC_VER
|
||||
/* Microsoft C/C++-compatible compiler */
|
||||
#include <intrin.h>
|
||||
|
|
@ -1322,4 +1322,4 @@ succeed:
|
|||
fail:
|
||||
return false;
|
||||
}
|
||||
/* end file /home/dlemire/CVS/github/simdjson/src/stage2_build_tape.cpp */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/src/stage2_build_tape.cpp */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* auto-generated on Fri Jan 4 17:36:46 EST 2019. Do not edit! */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/portability.h */
|
||||
/* auto-generated on Fri 4 Jan 2019 20:12:48 EST. Do not edit! */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/portability.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/common_defs.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/common_defs.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/common_defs.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsoncharutils.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonformatutils.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonioutil.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/simdprune_tables.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/simdutf8check.h */
|
||||
/* begin file /Users/lemire/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 /home/dlemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonminifier.h */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
|
||||
#ifndef SIMDJSON_PARSEDJSON_H
|
||||
#define SIMDJSON_PARSEDJSON_H
|
||||
|
||||
|
|
@ -36500,8 +36500,8 @@ inline void dumpbits32_always(uint32_t v, const std::string &msg) {
|
|||
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/parsedjson.h */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
|
||||
#ifndef SIMDJSON_STAGE1_FIND_MARKS_H
|
||||
#define SIMDJSON_STAGE1_FIND_MARKS_H
|
||||
|
||||
|
|
@ -36515,8 +36515,8 @@ static inline bool find_structural_bits(const char *buf, size_t len, ParsedJson
|
|||
}
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage1_find_marks.h */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
|
||||
#ifndef SIMDJSON_STRINGPARSING_H
|
||||
#define SIMDJSON_STRINGPARSING_H
|
||||
|
||||
|
|
@ -36694,8 +36694,8 @@ really_inline bool parse_string(const uint8_t *buf, UNUSED size_t len,
|
|||
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stringparsing.h */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
|
||||
#ifndef SIMDJSON_NUMBERPARSING_H
|
||||
#define SIMDJSON_NUMBERPARSING_H
|
||||
|
||||
|
|
@ -37212,8 +37212,8 @@ static really_inline bool parse_number(const uint8_t *const buf,
|
|||
}
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/stage2_build_tape.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/numberparsing.h */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/stage2_build_tape.h */
|
||||
#ifndef SIMDJSON_STAGE34_UNIFIED_H
|
||||
#define SIMDJSON_STAGE34_UNIFIED_H
|
||||
|
||||
|
|
@ -37229,8 +37229,8 @@ static inline bool unified_machine(const char *buf, size_t len, ParsedJson &pj)
|
|||
}
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/stage2_build_tape.h */
|
||||
/* begin file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/stage2_build_tape.h */
|
||||
/* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
|
||||
#ifndef SIMDJSON_JSONPARSER_H
|
||||
#define SIMDJSON_JSONPARSER_H
|
||||
|
||||
|
|
@ -37310,4 +37310,4 @@ inline ParsedJson build_parsed_json(const std::string_view &s, bool reallocifnee
|
|||
}
|
||||
|
||||
#endif
|
||||
/* end file /home/dlemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
|
||||
/* end file /Users/lemire/CVS/github/simdjson/include/simdjson/jsonparser.h */
|
||||
|
|
|
|||
Loading…
Reference in New Issue