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

Update C array regex to allow explicitly-sized arrays

Browse source
This commit is contained in:
Marcus Huderle 2020-02-12 16:38:07 -06:00
parent b83ead44d0
commit 85c21855ef
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/parseutil.cpp
View file

@ -314,11 +314,11 @@ QStringList ParseUtil::readCArray(QString filename, QString label) {
file = filename; file = filename;
text = readTextFile(root + "/" + filename); text = readTextFile(root + "/" + filename);
QRegularExpression re(QString("\\b%1\\b\\s*\\[?\\s*\\]?\\s*=\\s*\\{([^\\}]*)\\}").arg(label)); QRegularExpression re(QString(R"(\b%1\b\s*(\[?[^\]]*\])?\s*=\s*\{([^\}]*)\})").arg(label));
QRegularExpressionMatch match = re.match(text); QRegularExpressionMatch match = re.match(text);
if (match.hasMatch()) { if (match.hasMatch()) {
QString body = match.captured(1); QString body = match.captured(2);
QStringList split = body.split(','); QStringList split = body.split(',');
for (QString item : split) { for (QString item : split) {
item = item.trimmed(); item = item.trimmed();
@ -334,8 +334,8 @@ QMap<QString, QString> ParseUtil::readNamedIndexCArray(QString filename, QString
text = readTextFile(root + "/" + filename); text = readTextFile(root + "/" + filename);
QMap<QString, QString> map; QMap<QString, QString> map;
QRegularExpression re_text(QString("\\b%1\\b\\s*\\[?\\s*\\]?\\s*=\\s*\\{([^\\}]*)\\}").arg(label)); QRegularExpression re_text(QString(R"(\b%1\b\s*(\[?[^\]]*\])?\s*=\s*\{([^\}]*)\})").arg(label));
QString body = re_text.match(text).captured(1).replace(QRegularExpression("\\s*"), ""); QString body = re_text.match(text).captured(2).replace(QRegularExpression("\\s*"), "");
QRegularExpression re("\\[(?<index>[A-Za-z1-9_]*)\\]=(?<value>&?[A-Za-z1-9_]*)"); QRegularExpression re("\\[(?<index>[A-Za-z1-9_]*)\\]=(?<value>&?[A-Za-z1-9_]*)");
QRegularExpressionMatchIterator iter = re.globalMatch(body); QRegularExpressionMatchIterator iter = re.globalMatch(body);