Messages now parsed

Signals still need to be added but messages are now parsed out. i updated the dbc files a little bit to not test other features of dbc in some of the error files.

Print function for message was also added to better see error messages when messages don't match.

A constructor was added to initialize the message. for now i deleted default to not allow uninitialized variables in message.

Author: LinuxDevon

include/dbc.hpp

@@ -6,9 +6,25 @@
 #include "utils/utils.hpp"
 
 #include <regex>
+#include <iostream>
 
 namespace libdbc {
 
+	struct Message {
+		uint32_t id;
+		std::string name;
+		uint8_t size;
+		std::string node;
+
+		Message() = delete;
+		explicit Message(uint32_t id, const std::string& name, uint8_t size, const std::string& node);
+
+		virtual bool operator==(const Message& rhs) const;
+	};
+
+	std::ostream& operator<< (std::ostream &out, const Message& msg);
+
+
 	class Parser {
 	public:
 		virtual ~Parser() = default;
@@ -30,23 +46,22 @@ namespace libdbc {
 
 		std::string get_version() const;
 		std::vector<std::string> get_nodes() const;
+		std::vector<libdbc::Message> get_messages() const;
 
 	private:
 		std::string version;
 		std::vector<std::string> nodes;
+		std::vector<libdbc::Message> messages;
 
 		const std::regex version_re;
 		const std::regex bit_timing_re;
 		const std::regex name_space_re;
 		const std::regex node_re;
+		const std::regex message_re;
 
 		void parse_dbc_header(std::istream& file_stream);
 		void parse_dbc_nodes(std::istream& file_stream);
-
-	};
-
-
-	struct Message {
+		void parse_dbc_messages(const std::vector<std::string>& lines);
 
 	};
 

src/dbc.cpp

@@ -6,24 +6,47 @@
 
 namespace libdbc {
 
+	Message::Message(uint32_t id, const std::string& name, uint8_t size, const std::string& node) :
+		id(id), name(name), size(size), node(node) {}
+
+	bool Message::operator==(const Message& rhs) const {
+		return (this->id == rhs.id) && (this->name == rhs.name) &&
+			   (this->size == rhs.size) && (this->node == rhs.node);
+	}
+
+	std::ostream& operator<< (std::ostream &out, const Message& msg) {
+		out << "Message: {id: " << msg.id << ", ";
+		out << "name: " << msg.name << ", ";
+		out << "size: " << msg.size << ", ";
+		out << "node: " << msg.node << "}";
+		return out;
+	}
+
+
+
 	DbcParser::DbcParser() : version(""), nodes(),
 				version_re("^(VERSION)\\s\"(.*)\""), bit_timing_re("^(BS_:)"),
-				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)") {
+				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)"),
+				message_re("^(BO_)\\s(\\d+)\\s(\\w+)\\:\\s(\\d+)\\s(\\w+|Vector__XXX)") {
 
 	}
 
 	void DbcParser::parse_file(const std::string& file) {
 		std::ifstream s(file.c_str());
 		std::string line;
+		std::vector<std::string> lines;
 
 		parse_dbc_header(s);
 
 		parse_dbc_nodes(s);
 
 		while(!s.eof()) {
-			utils::StreamHandler::get_line( s, line );
+			utils::StreamHandler::get_next_non_blank_line( s, line );
+			lines.push_back(line);
 		}
 
+		parse_dbc_messages(lines);
+
 	}
 
 	std::string DbcParser::get_version() const {
@@ -34,6 +57,10 @@ namespace libdbc {
 		return nodes;
 	}
 
+	std::vector<libdbc::Message> DbcParser::get_messages() const {
+		return messages;
+	}
+
 
 	void DbcParser::parse_dbc_header(std::istream& file_stream) {
 		std::string line;
@@ -74,6 +101,23 @@ namespace libdbc {
 
 	}
 
+	void DbcParser::parse_dbc_messages(const std::vector<std::string>& lines) {
+		std::smatch match;
+
+		for(const auto &line : lines) {
+			if(std::regex_search(line, match, message_re)) {
+				uint32_t id = std::stoul(match.str(2));
+				std::string name = match.str(3);
+				uint8_t size = std::stoul(match.str(4));
+				std::string node = match.str(5);
+
+				Message msg(id, name, size, node);
+
+				messages.push_back(msg);
+			}
+		}
+
+	}
 
 
 }

test/dbcs/MissingNewSymbols.dbc

@@ -24,6 +24,3 @@ NS_ :
 BS_:
 
 BU_: DBG DRIVER IO MOTOR SENSOR
-
-BO_ 500 IO_DEBUG: 4 IO
- SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG

test/dbcs/Simple.dbc

@@ -35,4 +35,4 @@ BS_:
 BU_: DBG DRIVER IO MOTOR SENSOR
 
 BO_ 500 IO_DEBUG: 4 IO
- SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG
+ SG_ IO_DEBUG_test_unsigned : 0|8@1+ (1,0) [0|0] "" DBG

test/test_dbc.cpp

@@ -17,7 +17,7 @@ TEST_CASE("Testing dbc file loading error issues", "[fileio][error]") {
 		REQUIRE_THROWS_AS(parser->parse_file(MISSING_BIT_TIMING_DBC_FILE), libdbc::validity_error);
 	}
 
-	SECTION("Loading a dbc with some missing namespace section tags (_NS :)", "[error]") {
+	SECTION("Loading a dbc with some missing namespace section tags (NS_ :)", "[error]") {
 		// Confusion about this type of error. it appears that the header isn't
 		// very well standardized for now we ignore this type of error.
 		CHECK_NOTHROW(parser->parse_file(MISSING_NEW_SYMBOLS_DBC_FILE));
@@ -30,11 +30,17 @@ TEST_CASE("Testing dbc file loading", "[fileio]") {
 	SECTION("Loading a single simple dbc file", "[dbc]") {
 		std::vector<std::string> nodes = {"DBG", "DRIVER", "IO", "MOTOR", "SENSOR"};
 
+		libdbc::Message msg(500, "IO_DEBUG", 4, "IO");
+
+		std::vector<libdbc::Message> msgs = {msg};
+
 		parser->parse_file(SIMPLE_DBC_FILE);
 
 		REQUIRE(parser->get_version() == "1.0.0");
 
 		REQUIRE(parser->get_nodes() == nodes);
+
+		REQUIRE(parser->get_messages() == msgs);
 	}
 
 }