diff --git a/amalgamate.py b/amalgamate.py index d6dd28d9..96fd8151 100644 --- a/amalgamate.py +++ b/amalgamate.py @@ -2,7 +2,7 @@ with open("src/opcodes.h", "rt", encoding='utf-8') as f: OPCODES_TEXT = f.read() pipeline = [ - ["__stl__.h", "memory.h", "str.h", "hash_table8.hpp", "safestl.h", "builtins.h", "error.h"], + ["hash_table8.hpp", "__stl__.h", "memory.h", "str.h", "safestl.h", "builtins.h", "error.h"], ["obj.h", "iter.h", "parser.h", "pointer.h", "codeobject.h"], ["vm.h", "compiler.h", "repl.h"], ["pocketpy.h"] diff --git a/plugins/flutter/src/pocketpy.h b/plugins/flutter/src/pocketpy.h index d43bb318..09aea6ad 100644 --- a/plugins/flutter/src/pocketpy.h +++ b/plugins/flutter/src/pocketpy.h @@ -5,399 +5,6 @@ #ifndef POCKETPY_H #define POCKETPY_H - - -#ifdef _MSC_VER -#pragma warning (disable:4267) -#pragma warning (disable:4101) -#define _CRT_NONSTDC_NO_DEPRECATE -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifdef POCKETPY_H -#define UNREACHABLE() throw std::runtime_error( "L" + std::to_string(__LINE__) + " UNREACHABLE()! This should be a bug, please report it"); -#else -#define UNREACHABLE() throw std::runtime_error( __FILE__ + std::string(":") + std::to_string(__LINE__) + " UNREACHABLE()!"); -#endif - -#ifdef __EMSCRIPTEN__ -#include -#else -#include -#endif - -#define PK_VERSION "0.6.0" - -//#define PKPY_NO_TYPE_CHECK -//#define PKPY_NO_INDEX_CHECK - - -namespace pkpy{ - template - class shared_ptr { - int* counter = nullptr; - -#define _t() ((T*)(counter + 1)) -#define _inc_counter() if(counter) ++(*counter) -#define _dec_counter() if(counter && --(*counter) == 0){ _t()->~T(); free(counter); } - - public: - shared_ptr() {} - shared_ptr(int* block) : counter(block) {} - shared_ptr(const shared_ptr& other) : counter(other.counter) { - _inc_counter(); - } - shared_ptr(shared_ptr&& other) noexcept : counter(other.counter) { - other.counter = nullptr; - } - ~shared_ptr() { - _dec_counter(); - } - - bool operator==(const shared_ptr& other) const { - return counter == other.counter; - } - - bool operator!=(const shared_ptr& other) const { - return counter != other.counter; - } - - bool operator==(std::nullptr_t) const { - return counter == nullptr; - } - - bool operator!=(std::nullptr_t) const { - return counter != nullptr; - } - - shared_ptr& operator=(const shared_ptr& other) { - if (this != &other) { - _dec_counter(); - counter = other.counter; - _inc_counter(); - } - return *this; - } - - shared_ptr& operator=(shared_ptr&& other) noexcept { - if (this != &other) { - _dec_counter(); - counter = other.counter; - other.counter = nullptr; - } - return *this; - } - - T& operator*() const { - return *_t(); - } - T* operator->() const { - return _t(); - } - T* get() const { - return _t(); - } - int use_count() const { - return counter ? *counter : 0; - } - void reset(){ - _dec_counter(); - counter = nullptr; - } - }; - -#undef _t -#undef _inc_counter -#undef _dec_counter - - template - shared_ptr make_shared(Args&&... args) { - static_assert(std::is_base_of::value, "U must be derived from T"); - int* p = (int*)malloc(sizeof(int) + sizeof(U)); - *p = 1; - new(p+1) U(std::forward(args)...); - return shared_ptr(p); - } - - template - shared_ptr make_shared(Args&&... args) { - int* p = (int*)malloc(sizeof(int) + sizeof(T)); - *p = 1; - new(p+1) T(std::forward(args)...); - return shared_ptr(p); - } - - template - class unique_ptr { - T* ptr; - - public: - unique_ptr() : ptr(nullptr) {} - unique_ptr(T* ptr) : ptr(ptr) {} - unique_ptr(const unique_ptr& other) = delete; - unique_ptr(unique_ptr&& other) : ptr(other.ptr) { - other.ptr = nullptr; - } - ~unique_ptr() { - delete ptr; - } - - bool operator==(const unique_ptr& other) const { - return ptr == other.ptr; - } - - bool operator!=(const unique_ptr& other) const { - return ptr != other.ptr; - } - - bool operator==(std::nullptr_t) const { - return ptr == nullptr; - } - - bool operator!=(std::nullptr_t) const { - return ptr != nullptr; - } - - unique_ptr& operator=(const unique_ptr& other) = delete; - - unique_ptr& operator=(unique_ptr&& other) { - if (this != &other) { - delete ptr; - ptr = other.ptr; - other.ptr = nullptr; - } - return *this; - } - - T& operator*() const { - return *ptr; - } - T* operator->() const { - return ptr; - } - T* get() const { - return ptr; - } - - void reset(){ - delete ptr; - ptr = nullptr; - } - }; - - template - unique_ptr make_unique(Args&&... args) { - return unique_ptr(new T(std::forward(args)...)); - } -}; - - -typedef std::stringstream _StrStream; - -class _Str : public std::string { - mutable std::vector* _u8_index = nullptr; - mutable bool hash_initialized = false; - mutable size_t _hash; - - void utf8_lazy_init() const{ - if(_u8_index != nullptr) return; - _u8_index = new std::vector(); - _u8_index->reserve(size()); - if(size() > 65535) throw std::runtime_error("String has more than 65535 bytes."); - for(uint16_t i = 0; i < size(); i++){ - // https://stackoverflow.com/questions/3911536/utf-8-unicode-whats-with-0xc0-and-0x80 - if((at(i) & 0xC0) != 0x80) - _u8_index->push_back(i); - } - } -public: - _Str() : std::string() {} - _Str(const char* s) : std::string(s) {} - _Str(const char* s, size_t n) : std::string(s, n) {} - _Str(const std::string& s) : std::string(s) {} - _Str(const _Str& s) : std::string(s) { - if(s._u8_index != nullptr){ - _u8_index = new std::vector(*s._u8_index); - } - if(s.hash_initialized){ - _hash = s._hash; - hash_initialized = true; - } - } - _Str(_Str&& s) : std::string(std::move(s)) { - if(_u8_index != nullptr) delete _u8_index; - _u8_index = s._u8_index; - s._u8_index = nullptr; - if(s.hash_initialized){ - _hash = s._hash; - hash_initialized = true; - } - } - - size_t hash() const{ - if(!hash_initialized){ - _hash = std::hash()(*this); - hash_initialized = true; - } - return _hash; - } - - int __to_u8_index(int64_t index) const{ - utf8_lazy_init(); - auto p = std::lower_bound(_u8_index->begin(), _u8_index->end(), index); - if(*p != index) UNREACHABLE(); - return (int)(p - _u8_index->begin()); - } - - int u8_length() const { - utf8_lazy_init(); - return _u8_index->size(); - } - - _Str u8_getitem(int i) const{ - return u8_substr(i, i+1); - } - - _Str u8_substr(int start, int end) const{ - utf8_lazy_init(); - if(start >= end) return _Str(); - int c_end = end >= _u8_index->size() ? size() : _u8_index->at(end); - return substr(_u8_index->at(start), c_end - _u8_index->at(start)); - } - - _Str __lstrip() const { - _Str copy(*this); - copy.erase(copy.begin(), std::find_if(copy.begin(), copy.end(), [](char c) { - // std::isspace(c) does not working on windows (Debug) - return c != ' ' && c != '\t' && c != '\r' && c != '\n'; - })); - return _Str(copy); - } - - _Str __escape(bool single_quote) const { - _StrStream ss; - ss << (single_quote ? '\'' : '"'); - for (int i=0; ioperator[](i); - switch (c) { - case '"': - if(!single_quote) ss << '\\'; - ss << '"'; - break; - case '\'': - if(single_quote) ss << '\\'; - ss << '\''; - break; - case '\\': ss << '\\' << '\\'; break; - case '\n': ss << "\\n"; break; - case '\r': ss << "\\r"; break; - case '\t': ss << "\\t"; break; - default: - if ('\x00' <= c && c <= '\x1f') { - ss << "\\u" - << std::hex << std::setw(4) << std::setfill('0') << static_cast(c); - } else { - ss << c; - } - } - } - ss << (single_quote ? '\'' : '"'); - return ss.str(); - } - - _Str& operator=(const _Str& s){ - this->std::string::operator=(s); - if(_u8_index != nullptr) delete _u8_index; - this->_u8_index = s._u8_index; - this->hash_initialized = s.hash_initialized; - this->_hash = s._hash; - return *this; - } - - _Str& operator=(_Str&& s){ - this->std::string::operator=(std::move(s)); - if(_u8_index != nullptr) delete _u8_index; - this->_u8_index = s._u8_index; - this->hash_initialized = s.hash_initialized; - this->_hash = s._hash; - return *this; - } - - ~_Str(){ - if(_u8_index != nullptr) delete _u8_index; - } -}; - -namespace std { - template<> - struct hash<_Str> { - std::size_t operator()(const _Str& s) const { - return s.hash(); - } - }; -} - -const _Str& __class__ = _Str("__class__"); -const _Str& __base__ = _Str("__base__"); -const _Str& __new__ = _Str("__new__"); -const _Str& __iter__ = _Str("__iter__"); -const _Str& __str__ = _Str("__str__"); -const _Str& __repr__ = _Str("__repr__"); -const _Str& __module__ = _Str("__module__"); -const _Str& __getitem__ = _Str("__getitem__"); -const _Str& __setitem__ = _Str("__setitem__"); -const _Str& __delitem__ = _Str("__delitem__"); -const _Str& __contains__ = _Str("__contains__"); -const _Str& __init__ = _Str("__init__"); -const _Str& __json__ = _Str("__json__"); -const _Str& __name__ = _Str("__name__"); -const _Str& __len__ = _Str("__len__"); - -const _Str& m_append = _Str("append"); -const _Str& m_eval = _Str("eval"); -const _Str& m_self = _Str("self"); -const _Str& __enter__ = _Str("__enter__"); -const _Str& __exit__ = _Str("__exit__"); - -const _Str CMP_SPECIAL_METHODS[] = { - "__lt__", "__le__", "__eq__", "__ne__", "__gt__", "__ge__" -}; // __ne__ should not be used - -const _Str BINARY_SPECIAL_METHODS[] = { - "__add__", "__sub__", "__mul__", "__truediv__", "__floordiv__", "__mod__", "__pow__" -}; - -const _Str BITWISE_SPECIAL_METHODS[] = { - "__lshift__", "__rshift__", "__and__", "__or__", "__xor__" -}; - -const uint32_t __LoRangeA[] = {170,186,443,448,660,1488,1519,1568,1601,1646,1649,1749,1774,1786,1791,1808,1810,1869,1969,1994,2048,2112,2144,2208,2230,2308,2365,2384,2392,2418,2437,2447,2451,2474,2482,2486,2493,2510,2524,2527,2544,2556,2565,2575,2579,2602,2610,2613,2616,2649,2654,2674,2693,2703,2707,2730,2738,2741,2749,2768,2784,2809,2821,2831,2835,2858,2866,2869,2877,2908,2911,2929,2947,2949,2958,2962,2969,2972,2974,2979,2984,2990,3024,3077,3086,3090,3114,3133,3160,3168,3200,3205,3214,3218,3242,3253,3261,3294,3296,3313,3333,3342,3346,3389,3406,3412,3423,3450,3461,3482,3507,3517,3520,3585,3634,3648,3713,3716,3718,3724,3749,3751,3762,3773,3776,3804,3840,3904,3913,3976,4096,4159,4176,4186,4193,4197,4206,4213,4238,4352,4682,4688,4696,4698,4704,4746,4752,4786,4792,4800,4802,4808,4824,4882,4888,4992,5121,5743,5761,5792,5873,5888,5902,5920,5952,5984,5998,6016,6108,6176,6212,6272,6279,6314,6320,6400,6480,6512,6528,6576,6656,6688,6917,6981,7043,7086,7098,7168,7245,7258,7401,7406,7413,7418,8501,11568,11648,11680,11688,11696,11704,11712,11720,11728,11736,12294,12348,12353,12447,12449,12543,12549,12593,12704,12784,13312,19968,40960,40982,42192,42240,42512,42538,42606,42656,42895,42999,43003,43011,43015,43020,43072,43138,43250,43259,43261,43274,43312,43360,43396,43488,43495,43514,43520,43584,43588,43616,43633,43642,43646,43697,43701,43705,43712,43714,43739,43744,43762,43777,43785,43793,43808,43816,43968,44032,55216,55243,63744,64112,64285,64287,64298,64312,64318,64320,64323,64326,64467,64848,64914,65008,65136,65142,65382,65393,65440,65474,65482,65490,65498,65536,65549,65576,65596,65599,65616,65664,66176,66208,66304,66349,66370,66384,66432,66464,66504,66640,66816,66864,67072,67392,67424,67584,67592,67594,67639,67644,67647,67680,67712,67808,67828,67840,67872,67968,68030,68096,68112,68117,68121,68192,68224,68288,68297,68352,68416,68448,68480,68608,68864,69376,69415,69424,69600,69635,69763,69840,69891,69956,69968,70006,70019,70081,70106,70108,70144,70163,70272,70280,70282,70287,70303,70320,70405,70415,70419,70442,70450,70453,70461,70480,70493,70656,70727,70751,70784,70852,70855,71040,71128,71168,71236,71296,71352,71424,71680,71935,72096,72106,72161,72163,72192,72203,72250,72272,72284,72349,72384,72704,72714,72768,72818,72960,72968,72971,73030,73056,73063,73066,73112,73440,73728,74880,77824,82944,92160,92736,92880,92928,93027,93053,93952,94032,94208,100352,110592,110928,110948,110960,113664,113776,113792,113808,123136,123214,123584,124928,126464,126469,126497,126500,126503,126505,126516,126521,126523,126530,126535,126537,126539,126541,126545,126548,126551,126553,126555,126557,126559,126561,126564,126567,126572,126580,126585,126590,126592,126603,126625,126629,126635,131072,173824,177984,178208,183984,194560}; -const uint32_t __LoRangeB[] = {170,186,443,451,660,1514,1522,1599,1610,1647,1747,1749,1775,1788,1791,1808,1839,1957,1969,2026,2069,2136,2154,2228,2237,2361,2365,2384,2401,2432,2444,2448,2472,2480,2482,2489,2493,2510,2525,2529,2545,2556,2570,2576,2600,2608,2611,2614,2617,2652,2654,2676,2701,2705,2728,2736,2739,2745,2749,2768,2785,2809,2828,2832,2856,2864,2867,2873,2877,2909,2913,2929,2947,2954,2960,2965,2970,2972,2975,2980,2986,3001,3024,3084,3088,3112,3129,3133,3162,3169,3200,3212,3216,3240,3251,3257,3261,3294,3297,3314,3340,3344,3386,3389,3406,3414,3425,3455,3478,3505,3515,3517,3526,3632,3635,3653,3714,3716,3722,3747,3749,3760,3763,3773,3780,3807,3840,3911,3948,3980,4138,4159,4181,4189,4193,4198,4208,4225,4238,4680,4685,4694,4696,4701,4744,4749,4784,4789,4798,4800,4805,4822,4880,4885,4954,5007,5740,5759,5786,5866,5880,5900,5905,5937,5969,5996,6000,6067,6108,6210,6264,6276,6312,6314,6389,6430,6509,6516,6571,6601,6678,6740,6963,6987,7072,7087,7141,7203,7247,7287,7404,7411,7414,7418,8504,11623,11670,11686,11694,11702,11710,11718,11726,11734,11742,12294,12348,12438,12447,12538,12543,12591,12686,12730,12799,19893,40943,40980,42124,42231,42507,42527,42539,42606,42725,42895,42999,43009,43013,43018,43042,43123,43187,43255,43259,43262,43301,43334,43388,43442,43492,43503,43518,43560,43586,43595,43631,43638,43642,43695,43697,43702,43709,43712,43714,43740,43754,43762,43782,43790,43798,43814,43822,44002,55203,55238,55291,64109,64217,64285,64296,64310,64316,64318,64321,64324,64433,64829,64911,64967,65019,65140,65276,65391,65437,65470,65479,65487,65495,65500,65547,65574,65594,65597,65613,65629,65786,66204,66256,66335,66368,66377,66421,66461,66499,66511,66717,66855,66915,67382,67413,67431,67589,67592,67637,67640,67644,67669,67702,67742,67826,67829,67861,67897,68023,68031,68096,68115,68119,68149,68220,68252,68295,68324,68405,68437,68466,68497,68680,68899,69404,69415,69445,69622,69687,69807,69864,69926,69956,70002,70006,70066,70084,70106,70108,70161,70187,70278,70280,70285,70301,70312,70366,70412,70416,70440,70448,70451,70457,70461,70480,70497,70708,70730,70751,70831,70853,70855,71086,71131,71215,71236,71338,71352,71450,71723,71935,72103,72144,72161,72163,72192,72242,72250,72272,72329,72349,72440,72712,72750,72768,72847,72966,72969,73008,73030,73061,73064,73097,73112,73458,74649,75075,78894,83526,92728,92766,92909,92975,93047,93071,94026,94032,100343,101106,110878,110930,110951,111355,113770,113788,113800,113817,123180,123214,123627,125124,126467,126495,126498,126500,126503,126514,126519,126521,126523,126530,126535,126537,126539,126543,126546,126548,126551,126553,126555,126557,126559,126562,126564,126570,126578,126583,126588,126590,126601,126619,126627,126633,126651,173782,177972,178205,183969,191456,195101}; - -bool __isLoChar(uint32_t c) { - auto index = std::lower_bound(__LoRangeA, __LoRangeA + 476, c) - __LoRangeA; - if(c == __LoRangeA[index]) return true; - index -= 1; - if(index < 0) return false; - return c >= __LoRangeA[index] && c <= __LoRangeB[index]; -} - // emhash8::HashMap for C++11/14/17 // version 1.6.3 // @@ -425,6 +32,11 @@ bool __isLoChar(uint32_t c) { +// Modification: +// 1. Add #define EMH_WYHASH_HASH 1 +// 2. Add static for wymix +#define EMH_WYHASH_HASH 1 + #include #include #include @@ -2060,7 +1672,7 @@ one-way search strategy. #if EMH_WYHASH_HASH //#define WYHASH_CONDOM 1 - inline uint64_t wymix(uint64_t A, uint64_t B) + inline static uint64_t wymix(uint64_t A, uint64_t B) { #if defined(__SIZEOF_INT128__) __uint128_t r = A; r *= B; @@ -2190,6 +1802,400 @@ private: +#ifdef _MSC_VER +#pragma warning (disable:4267) +#pragma warning (disable:4101) +#define _CRT_NONSTDC_NO_DEPRECATE +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#ifdef POCKETPY_H +#define UNREACHABLE() throw std::runtime_error( "L" + std::to_string(__LINE__) + " UNREACHABLE()! This should be a bug, please report it"); +#else +#define UNREACHABLE() throw std::runtime_error( __FILE__ + std::string(":") + std::to_string(__LINE__) + " UNREACHABLE()!"); +#endif + +#ifdef __EMSCRIPTEN__ +#include +#else +#include +#endif + +#define PK_VERSION "0.6.0" + +//#define PKPY_NO_TYPE_CHECK +//#define PKPY_NO_INDEX_CHECK + + +namespace pkpy{ + template + class shared_ptr { + int* counter = nullptr; + +#define _t() ((T*)(counter + 1)) +#define _inc_counter() if(counter) ++(*counter) +#define _dec_counter() if(counter && --(*counter) == 0){ _t()->~T(); free(counter); } + + public: + shared_ptr() {} + shared_ptr(int* block) : counter(block) {} + shared_ptr(const shared_ptr& other) : counter(other.counter) { + _inc_counter(); + } + shared_ptr(shared_ptr&& other) noexcept : counter(other.counter) { + other.counter = nullptr; + } + ~shared_ptr() { + _dec_counter(); + } + + bool operator==(const shared_ptr& other) const { + return counter == other.counter; + } + + bool operator!=(const shared_ptr& other) const { + return counter != other.counter; + } + + bool operator==(std::nullptr_t) const { + return counter == nullptr; + } + + bool operator!=(std::nullptr_t) const { + return counter != nullptr; + } + + shared_ptr& operator=(const shared_ptr& other) { + if (this != &other) { + _dec_counter(); + counter = other.counter; + _inc_counter(); + } + return *this; + } + + shared_ptr& operator=(shared_ptr&& other) noexcept { + if (this != &other) { + _dec_counter(); + counter = other.counter; + other.counter = nullptr; + } + return *this; + } + + T& operator*() const { + return *_t(); + } + T* operator->() const { + return _t(); + } + T* get() const { + return _t(); + } + int use_count() const { + return counter ? *counter : 0; + } + void reset(){ + _dec_counter(); + counter = nullptr; + } + }; + +#undef _t +#undef _inc_counter +#undef _dec_counter + + template + shared_ptr make_shared(Args&&... args) { + static_assert(std::is_base_of::value, "U must be derived from T"); + int* p = (int*)malloc(sizeof(int) + sizeof(U)); + *p = 1; + new(p+1) U(std::forward(args)...); + return shared_ptr(p); + } + + template + shared_ptr make_shared(Args&&... args) { + int* p = (int*)malloc(sizeof(int) + sizeof(T)); + *p = 1; + new(p+1) T(std::forward(args)...); + return shared_ptr(p); + } + + template + class unique_ptr { + T* ptr; + + public: + unique_ptr() : ptr(nullptr) {} + unique_ptr(T* ptr) : ptr(ptr) {} + unique_ptr(const unique_ptr& other) = delete; + unique_ptr(unique_ptr&& other) : ptr(other.ptr) { + other.ptr = nullptr; + } + ~unique_ptr() { + delete ptr; + } + + bool operator==(const unique_ptr& other) const { + return ptr == other.ptr; + } + + bool operator!=(const unique_ptr& other) const { + return ptr != other.ptr; + } + + bool operator==(std::nullptr_t) const { + return ptr == nullptr; + } + + bool operator!=(std::nullptr_t) const { + return ptr != nullptr; + } + + unique_ptr& operator=(const unique_ptr& other) = delete; + + unique_ptr& operator=(unique_ptr&& other) { + if (this != &other) { + delete ptr; + ptr = other.ptr; + other.ptr = nullptr; + } + return *this; + } + + T& operator*() const { + return *ptr; + } + T* operator->() const { + return ptr; + } + T* get() const { + return ptr; + } + + void reset(){ + delete ptr; + ptr = nullptr; + } + }; + + template + unique_ptr make_unique(Args&&... args) { + return unique_ptr(new T(std::forward(args)...)); + } +}; + + +typedef std::stringstream _StrStream; + +class _Str : public std::string { + mutable std::vector* _u8_index = nullptr; + mutable bool hash_initialized = false; + mutable size_t _hash; + + void utf8_lazy_init() const{ + if(_u8_index != nullptr) return; + _u8_index = new std::vector(); + _u8_index->reserve(size()); + if(size() > 65535) throw std::runtime_error("String has more than 65535 bytes."); + for(uint16_t i = 0; i < size(); i++){ + // https://stackoverflow.com/questions/3911536/utf-8-unicode-whats-with-0xc0-and-0x80 + if((at(i) & 0xC0) != 0x80) + _u8_index->push_back(i); + } + } +public: + _Str() : std::string() {} + _Str(const char* s) : std::string(s) {} + _Str(const char* s, size_t n) : std::string(s, n) {} + _Str(const std::string& s) : std::string(s) {} + _Str(const _Str& s) : std::string(s) { + if(s._u8_index != nullptr){ + _u8_index = new std::vector(*s._u8_index); + } + if(s.hash_initialized){ + _hash = s._hash; + hash_initialized = true; + } + } + _Str(_Str&& s) : std::string(std::move(s)) { + if(_u8_index != nullptr) delete _u8_index; + _u8_index = s._u8_index; + s._u8_index = nullptr; + if(s.hash_initialized){ + _hash = s._hash; + hash_initialized = true; + } + } + + size_t hash() const{ + if(!hash_initialized){ + //_hash = std::hash()(*this); + _hash = emhash8::HashMap::wyhashstr(data(), size()); + hash_initialized = true; + } + return _hash; + } + + int __to_u8_index(int64_t index) const{ + utf8_lazy_init(); + auto p = std::lower_bound(_u8_index->begin(), _u8_index->end(), index); + if(*p != index) UNREACHABLE(); + return (int)(p - _u8_index->begin()); + } + + int u8_length() const { + utf8_lazy_init(); + return _u8_index->size(); + } + + _Str u8_getitem(int i) const{ + return u8_substr(i, i+1); + } + + _Str u8_substr(int start, int end) const{ + utf8_lazy_init(); + if(start >= end) return _Str(); + int c_end = end >= _u8_index->size() ? size() : _u8_index->at(end); + return substr(_u8_index->at(start), c_end - _u8_index->at(start)); + } + + _Str __lstrip() const { + _Str copy(*this); + copy.erase(copy.begin(), std::find_if(copy.begin(), copy.end(), [](char c) { + // std::isspace(c) does not working on windows (Debug) + return c != ' ' && c != '\t' && c != '\r' && c != '\n'; + })); + return _Str(copy); + } + + _Str __escape(bool single_quote) const { + _StrStream ss; + ss << (single_quote ? '\'' : '"'); + for (int i=0; ioperator[](i); + switch (c) { + case '"': + if(!single_quote) ss << '\\'; + ss << '"'; + break; + case '\'': + if(single_quote) ss << '\\'; + ss << '\''; + break; + case '\\': ss << '\\' << '\\'; break; + case '\n': ss << "\\n"; break; + case '\r': ss << "\\r"; break; + case '\t': ss << "\\t"; break; + default: + if ('\x00' <= c && c <= '\x1f') { + ss << "\\u" + << std::hex << std::setw(4) << std::setfill('0') << static_cast(c); + } else { + ss << c; + } + } + } + ss << (single_quote ? '\'' : '"'); + return ss.str(); + } + + _Str& operator=(const _Str& s){ + this->std::string::operator=(s); + if(_u8_index != nullptr) delete _u8_index; + this->_u8_index = s._u8_index; + this->hash_initialized = s.hash_initialized; + this->_hash = s._hash; + return *this; + } + + _Str& operator=(_Str&& s){ + this->std::string::operator=(std::move(s)); + if(_u8_index != nullptr) delete _u8_index; + this->_u8_index = s._u8_index; + this->hash_initialized = s.hash_initialized; + this->_hash = s._hash; + return *this; + } + + ~_Str(){ + if(_u8_index != nullptr) delete _u8_index; + } +}; + +namespace std { + template<> + struct hash<_Str> { + std::size_t operator()(const _Str& s) const { + return s.hash(); + } + }; +} + +const _Str& __class__ = _Str("__class__"); +const _Str& __base__ = _Str("__base__"); +const _Str& __new__ = _Str("__new__"); +const _Str& __iter__ = _Str("__iter__"); +const _Str& __str__ = _Str("__str__"); +const _Str& __repr__ = _Str("__repr__"); +const _Str& __module__ = _Str("__module__"); +const _Str& __getitem__ = _Str("__getitem__"); +const _Str& __setitem__ = _Str("__setitem__"); +const _Str& __delitem__ = _Str("__delitem__"); +const _Str& __contains__ = _Str("__contains__"); +const _Str& __init__ = _Str("__init__"); +const _Str& __json__ = _Str("__json__"); +const _Str& __name__ = _Str("__name__"); +const _Str& __len__ = _Str("__len__"); + +const _Str& m_append = _Str("append"); +const _Str& m_eval = _Str("eval"); +const _Str& m_self = _Str("self"); +const _Str& __enter__ = _Str("__enter__"); +const _Str& __exit__ = _Str("__exit__"); + +const _Str CMP_SPECIAL_METHODS[] = { + "__lt__", "__le__", "__eq__", "__ne__", "__gt__", "__ge__" +}; // __ne__ should not be used + +const _Str BINARY_SPECIAL_METHODS[] = { + "__add__", "__sub__", "__mul__", "__truediv__", "__floordiv__", "__mod__", "__pow__" +}; + +const _Str BITWISE_SPECIAL_METHODS[] = { + "__lshift__", "__rshift__", "__and__", "__or__", "__xor__" +}; + +const uint32_t __LoRangeA[] = {170,186,443,448,660,1488,1519,1568,1601,1646,1649,1749,1774,1786,1791,1808,1810,1869,1969,1994,2048,2112,2144,2208,2230,2308,2365,2384,2392,2418,2437,2447,2451,2474,2482,2486,2493,2510,2524,2527,2544,2556,2565,2575,2579,2602,2610,2613,2616,2649,2654,2674,2693,2703,2707,2730,2738,2741,2749,2768,2784,2809,2821,2831,2835,2858,2866,2869,2877,2908,2911,2929,2947,2949,2958,2962,2969,2972,2974,2979,2984,2990,3024,3077,3086,3090,3114,3133,3160,3168,3200,3205,3214,3218,3242,3253,3261,3294,3296,3313,3333,3342,3346,3389,3406,3412,3423,3450,3461,3482,3507,3517,3520,3585,3634,3648,3713,3716,3718,3724,3749,3751,3762,3773,3776,3804,3840,3904,3913,3976,4096,4159,4176,4186,4193,4197,4206,4213,4238,4352,4682,4688,4696,4698,4704,4746,4752,4786,4792,4800,4802,4808,4824,4882,4888,4992,5121,5743,5761,5792,5873,5888,5902,5920,5952,5984,5998,6016,6108,6176,6212,6272,6279,6314,6320,6400,6480,6512,6528,6576,6656,6688,6917,6981,7043,7086,7098,7168,7245,7258,7401,7406,7413,7418,8501,11568,11648,11680,11688,11696,11704,11712,11720,11728,11736,12294,12348,12353,12447,12449,12543,12549,12593,12704,12784,13312,19968,40960,40982,42192,42240,42512,42538,42606,42656,42895,42999,43003,43011,43015,43020,43072,43138,43250,43259,43261,43274,43312,43360,43396,43488,43495,43514,43520,43584,43588,43616,43633,43642,43646,43697,43701,43705,43712,43714,43739,43744,43762,43777,43785,43793,43808,43816,43968,44032,55216,55243,63744,64112,64285,64287,64298,64312,64318,64320,64323,64326,64467,64848,64914,65008,65136,65142,65382,65393,65440,65474,65482,65490,65498,65536,65549,65576,65596,65599,65616,65664,66176,66208,66304,66349,66370,66384,66432,66464,66504,66640,66816,66864,67072,67392,67424,67584,67592,67594,67639,67644,67647,67680,67712,67808,67828,67840,67872,67968,68030,68096,68112,68117,68121,68192,68224,68288,68297,68352,68416,68448,68480,68608,68864,69376,69415,69424,69600,69635,69763,69840,69891,69956,69968,70006,70019,70081,70106,70108,70144,70163,70272,70280,70282,70287,70303,70320,70405,70415,70419,70442,70450,70453,70461,70480,70493,70656,70727,70751,70784,70852,70855,71040,71128,71168,71236,71296,71352,71424,71680,71935,72096,72106,72161,72163,72192,72203,72250,72272,72284,72349,72384,72704,72714,72768,72818,72960,72968,72971,73030,73056,73063,73066,73112,73440,73728,74880,77824,82944,92160,92736,92880,92928,93027,93053,93952,94032,94208,100352,110592,110928,110948,110960,113664,113776,113792,113808,123136,123214,123584,124928,126464,126469,126497,126500,126503,126505,126516,126521,126523,126530,126535,126537,126539,126541,126545,126548,126551,126553,126555,126557,126559,126561,126564,126567,126572,126580,126585,126590,126592,126603,126625,126629,126635,131072,173824,177984,178208,183984,194560}; +const uint32_t __LoRangeB[] = {170,186,443,451,660,1514,1522,1599,1610,1647,1747,1749,1775,1788,1791,1808,1839,1957,1969,2026,2069,2136,2154,2228,2237,2361,2365,2384,2401,2432,2444,2448,2472,2480,2482,2489,2493,2510,2525,2529,2545,2556,2570,2576,2600,2608,2611,2614,2617,2652,2654,2676,2701,2705,2728,2736,2739,2745,2749,2768,2785,2809,2828,2832,2856,2864,2867,2873,2877,2909,2913,2929,2947,2954,2960,2965,2970,2972,2975,2980,2986,3001,3024,3084,3088,3112,3129,3133,3162,3169,3200,3212,3216,3240,3251,3257,3261,3294,3297,3314,3340,3344,3386,3389,3406,3414,3425,3455,3478,3505,3515,3517,3526,3632,3635,3653,3714,3716,3722,3747,3749,3760,3763,3773,3780,3807,3840,3911,3948,3980,4138,4159,4181,4189,4193,4198,4208,4225,4238,4680,4685,4694,4696,4701,4744,4749,4784,4789,4798,4800,4805,4822,4880,4885,4954,5007,5740,5759,5786,5866,5880,5900,5905,5937,5969,5996,6000,6067,6108,6210,6264,6276,6312,6314,6389,6430,6509,6516,6571,6601,6678,6740,6963,6987,7072,7087,7141,7203,7247,7287,7404,7411,7414,7418,8504,11623,11670,11686,11694,11702,11710,11718,11726,11734,11742,12294,12348,12438,12447,12538,12543,12591,12686,12730,12799,19893,40943,40980,42124,42231,42507,42527,42539,42606,42725,42895,42999,43009,43013,43018,43042,43123,43187,43255,43259,43262,43301,43334,43388,43442,43492,43503,43518,43560,43586,43595,43631,43638,43642,43695,43697,43702,43709,43712,43714,43740,43754,43762,43782,43790,43798,43814,43822,44002,55203,55238,55291,64109,64217,64285,64296,64310,64316,64318,64321,64324,64433,64829,64911,64967,65019,65140,65276,65391,65437,65470,65479,65487,65495,65500,65547,65574,65594,65597,65613,65629,65786,66204,66256,66335,66368,66377,66421,66461,66499,66511,66717,66855,66915,67382,67413,67431,67589,67592,67637,67640,67644,67669,67702,67742,67826,67829,67861,67897,68023,68031,68096,68115,68119,68149,68220,68252,68295,68324,68405,68437,68466,68497,68680,68899,69404,69415,69445,69622,69687,69807,69864,69926,69956,70002,70006,70066,70084,70106,70108,70161,70187,70278,70280,70285,70301,70312,70366,70412,70416,70440,70448,70451,70457,70461,70480,70497,70708,70730,70751,70831,70853,70855,71086,71131,71215,71236,71338,71352,71450,71723,71935,72103,72144,72161,72163,72192,72242,72250,72272,72329,72349,72440,72712,72750,72768,72847,72966,72969,73008,73030,73061,73064,73097,73112,73458,74649,75075,78894,83526,92728,92766,92909,92975,93047,93071,94026,94032,100343,101106,110878,110930,110951,111355,113770,113788,113800,113817,123180,123214,123627,125124,126467,126495,126498,126500,126503,126514,126519,126521,126523,126530,126535,126537,126539,126543,126546,126548,126551,126553,126555,126557,126559,126562,126564,126570,126578,126583,126588,126590,126601,126619,126627,126633,126651,173782,177972,178205,183969,191456,195101}; + +bool __isLoChar(uint32_t c) { + auto index = std::lower_bound(__LoRangeA, __LoRangeA + 476, c) - __LoRangeA; + if(c == __LoRangeA[index]) return true; + index -= 1; + if(index < 0) return false; + return c >= __LoRangeA[index] && c <= __LoRangeB[index]; +} + + + struct PyObject; typedef pkpy::shared_ptr PyVar; typedef PyVar PyVarOrNull; diff --git a/plugins/godot/godot-cpp b/plugins/godot/godot-cpp index ed849abe..484bb4f2 160000 --- a/plugins/godot/godot-cpp +++ b/plugins/godot/godot-cpp @@ -1 +1 @@ -Subproject commit ed849abe8ed709eb7e378d39f4b8709e4ff9667f +Subproject commit 484bb4f281a60bda5ccb121b753b05fa4deead60 diff --git a/src/__stl__.h b/src/__stl__.h index c0344c88..7634cfb4 100644 --- a/src/__stl__.h +++ b/src/__stl__.h @@ -23,7 +23,6 @@ #include #include -#define EMH_WYHASH_HASH 1 #include "hash_table8.hpp" #ifdef POCKETPY_H diff --git a/src/hash_table8.hpp b/src/hash_table8.hpp index cd3556ea..acba4298 100644 --- a/src/hash_table8.hpp +++ b/src/hash_table8.hpp @@ -25,6 +25,11 @@ #pragma once +// Modification: +// 1. Add #define EMH_WYHASH_HASH 1 +// 2. Add static for wymix +#define EMH_WYHASH_HASH 1 + #include #include #include