asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix split_floats behavior when spaces are used as separators

Browse source
This commit is contained in:
Haoyu Qiu 2024-08-16 13:23:04 +08:00
parent a7598679cf
commit f483c3aafa
2 changed files with 82 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/string/ustring.cpp
View file

@ -1537,13 +1537,16 @@ Vector<double> String::split_floats(const String &p_splitter, bool p_allow_empty
int from = 0; int from = 0;
int len = length(); int len = length();
String buffer = *this;
while (true) { while (true) {
int end = find(p_splitter, from); int end = find(p_splitter, from);
if (end < 0) { if (end < 0) {
end = len; end = len;
} }
if (p_allow_empty || (end > from)) { if (p_allow_empty || (end > from)) {
ret.push_back(String::to_float(&get_data()[from])); buffer[end] = 0;
ret.push_back(String::to_float(&buffer.get_data()[from]));
buffer[end] = _cowdata.get(end);
} }
if (end == len) { if (end == len) {
@ -1561,6 +1564,7 @@ Vector<float> String::split_floats_mk(const Vector<String> &p_splitters, bool p_
int from = 0; int from = 0;
int len = length(); int len = length();
String buffer = *this;
while (true) { while (true) {
int idx; int idx;
int end = findmk(p_splitters, from, &idx); int end = findmk(p_splitters, from, &idx);
@ -1572,7 +1576,9 @@ Vector<float> String::split_floats_mk(const Vector<String> &p_splitters, bool p_
} }
if (p_allow_empty || (end > from)) { if (p_allow_empty || (end > from)) {
ret.push_back(String::to_float(&get_data()[from])); buffer[end] = 0;
ret.push_back(String::to_float(&buffer.get_data()[from]));
buffer[end] = _cowdata.get(end);
} }
if (end == len) { if (end == len) {

122
tests/core/string/test_string.h
View file

@ -638,64 +638,90 @@ TEST_CASE("[String] Ends with") {
} }
TEST_CASE("[String] Splitting") { TEST_CASE("[String] Splitting") {
String s = "Mars,Jupiter,Saturn,Uranus"; {
const char *slices_l[3] = { "Mars", "Jupiter", "Saturn,Uranus" }; const String s = "Mars,Jupiter,Saturn,Uranus";
MULTICHECK_SPLIT(s, split, ",", true, 2, slices_l, 3);
const char *slices_r[3] = { "Mars,Jupiter", "Saturn", "Uranus" }; const char *slices_l[3] = { "Mars", "Jupiter", "Saturn,Uranus" };
MULTICHECK_SPLIT(s, rsplit, ",", true, 2, slices_r, 3); MULTICHECK_SPLIT(s, split, ",", true, 2, slices_l, 3);
s = "test"; const char *slices_r[3] = { "Mars,Jupiter", "Saturn", "Uranus" };
const char *slices_3[4] = { "t", "e", "s", "t" }; MULTICHECK_SPLIT(s, rsplit, ",", true, 2, slices_r, 3);
MULTICHECK_SPLIT(s, split, "", true, 0, slices_3, 4);
s = "";
const char *slices_4[1] = { "" };
MULTICHECK_SPLIT(s, split, "", true, 0, slices_4, 1);
MULTICHECK_SPLIT(s, split, "", false, 0, slices_4, 0);
s = "Mars Jupiter Saturn Uranus";
const char *slices_s[4] = { "Mars", "Jupiter", "Saturn", "Uranus" };
Vector<String> l = s.split_spaces();
for (int i = 0; i < l.size(); i++) {
CHECK(l[i] == slices_s[i]);
} }
s = "1.2;2.3 4.5"; {
const double slices_d[3] = { 1.2, 2.3, 4.5 }; const String s = "test";
const char *slices[4] = { "t", "e", "s", "t" };
Vector<double> d_arr; MULTICHECK_SPLIT(s, split, "", true, 0, slices, 4);
d_arr = s.split_floats(";");
CHECK(d_arr.size() == 2);
for (int i = 0; i < d_arr.size(); i++) {
CHECK(ABS(d_arr[i] - slices_d[i]) <= 0.00001);
} }
Vector<String> keys; {
keys.push_back(";"); const String s = "";
keys.push_back(" "); const char *slices[1] = { "" };
MULTICHECK_SPLIT(s, split, "", true, 0, slices, 1);
Vector<float> f_arr; MULTICHECK_SPLIT(s, split, "", false, 0, slices, 0);
f_arr = s.split_floats_mk(keys);
CHECK(f_arr.size() == 3);
for (int i = 0; i < f_arr.size(); i++) {
CHECK(ABS(f_arr[i] - slices_d[i]) <= 0.00001);
} }
s = "1;2 4"; {
const int slices_i[3] = { 1, 2, 4 }; const String s = "Mars Jupiter Saturn Uranus";
const char *slices[4] = { "Mars", "Jupiter", "Saturn", "Uranus" };
Vector<int> ii; Vector<String> l = s.split_spaces();
ii = s.split_ints(";"); for (int i = 0; i < l.size(); i++) {
CHECK(ii.size() == 2); CHECK(l[i] == slices[i]);
for (int i = 0; i < ii.size(); i++) { }
CHECK(ii[i] == slices_i[i]);
} }
ii = s.split_ints_mk(keys); {
CHECK(ii.size() == 3); const String s = "1.2;2.3 4.5";
for (int i = 0; i < ii.size(); i++) { const double slices[3] = { 1.2, 2.3, 4.5 };
CHECK(ii[i] == slices_i[i]);
const Vector<double> d_arr = s.split_floats(";");
CHECK(d_arr.size() == 2);
for (int i = 0; i < d_arr.size(); i++) {
CHECK(ABS(d_arr[i] - slices[i]) <= 0.00001);
}
const Vector<String> keys = { ";", " " };
const Vector<float> f_arr = s.split_floats_mk(keys);
CHECK(f_arr.size() == 3);
for (int i = 0; i < f_arr.size(); i++) {
CHECK(ABS(f_arr[i] - slices[i]) <= 0.00001);
}
}
{
const String s = " -2.0 5";
const double slices[10] = { 0, -2, 0, 0, 0, 0, 0, 0, 0, 5 };
const Vector<double> arr = s.split_floats(" ");
CHECK(arr.size() == 10);
for (int i = 0; i < arr.size(); i++) {
CHECK(ABS(arr[i] - slices[i]) <= 0.00001);
}
const Vector<String> keys = { ";", " " };
const Vector<float> mk = s.split_floats_mk(keys);
CHECK(mk.size() == 10);
for (int i = 0; i < mk.size(); i++) {
CHECK(mk[i] == slices[i]);
}
}
{
const String s = "1;2 4";
const int slices[3] = { 1, 2, 4 };
const Vector<int> arr = s.split_ints(";");
CHECK(arr.size() == 2);
for (int i = 0; i < arr.size(); i++) {
CHECK(arr[i] == slices[i]);
}
const Vector<String> keys = { ";", " " };
const Vector<int> mk = s.split_ints_mk(keys);
CHECK(mk.size() == 3);
for (int i = 0; i < mk.size(); i++) {
CHECK(mk[i] == slices[i]);
}
} }
} }