mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-02 11:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: quantity_spec.h cleanup: extraneous detail namespace usage removed

Browse Source
This commit is contained in:
Mateusz Pusz
2024-10-29 13:20:15 +01:00
parent 74325e7965
commit 699b0e7c23
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/include/mp-units/framework/quantity_spec.h
View File

@@ -432,19 +432,18 @@ namespace detail {
template<typename... Expr> template<typename... Expr>
struct derived_quantity_spec_impl : struct derived_quantity_spec_impl :
#if MP_UNITS_API_NO_CRTP #if MP_UNITS_API_NO_CRTP
detail::quantity_spec_interface, quantity_spec_interface,
#else #else
detail::quantity_spec_interface<derived_quantity_spec<Expr...>>, quantity_spec_interface<derived_quantity_spec<Expr...>>,
#endif #endif
detail::expr_fractions<dimensionless, Expr...> { expr_fractions<dimensionless, Expr...> {
using _base_type_ = derived_quantity_spec_impl; using _base_type_ = derived_quantity_spec_impl;
using _base_ = detail::expr_fractions<dimensionless, Expr...>; using _base_ = expr_fractions<dimensionless, Expr...>;
static constexpr Dimension auto dimension = static constexpr Dimension auto dimension =
detail::expr_map<detail::to_dimension, derived_dimension, struct dimension_one, expr_map<to_dimension, derived_dimension, struct dimension_one, type_list_of_base_dimension_less>(_base_{});
detail::type_list_of_base_dimension_less>(_base_{});
static constexpr quantity_character character = static constexpr quantity_character character =
detail::derived_quantity_character(typename _base_::_num_{}, typename _base_::_den_{}); derived_quantity_character(typename _base_::_num_{}, typename _base_::_den_{});
}; };
} // namespace detail } // namespace detail
@@ -544,7 +543,7 @@ template<QuantitySpec auto... From, QuantitySpec Q>
template<QuantitySpec Q> template<QuantitySpec Q>
[[nodiscard]] consteval auto remove_kind(Q q) [[nodiscard]] consteval auto remove_kind(Q q)
{ {
if constexpr (detail::QuantityKindSpec<Q>) if constexpr (QuantityKindSpec<Q>)
return Q::_quantity_spec_; return Q::_quantity_spec_;
else else
return q; return q;
@@ -623,7 +622,7 @@ template<typename Q>
template<QuantitySpec Q> template<QuantitySpec Q>
[[nodiscard]] consteval int get_complexity(Q) [[nodiscard]] consteval int get_complexity(Q)
{ {
if constexpr (detail::DerivedQuantitySpec<Q>) if constexpr (DerivedQuantitySpec<Q>)
return get_complexity(typename Q::_num_{}) + get_complexity(typename Q::_den_{}); return get_complexity(typename Q::_num_{}) + get_complexity(typename Q::_den_{});
else if constexpr (requires { Q::_equation_; }) else if constexpr (requires { Q::_equation_; })
return 1 + get_complexity(Q::_equation_); return 1 + get_complexity(Q::_equation_);
@@ -641,7 +640,7 @@ template<Dimension D1, Dimension D2>
else if constexpr (D2{} == dimension_one) else if constexpr (D2{} == dimension_one)
return true; return true;
else else
return detail::type_name<D1>() < detail::type_name<D2>(); return type_name<D1>() < type_name<D2>();
} }
template<QuantitySpec Lhs, QuantitySpec Rhs, bool lhs_eq = requires { Lhs::_equation_; }, template<QuantitySpec Lhs, QuantitySpec Rhs, bool lhs_eq = requires { Lhs::_equation_; },
@@ -651,7 +650,7 @@ struct ingredients_less :
std::bool_constant<(lhs_compl > rhs_compl) || std::bool_constant<(lhs_compl > rhs_compl) ||
(lhs_compl == rhs_compl && ingredients_dimension_less(Lhs::dimension, Rhs::dimension)) || (lhs_compl == rhs_compl && ingredients_dimension_less(Lhs::dimension, Rhs::dimension)) ||
(lhs_compl == rhs_compl && Lhs::dimension == Rhs::dimension && (lhs_compl == rhs_compl && Lhs::dimension == Rhs::dimension &&
detail::type_name<Lhs>() < detail::type_name<Rhs>())>{}; type_name<Lhs>() < type_name<Rhs>())>{};
template<typename T1, typename T2> template<typename T1, typename T2>
using type_list_of_ingredients_less = expr_less<T1, T2, ingredients_less>; using type_list_of_ingredients_less = expr_less<T1, T2, ingredients_less>;
@@ -1460,10 +1459,10 @@ using to_kind = decltype(get_kind_tree_root(Q{}));
#if MP_UNITS_API_NO_CRTP #if MP_UNITS_API_NO_CRTP
template<NamedQuantitySpec auto QS, auto... Args> template<NamedQuantitySpec auto QS, auto... Args>
[[nodiscard]] consteval bool defined_as_kind(quantity_spec<QS, Args...>) [[nodiscard]] consteval bool defined_as_kind_impl(quantity_spec<QS, Args...>)
#else #else
template<typename Self, NamedQuantitySpec auto QS, auto... Args> template<typename Self, NamedQuantitySpec auto QS, auto... Args>
[[nodiscard]] consteval bool defined_as_kind(quantity_spec<Self, QS, Args...>) [[nodiscard]] consteval bool defined_as_kind_impl(quantity_spec<Self, QS, Args...>)
#endif #endif
{ {
return contains<struct is_kind, Args...>(); return contains<struct is_kind, Args...>();
@@ -1473,22 +1472,21 @@ template<QuantitySpec Q>
[[nodiscard]] consteval QuantitySpec auto get_kind_tree_root(Q q) [[nodiscard]] consteval QuantitySpec auto get_kind_tree_root(Q q)
{ {
auto defined_as_kind = []<typename QQ>(QQ qq) { auto defined_as_kind = []<typename QQ>(QQ qq) {
if constexpr (requires { detail::defined_as_kind(qq); }) if constexpr (requires { defined_as_kind_impl(qq); })
return detail::defined_as_kind(QQ{}); return defined_as_kind_impl(QQ{});
else else
return false; return false;
}; };
// NOLINTBEGIN(bugprone-branch-clone) // NOLINTBEGIN(bugprone-branch-clone)
if constexpr (detail::QuantityKindSpec<Q>) { if constexpr (QuantityKindSpec<Q>) {
return remove_kind(q); return remove_kind(q);
} else if constexpr (defined_as_kind(Q{})) { } else if constexpr (defined_as_kind(Q{})) {
return q; return q;
} else if constexpr (requires { Q::_parent_; }) { } else if constexpr (requires { Q::_parent_; }) {
return get_kind_tree_root(Q::_parent_); return get_kind_tree_root(Q::_parent_);
} else if constexpr (detail::DerivedQuantitySpec<Q>) { } else if constexpr (DerivedQuantitySpecSpecialization<Q>) {
return detail::expr_map<detail::to_kind, derived_quantity_spec, struct dimensionless, return expr_map<to_kind, derived_quantity_spec, struct dimensionless, type_list_of_quantity_spec_less>(q);
detail::type_list_of_quantity_spec_less>(q);
} else { } else {
// root quantity // root quantity
return q; return q;