roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-unit: refactor: move bu_fallback_abbrev to bu_store

Browse source
This commit is contained in:
Roland Conybeare 2024-05-08 16:55:54 -04:00
commit a9bb9631c2
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/xo/unit/basis_unit.hpp
View file

@ -203,16 +203,6 @@ namespace xo {
.abbrev_str()));
};
inline
constexpr bu_abbrev_type
bu_fallback_abbrev(dim basis_dim,
const scalefactor_ratio_type & scalefactor)
{
return (bu_abbrev_type::from_flatstring
(flatstring_concat
(scalefactor.to_str<bu_abbrev_type::fixed_capacity>(),
native_unit2_v[static_cast<std::uint32_t>(basis_dim)].abbrev_str())));
}
}
} /*namespace qty*/
} /*namespace xo*/

12
include/xo/unit/bu_store.hpp
View file

@ -173,6 +173,16 @@ namespace xo {
//this->bu_establish_abbrev_for<dim::price, 1, 1>();
}
static constexpr bu_abbrev_type
bu_fallback_abbrev(dim basis_dim,
const scalefactor_ratio_type & scalefactor)
{
return (bu_abbrev_type::from_flatstring
(flatstring_concat
(scalefactor.to_str<bu_abbrev_type::fixed_capacity>(),
native_unit2_v[static_cast<std::uint32_t>(basis_dim)].abbrev_str())));
}
/** @brief get basis-unit abbreviation at runtime **/
constexpr bu_abbrev_type bu_abbrev(dim basis_dim,
const scalefactor_ratio_type & scalefactor) const
@ -186,7 +196,7 @@ namespace xo {
{
return bu_abbrev_v[i_abbrev].second;
} else {
return units::bu_fallback_abbrev(basis_dim, scalefactor);
return bu_fallback_abbrev(basis_dim, scalefactor);
}
}