Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2024-11-14 04:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Erase, substr for String, and fixed comparisons.

Browse Source
This commit is contained in:
Relintai 2021-11-01 19:10:12 +01:00
parent dd966c9248
commit 041f824448
2 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
core/string.cpp
View File

@ -38,6 +38,26 @@ void String::erase(const char element) {
} }
} }
void String::erase(const int start_index, const int length) {
int sil = start_index + length;
if (sil >= _size) {
_size = 0;
_data[_size] = '\0';
return;
}
int j = start_index;
for (int i = sil; i < _size; ++i) {
_data[j] = _data[i];
++j;
}
_size -= length;
_data[_size] = '\0';
}
void String::clear() { void String::clear() {
_size = 0; _size = 0;
} }
@ -125,6 +145,42 @@ void String::get_substr_nt(char *into_buf, const int start_index, const int len)
into_buf[len + 1] = '\0'; into_buf[len + 1] = '\0';
} }
String String::substr(const int start_index, const int len) {
ERR_FAIL_INDEX_V(start_index, _size, String());
int sil = start_index + len;
ERR_FAIL_INDEX_V(sil, _size, String());
String str;
str.ensure_capacity(len + 1);
for (int i = start_index; i < sil; ++i) {
str._data[str._size++] = _data[i];
}
str._data[str._size] = '\0';
return str;
}
int String::compare(const String &other) const {
if (size() < other.size()) {
return 1;
} else if (size() > other.size()) {
return 2;
} else {
for (int i = 0; i < _size; ++i) {
if (_data[i] < other._data[i]) {
return 1;
} else if (_data[i] > other._data[i]) {
return 2;
}
}
return 0;
}
}
uint8_t String::read_uint8_bytes_at(int &index, bool advance_index) { uint8_t String::read_uint8_bytes_at(int &index, bool advance_index) {
ERR_FAIL_INDEX_V(index, _size, 0); ERR_FAIL_INDEX_V(index, _size, 0);
@ -609,64 +665,20 @@ bool operator!=(std::string &b, const String &a) {
} }
bool operator<(const String &a, const String &b) { bool operator<(const String &a, const String &b) {
if (a.size() < b.size()) { return a.compare(b) == 1;
return true;
} else if (a.size() > b.size()) {
return false;
} else {
for (int i = 0; i < a._size; ++i) {
if (a[i] < b[i]) {
return true;
}
}
return false;
}
} }
bool operator>(const String &a, const String &b) { bool operator>(const String &a, const String &b) {
if (a.size() > b.size()) { return a.compare(b) == 2;
return true;
} else if (a.size() < b.size()) {
return false;
} else {
for (int i = 0; i < a._size; ++i) {
if (a[i] > b[i]) {
return true;
}
}
return false;
}
} }
bool operator<=(const String &a, const String &b) { bool operator<=(const String &a, const String &b) {
if (a.size() < b.size()) { int c = a.compare(b);
return true;
} else if (a.size() > b.size()) {
return false;
} else {
for (int i = 0; i < a._size; ++i) {
if (a[i] <= b[i]) {
return true;
}
}
return false; return c == 0 || c == 1;
}
} }
bool operator>=(const String &a, const String &b) { bool operator>=(const String &a, const String &b) {
if (a.size() > b.size()) { int c = a.compare(b);
return true;
} else if (a.size() < b.size()) {
return false;
} else {
for (int i = 0; i < a._size; ++i) {
if (a[i] >= b[i]) {
return true;
}
}
return false; return c == 0 || c == 2;
}
} }
String &String::operator=(const String &other) { String &String::operator=(const String &other) {

4
core/string.h
View File

@ -11,6 +11,7 @@ public:
void pop_back(); void pop_back();
void remove(const int index); void remove(const int index);
void erase(const char element); void erase(const char element);
void erase(const int start_index, const int length);
void clear(); void clear();
bool empty() const; bool empty() const;
char get(const int index); char get(const int index);
@ -24,6 +25,9 @@ public:
int find(const char val) const; int find(const char val) const;
void get_substr(char *into_buf, const int start_index, const int len); void get_substr(char *into_buf, const int start_index, const int len);
void get_substr_nt(char *into_buf, const int start_index, const int len); void get_substr_nt(char *into_buf, const int start_index, const int len);
String substr(const int start_index, const int len);
int compare(const String &other) const;
uint8_t read_uint8_bytes_at(int &index, bool advance_index = true); uint8_t read_uint8_bytes_at(int &index, bool advance_index = true);
uint16_t read_uint16_bytes_at(int &index, bool advance_index = true); uint16_t read_uint16_bytes_at(int &index, bool advance_index = true);