an.tsouchlos/const_fmt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Started implementing zero padding

Browse Source
This commit is contained in:
Andreas Tsouchlos 2021-11-21 20:01:00 +01:00
parent f2de0773ed
commit ad737f1c73
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/Logger.h
View File

@ -41,6 +41,8 @@ public:
for (const auto& c : formatted_msg) {
m_output_policy.write(c);
}
m_output_policy.write('\n');
}
private:

50
inc/format.h
View File

@ -8,9 +8,10 @@
namespace detail {
template<fmt_node_t fmt_node, typename T>
template <fmt_node_t fmt_node, typename T>
constexpr void check_fmt_params() {
static_assert(fmt_node.length > fmt_node.precision + 1, "Insufficient length for desired precision");
static_assert(fmt_node.length > fmt_node.precision + 1,
"Insufficient length for desired precision");
}
@ -32,14 +33,25 @@ constexpr int get_output_len() {
}
template <std::size_t len, bool zeroed>
constexpr std::array<char, len> get_init_array() {
if constexpr (zeroed) {
return {'0'};
} else {
return {' '};
}
}
// TODO: See if this is possible with charconv
template <fmt_node_t fmt_node, std::integral arg_t>
constexpr std::array<char, fmt_node.length> format_arg(arg_t arg) {
check_fmt_params<fmt_node, arg_t>();
std::array<char, fmt_node.length> result;
std::array<char, fmt_node.length> result =
get_init_array<fmt_node.length, fmt_node.has_zero_padding>();
// TODO: See if this is possible with charconv
for (unsigned i = 1; i <= result.size(); ++i) {
for (unsigned i = 1; (i <= result.size()) && arg > 0; ++i) {
result[result.size() - i] = arg % 10 + 48;
arg = arg / 10;
}
@ -47,38 +59,32 @@ constexpr std::array<char, fmt_node.length> format_arg(arg_t arg) {
return result;
}
// TODO: See if this is possible with charconv
template <fmt_node_t fmt_node, std::floating_point arg_t>
constexpr std::array<char, fmt_node.length> format_arg(arg_t arg) {
check_fmt_params<fmt_node, arg_t>();
std::array<char, fmt_node.length> result;
constexpr unsigned len_before_point =
fmt_node.length - fmt_node.precision - 1;
result[result.size() - fmt_node.precision - 1] = '.';
// TODO: See if this is possible with charconv
constexpr unsigned multiplier = const_pow(10, fmt_node.precision);
std::array<char, fmt_node.length> result =
get_init_array<fmt_node.length, fmt_node.has_zero_padding>();
result[len_before_point] = '.';
arg = arg * multiplier;
for (unsigned i = result.size()-1; i >= result.size() - fmt_node.precision; --i) {
for (unsigned i = result.size() - 1; i > len_before_point; --i) {
result[i] = static_cast<int>(arg) % 10 + 48;
arg = arg / 10;
}
for (unsigned i = fmt_node.precision + 2; i <= result.size(); ++i) {
for (unsigned i = fmt_node.precision + 2; (i <= result.size()) && (arg >= 1); ++i) {
result[result.size() - i] = static_cast<int>(arg) % 10 + 48;
arg = arg / 10;
}
/*
for (unsigned i = fmt_node.precision + 1; i <= result.size(); ++i) {
result[result.size() - i] = static_cast<int>(arg) % 10 + 48;
arg = arg / 10;
}
*/
return result;
}
@ -93,19 +99,19 @@ constexpr std::array<char, fmt_node.length> format_arg(const char* arg) {
if (*arg != '\0')
c = *(arg++);
else
c = '_';
c = ' ';
}
return result;
}
template <auto t_ast, unsigned t_ast_i = 0, unsigned t_result_i = 0,
typename char_array_t>
constexpr char_array_t format_args(char_array_t result) {
return result;
}
template <auto t_ast, unsigned t_ast_i = 0, unsigned t_result_i = 0,
typename char_array_t, typename first_arg_t, typename... other_args_t>
constexpr char_array_t format_args(char_array_t result, first_arg_t first_arg,

2
src/main.cpp
View File

@ -12,7 +12,7 @@ public:
int main() {
const auto formatted = format<"Test: {:8.3} {:6.3} {:05.2}">(1432.4334, "abc", 1234);
constexpr auto formatted = format<"Test: {} {} {:0}">(142.4334, "abc", 1234);
for (const auto& c : formatted)
std::cout << c;