MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 00:02:34 +01:00
Code Issues Releases Wiki Activity

ircd::json::tuple: Add prop() convenience; add has_key(); redundant noexcept.

Browse source
This commit is contained in:
Jason Volk 2022-06-26 14:18:13 -07:00
parent f6f5809658
commit 3a4b5aa819
2 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/json/tuple/key.h
View file

@ -29,7 +29,7 @@ inline enable_if_tuple<tuple, const char *>
key(const tuple &t)
noexcept
{
return std::get<i>(t).key;
return prop<i>(t).key;
}
template<class tuple,

40
include/ircd/json/tuple/tuple.h
View file

@ -97,7 +97,6 @@ namespace json {
template<class T>
constexpr bool
is_tuple()
noexcept
{
return std::is_base_of<tuple_base, T>::value;
}
@ -142,11 +141,28 @@ stdcast(T &o)
template<class T>
constexpr enable_if_tuple<T, size_t>
size()
noexcept
{
return tuple_size<T>::value;
}
/// Reference to the json::property wrapper of the key and value
template<size_t i,
class tuple>
inline enable_if_tuple<tuple, tuple_element<tuple, i> &>
prop(tuple &t)
{
return std::get<i>(t);
}
/// Reference to the json::property wrapper of the key and value
template<size_t i,
class tuple>
inline enable_if_tuple<tuple, const tuple_element<tuple, i> &>
prop(const tuple &t)
{
return std::get<i>(t);
}
} // namespace json
} // namespace ircd
@ -156,31 +172,41 @@ noexcept
namespace ircd {
namespace json {
/// Reference to the payload value directly at index
template<size_t i,
class tuple>
inline enable_if_tuple<tuple, tuple_value_type<tuple, i> &>
val(tuple &t)
noexcept
{
return static_cast<tuple_value_type<tuple, i> &>(std::get<i>(t));
return static_cast<tuple_value_type<tuple, i> &>(prop<i>(t));
}
/// Reference to the payload value directly at index
template<size_t i,
class tuple>
inline enable_if_tuple<tuple, const tuple_value_type<tuple, i> &>
val(const tuple &t)
noexcept
{
return static_cast<const tuple_value_type<tuple, i> &>(std::get<i>(t));
return static_cast<const tuple_value_type<tuple, i> &>(prop<i>(t));
}
/// Convenience to determine if tuple has property by name.
template<class tuple>
inline bool
key_exists(const string_view &key)
has_key(const string_view &key)
{
return indexof<tuple>(key) < size<tuple>();
}
/// Convenience to determine if tuple has property by name.
template<class tuple>
inline bool
has_key(const tuple &t,
const string_view &key)
{
return has_key<tuple>(key);
}
} // namespace json
} // namespace ircd