Added definition of Signal

Signals has a comparison operator and a Signal constructor.

I don't like the constructor that is so long but works for now.

Author: LinuxDevon

include/dbc.hpp

@@ -10,18 +10,40 @@
 
 namespace libdbc {
 
+	struct Signal {
+		std::string name;
+		bool is_multiplexed;
+		uint32_t start_bit;
+		uint32_t size;
+		bool is_bigendian;
+		bool is_signed;
+		double factor;
+		double offset;
+		double min;
+		double max;
+		std::string unit;
+		std::vector<std::string> receivers;
+
+		Signal() = delete;
+		explicit Signal(std::string name, bool is_multiplexed, uint32_t start_bit, uint32_t size, bool is_bigendian, bool is_signed, double factor, double offset, double min, double max, std::string unit, std::vector<std::string> recievers);
+
+		virtual bool operator==(const Signal& rhs) const;
+	};
+
 	struct Message {
 		uint32_t id;
 		std::string name;
 		uint8_t size;
 		std::string node;
+		std::vector<Signal> signals;
 
 		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);
 
 
@@ -58,6 +80,7 @@ namespace libdbc {
 		const std::regex name_space_re;
 		const std::regex node_re;
 		const std::regex message_re;
+		const std::regex signal_re;
 
 		void parse_dbc_header(std::istream& file_stream);
 		void parse_dbc_nodes(std::istream& file_stream);

src/dbc.cpp

@@ -23,6 +23,18 @@ namespace libdbc {
 	}
 
 
+	Signal::Signal(std::string name, bool is_multiplexed, uint32_t start_bit, uint32_t size, bool is_bigendian, bool is_signed, double factor, double offset, double min, double max, std::string unit, std::vector<std::string> receivers) :
+		name(name), is_multiplexed(is_multiplexed), start_bit(start_bit), size(size), is_bigendian(is_bigendian), is_signed(is_signed), offset(offset), min(min), max(max), unit(unit), receivers(receivers) {}
+
+	bool Signal::operator==(const Signal& rhs) const {
+		return (this->name == rhs.name) && (this->is_multiplexed == rhs.is_multiplexed) &&
+			   (this->start_bit == rhs.start_bit) && (this->size == rhs.size) &&
+			   (this->is_bigendian == rhs.is_bigendian) && (this->is_signed == rhs.is_signed) &&
+			   (this->offset == rhs.offset) && (this->min == rhs.min) && (this->max == rhs.max) &&
+			   (this->unit == rhs.unit) && (this->receivers == rhs.receivers);
+	}
+
+
 
 	DbcParser::DbcParser() : version(""), nodes(),
 				version_re("^(VERSION)\\s\"(.*)\""), bit_timing_re("^(BS_:)"),

test/test_dbc.cpp

@@ -32,6 +32,10 @@ TEST_CASE("Testing dbc file loading", "[fileio]") {
 
 		libdbc::Message msg(500, "IO_DEBUG", 4, "IO");
 
+		std::vector<std::string> receivers{"DBG"};
+		libdbc::Signal sig("IO_DEBUG_test_unsigned", false, 0, 8, true, false, 1, 0, 0, 0, "", receivers);
+ 		msg.signals.push_back(sig);
+
 		std::vector<libdbc::Message> msgs = {msg};
 
 		parser->parse_file(SIMPLE_DBC_FILE);
@@ -41,6 +45,8 @@ TEST_CASE("Testing dbc file loading", "[fileio]") {
 		REQUIRE(parser->get_nodes() == nodes);
 
 		REQUIRE(parser->get_messages() == msgs);
+
+		REQUIRE(parser->get_messages().front().signals == msg.signals);
 	}
 
 }