feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

process second arg of include()

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-02-11 14:13:59 +01:00
parent 07abc847e8
commit 081f27e3ea
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/shared/proparser/profileevaluator.cpp
View File

@@ -2698,18 +2698,29 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
if ((args.count() == 2) || (args.count() == 3) ) { if ((args.count() == 2) || (args.count() == 3) ) {
parseInto = args[1]; parseInto = args[1];
} else if (args.count() != 1) { } else if (args.count() != 1) {
logMessage(format("include(file) requires one, two or three arguments.")); logMessage(format("include(file, into, silent) requires one, two or three arguments."));
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
} }
QString fn = resolvePath(expandEnvVars(args.first()));
bool ok;
if (parseInto.isEmpty()) {
State sts = m_sts; State sts = m_sts;
bool ok = evaluateFile(resolvePath(expandEnvVars(args.first()))); ok = evaluateFile(fn);
m_sts = sts; m_sts = sts;
} else {
QHash<QString, QStringList> symbols;
if ((ok = evaluateFileInto(fn, &symbols, 0)))
for (QHash<QString, QStringList>::ConstIterator it = symbols.constBegin();
it != symbols.constEnd(); ++it)
if (!it.key().startsWith(QLatin1Char('.')))
m_valuemapStack.top().insert(parseInto + QLatin1Char('.') + it.key(),
it.value());
}
return returnBool(ok); return returnBool(ok);
} }
case T_LOAD: { case T_LOAD: {
if (m_skipLevel && !m_cumulative) if (m_skipLevel && !m_cumulative)
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
QString parseInto;
bool ignore_error = false; bool ignore_error = false;
if (args.count() == 2) { if (args.count() == 2) {
QString sarg = args[1]; QString sarg = args[1];