From 5db7ad01f8f3020d56882483b63290544da2400d Mon Sep 17 00:00:00 2001 From: ADAM David Alan Martin Date: Sun, 12 Nov 2023 05:03:26 -0500 Subject: [PATCH] A large number of files have had their module namespace renamed --- AutoRAII.h | 8 ++++---- AutoRAII.test/0.cc | 2 +- Capabilities.h | 8 ++++---- Console.cc | 2 +- Console.h | 6 +++--- Exception.test/exception.cc | 4 ++-- IOStreams/OStreamable.test/0.cc | 2 +- IOStreams/String.h | 6 +++--- StaticValue.h | 6 +++--- Thread.h | 6 +++--- Thread.test/thread.cc | 4 ++-- auto_comparable.h | 8 ++++---- cmake/rules.cmake | 2 ++ comparisons.h | 10 +++++----- comparisons.test/0.cc | 10 +++++----- error.h | 6 +++--- function_traits.h | 6 +++--- meta.h | 6 +++--- string_algorithms.cc | 2 +- string_algorithms.h | 6 +++--- types.h | 8 ++++---- 21 files changed, 60 insertions(+), 58 deletions(-) diff --git a/AutoRAII.h b/AutoRAII.h index b6bbd12..09f60a1 100644 --- a/AutoRAII.h +++ b/AutoRAII.h @@ -11,9 +11,9 @@ static_assert( __cplusplus > 2020'99 ); namespace Alepha::Hydrogen { - inline namespace exports { inline namespace auto_raii {} } + inline namespace exports { inline namespace AutoRAII_m {} } - namespace detail::auto_raii + namespace detail::AutoRAII_m { inline namespace exports { @@ -79,8 +79,8 @@ namespace Alepha::Hydrogen } } - namespace exports::auto_raii + namespace exports::AutoRAII_m { - using namespace detail::auto_raii::exports; + using namespace detail::AutoRAII_m::exports; } } diff --git a/AutoRAII.test/0.cc b/AutoRAII.test/0.cc index f278399..4ef3f7f 100644 --- a/AutoRAII.test/0.cc +++ b/AutoRAII.test/0.cc @@ -7,7 +7,7 @@ static_assert( __cplusplus > 2020'99 ); static auto tests= Alepha::Utility::enroll <=[] { - using namespace Alepha::Hydrogen::exports::auto_raii; + using namespace Alepha::Hydrogen::exports::AutoRAII_m; using namespace Alepha::Testing::exports::literals; using Alepha::Testing::exports::TestState; diff --git a/Capabilities.h b/Capabilities.h index de7a75c..e1b9011 100644 --- a/Capabilities.h +++ b/Capabilities.h @@ -9,9 +9,9 @@ static_assert( __cplusplus > 2020'99 ); namespace Alepha::Hydrogen { - inline namespace exports { inline namespace capabilities {} } + inline namespace exports { inline namespace Capabilities_m {} } - namespace detail::capabilities + namespace detail::Capabilities_m { inline namespace exports { @@ -135,8 +135,8 @@ namespace Alepha::Hydrogen template< Capability< missing_capability_demo > C > void f( C ) {} } - namespace exports::capabilities + namespace exports::Capabilities_m { - using namespace detail::capabilities::exports; + using namespace detail::Capabilities_m::exports; } } diff --git a/Console.cc b/Console.cc index 254ab6d..ded34f2 100644 --- a/Console.cc +++ b/Console.cc @@ -39,7 +39,7 @@ static_assert( __cplusplus > 2020'99 ); // universally supported for effectively all cases modern users will care about. -namespace Alepha::Hydrogen ::detail:: console_m +namespace Alepha::Hydrogen ::detail:: Console_m { namespace { diff --git a/Console.h b/Console.h index 0530f62..53eb9ae 100644 --- a/Console.h +++ b/Console.h @@ -16,7 +16,7 @@ static_assert( __cplusplus > 2020'99 ); // As long as this works on most (all?) modern terminal emulators, this should be // fine. -namespace Alepha::Hydrogen ::detail:: console_m +namespace Alepha::Hydrogen ::detail:: Console_m { inline namespace exports {} @@ -244,7 +244,7 @@ namespace Alepha::Hydrogen ::detail:: console_m } -namespace Alepha::Hydrogen::inline exports::inline console_m +namespace Alepha::Hydrogen::inline exports::inline Console_m { - using namespace detail::console_m::exports; + using namespace detail::Console_m::exports; } diff --git a/Exception.test/exception.cc b/Exception.test/exception.cc index d988a3e..e62ce82 100644 --- a/Exception.test/exception.cc +++ b/Exception.test/exception.cc @@ -10,8 +10,8 @@ static_assert( __cplusplus > 2020'99 ); namespace { - using Alepha::Hydrogen::exports::types::argcnt_t; - using Alepha::Hydrogen::exports::types::argvec_t; + using Alepha::Hydrogen::exports::types_m::argcnt_t; + using Alepha::Hydrogen::exports::types_m::argvec_t; namespace util= Alepha::Utility; using namespace Alepha::Testing::exports; diff --git a/IOStreams/OStreamable.test/0.cc b/IOStreams/OStreamable.test/0.cc index 8f1828a..e03d0f9 100644 --- a/IOStreams/OStreamable.test/0.cc +++ b/IOStreams/OStreamable.test/0.cc @@ -61,7 +61,7 @@ static auto init= Alepha::Utility::enroll <=[] { using namespace Alepha::Testing::exports; using namespace Alepha::Testing::literals::test_literals; - using namespace Alepha::IOStreams::exports::string; + using namespace Alepha::IOStreams::exports::String_m; "Simple OStream (default delimiter)"_test <=TableTest< stringify_default > ::Cases diff --git a/IOStreams/String.h b/IOStreams/String.h index 6a51c80..ebae45d 100644 --- a/IOStreams/String.h +++ b/IOStreams/String.h @@ -8,7 +8,7 @@ static_assert( __cplusplus > 2020'99 ); #include -namespace Alepha::Hydrogen::IOStreams ::detail:: string +namespace Alepha::Hydrogen::IOStreams ::detail:: String_m { inline namespace exports { @@ -55,7 +55,7 @@ namespace Alepha::Hydrogen::IOStreams ::detail:: string } } -namespace Alepha::Hydrogen::IOStreams::inline exports::inline string +namespace Alepha::Hydrogen::IOStreams::inline exports::inline String_m { - using namespace detail::string::exports; + using namespace detail::String_m::exports; } diff --git a/StaticValue.h b/StaticValue.h index 0b57cf7..f371f78 100644 --- a/StaticValue.h +++ b/StaticValue.h @@ -8,7 +8,7 @@ static_assert( __cplusplus > 2020'99 ); #include -namespace Alepha::Hydrogen::detail:: static_value +namespace Alepha::Hydrogen ::detail:: StaticValue_m { inline namespace exports { @@ -151,7 +151,7 @@ namespace Alepha::Hydrogen::detail:: static_value }; } -namespace Alepha::Hydrogen::inline exports::inline static_value +namespace Alepha::Hydrogen::inline exports::inline StaticValue_m { - using namespace detail::static_value::exports; + using namespace detail::StaticValue_m::exports; } diff --git a/Thread.h b/Thread.h index 240c4c9..6e23adf 100644 --- a/Thread.h +++ b/Thread.h @@ -12,7 +12,7 @@ static_assert( __cplusplus > 2020'99 ); namespace Alepha::Hydrogen { - namespace detail::thread + namespace detail::Thread_m { inline namespace exports {} namespace exports @@ -161,8 +161,8 @@ namespace Alepha::Hydrogen } inline namespace exports {} - namespace exports::inline thread + namespace exports::inline Thread_m { - using namespace detail::thread::exports; + using namespace detail::Thread_m::exports; } } diff --git a/Thread.test/thread.cc b/Thread.test/thread.cc index f7f7544..b19858e 100644 --- a/Thread.test/thread.cc +++ b/Thread.test/thread.cc @@ -10,8 +10,8 @@ static_assert( __cplusplus > 2020'99 ); namespace { - using Alepha::exports::types::argcnt_t; - using Alepha::exports::types::argvec_t; + using Alepha::exports::types_m::argcnt_t; + using Alepha::exports::types_m::argvec_t; namespace util= Alepha::Utility; using namespace Alepha::Testing::exports; diff --git a/auto_comparable.h b/auto_comparable.h index aee0388..ff65512 100644 --- a/auto_comparable.h +++ b/auto_comparable.h @@ -9,7 +9,7 @@ static_assert( __cplusplus > 2020'99 ); #include -namespace Alepha::Hydrogen ::detail:: auto_comparable_module +namespace Alepha::Hydrogen ::detail:: auto_comparable_m { inline namespace exports { @@ -25,11 +25,11 @@ namespace Alepha::Hydrogen ::detail:: auto_comparable_module constexpr decltype( auto ) equality_lens( const AutoComparableAggregate auto &item ) noexcept { - return detail::comparisons::magma_hook{ Reflection::tuplizeAggregate( item ) }; + return detail::comparisons_m::magma_hook{ Reflection::tuplizeAggregate( item ) }; } } -namespace Alepha::Hydrogen::inline exports::inline auto_comparable_module +namespace Alepha::Hydrogen::inline exports::inline auto_comparable_m { - using namespace detail::auto_comparable_module::exports; + using namespace detail::auto_comparable_m::exports; } diff --git a/cmake/rules.cmake b/cmake/rules.cmake index 897a0c8..775c46e 100644 --- a/cmake/rules.cmake +++ b/cmake/rules.cmake @@ -41,6 +41,8 @@ endif() include(CTest) +enable_testing() + function( unit_test TEST_NAME ) diff --git a/comparisons.h b/comparisons.h index c5147b0..ab0ebfa 100644 --- a/comparisons.h +++ b/comparisons.h @@ -15,9 +15,9 @@ static_assert( __cplusplus > 2020'99 ); namespace Alepha::Hydrogen { - inline namespace exports { inline namespace comparisons {} } + inline namespace exports { inline namespace comparisons_m {} } - namespace detail::comparisons + namespace detail::comparisons_m { inline namespace exports {} @@ -27,7 +27,7 @@ namespace Alepha::Hydrogen namespace exports { - using detail::comparisons::comparable; + using detail::comparisons_m::comparable; inline constexpr Meta::type_value< comparable > comparable_capability; } @@ -438,8 +438,8 @@ namespace Alepha::Hydrogen } } - namespace exports::comparisons + namespace exports::comparisons_m { - using namespace detail::comparisons::exports; + using namespace detail::comparisons_m::exports; } } diff --git a/comparisons.test/0.cc b/comparisons.test/0.cc index ce94355..baa0ab8 100644 --- a/comparisons.test/0.cc +++ b/comparisons.test/0.cc @@ -8,12 +8,12 @@ static_assert( __cplusplus > 2020'99 ); namespace { - using Alepha::Hydrogen::exports::types::argcnt_t; - using Alepha::Hydrogen::exports::types::argvec_t; + using Alepha::Hydrogen::exports::types_m::argcnt_t; + using Alepha::Hydrogen::exports::types_m::argvec_t; using namespace Alepha::Testing::exports; - using namespace Alepha::Hydrogen::exports::comparisons; - using namespace Alepha::Hydrogen::exports::capabilities; + using namespace Alepha::Hydrogen::exports::comparisons_m; + using namespace Alepha::Hydrogen::exports::Capabilities_m; template < @@ -32,7 +32,7 @@ namespace }; using Date= Date_core<>; - namespace detail= Alepha::Hydrogen::detail::capabilities; + namespace detail= Alepha::Hydrogen::detail::Capabilities_m; namespace Meta= Alepha::Meta; diff --git a/error.h b/error.h index 0213168..60111aa 100644 --- a/error.h +++ b/error.h @@ -7,7 +7,7 @@ static_assert( __cplusplus > 2020'99 ); #include #include -namespace Alepha::Hydrogen ::detail:: error_stream +namespace Alepha::Hydrogen ::detail:: error_m { inline namespace exports {} @@ -59,7 +59,7 @@ namespace Alepha::Hydrogen ::detail:: error_stream } } -namespace Alepha::Hydrogen::inline exports::inline error_stream +namespace Alepha::Hydrogen::inline exports::inline error_m { - using namespace detail::error_stream::exports; + using namespace detail::error_m::exports; } diff --git a/function_traits.h b/function_traits.h index dc4f215..29c1115 100644 --- a/function_traits.h +++ b/function_traits.h @@ -8,7 +8,7 @@ static_assert( __cplusplus > 2020'99 ); #include #include -namespace Alepha::Hydrogen ::detail:: function_traits_module +namespace Alepha::Hydrogen ::detail:: function_traits_m { inline namespace exports { @@ -78,7 +78,7 @@ namespace Alepha::Hydrogen ::detail:: function_traits_module {}; } -namespace Alepha::Hydrogen::inline exports::inline function_traits_module +namespace Alepha::Hydrogen::inline exports::inline function_traits_m { - using namespace detail::function_traits_module::exports; + using namespace detail::function_traits_m::exports; } diff --git a/meta.h b/meta.h index fa09083..5ad9103 100644 --- a/meta.h +++ b/meta.h @@ -18,7 +18,7 @@ static_assert( __cplusplus > 2020'99 ); #include "type_lisp.h" -namespace Alepha::Hydrogen ::detail:: meta +namespace Alepha::Hydrogen ::detail:: meta_m { inline namespace exports { @@ -73,7 +73,7 @@ namespace Alepha::Hydrogen ::detail:: meta } } -namespace Alepha::Hydrogen::inline exports::inline meta +namespace Alepha::Hydrogen::inline exports::inline meta_m { - using namespace detail::meta::exports; + using namespace detail::meta_m::exports; } diff --git a/string_algorithms.cc b/string_algorithms.cc index 8a49451..cc06728 100644 --- a/string_algorithms.cc +++ b/string_algorithms.cc @@ -9,7 +9,7 @@ static_assert( __cplusplus > 2020'99 ); #include "error.h" #include "AutoRAII.h" -namespace Alepha::Hydrogen ::detail:: string_algorithms +namespace Alepha::Hydrogen ::detail:: string_algorithms_m { namespace { diff --git a/string_algorithms.h b/string_algorithms.h index 978d529..1009011 100644 --- a/string_algorithms.h +++ b/string_algorithms.h @@ -20,7 +20,7 @@ static_assert( __cplusplus > 2020'99 ); #include -namespace Alepha::Hydrogen ::detail:: string_algorithms +namespace Alepha::Hydrogen ::detail:: string_algorithms_m { inline namespace exports {} @@ -103,7 +103,7 @@ namespace Alepha::Hydrogen ::detail:: string_algorithms } } -namespace Alepha::Hydrogen::inline exports::inline string_algorithms +namespace Alepha::Hydrogen::inline exports::inline string_algorithms_m { - using namespace detail::string_algorithms::exports; + using namespace detail::string_algorithms_m::exports; } diff --git a/types.h b/types.h index 79dfc58..f1051c6 100644 --- a/types.h +++ b/types.h @@ -6,9 +6,9 @@ static_assert( __cplusplus > 2020'99 ); namespace Alepha::Hydrogen { - inline namespace exports { inline namespace types {} } + inline namespace exports { inline namespace types_m {} } - namespace detail::types + namespace detail::types_m { inline namespace exports { @@ -17,8 +17,8 @@ namespace Alepha::Hydrogen } } - namespace exports::types + namespace exports::types_m { - using namespace detail::types::exports; + using namespace detail::types_m::exports; } }