Fix error in AND lexing bug (#227)

* Fix AND bug

* Add simple BOOLEAN test

* Remove extra boolean

Author: pengnam

Team20/Code20/IntegrationTesting/TestPqlEndToEnd.cpp

@@ -17,5 +17,13 @@ TEST_CLASS(TestPqlEndToEnd) {
     std::list<std::string> expected = {"7 10", "11 10", "25 10"};
     Assert::IsTrue(actual == expected);
   }
+  TEST_METHOD(TestPqlEndToEnd_BooleanSelectWithFollows) {
+    const auto query =
+        "assign a; read r; call c; Select BOOLEAN such that Follows(r, a)";
+    std::list<std::string> actual;
+    Pql::evaluate(Pql::parse(Pql::lex(query)), pkb.getQueryInterface(), actual);
+    std::list<std::string> expected = {"TRUE"};
+    Assert::IsTrue(actual == expected);
+  }
 };
 } // namespace IntegrationTesting

Team20/Code20/source/PQL.cpp

@@ -31,15 +31,16 @@ std::unordered_map<std::string, TokenType> stringTokenMap = {
     {")", TokenType::CLOSED_PARENTHESIS},
     {"<", TokenType::OPEN_ANGLED_BRACKET},
     {">", TokenType::CLOSED_ANGLED_BRACKET},
-    {"BOOLEAN", TokenType::BOOLEAN},
     {".", TokenType::DOT},
     {"procName", TokenType::PROCNAME},
     {"varName", TokenType::VARNAME},
     {"value", TokenType::VALUE},
     {"stmt#", TokenType::STATEMENT_NUM},
     {",", TokenType::COMMA},
     {"with", TokenType::WITH},
-    {"=", TokenType::EQUALS}};
+    {"and", TokenType::AND},
+    {"=", TokenType::EQUALS},
+    {"BOOLEAN", TokenType::BOOLEAN}};
 
 ParsedQuery Pql::parse(std::vector<PqlToken> query) {
   auto parser = PqlParser(query);

Team20/Code20/source/PQLLexer.cpp

@@ -75,8 +75,6 @@ std::vector<std::string> PqlLexer::split(const std::string &s, char delim) {
   return result;
 }
 
-// TODO: Consider long strings when converting to int
-
 std::vector<std::string> PqlLexer::delimit(std::string s) {
   std::vector<char> result;
   bool isWithinStringLiterals = false;

Team20/Code20/source/PQLParser.cpp

@@ -351,6 +351,7 @@ void PqlParser::parsePattern() {
 void PqlParser::parseResultClause() {
   switch (it->type) {
   case TokenType::BOOLEAN:
+    getNextExpectedToken(TokenType::BOOLEAN);
     pq.results.resultType = PqlResultType::Boolean;
     break;