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

feat: The last corner cases in quantity_spec conversions addressed

Browse Source
This commit is contained in:
Mateusz Pusz
2023-05-22 16:50:04 +02:00
parent 2d2211fffa
commit 590539ad6c
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/include/mp_units/quantity_spec.h
View File

@@ -1255,20 +1255,31 @@ template<QuantitySpec From, QuantitySpec To>
else if constexpr (QuantityKindSpec<From> || QuantityKindSpec<To>) { else if constexpr (QuantityKindSpec<From> || QuantityKindSpec<To>) {
constexpr auto from_kind = get_kind(from); constexpr auto from_kind = get_kind(from);
constexpr auto to_kind = get_kind(to); constexpr auto to_kind = get_kind(to);
constexpr auto exploded_kind_result = [](specs_convertible_result res) {
using enum specs_convertible_result;
return res == no ? no : yes;
};
if constexpr ((NamedQuantitySpec<std::remove_cvref_t<decltype(from_kind)>> && if constexpr ((NamedQuantitySpec<std::remove_cvref_t<decltype(from_kind)>> &&
NamedQuantitySpec<std::remove_cvref_t<decltype(to_kind)>>) || NamedQuantitySpec<std::remove_cvref_t<decltype(to_kind)>>) ||
get_complexity(from_kind) == get_complexity(to_kind)) get_complexity(from_kind) == get_complexity(to_kind))
return convertible_impl(from_kind, to_kind); return convertible_impl(from_kind, to_kind);
else if constexpr (get_complexity(from_kind) > get_complexity(to_kind)) else if constexpr (get_complexity(from_kind) > get_complexity(to_kind))
return convertible_impl(get_kind(explode<get_complexity(to_kind)>(from_kind).quantity), to_kind); return exploded_kind_result(
convertible_impl(get_kind(explode<get_complexity(to_kind)>(from_kind).quantity), to_kind));
else else
return convertible_impl(from_kind, get_kind(explode<get_complexity(from_kind)>(to_kind).quantity)); return exploded_kind_result(
} else if constexpr (NamedQuantitySpec<From> && NamedQuantitySpec<To>) { convertible_impl(from_kind, get_kind(explode<get_complexity(from_kind)>(to_kind).quantity)));
} else if constexpr (get_kind(from) != get_kind(to) &&
std::derived_from<std::remove_cvref_t<decltype(get_kind(to))>,
std::remove_cvref_t<decltype(get_kind(from))>> &&
get_kind(to) == to)
return yes;
else if constexpr (NamedQuantitySpec<From> && NamedQuantitySpec<To>) {
if constexpr (have_common_base(from, to)) { if constexpr (have_common_base(from, to)) {
if (std::derived_from<From, To>) if (std::derived_from<From, To>)
return yes; return yes;
else else
return std::derived_from<To, From> ? explicit_conversion : cast; return std::derived_from<To, From> ? explicit_conversion : (get_kind(from) == get_kind(to) ? cast : no);
} else if constexpr (get_kind(from) != get_kind(to)) } else if constexpr (get_kind(from) != get_kind(to))
return no; return no;
else if constexpr (get_complexity(from) != get_complexity(to)) { else if constexpr (get_complexity(from) != get_complexity(to)) {