boost/pfr
2
0
Fork 0
mirror of https://github.com/boostorg/pfr.git synced 2026-01-19 04:22:13 +00:00
Code Issues Projects Releases Wiki Activity

Rename more internal functions to better match their usability (removed flat prefix and moved to sequence_tuple namespace)

Browse Source
This commit is contained in:
Antony Polukhin
2016-07-18 23:51:22 +03:00
parent 67b1b5c06a
commit 494a9cf6ca
2 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
include/boost/pfr/core.hpp
View File

@@ -144,6 +144,46 @@ using tuple_element = std::remove_reference< decltype(
::boost::pfr::detail::sequence_tuple::get<I>( std::declval<T>() )
) >;
template <std::size_t I, std::size_t N>
struct print_impl {
template <class Stream, class T>
static void print (Stream& out, const T& value) {
if (!!I) out << ", ";
out << ::boost::pfr::detail::sequence_tuple::get<I>(value);
print_impl<I + 1, N>::print(out, value);
}
};
template <std::size_t I>
struct print_impl<I, I> {
template <class Stream, class T> static void print (Stream&, const T&) noexcept {}
};
template <std::size_t I, std::size_t N>
struct read_impl {
template <class Stream, class T>
static void read (Stream& in, T& value) {
char ignore = {};
if (!!I) {
in >> ignore;
if (ignore != ',') in.setstate(Stream::failbit);
in >> ignore;
if (ignore != ' ') in.setstate(Stream::failbit);
}
in >> ::boost::pfr::detail::sequence_tuple::get<I>(value);
read_impl<I + 1, N>::read(in, value);
}
};
template <std::size_t I>
struct read_impl<I, I> {
template <class Stream, class T> static void read (Stream&, const T&) {}
};
} // namespace sequence_tuple
@@ -674,7 +714,7 @@ constexpr auto make_stdtuple_from_seqtuple(const T& t, std::index_sequence<I...>
}
template <class T, std::size_t... I>
constexpr auto tie_seqtuple_impl(T& t, std::index_sequence<I...>) noexcept {
constexpr auto tie_sequence_tuple_impl(T& t, std::index_sequence<I...>) noexcept {
return std::tie(
sequence_tuple::get<I>(t)...
);
@@ -831,31 +871,12 @@ template <class T>
auto flat_tie(T& val /* @cond */, std::enable_if_t< std::is_trivially_assignable<T, T>::value>* = 0 /* @endcond */) noexcept {
typedef detail::as_flat_tuple_t<T> internal_tuple_t;
return detail::tie_seqtuple_impl(
return detail::tie_sequence_tuple_impl(
detail::as_flat_tuple(val),
std::make_index_sequence< internal_tuple_t::size_v >()
);
}
namespace detail {
template <std::size_t I, std::size_t N>
struct seqtuple_print_impl {
template <class Stream, class T>
static void print (Stream& out, const T& value) {
if (!!I) out << ", ";
out << ::boost::pfr::detail::sequence_tuple::get<I>(value);
seqtuple_print_impl<I + 1, N>::print(out, value);
}
};
template <std::size_t I>
struct seqtuple_print_impl<I, I> {
template <class Stream, class T> static void print (Stream&, const T&) noexcept {}
};
}
/// \brief Writes \flattening{flattened} POD `value` to `out`
///
/// \b Example:
@@ -867,34 +888,10 @@ namespace detail {
template <class Char, class Traits, class T>
void flat_write(std::basic_ostream<Char, Traits>& out, const T& value) {
out << '{';
detail::seqtuple_print_impl<0, flat_tuple_size_v<T> >::print(out, detail::as_flat_tuple(value));
detail::sequence_tuple::print_impl<0, flat_tuple_size_v<T> >::print(out, detail::as_flat_tuple(value));
out << '}';
}
namespace detail {
template <std::size_t I, std::size_t N>
struct seqtuple_read_impl {
template <class Stream, class T>
static void read (Stream& in, T& value) {
char ignore = {};
if (!!I) {
in >> ignore;
if (ignore != ',') in.setstate(Stream::failbit);
in >> ignore;
if (ignore != ' ') in.setstate(Stream::failbit);
}
in >> ::boost::pfr::detail::sequence_tuple::get<I>(value);
seqtuple_read_impl<I + 1, N>::read(in, value);
}
};
template <std::size_t I>
struct seqtuple_read_impl<I, I> {
template <class Stream, class T> static void read (Stream&, const T&) {}
};
}
/// Reads \flattening{flattened} POD `value` from stream `in`
///
/// \b Example:
@@ -916,7 +913,7 @@ void flat_read(std::basic_istream<Char, Traits>& in, T& value) {
char parenthis = {};
in >> parenthis;
if (parenthis != '{') in.setstate(std::basic_istream<Char, Traits>::failbit);
detail::seqtuple_read_impl<0, flat_tuple_size_v<T> >::read(in, detail::as_flat_tuple(value));
detail::sequence_tuple::read_impl<0, flat_tuple_size_v<T> >::read(in, detail::as_flat_tuple(value));
in >> parenthis;
if (parenthis != '}') in.setstate(std::basic_istream<Char, Traits>::failbit);

6
include/boost/pfr/core17.hpp
View File

@@ -114,7 +114,7 @@ template <class T>
constexpr auto tie(T& val) noexcept { // TODO: Bad name :(
typedef detail::as_tuple_t<T> internal_tuple_t;
return detail::tie_seqtuple_impl(
return detail::tie_sequence_tuple_impl(
detail::as_tuple(val),
std::make_index_sequence< internal_tuple_t::size_v >()
);
@@ -134,7 +134,7 @@ constexpr auto tie(T& val) noexcept { // TODO: Bad name :(
template <class Char, class Traits, class T>
void write(std::basic_ostream<Char, Traits>& out, const T& value) {
out << '{';
detail::seqtuple_print_impl<0, tuple_size_v<T> >::print(out, detail::as_tuple(value));
detail::sequence_tuple::print_impl<0, tuple_size_v<T> >::print(out, detail::as_tuple(value));
out << '}';
}
@@ -161,7 +161,7 @@ void read(std::basic_istream<Char, Traits>& in, T& value) {
char parenthis = {};
in >> parenthis;
if (parenthis != '{') in.setstate(std::basic_istream<Char, Traits>::failbit);
detail::seqtuple_read_impl<0, tuple_size_v<T> >::read(in, detail::as_tuple(value));
detail::sequence_tuple::read_impl<0, tuple_size_v<T> >::read(in, detail::as_tuple(value));
in >> parenthis;
if (parenthis != '}') in.setstate(std::basic_istream<Char, Traits>::failbit);