atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

ignore multi line comments when reading C defines (courtesy WWMB)

Browse source
This commit is contained in:
garak 2019-01-16 01:57:19 -05:00 committed by huderlem
parent 596216d5fb
commit a2e3d17dbb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/project.cpp
View file

@ -1968,7 +1968,7 @@ QString Project::readCIncbin(QString text, QString label) {
QMap<QString, int> Project::readCDefines(QString text, QStringList prefixes) { QMap<QString, int> Project::readCDefines(QString text, QStringList prefixes) {
ParseUtil parser; ParseUtil parser;
text.replace(QRegularExpression("//.*"), ""); text.replace(QRegularExpression("(//.*)|(\\/+\\*+[^*]*\\*+\\/+)"), "");
QMap<QString, int> allDefines; QMap<QString, int> allDefines;
QMap<QString, int> filteredDefines; QMap<QString, int> filteredDefines;
QRegularExpression re("#define\\s+(?<defineName>\\w+)[^\\S\\n]+(?<defineValue>.+)"); QRegularExpression re("#define\\s+(?<defineName>\\w+)[^\\S\\n]+(?<defineValue>.+)");