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

allow spaces in C INCBINS

Browse source
This commit is contained in:
garak 2019-06-03 23:48:39 -04:00 committed by huderlem
parent 889efd752f
commit a240bf5038
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/parseutil.cpp
View file

@ -243,7 +243,7 @@ QString ParseUtil::readCIncbin(QString filename, QString label) {
"\\b%1\\b" "\\b%1\\b"
"\\s*\\[?\\s*\\]?\\s*=\\s*" "\\s*\\[?\\s*\\]?\\s*=\\s*"
"INCBIN_[US][0-9][0-9]?" "INCBIN_[US][0-9][0-9]?"
"\\(\"([^\"]*)\"\\)").arg(label)); "\\(\\s*\"([^\"]*)\"\\s*\\)").arg(label));
int pos = re->indexIn(text); int pos = re->indexIn(text);
if (pos != -1) { if (pos != -1) {
@ -322,7 +322,7 @@ QStringList ParseUtil::readCArray(QString filename, QString label) {
QStringList split = body.split(','); QStringList split = body.split(',');
for (QString item : split) { for (QString item : split) {
item = item.trimmed(); item = item.trimmed();
if (!item.contains(QRegularExpression("[^A-Za-z0-9_&()]"))) list.append(item); if (!item.contains(QRegularExpression("[^A-Za-z0-9_&()\\s]"))) list.append(item);
// do not print error info here because this is called dozens of times // do not print error info here because this is called dozens of times
} }
} }