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

rename get(table, key) to find()

Browse Source
This commit is contained in:
ToruNiina
2018-12-13 02:00:13 +09:00
parent f62bcb3077
commit 27a80b1214
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test_get_related_func.cpp
View File

@@ -12,14 +12,14 @@
#include <deque>
#include <array>
BOOST_AUTO_TEST_CASE(test_find_and_get)
BOOST_AUTO_TEST_CASE(test_find)
{
{
toml::value v(true);
bool thrown = false;
try
{
toml::get<toml::boolean>(v, "key");
toml::find<toml::boolean>(v, "key");
}
catch(toml::type_error const& te)
{
@@ -30,16 +30,16 @@ BOOST_AUTO_TEST_CASE(test_find_and_get)
{
toml::table v{{"num", 42}};
BOOST_CHECK_EQUAL(42, toml::get<int>(v, "num"));
toml::get<toml::integer>(v, "num") = 54;
BOOST_CHECK_EQUAL(54, toml::get<int>(v, "num"));
BOOST_CHECK_EQUAL(42, toml::find<int>(v, "num"));
toml::find<toml::integer>(v, "num") = 54;
BOOST_CHECK_EQUAL(54, toml::find<int>(v, "num"));
}
{
toml::value v = toml::table{{"num", 42}};
BOOST_CHECK_EQUAL(42, toml::get<int>(v, "num"));
toml::get<toml::integer>(v, "num") = 54;
BOOST_CHECK_EQUAL(54, toml::get<int>(v, "num"));
BOOST_CHECK_EQUAL(42, toml::find<int>(v, "num"));
toml::find<toml::integer>(v, "num") = 54;
BOOST_CHECK_EQUAL(54, toml::find<int>(v, "num"));
}
}

12
toml/get.hpp
View File

@@ -270,7 +270,7 @@ T get(const toml::value& v)
template<typename T>
decltype(::toml::get<T>(std::declval<const ::toml::value&>()))
get(const toml::table& tab, const toml::key& ky,
find(const toml::table& tab, const toml::key& ky,
std::string tablename = "unknown table")
{
if(tab.count(ky) == 0)
@@ -282,7 +282,7 @@ get(const toml::table& tab, const toml::key& ky,
}
template<typename T>
decltype(::toml::get<T>(std::declval<::toml::value&>()))
get(toml::table& tab, const toml::key& ky,
find(toml::table& tab, const toml::key& ky,
std::string tablename = "unknown table")
{
if(tab.count(ky) == 0)
@@ -294,7 +294,7 @@ get(toml::table& tab, const toml::key& ky,
}
template<typename T>
decltype(::toml::get<T>(std::declval<::toml::value&&>()))
get(toml::table&& tab, const toml::key& ky,
find(toml::table&& tab, const toml::key& ky,
std::string tablename = "unknown table")
{
if(tab.count(ky) == 0)
@@ -307,7 +307,7 @@ get(toml::table&& tab, const toml::key& ky,
template<typename T>
decltype(::toml::get<T>(std::declval<const ::toml::value&>()))
get(const toml::value& v, const toml::key& ky)
find(const toml::value& v, const toml::key& ky)
{
const auto& tab = ::toml::get<toml::table>(v);
if(tab.count(ky) == 0)
@@ -320,7 +320,7 @@ get(const toml::value& v, const toml::key& ky)
}
template<typename T>
decltype(::toml::get<T>(std::declval<::toml::value&>()))
get(toml::value& v, const toml::key& ky)
find(toml::value& v, const toml::key& ky)
{
auto& tab = ::toml::get<toml::table>(v);
if(tab.count(ky) == 0)
@@ -333,7 +333,7 @@ get(toml::value& v, const toml::key& ky)
}
template<typename T>
decltype(::toml::get<T>(std::declval<::toml::value&&>()))
get(toml::value&& v, const toml::key& ky)
find(toml::value&& v, const toml::key& ky)
{
auto tab = ::toml::get<toml::table>(std::move(v));
if(tab.count(ky) == 0)