version is now parsed out correctly. Working on verifying the rest of the header.

Author: LinuxDevon

src/dbc.hpp

@@ -1,6 +1,8 @@
 #include "exceptions/error.hpp"
 #include "util/utils.hpp"
 
+#include <regex>
+
 namespace libdbc {
 
 	class Parser {
@@ -11,26 +13,20 @@ namespace libdbc {
 
 	protected:
 
-		void verify_dbc_format(std::istream& file_stream) const {
-			std::string line;
 
-			Utils::SafeString::get_line(file_stream, line);
-
-			if(line.find("VERSION") == std::string::npos) {
-				throw validity_error();
-			}
-		}
 	};
 
 	class DbcParser : public Parser {
 	public:
+		DbcParser() : version(""), version_re("(VERSION)\\s\"(.*)\"") {}
+
 		virtual ~DbcParser() = default;
 
 		virtual void parse_file(const std::string& file) final override {
 			std::ifstream s(file.c_str());
 			std::string line;
 
-			verify_dbc_format(s);
+			parse_dbc_header(s);
 
 			while(!s.eof()) {
 				Utils::SafeString::get_line(s, line);
@@ -40,11 +36,27 @@ namespace libdbc {
 		}
 
 		std::string get_version() const {
-			return "";
+			return version;
 		}
 
 	private:
+		std::string version;
+
+		const std::regex version_re;
 
+		void parse_dbc_header(std::istream& file_stream) {
+			std::string line;
+			std::smatch match;
+
+			Utils::SafeString::get_line(file_stream, line);
+
+			if(!std::regex_search(line, match, version_re)) {
+				throw validity_error();
+			}
+
+			version = match.str(2);
+
+		}
 
 	};
 

test/dbcs/Sample2.dbc

@@ -1,4 +1,4 @@
-VERSION ""
+VERSION "1.0.0"
 
 NS_ :
 	BA_

test/test_dbc.cpp

@@ -14,7 +14,7 @@ TEST_CASE("Testing dbc file loading", "[fileio]") {
 
 		parser->parse_file(DBC_FILE_2);
 
-		REQUIRE(parser->get_version() == "");
+		REQUIRE(parser->get_version() == "1.0.0");
 	}
 
 }