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

make context setup for included files qmake-like

Browse Source 
that's - as usual - making things rather braindead:
- the included files inherit the current context's function defs,
  but not the variables
- default_pre.prf is re-loaded for infile()/$$fromfile()
- the entire config is re-loaded for include(file, PREFIX)
This commit is contained in:
Oswald Buddenhagen
2010-06-22 12:07:27 +02:00
parent d29e19237a
commit 79073d3d93
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,8 +180,10 @@ public:
bool evaluateFileDirect(const QString &fileName, ProFileEvaluatorHandler::EvalFileType type); bool evaluateFileDirect(const QString &fileName, ProFileEvaluatorHandler::EvalFileType type);
bool evaluateFile(const QString &fileName, ProFileEvaluatorHandler::EvalFileType type); bool evaluateFile(const QString &fileName, ProFileEvaluatorHandler::EvalFileType type);
bool evaluateFeatureFile(const QString &fileName); bool evaluateFeatureFile(const QString &fileName);
enum EvalIntoMode { EvalProOnly, EvalWithDefaults, EvalWithSetup };
bool evaluateFileInto(const QString &fileName, ProFileEvaluatorHandler::EvalFileType type, bool evaluateFileInto(const QString &fileName, ProFileEvaluatorHandler::EvalFileType type,
QHash<ProString, ProStringList> *values, FunctionDefs *defs); QHash<ProString, ProStringList> *values, FunctionDefs *defs,
EvalIntoMode mode); // values are output-only, defs are input-only
static ALWAYS_INLINE VisitReturn returnBool(bool b) static ALWAYS_INLINE VisitReturn returnBool(bool b)
{ return b ? ReturnTrue : ReturnFalse; } { return b ? ReturnTrue : ReturnFalse; }
@@ -1150,7 +1152,7 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProFile(
qmake_cache = resolvePath(qmake_cache); qmake_cache = resolvePath(qmake_cache);
QHash<ProString, ProStringList> cache_valuemap; QHash<ProString, ProStringList> cache_valuemap;
if (evaluateFileInto(qmake_cache, ProFileEvaluatorHandler::EvalConfigFile, if (evaluateFileInto(qmake_cache, ProFileEvaluatorHandler::EvalConfigFile,
&cache_valuemap, 0)) { &cache_valuemap, 0, EvalProOnly)) {
if (m_option->qmakespec.isEmpty()) { if (m_option->qmakespec.isEmpty()) {
const ProStringList &vals = cache_valuemap.value(ProString("QMAKESPEC")); const ProStringList &vals = cache_valuemap.value(ProString("QMAKESPEC"));
if (!vals.isEmpty()) if (!vals.isEmpty())
@@ -2097,7 +2099,8 @@ ProStringList ProFileEvaluator::Private::evaluateExpandFunction(
QHash<ProString, ProStringList> vars; QHash<ProString, ProStringList> vars;
QString fn = resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1))); QString fn = resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach(); fn.detach();
if (evaluateFileInto(fn, ProFileEvaluatorHandler::EvalAuxFile, &vars, 0)) if (evaluateFileInto(fn, ProFileEvaluatorHandler::EvalAuxFile,
&vars, &m_functionDefs, EvalWithDefaults))
ret = vars.value(map(args.at(1))); ret = vars.value(map(args.at(1)));
} }
break; break;
@@ -2377,7 +2380,8 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateCondit
QHash<ProString, ProStringList> vars; QHash<ProString, ProStringList> vars;
QString fn = resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1))); QString fn = resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach(); fn.detach();
if (!evaluateFileInto(fn, ProFileEvaluatorHandler::EvalAuxFile, &vars, 0)) if (!evaluateFileInto(fn, ProFileEvaluatorHandler::EvalAuxFile,
&vars, &m_functionDefs, EvalWithDefaults))
return ReturnFalse; return ReturnFalse;
if (args.count() == 2) if (args.count() == 2)
return returnBool(vars.contains(args.at(1))); return returnBool(vars.contains(args.at(1)));
@@ -2665,7 +2669,8 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateCondit
ok = evaluateFile(fn, ProFileEvaluatorHandler::EvalIncludeFile); ok = evaluateFile(fn, ProFileEvaluatorHandler::EvalIncludeFile);
} else { } else {
QHash<ProString, ProStringList> symbols; QHash<ProString, ProStringList> symbols;
if ((ok = evaluateFileInto(fn, ProFileEvaluatorHandler::EvalAuxFile, &symbols, 0))) { if ((ok = evaluateFileInto(fn, ProFileEvaluatorHandler::EvalAuxFile,
&symbols, 0, EvalWithSetup))) {
QHash<ProString, ProStringList> newMap; QHash<ProString, ProStringList> newMap;
for (QHash<ProString, ProStringList>::ConstIterator for (QHash<ProString, ProStringList>::ConstIterator
it = m_valuemapStack.top().constBegin(), it = m_valuemapStack.top().constBegin(),
@@ -3020,19 +3025,21 @@ bool ProFileEvaluator::Private::evaluateFeatureFile(const QString &fileName)
bool ProFileEvaluator::Private::evaluateFileInto( bool ProFileEvaluator::Private::evaluateFileInto(
const QString &fileName, ProFileEvaluatorHandler::EvalFileType type, const QString &fileName, ProFileEvaluatorHandler::EvalFileType type,
QHash<ProString, ProStringList> *values, FunctionDefs *funcs) QHash<ProString, ProStringList> *values, FunctionDefs *funcs, EvalIntoMode mode)
{ {
ProFileEvaluator visitor(m_option, m_parser, m_handler); ProFileEvaluator visitor(m_option, m_parser, m_handler);
visitor.d->m_cumulative = false; visitor.d->m_cumulative = false;
visitor.d->m_parsePreAndPostFiles = false; visitor.d->m_parsePreAndPostFiles = (mode == EvalWithSetup);
visitor.d->m_valuemapStack.top() = *values; // visitor.d->m_valuemapStack.top() = *values;
if (funcs) if (funcs)
visitor.d->m_functionDefs = *funcs; visitor.d->m_functionDefs = *funcs;
if (mode == EvalWithDefaults)
visitor.d->evaluateFeatureFile(QLatin1String("default_pre.prf"));
if (!visitor.d->evaluateFile(fileName, type)) if (!visitor.d->evaluateFile(fileName, type))
return false; return false;
*values = visitor.d->m_valuemapStack.top(); *values = visitor.d->m_valuemapStack.top();
if (funcs) // if (funcs)
*funcs = visitor.d->m_functionDefs; // *funcs = visitor.d->m_functionDefs;
return true; return true;
} }