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-06-30 00:05:11 +08:00
parent d8ea87e408
commit e11702aebc
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/str.h
View File

@ -23,6 +23,8 @@ struct Str{
char* data; char* data;
char _inlined[16]; char _inlined[16];
const char* _cached_c_str = nullptr;
bool is_inlined() const { return data == _inlined; } bool is_inlined() const { return data == _inlined; }
Str(): size(0), is_ascii(true), data(_inlined) {} Str(): size(0), is_ascii(true), data(_inlined) {}
@ -98,6 +100,7 @@ struct Str{
~Str(){ ~Str(){
if(!is_inlined()) pool64.dealloc(data); if(!is_inlined()) pool64.dealloc(data);
if(_cached_c_str != nullptr) free((void*)_cached_c_str);
} }
Str operator+(const Str& other) const { Str operator+(const Str& other) const {
@ -201,10 +204,11 @@ struct Str{
return p; return p;
} }
const char* c_str_temp() const { const char* c_str(){
static THREAD_LOCAL std::string temp; if(_cached_c_str == nullptr){
temp.assign(data, size); _cached_c_str = c_str_dup();
return temp.c_str(); }
return _cached_c_str;
} }
std::string_view sv() const { std::string_view sv() const {
@ -429,7 +433,6 @@ struct FastStrStream{
struct CString{ struct CString{
const char* ptr; const char* ptr;
CString(const char* ptr): ptr(ptr) {} CString(const char* ptr): ptr(ptr) {}
CString(const Str& str): ptr(str.c_str_temp()) {}
operator const char*() const { return ptr; } operator const char*() const { return ptr; }
}; };

4
src/vm.h
View File

@ -824,11 +824,11 @@ template<> inline bool _py_cast<bool>(VM* vm, PyObject* obj){
template<> inline CString py_cast<CString>(VM* vm, PyObject* obj){ template<> inline CString py_cast<CString>(VM* vm, PyObject* obj){
vm->check_non_tagged_type(obj, vm->tp_str); vm->check_non_tagged_type(obj, vm->tp_str);
return PK_OBJ_GET(Str, obj).c_str_temp(); return PK_OBJ_GET(Str, obj).c_str();
} }
template<> inline CString _py_cast<CString>(VM* vm, PyObject* obj){ template<> inline CString _py_cast<CString>(VM* vm, PyObject* obj){
return PK_OBJ_GET(Str, obj).c_str_temp(); return PK_OBJ_GET(Str, obj).c_str();
} }
inline PyObject* py_var(VM* vm, const char val[]){ inline PyObject* py_var(VM* vm, const char val[]){