Added in parsing the nodes of the DBC.

Now you can get a vector of nodes from the file. Maybe this should become generic and allow other containers.

A split function was needed so this was added to the utils to be used else where if needed.

Author: LinuxDevon

include/dbc.hpp

@@ -29,15 +29,19 @@ namespace libdbc {
 		virtual void parse_file(const std::string& file) final override;
 
 		std::string get_version() const;
+		std::vector<std::string> get_nodes() const;
 
 	private:
 		std::string version;
+		std::vector<std::string> nodes;
 
 		const std::regex version_re;
 		const std::regex bit_timing_re;
 		const std::regex name_space_re;
+		const std::regex node_re;
 
 		void parse_dbc_header(std::istream& file_stream);
+		void parse_dbc_nodes(std::istream& file_stream);
 
 	};
 

include/utils/utils.hpp

@@ -5,6 +5,9 @@
 #include <string>
 #include <fstream>
 #include <iostream>
+#include <sstream>
+#include <algorithm>
+#include <iterator>
 
 namespace utils {
 
@@ -33,6 +36,17 @@ namespace utils {
 
 		static std::string trim(const std::string& line);
 
+		template <class Container>
+		static void split(const std::string& str, Container& cont, char delim = ' ') {
+			std::stringstream ss(str);
+			std::string token;
+
+			while (std::getline(ss, token, delim)) {
+				cont.push_back(token);
+			}
+		}
+
+
 	};
 
 }

src/dbc.cpp

@@ -6,8 +6,9 @@
 
 namespace libdbc {
 
-	DbcParser::DbcParser() : version(""), version_re("^(VERSION)\\s\"(.*)\""),
-				  bit_timing_re("^(BS_:)"), name_space_re("^(NS_)\\s\\:") {
+	DbcParser::DbcParser() : version(""), nodes(),
+				version_re("^(VERSION)\\s\"(.*)\""), bit_timing_re("^(BS_:)"),
+				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)") {
 
 	}
 
@@ -17,9 +18,10 @@ namespace libdbc {
 
 		parse_dbc_header(s);
 
-		while(!s.eof()) {
-			utils::StreamHandler::get_line(s, line);
+		parse_dbc_nodes(s);
 
+		while(!s.eof()) {
+			utils::StreamHandler::get_line( s, line );
 		}
 
 	}
@@ -28,11 +30,14 @@ namespace libdbc {
 		return version;
 	}
 
+	std::vector<std::string> DbcParser::get_nodes() const {
+		return nodes;
+	}
+
+
 	void DbcParser::parse_dbc_header(std::istream& file_stream) {
 		std::string line;
 		std::smatch match;
-		bool is_blank = true;
-		bool not_blank = true;
 
 		utils::StreamHandler::get_line(file_stream, line);
 
@@ -53,4 +58,22 @@ namespace libdbc {
 
 	}
 
+	void DbcParser::parse_dbc_nodes(std::istream& file_stream) {
+		std::string line;
+		std::smatch match;
+
+		utils::StreamHandler::get_next_non_blank_line( file_stream, line );
+
+		if(!std::regex_search(line, match, node_re))
+			throw validity_error();
+
+		if(match.length() > 2) {
+			std::string n = match.str(2);
+			utils::String::split(n, nodes);
+		}
+
+	}
+
+
+
 }

test/test_dbc.cpp

@@ -28,11 +28,13 @@ TEST_CASE("Testing dbc file loading", "[fileio]") {
 	auto parser = std::unique_ptr<libdbc::DbcParser>(new libdbc::DbcParser());
 
 	SECTION("Loading a single simple dbc file", "[dbc]") {
-		std::vector<libdbc::Message> messages;
+		std::vector<std::string> nodes = {"DBG", "DRIVER", "IO", "MOTOR", "SENSOR"};
 
 		parser->parse_file(SIMPLE_DBC_FILE);
 
 		REQUIRE(parser->get_version() == "1.0.0");
+
+		REQUIRE(parser->get_nodes() == nodes);
 	}
 
 }

test/test_utils.cpp

@@ -81,3 +81,14 @@ TEST_CASE("Test the string trim feature", "[string]") {
 	REQUIRE(String::trim(s) == "there might be some white space....");
 }
 
+TEST_CASE("Test string split feature", "[string]") {
+	std::string s = "name1 name2 name3 name4 name5 ";
+	std::vector<std::string> vs = {"name1", "name2", "name3", "name4", "name5"};
+
+	std::vector<std::string> v;
+
+	String::split(s, v);
+
+	REQUIRE(v == vs);
+}
+