Skip to content

Commit deba3da

Browse files
committed
do not pass a flag to the Contructor, but create a dedicated function
1 parent 2fd90e0 commit deba3da

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

include/libdbc/dbc.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace libdbc {
2424

2525
class DbcParser : public Parser {
2626
public:
27-
DbcParser(bool sortSignals = false);
27+
DbcParser();
2828

2929
virtual ~DbcParser() = default;
3030

@@ -37,6 +37,8 @@ namespace libdbc {
3737
bool parseMessage(const uint32_t id, const std::vector<uint8_t>& data, std::vector<double>& out_values);
3838
bool parseMessage(const uint32_t id, const std::array<uint8_t, 8>& data, std::vector<double>& out_values);
3939

40+
void sortSignals();
41+
4042
private:
4143
std::string version;
4244
std::vector<std::string> nodes;
@@ -49,8 +51,6 @@ namespace libdbc {
4951
const std::regex message_re;
5052
const std::regex signal_re;
5153

52-
bool sortSignals{false};
53-
5454
void parse_dbc_header(std::istream& file_stream);
5555
void parse_dbc_nodes(std::istream& file_stream);
5656
void parse_dbc_messages(const std::vector<std::string>& lines);

src/dbc.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const auto whiteSpace = "\\s";
2929

3030
namespace libdbc {
3131

32-
DbcParser::DbcParser(bool sortSignals) : version(""), nodes(),
32+
DbcParser::DbcParser() : version(""), nodes(),
3333
version_re("^(VERSION)\\s\"(.*)\""), bit_timing_re("^(BS_:)"),
3434
name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)"),
3535
message_re("^(BO_)\\s(\\d+)\\s(\\w+)\\:\\s(\\d+)\\s(\\w+|Vector__XXX)"),
@@ -54,8 +54,7 @@ namespace libdbc {
5454
whiteSpace +
5555
unitPattern +
5656
whiteSpace +
57-
receiverPattern),
58-
sortSignals(sortSignals) {
57+
receiverPattern) {
5958

6059
}
6160

@@ -75,14 +74,14 @@ namespace libdbc {
7574
lines.push_back(line);
7675
}
7776

78-
parse_dbc_messages(lines);
77+
parse_dbc_messages(lines);
78+
}
7979

80-
if (sortSignals) {
81-
for (auto& message: messages) {
82-
message.prepareMessage();
83-
}
80+
void DbcParser::sortSignals() {
81+
for (auto& message: messages) {
82+
message.prepareMessage();
8483
}
85-
}
84+
}
8685

8786
std::string DbcParser::get_version() const {
8887
return version;

0 commit comments

Comments
 (0)