talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of wrap-string-view

Browse Source
This commit is contained in:
jyelon
2022-02-24 13:50:43 -05:00
parent eb6cbebd20
commit 08f6aa2092
10 changed files with 53 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
luprex/core/cpp/util.cpp
View File

@@ -271,25 +271,25 @@ double strtodouble(const eng::string &value) {
}
}
eng::string_view sv_ltrim(eng::string_view v) {
std::string_view sv_ltrim(std::string_view v) {
const char *b = v.data();
const char *e = v.data() + v.size();
while ((e > b) && (std::isspace(b[0]))) {
b++;
}
return eng::string_view(b, e-b);
return std::string_view(b, e-b);
}
eng::string_view sv_rtrim(eng::string_view v) {
std::string_view sv_rtrim(std::string_view v) {
const char *b = v.data();
const char *e = v.data() + v.size();
while ((e > b) && (std::isspace(e[-1]))) {
e--;
}
return eng::string_view(b, e-b);
return std::string_view(b, e-b);
}
eng::string_view sv_trim(eng::string_view v) {
std::string_view sv_trim(std::string_view v) {
const char *b = v.data();
const char *e = v.data() + v.size();
while ((e > b) && (std::isspace(b[0]))) {
@@ -298,25 +298,25 @@ eng::string_view sv_trim(eng::string_view v) {
while ((e > b) && (std::isspace(e[-1]))) {
e--;
}
return eng::string_view(b, e-b);
return std::string_view(b, e-b);
}
eng::string ltrim(eng::string_view v) {
eng::string ltrim(std::string_view v) {
return eng::string(sv_ltrim(v));
}
eng::string rtrim(eng::string_view v) {
eng::string rtrim(std::string_view v) {
return eng::string(sv_rtrim(v));
}
eng::string trim(eng::string_view v) {
eng::string trim(std::string_view v) {
return eng::string(sv_trim(v));
}
eng::string_view sv_read_line(eng::string_view &source) {
std::string_view sv_read_line(std::string_view &source) {
size_t pos = source.find('\n');
eng::string_view result;
if (pos == eng::string_view::npos) {
std::string_view result;
if (pos == std::string_view::npos) {
result = source;
source = "";
} else {
@@ -449,10 +449,10 @@ LuaDefine(unittests_util, "", "some unit tests") {
LuaAssert(L, util::trim("") == "");
// Test sv_read_line
eng::string_view v = "foo\nbar\r\n";
eng::string_view v1 = util::sv_read_line(v);
eng::string_view v2 = util::sv_read_line(v);
eng::string_view v3 = util::sv_read_line(v);
std::string_view v = "foo\nbar\r\n";
std::string_view v1 = util::sv_read_line(v);
std::string_view v2 = util::sv_read_line(v);
std::string_view v3 = util::sv_read_line(v);
LuaAssertStrEq(L, v1, "foo");
LuaAssertStrEq(L, v2, "bar");
LuaAssertStrEq(L, v3, "");