Parser: separate declaration from implementation

wpmed92 · Aug 13, 2024 · 6e3f63b · 6e3f63b
1 parent 1511589
commit 6e3f63b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/include/Parser/Parser.h b/include/Parser/Parser.h
@@ -21,23 +21,19 @@ enum ParserErrorKind {
 };
 
 struct ParserError {
-  ParserError() : kind(ParserErrorKind::None) {}
-  ParserError(ParserErrorKind kind, const std::string &msg) : kind(kind), msg(msg) {}
+  ParserError();
+  ParserError(ParserErrorKind kind, const std::string &msg);
 
   ParserErrorKind kind;
   std::string msg;
 
-  bool none() { return kind == ParserErrorKind::None; }
+  bool none();
 };
 
 class Parser {
 
 public:
-  Parser(std::vector<std::unique_ptr<Token>> &tokens)
-      : tokenStream(tokens), cursor(-1), curToken(nullptr), parsingLhsExpression(false) {
-    advanceToken();
-  }
-
+  Parser(std::vector<std::unique_ptr<Token>> &tokens);
   std::unique_ptr<TranslationUnit> parseTranslationUnit();
   std::unique_ptr<ExternalDeclaration> parseExternalDeclaration();
   std::unique_ptr<FunctionDeclaration> parseFunctionDeclaration();
@@ -108,15 +104,8 @@ class Parser {
   makeMatrixType(std::vector<std::unique_ptr<TypeQualifier>>, TypeKind, int,
                  int);
 
-  void savePosition() {
-    savedPositions.push_back(cursor);
-  }
-
-  void rollbackPosition() {
-    cursor = savedPositions.back() - 1;
-    savedPositions.pop_back();
-    advanceToken();
-  }
+  void savePosition();
+  void rollbackPosition();
 };
 
 } // namespace parser

diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
@@ -7,6 +7,23 @@ using namespace ast;
 
 namespace parser {
 
+Parser::Parser(std::vector<std::unique_ptr<Token>> &tokens)
+  : tokenStream(tokens), cursor(-1), curToken(nullptr), parsingLhsExpression(false) {
+    advanceToken();
+}
+
+ParserError::ParserError() : kind(ParserErrorKind::None) {
+
+}
+
+ParserError::ParserError(ParserErrorKind kind, const std::string &msg) : kind(kind), msg(msg) {
+
+}
+
+bool ParserError::none() {
+  return kind == ParserErrorKind::None;
+}
+
 std::map<BinaryOperator, int> Parser::binopPrecedence = {
     {BinaryOperator::LogOr, 10},     {BinaryOperator::LogXor, 20},
     {BinaryOperator::LogAnd, 30},    {BinaryOperator::BitIor, 40},
@@ -1503,6 +1520,16 @@ void Parser::reportError(ParserErrorKind kind, const std::string &msg) {
   error = ParserError(kind, msg);
 }
 
+void Parser::savePosition() {
+  savedPositions.push_back(cursor);
+}
+
+void Parser::rollbackPosition() {
+  cursor = savedPositions.back() - 1;
+  savedPositions.pop_back();
+  advanceToken();
+}
+
 }; // namespace parser
 
 }; // namespace shaderpulse