Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

string: deduplicate comparison logic between string and string_view #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

string: deduplicate comparison logic between string and string_view #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions include/frg/string.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,19 @@ class basic_string_view {
return _length;
}

bool operator== (basic_string_view other) const {
if(_length != other._length)
return false;
int compare(basic_string_view other) const {
if(_length != other.size())
return _length < other.size() ? -1 : 1;
for(size_t i = 0; i < _length; i++)
if(_pointer[i] != other._pointer[i])
return false;
return true;
if(_pointer[i] != other[i])
return _pointer[i] < other[i] ? -1 : 1;
return 0;
}

bool operator== (basic_string_view other) const {
return compare(other) == 0;
}

bool operator!= (basic_string_view other) const {
return !(*this == other);
}
Expand Down Expand Up @@ -303,22 +308,11 @@ class basic_string {
}

int compare(const basic_string &other) const {
if(_length != other.size())
return _length < other.size() ? -1 : 1;
for(size_t i = 0; i < _length; i++)
if(_buffer[i] != other[i])
return _buffer[i] < other[i] ? -1 : 1;
return 0;
return view().compare(other);
}

int compare(const char *other) const {
auto other_len = generic_strlen(other);
if(_length != other_len)
return _length < other_len ? -1 : 1;
for(size_t i = 0; i < _length; i++)
if(_buffer[i] != other[i])
return _buffer[i] < other[i] ? -1 : 1;
return 0;
return view().compare(other);
}

bool operator== (const basic_string &other) const {
Expand All @@ -341,14 +335,16 @@ class basic_string {
return basic_string_view<Char>(_buffer, _length);
}

basic_string_view<Char> view() const {
return basic_string_view<Char>(_buffer, _length);
}

bool starts_with(basic_string_view<Char> other) {
auto self = basic_string_view<Char> { *this };
return self.starts_with(other);
return view().starts_with(other);
}

bool ends_with(basic_string_view<Char> other) {
auto self = basic_string_view<Char> { *this };
return self.ends_with(other);
return view().ends_with(other);
}

private:
Expand Down