Skip to content

Commit 87b8812

Browse files
committed
[#24061] New uncrustify
Signed-off-by: danipiza <dpizarrogallego@gmail.com>
1 parent fa0f1e0 commit 87b8812

2 files changed

Lines changed: 64 additions & 66 deletions

File tree

cpp_utils/include/cpp_utils/user_interface/CommandReader.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace utils {
2626
*
2727
* @tparam CommandEnum enumeration that represent the different commands available.
2828
*/
29-
template <typename CommandEnum>
29+
template<typename CommandEnum>
3030
struct Command
3131
{
3232
//! Command in the way of a enumeration class.
@@ -48,7 +48,7 @@ struct Command
4848
*
4949
* @note This class relies on \c StdinEventHandler to read from stdin and in \c EnumBuilder to interpret command.
5050
*/
51-
template <typename CommandEnum>
51+
template<typename CommandEnum>
5252
class CommandReader
5353
{
5454
public:
@@ -121,7 +121,7 @@ class CommandReader
121121

122122
};
123123

124-
} /* namespace utils */
124+
} /* namespace utils */
125125
} /* namespace eprosima */
126126

127127
// Include implementation template file

cpp_utils/include/cpp_utils/user_interface/impl/CommandReader.ipp

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -17,81 +17,79 @@
1717
#include <cpp_utils/utils.hpp>
1818

1919
namespace eprosima {
20-
namespace utils {
21-
22-
template < typename CommandEnum >
23-
CommandReader < CommandEnum > ::CommandReader(
24-
const EnumBuilder < CommandEnum > &builder,
25-
std::istream& source /* = std::cin */)
26-
: builder_(builder)
27-
, stdin_handler_(
28-
[this](std::string st)
20+
namespace utils {
21+
22+
template<typename CommandEnum>
23+
CommandReader<CommandEnum>::CommandReader(
24+
const EnumBuilder<CommandEnum>& builder,
25+
std::istream& source /* = std::cin */)
26+
: builder_(builder)
27+
, stdin_handler_(
28+
[this](std::string st)
2929
{
3030
this->read_command_callback_(st);
3131
},
32-
true,
33-
0,
34-
source)
35-
, commands_read_(0, true)
36-
{
37-
// Do nothing
38-
}
39-
40-
template < typename CommandEnum >
41-
bool CommandReader < CommandEnum > ::read_next_command(
42-
Command < CommandEnum > &command)
43-
{
44-
stdin_handler_.read_one_more_line();
45-
std::string full_command = commands_read_.consume();
46-
47-
// Divide command
48-
command.arguments = join_quoted_strings(utils::split_string(full_command, " "));
49-
// Check if command exists
50-
// The args are already set in command, and the enum value will be set string_to_enumeration
51-
return builder_.string_to_enumeration(command.arguments[0], command.command);
52-
}
53-
54-
template < typename CommandEnum >
55-
std::vector < std::string > CommandReader < CommandEnum > ::join_quoted_strings(
56-
const std::vector < std::string > &input)
32+
true,
33+
0,
34+
source)
35+
, commands_read_(0, true)
36+
{
37+
// Do nothing
38+
}
39+
40+
template<typename CommandEnum>
41+
bool CommandReader<CommandEnum>::read_next_command(
42+
Command<CommandEnum>& command)
43+
{
44+
stdin_handler_.read_one_more_line();
45+
std::string full_command = commands_read_.consume();
46+
47+
// Divide command
48+
command.arguments = join_quoted_strings(utils::split_string(full_command, " "));
49+
// Check if command exists
50+
// The args are already set in command, and the enum value will be set string_to_enumeration
51+
return builder_.string_to_enumeration(command.arguments[0], command.command);
52+
}
53+
54+
template<typename CommandEnum>
55+
std::vector<std::string> CommandReader<CommandEnum>::join_quoted_strings(
56+
const std::vector<std::string>& input)
57+
{
58+
std::vector<std::string> result;
59+
60+
for (size_t i = 0; i < input.size(); ++i)
61+
{
62+
// Check if string starts with a quote
63+
if (!input[i].empty() && input[i].front() == '"')
5764
{
58-
std::vector < std::string > result;
65+
std::string joined = input[i];
5966

60-
for (size_t i = 0; i < input.size(); ++i)
67+
// Keep joining until we find a string ending with a quote
68+
while (i + 1 < input.size() &&
69+
(joined.empty() || joined.back() != '"'))
6170
{
62-
// Check if string starts with a quote
63-
if (!input[i].empty() && input[i].front() == '"')
64-
{
65-
std::string joined = input[i];
66-
67-
// Keep joining until we find a string ending with a quote
68-
while (i + 1 < input.size() &&
69-
(joined.empty() || joined.back() != '"'))
70-
{
71-
joined += " " + input[++i];
72-
}
73-
74-
result.push_back(joined.substr(1, joined.size() - 2));
75-
}
76-
else
77-
{
78-
result.push_back(input[i]);
79-
}
71+
joined += " " + input[++i];
8072
}
8173

82-
return result;
74+
result.push_back(joined.substr(1, joined.size() - 2));
8375
}
84-
85-
86-
87-
template < typename CommandEnum >
88-
void CommandReader < CommandEnum > ::read_command_callback_(
89-
std::string command_read)
76+
else
9077
{
91-
commands_read_.produce(command_read);
78+
result.push_back(input[i]);
9279
}
80+
}
81+
82+
return result;
83+
}
84+
85+
template<typename CommandEnum>
86+
void CommandReader<CommandEnum>::read_command_callback_(
87+
std::string command_read)
88+
{
89+
commands_read_.produce(command_read);
90+
}
9391

94-
} /* namespace utils */
92+
} /* namespace utils */
9593
} /* namespace eprosima */
9694

9795
// Include implementation template file

0 commit comments

Comments
 (0)