fix quote in quotes issue

EclipseMenu · Oct 9, 2024 · aa0aeab · aa0aeab
1 parent c3f1c29
commit aa0aeab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/include/rift/lexer.hpp b/include/rift/lexer.hpp
@@ -40,7 +40,7 @@ namespace rift {
         Token parseNumber();
 
         /// @brief Parse a string.
-        Token parseString();
+        Token parseString(char quote);
 
         /// @brief Parse an identifier.
         Token parseIdentifier();
@@ -57,4 +57,4 @@ namespace rift {
         size_t m_expressionDepth = 0;
     };
 
-}
+}
diff --git a/src/lexer.cpp b/src/lexer.cpp
@@ -48,7 +48,7 @@ namespace rift {
                 return parseIdentifier();
             } else {
                 switch (c) {
-                    case '\'': case '"': return parseString();
+                    case '\'': case '"': return parseString(c);
                     case '(': return createToken(TokenType::LEFT_PAREN, "(");
                     case ')': return createToken(TokenType::RIGHT_PAREN, ")");
                     case '+': return createToken(TokenType::PLUS, "+");
@@ -157,10 +157,13 @@ namespace rift {
         return createToken(TokenType::INTEGER, m_script.substr(start, m_index - start));
     }
 
-    Token Lexer::parseString() {
+    Token Lexer::parseString(char quote) {
         size_t start = m_index - 1;
-        while (!isEnd() && peek() != '\'' && peek() != '"') {
+        bool isSingleQuote = quote == '\'';
+        bool isEscape = false;
+        while (!isEnd() && (peek() != (isSingleQuote ? '\'' : '"') || isEscape)) {
             advance();
+            isEscape = !isEscape && peek() == '\\';
         }
 
         if (isEnd()) {
@@ -179,4 +182,4 @@ namespace rift {
         return createToken(TokenType::IDENTIFIER, m_script.substr(start, m_index - start));
     }
 
-}
+}