Skip to content

Commit 089c1e5

Browse files
committed
refactor(naming)!: Breaking interface to follow standard naming convention.
* Namespace `libdbc` -> `Libdbc` * Message method `parseMessage` -> `parse_message` * Exception class names `exception` -> `Exception`, `validity_error` -> `ValidityError` * Signal method names `parseSignals` -> `parse_signals`, `appendSignal` -> `append_signal`, -> `getSignals` -> `get_signals`, `addValueDescription` -> `add_value_description` * Signal class name change `SignalValueDescriptions` -> `ValueDescription` * Utils name space `utils` -> `Utils` Using naming scheme of CamelCase for classes, structs, and namespaces. Snake case for everything else
1 parent b90af2d commit 089c1e5

File tree

14 files changed

+187
-187
lines changed

14 files changed

+187
-187
lines changed

include/libdbc/dbc.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <regex>
1010

11-
namespace libdbc {
11+
namespace Libdbc {
1212

1313
class Parser {
1414
public:
@@ -27,14 +27,14 @@ class DbcParser : public Parser {
2727

2828
std::string get_version() const;
2929
std::vector<std::string> get_nodes() const;
30-
std::vector<libdbc::Message> get_messages() const;
30+
std::vector<Libdbc::Message> get_messages() const;
3131

32-
Message::ParseSignalsStatus parseMessage(uint32_t message_id, const std::vector<uint8_t>& data, std::vector<double>& out_values);
32+
Message::ParseSignalsStatus parse_message(uint32_t message_id, const std::vector<uint8_t>& data, std::vector<double>& out_values);
3333

3434
private:
3535
std::string version;
3636
std::vector<std::string> nodes;
37-
std::vector<libdbc::Message> messages;
37+
std::vector<Libdbc::Message> messages;
3838

3939
std::regex version_re;
4040
std::regex bit_timing_re;

include/libdbc/exceptions/error.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
#include <exception>
55

6-
namespace libdbc {
6+
namespace Libdbc {
77

8-
class exception : public std::exception {
8+
class Exception : public std::exception {
99
public:
1010
const char* what() const throw() override {
1111
return "libdbc exception occurred";
1212
}
1313
};
1414

15-
class validity_error : public exception {
15+
class ValidityError : public Exception {
1616
public:
1717
const char* what() const throw() override {
1818
return "Invalid DBC file";

include/libdbc/message.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <string>
88
#include <vector>
99

10-
namespace libdbc {
10+
namespace Libdbc {
1111
struct Message {
1212
Message() = delete;
1313
virtual ~Message() = default;
@@ -21,14 +21,14 @@ struct Message {
2121
ErrorInvalidConversion,
2222
};
2323

24-
ParseSignalsStatus parseSignals(const std::vector<uint8_t>& data, std::vector<double>& values) const;
24+
ParseSignalsStatus parse_signals(const std::vector<uint8_t>& data, std::vector<double>& values) const;
2525

26-
void appendSignal(const Signal& signal);
27-
std::vector<Signal> getSignals() const;
26+
void append_signal(const Signal& signal);
27+
std::vector<Signal> get_signals() const;
2828
uint32_t id() const;
2929
uint8_t size() const;
3030
const std::string& name() const;
31-
void addValueDescription(const std::string& signal_name, const std::vector<Signal::SignalValueDescriptions>&);
31+
void add_value_description(const std::string& signal_name, const std::vector<Signal::ValueDescription>&);
3232

3333
virtual bool operator==(const Message& rhs) const;
3434

include/libdbc/signal.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include <string>
88
#include <vector>
99

10-
namespace libdbc {
10+
namespace Libdbc {
1111
struct Signal {
12-
struct SignalValueDescriptions {
12+
struct ValueDescription {
1313
uint32_t value;
1414
std::string description;
1515
};
@@ -26,7 +26,7 @@ struct Signal {
2626
double max;
2727
std::string unit;
2828
std::vector<std::string> receivers;
29-
std::vector<SignalValueDescriptions> svDescriptions;
29+
std::vector<ValueDescription> value_descriptions;
3030

3131
Signal() = delete;
3232
virtual ~Signal() = default;

include/libdbc/utils/utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <sstream>
1010
#include <string>
1111

12-
namespace utils {
12+
namespace Utils {
1313

1414
class StreamHandler {
1515
public:

src/dbc.cpp

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <regex>
77
#include <vector>
88

9-
namespace libdbc {
9+
namespace Libdbc {
1010

1111
const auto floatPattern = "(-?\\d+\\.?(\\d+)?)"; // Can be negative
1212

@@ -45,12 +45,10 @@ constexpr unsigned MESSAGE_NAME_GROUP = 3;
4545
constexpr unsigned MESSAGE_SIZE_GROUP = 4;
4646
constexpr unsigned MESSAGE_NODE_GROUP = 5;
4747

48-
enum VALToken { Identifier = 0, CANId, SignalName, Value, Description };
49-
50-
struct VALObject {
48+
struct Value {
5149
uint32_t can_id;
5250
std::string signal_name;
53-
std::vector<Signal::SignalValueDescriptions> vd;
51+
std::vector<Signal::ValueDescription> value_descriptions;
5452
};
5553

5654
DbcParser::DbcParser()
@@ -79,7 +77,7 @@ void DbcParser::parse_file(const std::string& file) {
7977
parse_dbc_nodes(stream);
8078

8179
while (!stream.eof()) {
82-
utils::StreamHandler::get_next_non_blank_line(stream, line);
80+
Utils::StreamHandler::get_next_non_blank_line(stream, line);
8381
lines.push_back(line);
8482
}
8583

@@ -94,14 +92,14 @@ std::vector<std::string> DbcParser::get_nodes() const {
9492
return nodes;
9593
}
9694

97-
std::vector<libdbc::Message> DbcParser::get_messages() const {
95+
std::vector<Libdbc::Message> DbcParser::get_messages() const {
9896
return messages;
9997
}
10098

101-
Message::ParseSignalsStatus DbcParser::parseMessage(const uint32_t message_id, const std::vector<uint8_t>& data, std::vector<double>& out_values) {
99+
Message::ParseSignalsStatus DbcParser::parse_message(const uint32_t message_id, const std::vector<uint8_t>& data, std::vector<double>& out_values) {
102100
for (const auto& message : messages) {
103101
if (message.id() == message_id) {
104-
return message.parseSignals(data, out_values);
102+
return message.parse_signals(data, out_values);
105103
}
106104
}
107105
return Message::ParseSignalsStatus::ErrorUnknownID;
@@ -111,43 +109,43 @@ void DbcParser::parse_dbc_header(std::istream& file_stream) {
111109
std::string line;
112110
std::smatch match;
113111

114-
utils::StreamHandler::get_line(file_stream, line);
112+
Utils::StreamHandler::get_line(file_stream, line);
115113

116114
if (!std::regex_search(line, match, version_re)) {
117-
throw validity_error();
115+
throw ValidityError();
118116
}
119117

120118
version = match.str(2);
121119

122-
utils::StreamHandler::get_next_non_blank_line(file_stream, line);
123-
utils::StreamHandler::skip_to_next_blank_line(file_stream, line);
124-
utils::StreamHandler::get_next_non_blank_line(file_stream, line);
120+
Utils::StreamHandler::get_next_non_blank_line(file_stream, line);
121+
Utils::StreamHandler::skip_to_next_blank_line(file_stream, line);
122+
Utils::StreamHandler::get_next_non_blank_line(file_stream, line);
125123

126124
if (!std::regex_search(line, match, bit_timing_re)) {
127-
throw validity_error();
125+
throw ValidityError();
128126
}
129127
}
130128

131129
void DbcParser::parse_dbc_nodes(std::istream& file_stream) {
132130
std::string line;
133131
std::smatch match;
134132

135-
utils::StreamHandler::get_next_non_blank_line(file_stream, line);
133+
Utils::StreamHandler::get_next_non_blank_line(file_stream, line);
136134

137135
if (!std::regex_search(line, match, node_re)) {
138-
throw validity_error();
136+
throw ValidityError();
139137
}
140138

141139
if (match.length() > 2) {
142140
std::string node = match.str(2);
143-
utils::String::split(node, nodes);
141+
Utils::String::split(node, nodes);
144142
}
145143
}
146144

147145
void DbcParser::parse_dbc_messages(const std::vector<std::string>& lines) {
148146
std::smatch match;
149147

150-
std::vector<VALObject> signal_value;
148+
std::vector<Value> signal_value;
151149

152150
for (const auto& line : lines) {
153151
if (std::regex_search(line, match, message_re)) {
@@ -170,18 +168,18 @@ void DbcParser::parse_dbc_messages(const std::vector<std::string>& lines) {
170168
bool is_bigendian = (std::stoul(match.str(SIGNAL_ENDIAN_GROUP)) == 0);
171169
bool is_signed = (match.str(SIGNAL_SIGNED_GROUP) == "-");
172170

173-
double factor = utils::String::convert_to_double(match.str(SIGNAL_FACTOR_GROUP));
174-
double offset = utils::String::convert_to_double(match.str(SIGNAL_OFFSET_GROUP));
175-
double min = utils::String::convert_to_double(match.str(SIGNAL_MIN_GROUP));
176-
double max = utils::String::convert_to_double(match.str(SIGNAL_MAX_GROUP));
171+
double factor = Utils::String::convert_to_double(match.str(SIGNAL_FACTOR_GROUP));
172+
double offset = Utils::String::convert_to_double(match.str(SIGNAL_OFFSET_GROUP));
173+
double min = Utils::String::convert_to_double(match.str(SIGNAL_MIN_GROUP));
174+
double max = Utils::String::convert_to_double(match.str(SIGNAL_MAX_GROUP));
177175

178176
std::string unit = match.str(SIGNAL_UNIT_GROUP);
179177

180178
std::vector<std::string> receivers;
181-
utils::String::split(match.str(SIGNAL_RECIEVER_GROUP), receivers, ',');
179+
Utils::String::split(match.str(SIGNAL_RECIEVER_GROUP), receivers, ',');
182180

183181
Signal sig(name, is_multiplexed, start_bit, size, is_bigendian, is_signed, factor, offset, min, max, unit, receivers);
184-
messages.back().appendSignal(sig);
182+
messages.back().append_signal(sig);
185183
continue;
186184
}
187185

@@ -196,27 +194,27 @@ void DbcParser::parse_dbc_messages(const std::vector<std::string>& lines) {
196194
std::sregex_iterator desc_iter(rest_of_descriptions.begin(), rest_of_descriptions.end(), description_re);
197195
std::sregex_iterator desc_end = std::sregex_iterator();
198196

199-
std::vector<Signal::SignalValueDescriptions> values{};
197+
std::vector<Signal::ValueDescription> values{};
200198
for (std::sregex_iterator i = desc_iter; i != desc_end; ++i) {
201199
std::smatch desc_match = *desc_iter;
202200
uint32_t number = static_cast<uint32_t>(std::stoul(desc_match.str(1)));
203201
std::string text = desc_match.str(2);
204202

205-
values.push_back(Signal::SignalValueDescriptions{number, text});
203+
values.push_back(Signal::ValueDescription{number, text});
206204
++desc_iter;
207205
}
208206

209-
VALObject obj{message_id, signal_name, values};
207+
Value val{message_id, signal_name, values};
210208

211-
signal_value.push_back(obj);
209+
signal_value.push_back(val);
212210
continue;
213211
}
214212
}
215213

216214
for (const auto& signal : signal_value) {
217215
for (auto& msg : messages) {
218216
if (msg.id() == signal.can_id) {
219-
msg.addValueDescription(signal.signal_name, signal.vd);
217+
msg.add_value_description(signal.signal_name, signal.value_descriptions);
220218
break;
221219
}
222220
}

src/message.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <cstdint>
22
#include <libdbc/message.hpp>
33

4-
namespace libdbc {
4+
namespace Libdbc {
55

66
constexpr unsigned ONE_BYTE = 8;
77
constexpr unsigned TWO_BYTES = 16;
@@ -21,7 +21,7 @@ bool Message::operator==(const Message& rhs) const {
2121
return (m_id == rhs.id()) && (m_name == rhs.m_name) && (m_size == rhs.m_size) && (m_node == rhs.m_node);
2222
}
2323

24-
Message::ParseSignalsStatus Message::parseSignals(const std::vector<uint8_t>& data, std::vector<double>& values) const {
24+
Message::ParseSignalsStatus Message::parse_signals(const std::vector<uint8_t>& data, std::vector<double>& values) const {
2525
auto size = data.size();
2626
if (size > ONE_BYTE) {
2727
return ParseSignalsStatus::ErrorMessageToLong; // not supported yet
@@ -83,11 +83,11 @@ Message::ParseSignalsStatus Message::parseSignals(const std::vector<uint8_t>& da
8383
return ParseSignalsStatus::Success;
8484
}
8585

86-
void Message::appendSignal(const Signal& signal) {
86+
void Message::append_signal(const Signal& signal) {
8787
m_signals.push_back(signal);
8888
}
8989

90-
std::vector<Signal> Message::getSignals() const {
90+
std::vector<Signal> Message::get_signals() const {
9191
return m_signals;
9292
}
9393

@@ -103,10 +103,10 @@ const std::string& Message::name() const {
103103
return m_name;
104104
}
105105

106-
void Message::addValueDescription(const std::string& signal_name, const std::vector<Signal::SignalValueDescriptions>& value_descriptor) {
106+
void Message::add_value_description(const std::string& signal_name, const std::vector<Signal::ValueDescription>& value_descriptor) {
107107
for (auto& signal : m_signals) {
108108
if (signal.name == signal_name) {
109-
signal.svDescriptions = value_descriptor;
109+
signal.value_descriptions = value_descriptor;
110110
return;
111111
}
112112
}

src/signal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <libdbc/signal.hpp>
22

3-
namespace libdbc {
3+
namespace Libdbc {
44
Signal::Signal(std::string name,
55
bool is_multiplexed,
66
uint32_t start_bit,

src/utils.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <regex>
77

8-
namespace utils {
8+
namespace Utils {
99

1010
std::istream& StreamHandler::get_line(std::istream& stream, std::string& line) {
1111
std::string newline;
@@ -32,7 +32,7 @@ std::istream& StreamHandler::get_next_non_blank_line(std::istream& stream, std::
3232
std::smatch match;
3333

3434
while (is_blank) {
35-
utils::StreamHandler::get_line(stream, line);
35+
Utils::StreamHandler::get_line(stream, line);
3636

3737
std::regex_search(line, match, whitespace_re);
3838

@@ -53,7 +53,7 @@ std::istream& StreamHandler::skip_to_next_blank_line(std::istream& stream, std::
5353
std::smatch match;
5454

5555
while (!line_is_empty) {
56-
utils::StreamHandler::get_line(stream, line);
56+
Utils::StreamHandler::get_line(stream, line);
5757

5858
std::regex_search(line, match, whitespace_re);
5959

@@ -74,9 +74,8 @@ std::string String::trim(const std::string& line) {
7474

7575
double String::convert_to_double(const std::string& value, double default_value) {
7676
double converted_value = default_value;
77-
fast_float::from_chars(value.data(),
78-
value.data() + value.size(),
79-
converted_value); // NOLINT -- Trying to iterators on the value causes the test to infinitly hang on windows builds
77+
// NOLINTNEXTLINE -- Trying to iterators on the value causes the test to infinitly hang on windows builds
78+
fast_float::from_chars(value.data(), value.data() + value.size(), converted_value);
8079
return converted_value;
8180
}
8281

0 commit comments

Comments
 (0)