Merge pull request #19 from rafalgrodzinski/17-support-character-literals

Parse char types

src/Lexer/Lexer.cpp

@@ -237,6 +237,10 @@ shared_ptr<Token> Lexer::nextToken() {
     if (token != nullptr)
         return token;
 
+    token = matchIntegerChar();
+    if (token != nullptr)
+        return token;
+
     // type
     token = match(TokenKind::TYPE, "bool", true);
     if (token != nullptr)
@@ -354,6 +358,27 @@ shared_ptr<Token> Lexer::matchIntegerBin() {
     return token;
 }
 
+shared_ptr<Token> Lexer::matchIntegerChar() {
+    int nextIndex = currentIndex;
+
+    if (currentIndex >= source.size() || source.at(nextIndex) != '\'')
+        return nullptr;
+
+    bool isClosing = false;
+    do {
+        nextIndex++;
+        isClosing = source.at(nextIndex) == '\'' && source.at(nextIndex - 1) != '\\';
+    } while (nextIndex < source.length() && !isClosing);
+
+    if (!isClosing)
+        return nullptr;
+
+    string lexme = source.substr(currentIndex, nextIndex - currentIndex + 1);
+    shared_ptr<Token> token = make_shared<Token>(TokenKind::INTEGER_CHAR, lexme, currentLine, currentColumn);
+    advanceWithToken(token);
+    return token;
+}
+
 shared_ptr<Token> Lexer::matchReal() {
     int nextIndex = currentIndex;
 

src/Lexer/Lexer.h

@@ -22,6 +22,7 @@ private:
     shared_ptr<Token> matchIntegerDec();
     shared_ptr<Token> matchIntegerHex();
     shared_ptr<Token> matchIntegerBin();
+    shared_ptr<Token> matchIntegerChar();
     shared_ptr<Token> matchReal();
     shared_ptr<Token> matchIdentifier();
     shared_ptr<Token> matchEnd();

src/Lexer/Token.cpp

@@ -40,6 +40,7 @@ vector<TokenKind> Token::tokensLiteral = {
     TokenKind::INTEGER_DEC,
     TokenKind::INTEGER_HEX,
     TokenKind::INTEGER_BIN,
+    TokenKind::INTEGER_CHAR,
     TokenKind::REAL
 };
 

src/Lexer/Token.h

@@ -39,6 +39,7 @@ enum class TokenKind {
     INTEGER_DEC,
     INTEGER_HEX,
     INTEGER_BIN,
+    INTEGER_CHAR,
     REAL,
     IDENTIFIER,
     TYPE,

src/Logger.cpp

@@ -74,6 +74,8 @@ string Logger::toString(shared_ptr<Token> token) {
             return "INT_HEX(" + token->getLexme() + ")";
         case TokenKind::INTEGER_BIN:
             return "INT_BIN(" + token->getLexme() + ")";
+        case TokenKind::INTEGER_CHAR:
+            return "INT_CHAR(" + token->getLexme() + ")";
         case TokenKind::REAL:
             return "REAL(" + token->getLexme() + ")";
         case TokenKind::IDENTIFIER:

src/Parser/Expression/ExpressionLiteral.cpp

@@ -32,6 +32,36 @@ Expression(ExpressionKind::LITERAL, ValueType::NONE) {
             valueType = ValueType::SINT32;
             break;
         }
+        case TokenKind::INTEGER_CHAR: {
+            string charString = token->getLexme();
+
+            valueType = ValueType::SINT32;
+            if (charString.length() == 3) {
+                sint32Value = charString[1];
+            } else if (charString.length() == 4 && charString[1] == '\\') {
+                switch (charString[2]) {
+                    case 'b':
+                        sint32Value = '\b';
+                        break;
+                    case 'n':
+                        sint32Value = '\n';
+                        break;
+                    case 't':
+                        sint32Value = '\t';
+                        break;
+                    case '\\':
+                        sint32Value = '\\';
+                        break;
+                    case '\'':
+                        sint32Value = '\'';
+                        break;
+                    case '\"':
+                        sint32Value = '\"';
+                        break;
+                }
+            }
+            break;
+        }
         case TokenKind::REAL:
             real32Value = stof(token->getLexme());
             valueType = ValueType::REAL32;