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

Util: Make character breaks in Lexer more clear syntactically

Browse Source
This commit is contained in:
Riyyi
2022-07-12 11:17:34 +02:00
parent 5835c63bda
commit ad137576a8
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/json/lexer.cpp
+4 -7
View File
@@ -158,9 +158,7 @@ bool Lexer::getString()
{ {
size_t column = m_column; size_t column = m_column;
std::string symbol = ""; std::string symbol = "";
std::string breakOnCharacter = std::string() + '"' + '\r' + '\n' + '\0';
// Break on "\r\n
std::string breakOnGrammar = std::string("\"") + '\r' + '\n' + '\0';
bool escape = false; bool escape = false;
char character = consume(); char character = consume();
@@ -174,7 +172,7 @@ bool Lexer::getString()
continue; continue;
} }
if (!escape && breakOnGrammar.find(character) != std::string::npos) { if (!escape && breakOnCharacter.find(character) != std::string::npos) {
break; break;
} }
@@ -200,13 +198,12 @@ 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' + '\0'; std::string breakOnCharacter = std::string("{}[]:,") + '"' + ' ' + '\t' + '\r' + '\n' + '\0';
for (char character;;) { for (char character;;) {
character = peek(); character = peek();
// Break on all valid JSON grammar thats not a number or literal if (breakOnCharacter.find(character) != std::string::npos) {
if (breakOnGrammar.find(character) != std::string::npos) {
break; break;
} }