More robust DBC parsing

Author: Avi SZYCHTER

CMakeLists.txt

@@ -12,8 +12,9 @@ set(CPPPARSER_INCLUDE_DIRECTORY
 set(CPPPARSER_SRC_FILES
 	src/models/CANDatabase.cpp
 	src/models/CANFrame.cpp
-  	src/models/CANSignal.cpp
+  src/models/CANSignal.cpp
 	src/parsing/DBCParser.cpp
+	src/parsing/ParsingUtils.cpp
 	src/parsing/Tokenizer.cpp
 	src/analysis/CANFrameAnalysis.cpp)
 

include/ParsingUtils.h

@@ -31,4 +31,8 @@ bool is_token(Tokenizer& tokenizer, const std::string& token);
 
 bool is_token(Tokenizer& tokenizer, Token::Type token);
 
+bool peek_token(Tokenizer& tokenizer, Token::Type type);
+
+bool peek_token(Tokenizer& tokenizer, const std::string& token);
+
 #endif

include/Tokenizer.h

@@ -17,6 +17,7 @@ class Tokenizer {
   void skipLine();
   void skipUntil(const std::string& token);
   void saveToken(const Token& token);
+  void saveTokenIfNotEof(const Token& token);
 
   unsigned long long charCount() const;
   unsigned long long lineCount() const;