Fix broken SPA and Integration Test (#224)

* Fix broken builds

* Revert erroneous refactor

* Clang-format

Author: afterdusk

Team20/Code20/IntegrationTesting/TestPQLEvaluator.cpp

@@ -387,29 +387,6 @@ TEST_CLASS(TestPqlEvaluator) {
     Assert::IsTrue(expected == actual);
   }
 
-  TEST_METHOD(TestEvaluateParsedQuery_SelectMultipleNoClause) {
-    // constant c; procedure p; Select <p, c>
-    ParsedQuery pq = {{{"c", TokenType::CONSTANT}, {"p", TokenType::PROCEDURE}},
-                      {"p", "c"},
-                      {}};
-    std::list<std::string> expected = {
-        "main 0",       "main 1",
-        "main 5",       "main 11111111111111111111111111111111111111",
-        "extra 0",      "extra 1",
-        "extra 5",      "extra 11111111111111111111111111111111111111",
-        "complicate 0", "complicate 1",
-        "complicate 5", "complicate 11111111111111111111111111111111111111",
-        "aux 0",        "aux 1",
-        "aux 5",        "aux 11111111111111111111111111111111111111",
-
-    };
-    std::list<std::string> actual;
-    Pql::evaluate(pq, pkb.getQueryInterface(), actual);
-    expected.sort();
-    actual.sort();
-    Assert::IsTrue(expected == actual);
-  }
-
   TEST_METHOD(TestEvaluateParsedQuery_SelectTuple) {
     /* All seen synonyms
        read r1; read r2; Select <r2, r1> such that Follows(r1, r2)

Team20/Code20/source/PQLEvaluator.cpp

@@ -14,10 +14,12 @@ void Pql::evaluate(ParsedQuery pq, PkbQueryInterface *queryHandler,
   for (auto &relationship : pq.relationships) {
     ClauseDispatcher *dispatcher =
         ClauseDispatcher::FromRelationship(relationship, queryHandler);
-    // Early termination if clause evaluates to false
-    if (dispatcher->willReturnBoolean() && !dispatcher->booleanDispatch()) {
-      delete dispatcher;
-      return;
+    if (dispatcher->willReturnBoolean()) {
+      // Early termination if clause evaluates to false
+      if (!dispatcher->booleanDispatch()) {
+        delete dispatcher;
+        return;
+      }
     } else {
       EvaluationTable clauseResult = dispatcher->resultDispatch();
       delete dispatcher;
@@ -29,10 +31,12 @@ void Pql::evaluate(ParsedQuery pq, PkbQueryInterface *queryHandler,
   for (auto &pattern : pq.patterns) {
     ClauseDispatcher *dispatcher =
         ClauseDispatcher::FromPattern(pattern, queryHandler);
-    // Early termination if clause evaluates to false
-    if (dispatcher->willReturnBoolean() && !dispatcher->booleanDispatch()) {
-      delete dispatcher;
-      return;
+    if (dispatcher->willReturnBoolean()) {
+      // Early termination if clause evaluates to false
+      if (!dispatcher->booleanDispatch()) {
+        delete dispatcher;
+        return;
+      }
     } else {
       EvaluationTable clauseResult = dispatcher->resultDispatch();
       delete dispatcher;

Team20/Code20/source/PQLParser.cpp

@@ -390,13 +390,13 @@ void PqlParser::parseWithClause() {
 }
 
 void PqlParser::parseAttributeCompare() {
-  const auto firstRef = getRef();
+  getRef();
   getNextExpectedToken(TokenType::EQUALS);
-  const auto secondRef = getRef();
+  getRef();
   // TODO: Add ref to with clause handling
 }
 
-PqlToken PqlParser::getRef() {
+void PqlParser::getRef() {
   // TODO: Return new ref instead of pqltoken
   switch (it->type) {
   case TokenType::STRING: {

Team20/Code20/source/PQLParser.h

@@ -35,5 +35,5 @@ class PqlParser {
   PqlToken getNextExpectedToken(TokenType expectedTokenType);
   PqlToken getNextTokenWithDeclarationTypeInArgumentsList(
       std::unordered_set<TokenType> &argumentsList);
-  PqlToken getRef();
+  void getRef();
 };