From 2ebb5d337b085a4c7f21ffcd0e63f969272285ce Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 28 Dec 2019 19:35:55 +0100 Subject: new_type: implement stream io operators --- CMakeLists.txt | 1 + doc/src/index.rst | 6 +- include/newtype/new_type.hpp | 51 +++++++++++++-- test/include/io_operators_suite.hpp | 11 ++++ test/src/driver.cpp | 2 + test/src/io_operators_suite.cpp | 121 ++++++++++++++++++++++++++++++++++++ 6 files changed, 185 insertions(+), 7 deletions(-) create mode 100644 test/include/io_operators_suite.hpp create mode 100644 test/src/io_operators_suite.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f28c54..55d4da0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ if(BUILD_TESTING) "${PROJECT_SOURCE_DIR}/test/src/derivation_clause_suite.cpp" "${PROJECT_SOURCE_DIR}/test/src/conversion_suite.cpp" "${PROJECT_SOURCE_DIR}/test/src/equality_comparison_suite.cpp" + "${PROJECT_SOURCE_DIR}/test/src/io_operators_suite.cpp" "${PROJECT_SOURCE_DIR}/test/src/new_type_constructor_suite.cpp" "${PROJECT_SOURCE_DIR}/test/src/relational_operators_suite.cpp" ) diff --git a/doc/src/index.rst b/doc/src/index.rst index 907b58d..e0ebaad 100644 --- a/doc/src/index.rst +++ b/doc/src/index.rst @@ -169,7 +169,7 @@ Synopsis typename CharType, typename StreamTraits, typename = std::enable_if_t> - auto operator<<(std::basic_ostream &&, + auto operator<<(std::basic_ostream &, new_type const &) noexcept(/*see below*/) -> std::basic_ostream &; @@ -179,8 +179,8 @@ Synopsis typename CharType, typename StreamTraits, typename = std::enable_if_t> - auto operator>>(std::basic_istream &&, - new_type &&) noexcept(/*see below*/) + auto operator>>(std::basic_istream &, + new_type &) noexcept(/*see below*/) -> std::basic_istream &; } diff --git a/include/newtype/new_type.hpp b/include/newtype/new_type.hpp index 17959ba..781c7a1 100644 --- a/include/newtype/new_type.hpp +++ b/include/newtype/new_type.hpp @@ -5,6 +5,8 @@ #include "newtype/deriving.hpp" #include "newtype/type.hpp" +#include +#include #include namespace nt @@ -44,7 +46,7 @@ namespace nt return m_value; } - private: + protected: BaseType m_value{}; }; @@ -80,7 +82,7 @@ namespace nt return m_value; } - private: + protected: BaseType m_value; }; @@ -94,15 +96,29 @@ namespace nt template class new_type : public impl::new_type_storage { - using impl::new_type_storage::new_type_storage; + using storage = impl::new_type_storage; + + using storage::storage; using base_type = BaseType; using tag_type = TagType; auto constexpr static derivations = DerivationClause; + template + auto friend operator>>(std::basic_istream & input, + new_type & target) noexcept(noexcept(std::declval() >> + std::declval())) + -> std::basic_istream &; + public: - using impl::new_type_storage::decay; + using storage::decay; /** * Convert this instance into the equivalent base type value @@ -217,6 +233,33 @@ namespace nt return lhs.decay() >= rhs.decay(); } + template, + typename StreamType = std::basic_ostream> + auto operator<<(std::basic_ostream & output, + new_type const & source) noexcept(noexcept(std::declval() + << std::declval())) + -> std::basic_ostream & + { + return output << source.decay(); + } + + template, + typename StreamType = std::basic_istream> + auto operator>>(std::basic_istream & input, new_type & target) noexcept( + noexcept(std::declval() >> std::declval())) -> std::basic_istream & + { + return input >> target.m_value; + } } // namespace nt #endif diff --git a/test/include/io_operators_suite.hpp b/test/include/io_operators_suite.hpp new file mode 100644 index 0000000..c7af2ee --- /dev/null +++ b/test/include/io_operators_suite.hpp @@ -0,0 +1,11 @@ +#ifndef NEWTYPE_TEST_IO_OPERATORS_SUITE_HPP +#define NEWTYPE_TEST_IO_OPERATORS_SUITE_HPP + +#include + +#include +#include + +auto io_operators_suite() -> std::pair; + +#endif \ No newline at end of file diff --git a/test/src/driver.cpp b/test/src/driver.cpp index 1ba3d68..c650dda 100644 --- a/test/src/driver.cpp +++ b/test/src/driver.cpp @@ -1,6 +1,7 @@ #include "conversion_suite.hpp" #include "derivation_clause_suite.hpp" #include "equality_comparison_suite.hpp" +#include "io_operators_suite.hpp" #include "new_type_constructor_suite.hpp" #include "relational_operators_suite.hpp" @@ -55,6 +56,7 @@ int main(int argc, char ** argv) conversion_suite(), equality_comparison_suite(), relational_operators_suite(), + io_operators_suite(), }; auto selectors = get_test_selectors(suites); diff --git a/test/src/io_operators_suite.cpp b/test/src/io_operators_suite.cpp new file mode 100644 index 0000000..7f19963 --- /dev/null +++ b/test/src/io_operators_suite.cpp @@ -0,0 +1,121 @@ +#include "io_operators_suite.hpp" + +#include "kawaii.hpp" +#include "newtype/derivable.hpp" +#include "newtype/deriving.hpp" +#include "newtype/new_type.hpp" + +#include + +#include +#include +#include +#include +#include + +inline namespace traits_extensions +{ + + template + struct has_stream_input : std::false_type + { + }; + + template + struct has_stream_input() >> std::declval())>> : std::true_type + { + }; + + template + auto constexpr has_stream_input_v = has_stream_input::value; + + template + struct has_stream_output : std::false_type + { + }; + + template + struct has_stream_output() << std::declval())>> : std::true_type + { + }; + + template + auto constexpr has_stream_output_v = has_stream_output::value; + +} // namespace traits_extensions + +inline namespace stream_input_operator_tests +{ + + auto a_new__type_has_the_stream_input_operator_if_the_derivation_clause_contains_read() -> void + { + using type_alias = nt::new_type; + ASSERT(has_stream_input_v); + } + + auto a_new__type_does_not_have_the_stream_input_operator_if_the_derivation_clause_does_not_contain_read() -> void + { + using type_alias = nt::new_type; + ASSERT(!has_stream_input_v); + } + + auto a_instance_of_a_new__type_can_be_read_from_an_istream_if_the_base_type_can_be_read_from_an_istream() -> void + { + static_assert(has_stream_input_v, "Sanity Check"); + using type_alias = nt::new_type; + + auto obj = type_alias{}; + auto input = std::istringstream{"42"}; + + input >> obj; + + ASSERT_EQUAL(42, obj.decay()); + } + +} // namespace stream_input_operator_tests + +inline namespace stream_output_operator_tests +{ + + auto a_new__type_has_the_stream_output_operator_if_the_derivation_clause_contains_show() -> void + { + using type_alias = nt::new_type; + ASSERT(has_stream_output_v); + } + + auto a_new__type_does_not_have_the_stream_output_operator_if_the_derivation_clause_does_not_contain_show() -> void + { + using type_alias = nt::new_type; + ASSERT(!has_stream_output_v); + } + + auto a_instance_of_a_new__type_can_be_written_to_an_ostream_if_the_base_type_can_be_written_to_an_ostream() -> void + { + static_assert(has_stream_output_v, "Sanity Check"); + using type_alias = nt::new_type; + + auto obj = type_alias{42}; + auto output = std::ostringstream{}; + + output << obj; + + ASSERT_EQUAL("42", output.str()); + } + +} // namespace stream_output_operator_tests + +auto io_operators_suite() -> std::pair +{ + return {{ + // Stream Input Operator Tests + KAWAII(a_new__type_has_the_stream_input_operator_if_the_derivation_clause_contains_read), + KAWAII(a_new__type_does_not_have_the_stream_input_operator_if_the_derivation_clause_does_not_contain_read), + KAWAII(a_instance_of_a_new__type_can_be_read_from_an_istream_if_the_base_type_can_be_read_from_an_istream), + + // Stream Ouput Operator Tests + KAWAII(a_new__type_has_the_stream_output_operator_if_the_derivation_clause_contains_show), + KAWAII(a_new__type_does_not_have_the_stream_output_operator_if_the_derivation_clause_does_not_contain_show), + KAWAII(a_instance_of_a_new__type_can_be_written_to_an_ostream_if_the_base_type_can_be_written_to_an_ostream), + }, + "I/O Operators Tests"}; +} \ No newline at end of file -- cgit v1.2.3