empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Trace Logger - Made format string a bit more lenient on syntax (and display [Invalid tag] when the content can't be parsed properly)

Browse source
This commit is contained in:
Sour 2018-05-31 21:21:04 -04:00
parent ab8af4693a
commit 840368467a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/TraceLogger.cpp
View file

@ -69,7 +69,7 @@ void TraceLogger::SetOptions(TraceLoggerOptions options)
_rowParts.clear();
std::regex formatRegex = std::regex("(\\[([^,[]*?)(,([\\d]*)(h){0,1})?\\])|([^[]*)", std::regex_constants::icase);
std::regex formatRegex = std::regex("(\\[\\s*([^[]*?)\\s*(,\\s*([\\d]*)\\s*(h){0,1}){0,1}\\s*\\])|([^[]*)", std::regex_constants::icase);
std::sregex_iterator start = std::sregex_iterator(format.cbegin(), format.cend(), formatRegex);
std::sregex_iterator end = std::sregex_iterator();
@ -115,6 +115,9 @@ void TraceLogger::SetOptions(TraceLoggerOptions options)
part.DataType = RowDataType::FrameCount;
} else if(dataType == "CycleCount") {
part.DataType = RowDataType::CycleCount;
} else {
part.DataType = RowDataType::Text;
part.Text = "[Invalid tag]";
}
if(!match.str(4).empty()) {