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

Util: Fix brace checks in Parser

Browse Source
This commit is contained in:
Riyyi
2022-08-05 22:01:54 +02:00
parent dc8d2a49cd
commit a75bb863ff
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/format/parser.cpp
+6 -10
View File
@@ -33,10 +33,6 @@ Parser::~Parser()
void Parser::checkFormatParameterConsistency() void Parser::checkFormatParameterConsistency()
{ {
size_t length = m_input.length();
VERIFY(length >= m_parameterCount * 2, "format string does not reference all parameters");
size_t braceOpen = 0; size_t braceOpen = 0;
size_t braceClose = 0; size_t braceClose = 0;
while (!isEOF()) { while (!isEOF()) {
@@ -68,13 +64,13 @@ void Parser::checkFormatParameterConsistency()
} }
m_index = 0; m_index = 0;
// VERIFY(!(braceOpen < braceClose), "extra open braces in format string"); VERIFY(!(braceOpen < braceClose), "extra open braces in format string");
VERIFY(!(braceOpen > braceClose), "extra closing braces in format string");
// VERIFY(!(braceOpen > braceClose), "extra closing braces in format string"); if (m_mode == ArgumentIndexingMode::Automatic) {
VERIFY(!(braceOpen < m_parameterCount), "format string does not reference all passed parameters");
// VERIFY(!(braceOpen < m_parameterCount), "format string does not reference all passed parameters"); VERIFY(!(braceOpen > m_parameterCount), "format string references nonexistent parameter");
}
// VERIFY(!(braceOpen > m_parameterCount), "format string references nonexistent parameter");
} }
size_t Parser::stringToNumber(std::string_view value) size_t Parser::stringToNumber(std::string_view value)