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

fix https://github.com/blueloveTH/pocketpy/issues/179

Browse Source
This commit is contained in:
blueloveTH 2023-12-01 10:42:42 +08:00
parent 74e31b36ed
commit 9e66bab34b
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pocketpy/str.h
View File

@ -26,6 +26,7 @@ struct Str{
Str(std::nullptr_t) { FATAL_ERROR(); } Str(std::nullptr_t) { FATAL_ERROR(); }
Str(const char* s); Str(const char* s);
Str(const char* s, int len); Str(const char* s, int len);
Str(std::pair<char *, int>);
Str(const Str& other); Str(const Str& other);
Str(Str&& other); Str(Str&& other);

16
src/str.cpp
View File

@ -42,6 +42,19 @@ int utf8len(unsigned char c, bool suppress){
#undef STR_INIT #undef STR_INIT
Str::Str(std::pair<char *, int> detached) {
this->size = detached.second;
this->data = detached.first;
this->is_ascii = true;
// check is_ascii
for(int i=0; i<size; i++){
if(!isascii(data[i])){
is_ascii = false;
break;
}
}
}
Str::Str(const Str& other): size(other.size), is_ascii(other.is_ascii) { Str::Str(const Str& other): size(other.size), is_ascii(other.is_ascii) {
_alloc(); _alloc();
memcpy(data, other.data, size); memcpy(data, other.data, size);
@ -423,8 +436,7 @@ int utf8len(unsigned char c, bool suppress){
Str SStream::str(){ Str SStream::str(){
// after this call, the buffer is no longer valid // after this call, the buffer is no longer valid
auto detached = buffer.detach(); return Str(buffer.detach());
return Str(detached.first, detached.second);
} }
SStream& SStream::operator<<(const Str& s){ SStream& SStream::operator<<(const Str& s){