Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 11:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
blueloveTH 2023-10-13 12:18:33 +08:00
parent 67a0ecae92
commit 9f3d15ca51
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pocketpy/namedict.h
View File

@ -256,7 +256,6 @@ while(!_items[i].first.empty()) { \
} }
#undef HASH_PROBE_0 #undef HASH_PROBE_0
#undef HASH_PROBE_1 #undef HASH_PROBE_1
#undef _hash
}; };
template<typename V> template<typename V>

4
include/pocketpy/str.h
View File

@ -3,7 +3,6 @@
#include "common.h" #include "common.h"
#include "memory.h" #include "memory.h"
#include "vector.h" #include "vector.h"
#include <cstddef>
namespace pkpy { namespace pkpy {
@ -123,7 +122,8 @@ struct StrName {
static bool is_valid(int index); static bool is_valid(int index);
static StrName get(std::string_view s); static StrName get(std::string_view s);
static std::map<std::string, uint16_t, std::less<>>& _interned(); static std::map<std::string, uint16_t, std::less<>>& _interned();
static std::vector<std::string>& _r_interned(); static std::map<uint16_t, std::string>& _r_interned();
static uint32_t _pesudo_random_index;
}; };
struct FastStrStream{ struct FastStrStream{

26
src/str.cpp
View File

@ -1,4 +1,7 @@
#include "pocketpy/str.h" #include "pocketpy/str.h"
#include <_types/_uint16_t.h>
#include <_types/_uint32_t.h>
#include <stdexcept>
namespace pkpy { namespace pkpy {
@ -360,18 +363,24 @@ int utf8len(unsigned char c, bool suppress){
return interned; return interned;
} }
std::vector<std::string>& StrName::_r_interned(){ std::map<uint16_t, std::string>& StrName::_r_interned(){
static std::vector<std::string> r_interned; static std::map<uint16_t, std::string> r_interned;
return r_interned; return r_interned;
} }
uint32_t StrName::_pesudo_random_index = 0;
StrName StrName::get(std::string_view s){ StrName StrName::get(std::string_view s){
auto it = _interned().find(s); auto it = _interned().find(s);
if(it != _interned().end()) return StrName(it->second); if(it != _interned().end()) return StrName(it->second);
uint16_t index = (uint16_t)(_r_interned().size() + 1); // generate new index
std::string str(s); // https://github.com/python/cpython/blob/3.12/Objects/dictobject.c#L175
_interned()[str] = index; uint16_t index = ((_pesudo_random_index*5) + 1) & 65535;
_r_interned().push_back(str); if(index == 0) throw std::runtime_error("StrName index overflow");
_interned()[std::string(s)] = index;
if(is_valid(index)) throw std::runtime_error("StrName index conflict");
_r_interned()[index] = std::string(s);
_pesudo_random_index = index;
return StrName(index); return StrName(index);
} }
@ -380,8 +389,7 @@ int utf8len(unsigned char c, bool suppress){
} }
bool StrName::is_valid(int index) { bool StrName::is_valid(int index) {
// check _r_interned()[index-1] is valid return _r_interned().find(index) != _r_interned().end();
return index > 0 && index <= _r_interned().size();
} }
StrName::StrName(): index(0) {} StrName::StrName(): index(0) {}
@ -392,7 +400,7 @@ int utf8len(unsigned char c, bool suppress){
} }
std::string_view StrName::sv() const { std::string_view StrName::sv() const {
const std::string& str = _r_interned()[index-1]; const std::string& str = _r_interned()[index];
return std::string_view(str); return std::string_view(str);
} }

4
tests/80_linalg.py
View File

@ -85,7 +85,9 @@ assert str(static_test_vec4_int) == 'vec4(278, -1.39197e+13, 1.36422e+15, -37)'
# test __getnewargs__ # test __getnewargs__
element_name_list = [e for e in dir(test_vec4) if e in 'x,y,z,w'] element_name_list = [e for e in dir(test_vec4) if e in 'x,y,z,w']
element_value_list = [getattr(test_vec4, attr) for attr in element_name_list] element_value_list = [getattr(test_vec4, attr) for attr in element_name_list]
assert tuple(element_value_list) == test_vec4.__getnewargs__() _0 = tuple(element_value_list)
_1 = test_vec4.__getnewargs__()
assert (_0 == _1), (_0, _1)
# test copy # test copy
element_name_list = [e for e in dir(test_vec4) if e in 'x,y,z,w'] element_name_list = [e for e in dir(test_vec4) if e in 'x,y,z,w']