More robust DBC parsing

Author: Avi SZYCHTER

include/ParsingUtils.h

@@ -6,80 +6,29 @@
 #include <iostream>
 #include "CANDatabaseException.h"
 
-void throwError(const std::string& category, const std::string& description,
-                unsigned long long line) {
-  throw CANDatabaseException(
-    category + ": " + description + " at line " + std::to_string(line + 1)
-  );
-}
+void throw_error(const std::string& category, const std::string& description,
+                unsigned long long line);
 
-void warning(const std::string& description, unsigned long long line) {
-  std::cerr << "WARNING: "
-            << description
-            << " at line "
-            << line + 1
-            << std::endl;
-}
+void warning(const std::string& description, unsigned long long line) ;
 
-void skipIf(Tokenizer& tokenizer, const std::string& token) {
-  if(tokenizer.getNextToken() == token)
-    return;
+const Token&
+assert_token(Tokenizer& tokenizer, const std::string& token);
 
-  throwError(
-    "Syntax error",
-    "expected \"" + token + "\" but got \"" +
-    tokenizer.getCurrentToken().image + "\"",
-    tokenizer.lineCount()
-  );
-}
+const Token&
+assert_token(Tokenizer& tokenizer, Token::Type targetType);
 
-void assertToken(const Tokenizer& tokenizer, const std::string& token) {
-  if(tokenizer.getCurrentToken() == token)
-    return;
+const Token&
+assert_current_token(const Tokenizer& tokenizer, const std::string& token);
 
-  throwError(
-    "Syntax error",
-    "expected \"" + token + "\" but got \"" +
-    tokenizer.getCurrentToken().image + "\"",
-    tokenizer.lineCount()
-  );
-}
+const Token&
+assert_current_token(const Tokenizer& tokenizer, Token::Type type);
 
+bool is_current_token(const Tokenizer& tokenizer, const std::string& token);
 
-Token checkCurrentTokenType(const Token& toCheck, Token::Type targetType,
-                            unsigned long long line) {
-  if(toCheck == targetType)
-    return toCheck;
+bool is_current_token(const Tokenizer& tokenizer, Token::Type token);
 
-  throwError(
-    "Syntax error",
-    "unexpected \"" + toCheck.image  + "\"",
-    line
-  );
+bool is_token(Tokenizer& tokenizer, const std::string& token);
 
-  // Removes a compilation warning
-  return toCheck;
-}
+bool is_token(Tokenizer& tokenizer, Token::Type token);
 
-Token checkCurrentTokenType(const Token& toCheck,
-                            const std::string& token,
-                            unsigned long long line) {
-  if(toCheck == token)
-    return toCheck;
-
-  throwError(
-    "Syntax error",
-    "unexpected \"" + toCheck.image + "\"",
-    line
-  );
-
-  // Removes a compilation warning
-  return toCheck;
-}
-
-Token checkTokenType(Tokenizer& tokenizer, Token::Type targetType) {
-  return checkCurrentTokenType(tokenizer.getNextToken(),
-                               targetType,
-                               tokenizer.lineCount());
-}
 #endif

include/Tokenizer.h

@@ -11,8 +11,8 @@ class Tokenizer {
   Tokenizer();
   virtual ~Tokenizer() = default;
 
-  Token getNextToken();
-  Token getCurrentToken() const;
+  const Token& getNextToken();
+  const Token& getCurrentToken() const;
 
   void skipLine();
   void skipUntil(const std::string& token);