riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util: Break Lexer strings on quote and new lines

Browse Source
This commit is contained in:
Riyyi
2022-07-01 11:32:26 +02:00
parent 4501061060
commit d65f56bf03
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/json/lexer.cpp
+5 -2
View File
@@ -180,6 +180,9 @@ bool Lexer::getString()
size_t column = m_column; size_t column = m_column;
std::string symbol = ""; std::string symbol = "";
// Break on "\r\n
std::string breakOnGrammar = std::string("\"") + '\r' + '\n';
bool escape = false; bool escape = false;
char character = consume(); char character = consume();
for (;;) { for (;;) {
@@ -192,7 +195,7 @@ bool Lexer::getString()
continue; continue;
} }
if (!escape && character == '"') { if (!escape && breakOnGrammar.find(character) != std::string::npos) {
break; break;
} }
@@ -219,7 +222,7 @@ bool Lexer::getNumberOrLiteral(Token::Type type)
{ {
size_t column = m_column; size_t column = m_column;
std::string symbol = ""; std::string symbol = "";
std::string breakOnGrammar = std::string() + "{}[]:,\" " + '\t' + '\r' + '\n'; std::string breakOnGrammar = std::string("{}[]:,\" ") + '\t' + '\r' + '\n';
for (char character;;) { for (char character;;) {
character = peek(); character = peek();