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

Formatting

Browse Source
This commit is contained in:
Andreas Tsouchlos 2021-11-22 11:18:48 +01:00
parent ee8f3a02e5
commit 12eec70058
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/format.h
View File

@ -75,7 +75,7 @@ constexpr std::array<char, fmt_node.length> format_arg(arg_t arg) {
auto result = get_init_array<fmt_node>(); auto result = get_init_array<fmt_node>();
result[point_index] = '.'; result[point_index] = '.';
arg = arg * multiplier; arg = arg * multiplier;
for (int i = result.size() - 1; for (int i = result.size() - 1;

18
inc/parse.h
View File

@ -53,8 +53,7 @@ constexpr unsigned count_braces() {
unsigned result = 0; unsigned result = 0;
for (unsigned i = 0; i < s.size(); ++i) { for (unsigned i = 0; i < s.size(); ++i) {
if (s[i] == '{') if (s[i] == '{') ++result;
++result;
} }
return result; return result;
@ -190,8 +189,7 @@ constexpr parse_result_t<fmt_node_t> parse_fmt_string(unsigned i) {
if (is_digit<s>(i)) { if (is_digit<s>(i)) {
auto [is_valid, new_i, number] = parse_number<s>(i); auto [is_valid, new_i, number] = parse_number<s>(i);
if (!is_valid) if (!is_valid) return {false, i, result};
return {false, i, result};
i = new_i; i = new_i;
result.length = number; result.length = number;
} }
@ -199,16 +197,14 @@ constexpr parse_result_t<fmt_node_t> parse_fmt_string(unsigned i) {
if (s[i] == '.') { if (s[i] == '.') {
++i; ++i;
auto [is_valid, new_i, number] = parse_number<s>(i); auto [is_valid, new_i, number] = parse_number<s>(i);
if (!is_valid) if (!is_valid) return {false, i, result};
return {false, i, result};
i = new_i; i = new_i;
result.precision = number; result.precision = number;
} }
if (s[i] != '}') { if (s[i] != '}') {
auto [is_valid, new_i, type] = parse_type<s>(i); auto [is_valid, new_i, type] = parse_type<s>(i);
if (!is_valid) if (!is_valid) return {false, i, result};
return {false, i, result};
i = new_i; i = new_i;
result.type = type; result.type = type;
} }
@ -225,8 +221,7 @@ constexpr parse_result_t<fmt_node_t> parse_braces(unsigned i) {
++i; ++i;
auto [is_valid, new_i, format_node] = parse_fmt_string<s>(i); auto [is_valid, new_i, format_node] = parse_fmt_string<s>(i);
if (!is_valid) if (!is_valid) return {false, i, {}};
return {false, i, {}};
i = new_i; i = new_i;
if (s[i] == '}') { if (s[i] == '}') {
@ -251,8 +246,7 @@ constexpr parse_result_t<string_result_t<get_ast_len<s>()>> parse_string() {
++i; ++i;
auto [is_valid, new_i, format_node] = parse_braces<s>(i); auto [is_valid, new_i, format_node] = parse_braces<s>(i);
if (!is_valid) if (!is_valid) return {false, i, {}};
return {false, i, {}};
i = new_i; i = new_i;
result.value[ast_position++].set_node(format_node); result.value[ast_position++].set_node(format_node);