zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-17 00:38:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'find-or-deep-nest'

Browse Source
This commit is contained in:
ToruNiina
2024-08-10 18:35:10 +09:00
parent 9b914db23d 5d74160df3
commit 9b58c7e321
2 changed files with 112 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/toml11/find.hpp
View File

@@ -333,16 +333,14 @@ find_or(const basic_value<TC>& v, const K& ky, T opt)
namespace detail
{
template<typename T>
T& last_one(T& arg)
template<typename ...Ts>
auto last_one(Ts&&... args)
-> decltype(std::get<sizeof...(Ts)-1>(std::forward_as_tuple(std::forward<Ts>(args)...)))
{
return arg;
}
template<typename T1, typename T2, typename ...Ts>
auto last_one(T1&, T2& arg, Ts& ... args) -> decltype(last_one(arg, args...))
{
return last_one(arg, args...);
return std::get<sizeof...(Ts)-1>(std::forward_as_tuple(std::forward<Ts>(args)...));
}
} // detail
template<typename Value, typename K1, typename K2, typename K3, typename ... Ks>

106
tests/test_find_or.cpp
View File

@@ -505,6 +505,39 @@ TEST_CASE("testing find_or(val, keys..., opt)")
CHECK_EQ(v1, "qux");
CHECK_EQ(v2, "hoge");
// v1 and v2 are mutable
v1 = "hoge";
v2 = "fuga";
CHECK_EQ(v1, "hoge");
CHECK_EQ(v2, "fuga");
}
// the same with deeper table
{
toml::value v(
toml::table{ {"A",
toml::table{ {"B",
toml::table{ {"C",
toml::table{ {"D",
toml::table{ {"E",
toml::table{ {"F",
"foo"
} }
} }
} }
} }
} }
} }
);
std::string opt("bar");
auto& v1 = toml::find_or(v, "A", "B", "C", "D", "E", "F", opt);
auto& v2 = toml::find_or(v, "A", "B", "C", "D", "E", "G", opt);
CHECK_EQ(v1, "foo");
CHECK_EQ(v2, "bar");
// v1 and v2 are mutable
v1 = "hoge";
v2 = "fuga";
@@ -531,6 +564,30 @@ TEST_CASE("testing find_or(val, keys..., opt)")
CHECK_EQ(v1, "qux");
CHECK_EQ(v2, "hoge");
}
{
toml::value v(
toml::table{ {"A",
toml::table{ {"B",
toml::table{ {"C",
toml::table{ {"D",
toml::table{ {"E",
toml::table{ {"F",
"foo"
} }
} }
} }
} }
} }
} }
);
std::string opt("bar");
const auto& v1 = toml::find_or(v, "A", "B", "C", "D", "E", "F", opt);
const auto& v2 = toml::find_or(v, "A", "B", "C", "D", "E", "G", opt);
CHECK_EQ(v1, "foo");
CHECK_EQ(v2, "bar");
}
// explicitly specify type, doing type conversion
{
@@ -551,7 +608,32 @@ TEST_CASE("testing find_or(val, keys..., opt)")
CHECK_EQ(v1, 42);
CHECK_EQ(v2, 6*9);
}
{
toml::value v(
toml::table{ {"A",
toml::table{ {"B",
toml::table{ {"C",
toml::table{ {"D",
toml::table{ {"E",
toml::table{ {"F",
42
} }
} }
} }
} }
} }
} }
);
int opt = 6 * 9;
auto v1 = toml::find_or<int>(v, "A", "B", "C", "D", "E", "F", opt);
auto v2 = toml::find_or<int>(v, "A", "B", "C", "D", "E", "G", opt);
CHECK_EQ(v1, 42);
CHECK_EQ(v2, 6*9);
}
// the value exists, but type is different from the expected.
{
const toml::value v(
toml::table{ {"foo",
@@ -563,7 +645,31 @@ TEST_CASE("testing find_or(val, keys..., opt)")
} }
);
auto v1 = toml::find_or<std::string>(v, "foo", "bar", "baz", "hoge");
auto v2 = toml::find_or<double >(v, "foo", "bar", "baz", 3.14);
CHECK_EQ(v1, "hoge");
CHECK_EQ(v2, 3.14);
}
{
const toml::value v(
toml::table{ {"A",
toml::table{ {"B",
toml::table{ {"C",
toml::table{ {"D",
toml::table{ {"E",
toml::table{ {"F",
42
} }
} }
} }
} }
} }
} }
);
auto v1 = toml::find_or<std::string>(v, "A", "B", "C", "D", "E", "F", "bar");
auto v2 = toml::find_or<double >(v, "A", "B", "C", "D", "E", "F", 3.14);
CHECK_EQ(v1, "bar");
CHECK_EQ(v2, 3.14);
}
}