Split and moved files

I separated the header and source. If i want to have a header only version i think scripting to get there is best.

It does compile a bit faster now. I have the source files named for now in the cmake. I might make that auto discover but not sure yet.

Author: LinuxDevon

CMakeLists.txt

@@ -22,7 +22,8 @@ endif()
 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
 
 # add where to find the source files
-list(APPEND SOURCE ${PROJECT_SOURCE_DIR}/src/util/utils.cpp)
+list(APPEND SOURCE ${PROJECT_SOURCE_DIR}/src/utils.cpp
+				   ${PROJECT_SOURCE_DIR}/src/dbc.cpp)
 
 include_directories(src)
 include_directories(include)

include/dbc.hpp

@@ -0,0 +1,51 @@
+
+#ifndef __DBC_HPP__
+#define __DBC_HPP__
+
+#include "exceptions/error.hpp"
+#include "utils/utils.hpp"
+
+#include <regex>
+
+namespace libdbc {
+
+	class Parser {
+	public:
+		virtual ~Parser() = default;
+
+		virtual void parse_file(const std::string& file) = 0;
+
+	protected:
+
+
+	};
+
+	class DbcParser : public Parser {
+	public:
+		DbcParser();
+
+		virtual ~DbcParser() = default;
+
+		virtual void parse_file(const std::string& file) final override;
+
+		std::string get_version() const;
+
+	private:
+		std::string version;
+
+		const std::regex version_re;
+		const std::regex bit_timing_re;
+		const std::regex name_space_re;
+
+		void parse_dbc_header(std::istream& file_stream);
+
+	};
+
+
+	struct Message {
+
+	};
+
+}
+
+#endif // __DBC_HPP__

src/exceptions/error.hpp include/exceptions/error.hppsrc/exceptions/error.hpp renamed to include/exceptions/error.hpp

@@ -1,3 +1,6 @@
+#ifndef __ERROR_HPP__
+#define __ERROR_HPP__
+
 #include <sstream>
 
 namespace libdbc {
@@ -31,4 +34,6 @@ namespace libdbc {
 		const char * file;
 	};
 
-} // libdbc
+} // libdbc
+
+#endif // __ERROR_HPP__

src/util/utils.hpp include/utils/utils.hppsrc/util/utils.hpp renamed to include/utils/utils.hpp

@@ -1,3 +1,7 @@
+
+#ifndef __UTILS_HPP__
+#define __UTILS_HPP__
+
 #include <string>
 #include <fstream>
 #include <iostream>
@@ -24,4 +28,13 @@ namespace utils {
 
 	};
 
-}
+	class String {
+	public:
+
+		static std::string trim(const std::string& line);
+
+	};
+
+}
+
+#endif // __UTILS_HPP__

src/dbc.cpp

@@ -0,0 +1,56 @@
+#include "exceptions/error.hpp"
+#include "utils/utils.hpp"
+#include "dbc.hpp"
+
+#include <regex>
+
+namespace libdbc {
+
+	DbcParser::DbcParser() : version(""), version_re("^(VERSION)\\s\"(.*)\""),
+				  bit_timing_re("^(BS_:)"), name_space_re("^(NS_)\\s\\:") {
+
+	}
+
+	void DbcParser::parse_file(const std::string& file) {
+		std::ifstream s(file.c_str());
+		std::string line;
+
+		parse_dbc_header(s);
+
+		while(!s.eof()) {
+			utils::StreamHandler::get_line(s, line);
+
+		}
+
+	}
+
+	std::string DbcParser::get_version() const {
+		return version;
+	}
+
+	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);
+
+		if(!std::regex_search(line, match, version_re)) {
+			throw validity_error();
+		}
+
+		version = match.str(2);
+
+		utils::StreamHandler::get_next_non_blank_line( file_stream, line );
+
+		utils::StreamHandler::skip_to_next_blank_line( file_stream, line );
+
+		utils::StreamHandler::get_next_non_blank_line( file_stream, line );
+
+		if(!std::regex_search(line, match, bit_timing_re))
+			throw validity_error();
+
+	}
+
+}

src/dbc.hpp

@@ -1,4 +1,4 @@
-#include "util/utils.hpp"
+#include "utils/utils.hpp"
 
 #include <regex>
 
@@ -64,4 +64,12 @@ namespace utils {
 	}
 
 
+
+	std::string String::trim(const std::string& line) {
+		const char* WhiteSpace = " \t\v\r\n";
+		std::size_t start = line.find_first_not_of(WhiteSpace);
+		std::size_t end = line.find_last_not_of(WhiteSpace);
+		return start == end ? std::string() : line.substr(start, end - start + 1);
+	}
+
 }	// Namespace Utils

src/util/utils.cpp src/utils.cppsrc/util/utils.cpp renamed to src/utils.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 #include "defines.hpp"
-#include "util/utils.hpp"
+#include "utils/utils.hpp"
 
 #include <sstream>