Add constexpr values to lambda to handle msvc issue with respect to captured constexpr values

This commit is contained in:
ado 2023-07-29 01:11:29 +02:00
parent 75f5ee2a55
commit 705ce422f0

View File

@ -20,18 +20,15 @@ struct unique_file_name {
const std::string name; const std::string name;
unique_file_name() unique_file_name()
: name{"random_" + std::to_string(i++) + time_now_rand() + : name{"random_" + std::to_string(i++) + time_now_rand() + "_file.csv"} {}
"_file.csv"} {
}
~unique_file_name() { ~unique_file_name() { std::filesystem::remove(name); }
std::filesystem::remove(name);
}
}; };
void replace_all(std::string &s, const std::string &from, void replace_all(std::string &s, const std::string &from,
const std::string &to) { const std::string &to) {
if (from.empty()) return; if (from.empty())
return;
size_t start_pos = 0; size_t start_pos = 0;
while ((start_pos = s.find(from, start_pos)) != std::string::npos) { while ((start_pos = s.find(from, start_pos)) != std::string::npos) {
s.replace(start_pos, from.length(), to); s.replace(start_pos, from.length(), to);
@ -65,9 +62,7 @@ struct X {
.append(delim) .append(delim)
.append(s); .append(s);
} }
auto tied() const { auto tied() const { return std::tie(i, d, s); }
return std::tie(i, d, s);
}
}; };
template <typename T> template <typename T>
@ -261,15 +256,14 @@ TEST_CASE("parser test various cases") {
std::vector<X> i2; std::vector<X> i2;
while (!p.eof()) { while (!p.eof()) {
auto a = auto a = p.get_object<X, ss::ax<int, excluded>, double, std::string>();
p.get_object<X, ss::ax<int, excluded>, double, std::string>();
if (p.valid()) { if (p.valid()) {
i.push_back(a); i.push_back(a);
} }
} }
for (auto&& a : p2.iterate_object<X, ss::ax<int, excluded>, double, for (auto &&a :
std::string>()) { p2.iterate_object<X, ss::ax<int, excluded>, double, std::string>()) {
if (p2.valid()) { if (p2.valid()) {
i2.push_back(std::move(a)); i2.push_back(std::move(a));
} }
@ -283,7 +277,7 @@ TEST_CASE("parser test various cases") {
} }
std::copy_if(data.begin(), data.end(), expected.begin(), std::copy_if(data.begin(), data.end(), expected.begin(),
[](const X& x) { return x.i != excluded; }); [&](const X &x) { return x.i != excluded; });
CHECK_EQ(i, expected); CHECK_EQ(i, expected);
CHECK_EQ(i2, expected); CHECK_EQ(i2, expected);
} }
@ -344,13 +338,10 @@ struct test_struct {
int i; int i;
double d; double d;
char c; char c;
auto tied() { auto tied() { return std::tie(i, d, c); }
return std::tie(i, d, c);
}
}; };
void expect_test_struct(const test_struct&) { void expect_test_struct(const test_struct &) {}
}
// various scenarios // various scenarios
TEST_CASE("parser test composite conversion") { TEST_CASE("parser test composite conversion") {
@ -374,11 +365,11 @@ TEST_CASE("parser test composite conversion") {
{ {
constexpr static auto expectedData = std::tuple{10, 'a', 11.1}; constexpr static auto expectedData = std::tuple{10, 'a', 11.1};
auto [d1, d2, d3, d4] = auto [d1, d2, d3, d4] = p.try_next<int, int, double>(fail)
p.try_next<int, int, double>(fail)
.or_else<test_struct>(fail) .or_else<test_struct>(fail)
.or_else<int, char, double>( .or_else<int, char, double>([&](auto &&data) {
[](auto&& data) { CHECK_EQ(data, expectedData); }) CHECK_EQ(data, expectedData);
})
.on_error(fail) .on_error(fail)
.or_else<test_tuple>(fail) .or_else<test_tuple>(fail)
.values(); .values();
@ -396,7 +387,7 @@ TEST_CASE("parser test composite conversion") {
constexpr static auto expectedData = std::tuple{10, 20, 11.1}; constexpr static auto expectedData = std::tuple{10, 20, 11.1};
auto [d1, d2, d3, d4] = auto [d1, d2, d3, d4] =
p.try_next<int, int, double>([](auto& i1, auto i2, double d) { p.try_next<int, int, double>([&](auto &i1, auto i2, double d) {
CHECK_EQ(std::tie(i1, i2, d), expectedData); CHECK_EQ(std::tie(i1, i2, d), expectedData);
}) })
.on_error(fail) .on_error(fail)
@ -438,8 +429,7 @@ TEST_CASE("parser test composite conversion") {
{ {
REQUIRE(!p.eof()); REQUIRE(!p.eof());
auto [d1, d2] = auto [d1, d2] = p.try_next<int, double>([](auto &i, auto &d) {
p.try_next<int, double>([](auto& i, auto& d) {
REQUIRE_EQ(std::tie(i, d), std::tuple{10, 11.1}); REQUIRE_EQ(std::tie(i, d), std::tuple{10, 11.1});
}) })
.or_else<int, double>([](auto &, auto &) { FAIL(""); }) .or_else<int, double>([](auto &, auto &) { FAIL(""); })
@ -466,8 +456,7 @@ TEST_CASE("parser test composite conversion") {
{ {
REQUIRE(!p.eof()); REQUIRE(!p.eof());
auto [d1, d2, d3, d4, d5] = auto [d1, d2, d3, d4, d5] = p.try_next<int, int, double>(fail)
p.try_next<int, int, double>(fail)
.or_object<test_struct, int, double, char>() .or_object<test_struct, int, double, char>()
.or_else<test_struct>(expect_test_struct) .or_else<test_struct>(expect_test_struct)
.or_else<test_tuple>(fail) .or_else<test_tuple>(fail)
@ -571,9 +560,7 @@ struct my_string {
my_string() = default; my_string() = default;
~my_string() { ~my_string() { delete[] data; }
delete[] data;
}
// make sure no object is copied // make sure no object is copied
my_string(const my_string &) = delete; my_string(const my_string &) = delete;
@ -604,9 +591,7 @@ struct xyz {
my_string x; my_string x;
my_string y; my_string y;
my_string z; my_string z;
auto tied() { auto tied() { return std::tie(x, y, z); }
return std::tie(x, y, z);
}
}; };
TEST_CASE("parser test the moving of parsed values") { TEST_CASE("parser test the moving of parsed values") {
@ -735,12 +720,9 @@ std::string no_escape(std::string& s) {
TEST_CASE("parser test csv on multiple lines with escapes") { TEST_CASE("parser test csv on multiple lines with escapes") {
unique_file_name f; unique_file_name f;
std::vector<X> data = {{1, 2, "x\\\nx\\\r\nx"}, std::vector<X> data = {
{5, 6, "z\\\nz\\\nz"}, {1, 2, "x\\\nx\\\r\nx"}, {5, 6, "z\\\nz\\\nz"}, {7, 8, "u"},
{7, 8, "u"}, {3, 4, "y\\\ny\\\ny"}, {9, 10, "v\\\\"}, {11, 12, "w\\\n"}};
{3, 4, "y\\\ny\\\ny"},
{9, 10, "v\\\\"},
{11, 12, "w\\\n"}};
for (auto &[_, __, s] : data) { for (auto &[_, __, s] : data) {
update_if_crlf(s); update_if_crlf(s);
} }
@ -833,8 +815,8 @@ TEST_CASE("parser test multiline restricted") {
out << "19,20,just strings" << std::endl; out << "19,20,just strings" << std::endl;
} }
ss::parser<ss::multiline_restricted<2>, ss::quote<'"'>, ss::escape<'\\'>> ss::parser<ss::multiline_restricted<2>, ss::quote<'"'>, ss::escape<'\\'>> p{
p{f.name, ","}; f.name, ","};
std::vector<X> i; std::vector<X> i;
while (!p.eof()) { while (!p.eof()) {
@ -859,16 +841,13 @@ TEST_CASE("parser test multiline restricted") {
CHECK_EQ(i, data); CHECK_EQ(i, data);
} }
template <typename T, typename Tuple> template <typename T, typename Tuple> struct has_type;
struct has_type;
template <typename T, typename... Us> template <typename T, typename... Us>
struct has_type<T, std::tuple<Us...>> struct has_type<T, std::tuple<Us...>>
: std::disjunction<std::is_same<T, Us>...> {}; : std::disjunction<std::is_same<T, Us>...> {};
void checkSize(size_t size1, size_t size2) { void checkSize(size_t size1, size_t size2) { CHECK_EQ(size1, size2); }
CHECK_EQ(size1, size2);
}
template <typename... Ts> template <typename... Ts>
void testFields(const std::string file_name, const std::vector<X> &data, void testFields(const std::string file_name, const std::vector<X> &data,
@ -996,8 +975,7 @@ TEST_CASE("parser test various cases with header") {
p.use_fields(Str, Int, Dbl); p.use_fields(Str, Int, Dbl);
{ {
auto [string_, int_, double_] = auto [string_, int_, double_] = p.get_next<std::string, int, double>();
p.get_next<std::string, int, double>();
CHECK_EQ(double_, data[3].d); CHECK_EQ(double_, data[3].d);
CHECK_EQ(int_, data[3].i); CHECK_EQ(int_, data[3].i);
CHECK_EQ(string_, data[3].s); CHECK_EQ(string_, data[3].s);