Skip to content

Commit 1a52981

Browse files
committed
refactor: misc
1 parent eb46784 commit 1a52981

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

ben-bot/main.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ namespace {
3737
{
3838
std::string result;
3939

40-
for (const auto fragment : strings) {
41-
result += fragment;
42-
result += ' ';
43-
}
40+
for (const auto fragment : strings)
41+
result.append(std::format("{} ", fragment));
4442

4543
return result;
4644
}

libbenbot/src/engine/ColorPrinting.cpp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* ======================================================================================
1313
*/
1414

15+
#include <algorithm>
1516
#include <beman/inplace_vector/inplace_vector.hpp>
1617
#include <iostream>
1718
#include <libbenbot/Resources.hpp>
@@ -50,8 +51,11 @@ void Engine::print_logo_and_version() const
5051
cout << termcolor::grey << logoLines.front() << '\n'
5152
<< termcolor::blue;
5253

53-
for (const auto line : logoLines | std::views::drop(1) | std::views::take(NumLogoLines - 2uz))
54-
cout << line << '\n';
54+
std::ranges::for_each(
55+
logoLines | std::views::drop(1) | std::views::take(NumLogoLines - 2uz),
56+
[](const string_view line) {
57+
cout << line << '\n';
58+
});
5559

5660
cout << termcolor::grey << logoLines.back() << "\n\n"
5761
<< termcolor::reset << termcolor::bold << get_name() << ", "
@@ -97,11 +101,13 @@ void print_colored_board(
97101

98102
const auto lines = get_at_most_n_lines<BoardLines>(boardStr);
99103

100-
for (const auto line : lines | std::views::take(BoardLines - 1uz)) {
101-
cout << line.substr(0uz, line.length() - 1uz)
102-
<< termcolor::white << line.back() << '\n'
103-
<< termcolor::reset;
104-
}
104+
std::ranges::for_each(
105+
lines | std::views::take(BoardLines - 1uz),
106+
[](const string_view line) {
107+
cout << line.substr(0uz, line.length() - 1uz)
108+
<< termcolor::white << line.back() << '\n'
109+
<< termcolor::reset;
110+
});
105111

106112
cout << termcolor::white << lines.back() << '\n'
107113
<< termcolor::reset;

libbenbot/src/search/Callbacks.cpp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ auto Callbacks::make_uci_printer(
5555

5656
namespace {
5757
using std::string;
58+
using std::string_view;
5859

5960
enum class Alignment : std::uint_least8_t {
6061
Left,
@@ -66,7 +67,7 @@ namespace {
6667

6768
template <Alignment Align>
6869
[[nodiscard]] auto get_column_text(
69-
const std::string_view text) -> string
70+
const string_view text) -> string
7071
{
7172
assert(text.size() < COLUMN_WIDTH);
7273

@@ -89,11 +90,14 @@ namespace {
8990

9091
template <Alignment Align>
9192
void print_column_text(
92-
const std::string_view text)
93+
const string_view text)
9394
{
9495
std::cout << get_column_text<Align>(text);
9596
}
9697

98+
inline constexpr string_view FRACTIONAL_DURATION_FMT { "{:.2%Q %q}" };
99+
inline constexpr string_view INTEGER_DURATION_FMT { "{:%Q %q}" };
100+
97101
template <util::ChronoDuration Duration>
98102
[[nodiscard]] auto get_duration_string(
99103
const milliseconds duration) -> std::optional<string>
@@ -104,7 +108,7 @@ namespace {
104108
using FractionalDuration = util::FractionalDuration<Duration>;
105109

106110
return std::format(
107-
"{:.2%Q %q}",
111+
FRACTIONAL_DURATION_FMT,
108112
duration_cast<FractionalDuration>(duration));
109113
}
110114

@@ -118,7 +122,9 @@ namespace {
118122
return get_duration_string<std::chrono::hours>(duration)
119123
.or_else([duration] { return get_duration_string<std::chrono::minutes>(duration); })
120124
.or_else([duration] { return get_duration_string<std::chrono::seconds>(duration); })
121-
.or_else([duration] { return std::make_optional(std::format("{:%Q %q}", duration)); })
125+
.or_else([duration] {
126+
return std::make_optional(std::format(INTEGER_DURATION_FMT, duration));
127+
})
122128
.value();
123129
}
124130

@@ -241,12 +247,8 @@ namespace {
241247

242248
string result;
243249

244-
for (const auto move : pv) {
245-
result.append(printMove(move));
246-
result.append(1uz, ' ');
247-
}
248-
249-
result.pop_back(); // trim last space
250+
for (const auto move : pv)
251+
result.append(std::format("{} ", printMove(move)));
250252

251253
return result;
252254
}

0 commit comments

Comments
 (0)