summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpression.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGeneratorExpression.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
-rw-r--r--Source/cmGeneratorExpression.cxx362
1 files changed, 147 insertions, 215 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 0566662..002f9ec 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -21,20 +21,20 @@
#include "cmGeneratorExpressionParser.h"
cmGeneratorExpression::cmGeneratorExpression(
- const cmListFileBacktrace& backtrace):
- Backtrace(backtrace)
+ const cmListFileBacktrace& backtrace)
+ : Backtrace(backtrace)
{
}
-cmsys::auto_ptr<cmCompiledGeneratorExpression>
-cmGeneratorExpression::Parse(std::string const& input)
+cmsys::auto_ptr<cmCompiledGeneratorExpression> cmGeneratorExpression::Parse(
+ std::string const& input)
{
return cmsys::auto_ptr<cmCompiledGeneratorExpression>(
new cmCompiledGeneratorExpression(this->Backtrace, input));
}
-cmsys::auto_ptr<cmCompiledGeneratorExpression>
-cmGeneratorExpression::Parse(const char* input)
+cmsys::auto_ptr<cmCompiledGeneratorExpression> cmGeneratorExpression::Parse(
+ const char* input)
{
return this->Parse(std::string(input ? input : ""));
}
@@ -43,73 +43,62 @@ cmGeneratorExpression::~cmGeneratorExpression()
{
}
-const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
- const std::string& config, bool quiet,
+const char* cmCompiledGeneratorExpression::Evaluate(
+ cmLocalGenerator* lg, const std::string& config, bool quiet,
const cmGeneratorTarget* headTarget,
- cmGeneratorExpressionDAGChecker *dagChecker,
- std::string const& language) const
+ cmGeneratorExpressionDAGChecker* dagChecker,
+ std::string const& language) const
{
- return this->Evaluate(lg,
- config,
- quiet,
- headTarget,
- headTarget,
- dagChecker,
+ return this->Evaluate(lg, config, quiet, headTarget, headTarget, dagChecker,
language);
}
-const char *cmCompiledGeneratorExpression::Evaluate(
+const char* cmCompiledGeneratorExpression::Evaluate(
cmLocalGenerator* lg, const std::string& config, bool quiet,
- const cmGeneratorTarget* headTarget,
- const cmGeneratorTarget* currentTarget,
- cmGeneratorExpressionDAGChecker *dagChecker,
+ const cmGeneratorTarget* headTarget, const cmGeneratorTarget* currentTarget,
+ cmGeneratorExpressionDAGChecker* dagChecker,
std::string const& language) const
{
- cmGeneratorExpressionContext context(lg, config, quiet, headTarget,
- currentTarget ? currentTarget : headTarget,
- this->EvaluateForBuildsystem,
- this->Backtrace, language);
+ cmGeneratorExpressionContext context(
+ lg, config, quiet, headTarget, currentTarget ? currentTarget : headTarget,
+ this->EvaluateForBuildsystem, this->Backtrace, language);
return this->EvaluateWithContext(context, dagChecker);
}
const char* cmCompiledGeneratorExpression::EvaluateWithContext(
- cmGeneratorExpressionContext& context,
- cmGeneratorExpressionDAGChecker *dagChecker) const
+ cmGeneratorExpressionContext& context,
+ cmGeneratorExpressionDAGChecker* dagChecker) const
{
- if (!this->NeedsEvaluation)
- {
+ if (!this->NeedsEvaluation) {
return this->Input.c_str();
- }
+ }
this->Output = "";
- std::vector<cmGeneratorExpressionEvaluator*>::const_iterator it
- = this->Evaluators.begin();
- const std::vector<cmGeneratorExpressionEvaluator*>::const_iterator end
- = this->Evaluators.end();
+ std::vector<cmGeneratorExpressionEvaluator*>::const_iterator it =
+ this->Evaluators.begin();
+ const std::vector<cmGeneratorExpressionEvaluator*>::const_iterator end =
+ this->Evaluators.end();
- for ( ; it != end; ++it)
- {
+ for (; it != end; ++it) {
this->Output += (*it)->Evaluate(&context, dagChecker);
this->SeenTargetProperties.insert(context.SeenTargetProperties.begin(),
context.SeenTargetProperties.end());
- if (context.HadError)
- {
+ if (context.HadError) {
this->Output = "";
break;
- }
}
+ }
this->MaxLanguageStandard = context.MaxLanguageStandard;
- if (!context.HadError)
- {
+ if (!context.HadError) {
this->HadContextSensitiveCondition = context.HadContextSensitiveCondition;
this->HadHeadSensitiveCondition = context.HadHeadSensitiveCondition;
this->SourceSensitiveTargets = context.SourceSensitiveTargets;
- }
+ }
this->DependTargets = context.DependTargets;
this->AllTargetsSeen = context.AllTargets;
@@ -118,325 +107,270 @@ const char* cmCompiledGeneratorExpression::EvaluateWithContext(
}
cmCompiledGeneratorExpression::cmCompiledGeneratorExpression(
- cmListFileBacktrace const& backtrace,
- const std::string& input)
- : Backtrace(backtrace), Input(input),
- HadContextSensitiveCondition(false),
- HadHeadSensitiveCondition(false),
- EvaluateForBuildsystem(false)
+ cmListFileBacktrace const& backtrace, const std::string& input)
+ : Backtrace(backtrace)
+ , Input(input)
+ , HadContextSensitiveCondition(false)
+ , HadHeadSensitiveCondition(false)
+ , EvaluateForBuildsystem(false)
{
cmGeneratorExpressionLexer l;
- std::vector<cmGeneratorExpressionToken> tokens =
- l.Tokenize(this->Input);
+ std::vector<cmGeneratorExpressionToken> tokens = l.Tokenize(this->Input);
this->NeedsEvaluation = l.GetSawGeneratorExpression();
- if (this->NeedsEvaluation)
- {
+ if (this->NeedsEvaluation) {
cmGeneratorExpressionParser p(tokens);
p.Parse(this->Evaluators);
- }
+ }
}
-
cmCompiledGeneratorExpression::~cmCompiledGeneratorExpression()
{
cmDeleteAll(this->Evaluators);
}
std::string cmGeneratorExpression::StripEmptyListElements(
- const std::string &input)
+ const std::string& input)
{
- if (input.find(';') == input.npos)
- {
+ if (input.find(';') == input.npos) {
return input;
- }
+ }
std::string result;
result.reserve(input.size());
- const char *c = input.c_str();
- const char *last = c;
+ const char* c = input.c_str();
+ const char* last = c;
bool skipSemiColons = true;
- for ( ; *c; ++c)
- {
- if(*c == ';')
- {
- if(skipSemiColons)
- {
+ for (; *c; ++c) {
+ if (*c == ';') {
+ if (skipSemiColons) {
result.append(last, c - last);
last = c + 1;
- }
- skipSemiColons = true;
}
- else
- {
+ skipSemiColons = true;
+ } else {
skipSemiColons = false;
- }
}
+ }
result.append(last);
- if (!result.empty() && *(result.end() - 1) == ';')
- {
+ if (!result.empty() && *(result.end() - 1) == ';') {
result.resize(result.size() - 1);
- }
+ }
return result;
}
-static std::string stripAllGeneratorExpressions(const std::string &input)
+static std::string stripAllGeneratorExpressions(const std::string& input)
{
std::string result;
std::string::size_type pos = 0;
std::string::size_type lastPos = pos;
int nestingLevel = 0;
- while((pos = input.find("$<", lastPos)) != input.npos)
- {
+ while ((pos = input.find("$<", lastPos)) != input.npos) {
result += input.substr(lastPos, pos - lastPos);
pos += 2;
nestingLevel = 1;
- const char *c = input.c_str() + pos;
- const char * const cStart = c;
- for ( ; *c; ++c)
- {
- if(c[0] == '$' && c[1] == '<')
- {
+ const char* c = input.c_str() + pos;
+ const char* const cStart = c;
+ for (; *c; ++c) {
+ if (c[0] == '$' && c[1] == '<') {
++nestingLevel;
++c;
continue;
- }
- if(c[0] == '>')
- {
+ }
+ if (c[0] == '>') {
--nestingLevel;
- if (nestingLevel == 0)
- {
+ if (nestingLevel == 0) {
break;
- }
}
}
+ }
const std::string::size_type traversed = (c - cStart) + 1;
- if (!*c)
- {
+ if (!*c) {
result += "$<" + input.substr(pos, traversed);
- }
+ }
pos += traversed;
lastPos = pos;
- }
- if (nestingLevel == 0)
- {
+ }
+ if (nestingLevel == 0) {
result += input.substr(lastPos);
- }
+ }
return cmGeneratorExpression::StripEmptyListElements(result);
}
-static void prefixItems(const std::string &content, std::string &result,
- const std::string &prefix)
+static void prefixItems(const std::string& content, std::string& result,
+ const std::string& prefix)
{
std::vector<std::string> entries;
cmGeneratorExpression::Split(content, entries);
- const char *sep = "";
- for(std::vector<std::string>::const_iterator ei = entries.begin();
- ei != entries.end(); ++ei)
- {
+ const char* sep = "";
+ for (std::vector<std::string>::const_iterator ei = entries.begin();
+ ei != entries.end(); ++ei) {
result += sep;
sep = ";";
- if (!cmSystemTools::FileIsFullPath(ei->c_str())
- && cmGeneratorExpression::Find(*ei) != 0)
- {
+ if (!cmSystemTools::FileIsFullPath(ei->c_str()) &&
+ cmGeneratorExpression::Find(*ei) != 0) {
result += prefix;
- }
- result += *ei;
}
+ result += *ei;
+ }
}
-static std::string stripExportInterface(const std::string &input,
- cmGeneratorExpression::PreprocessContext context,
- bool resolveRelative)
+static std::string stripExportInterface(
+ const std::string& input, cmGeneratorExpression::PreprocessContext context,
+ bool resolveRelative)
{
std::string result;
int nestingLevel = 0;
std::string::size_type pos = 0;
std::string::size_type lastPos = pos;
- while (true)
- {
+ while (true) {
std::string::size_type bPos = input.find("$<BUILD_INTERFACE:", lastPos);
std::string::size_type iPos = input.find("$<INSTALL_INTERFACE:", lastPos);
- if (bPos == std::string::npos && iPos == std::string::npos)
- {
+ if (bPos == std::string::npos && iPos == std::string::npos) {
break;
- }
+ }
- if (bPos == std::string::npos)
- {
+ if (bPos == std::string::npos) {
pos = iPos;
- }
- else if (iPos == std::string::npos)
- {
+ } else if (iPos == std::string::npos) {
pos = bPos;
- }
- else
- {
+ } else {
pos = (bPos < iPos) ? bPos : iPos;
- }
+ }
result += input.substr(lastPos, pos - lastPos);
const bool gotInstallInterface = input[pos + 2] == 'I';
pos += gotInstallInterface ? sizeof("$<INSTALL_INTERFACE:") - 1
: sizeof("$<BUILD_INTERFACE:") - 1;
nestingLevel = 1;
- const char *c = input.c_str() + pos;
- const char * const cStart = c;
- for ( ; *c; ++c)
- {
- if(c[0] == '$' && c[1] == '<')
- {
+ const char* c = input.c_str() + pos;
+ const char* const cStart = c;
+ for (; *c; ++c) {
+ if (c[0] == '$' && c[1] == '<') {
++nestingLevel;
++c;
continue;
- }
- if(c[0] == '>')
- {
+ }
+ if (c[0] == '>') {
--nestingLevel;
- if (nestingLevel != 0)
- {
+ if (nestingLevel != 0) {
continue;
- }
- if(context == cmGeneratorExpression::BuildInterface
- && !gotInstallInterface)
- {
+ }
+ if (context == cmGeneratorExpression::BuildInterface &&
+ !gotInstallInterface) {
result += input.substr(pos, c - cStart);
- }
- else if(context == cmGeneratorExpression::InstallInterface
- && gotInstallInterface)
- {
+ } else if (context == cmGeneratorExpression::InstallInterface &&
+ gotInstallInterface) {
const std::string content = input.substr(pos, c - cStart);
- if (resolveRelative)
- {
+ if (resolveRelative) {
prefixItems(content, result, "${_IMPORT_PREFIX}/");
- }
- else
- {
+ } else {
result += content;
- }
}
- break;
}
+ break;
}
+ }
const std::string::size_type traversed = (c - cStart) + 1;
- if (!*c)
- {
+ if (!*c) {
result += std::string(gotInstallInterface ? "$<INSTALL_INTERFACE:"
- : "$<BUILD_INTERFACE:")
- + input.substr(pos, traversed);
- }
+ : "$<BUILD_INTERFACE:") +
+ input.substr(pos, traversed);
+ }
pos += traversed;
lastPos = pos;
- }
- if (nestingLevel == 0)
- {
+ }
+ if (nestingLevel == 0) {
result += input.substr(lastPos);
- }
+ }
return cmGeneratorExpression::StripEmptyListElements(result);
}
-void cmGeneratorExpression::Split(const std::string &input,
- std::vector<std::string> &output)
+void cmGeneratorExpression::Split(const std::string& input,
+ std::vector<std::string>& output)
{
std::string::size_type pos = 0;
std::string::size_type lastPos = pos;
- while((pos = input.find("$<", lastPos)) != input.npos)
- {
+ while ((pos = input.find("$<", lastPos)) != input.npos) {
std::string part = input.substr(lastPos, pos - lastPos);
std::string preGenex;
- if (!part.empty())
- {
+ if (!part.empty()) {
std::string::size_type startPos = input.rfind(";", pos);
- if (startPos == std::string::npos)
- {
+ if (startPos == std::string::npos) {
preGenex = part;
part = "";
- }
- else if (startPos != pos - 1 && startPos >= lastPos)
- {
+ } else if (startPos != pos - 1 && startPos >= lastPos) {
part = input.substr(lastPos, startPos - lastPos);
preGenex = input.substr(startPos + 1, pos - startPos - 1);
- }
- if(!part.empty())
- {
+ }
+ if (!part.empty()) {
cmSystemTools::ExpandListArgument(part, output);
- }
}
+ }
pos += 2;
int nestingLevel = 1;
- const char *c = input.c_str() + pos;
- const char * const cStart = c;
- for ( ; *c; ++c)
- {
- if(c[0] == '$' && c[1] == '<')
- {
+ const char* c = input.c_str() + pos;
+ const char* const cStart = c;
+ for (; *c; ++c) {
+ if (c[0] == '$' && c[1] == '<') {
++nestingLevel;
++c;
continue;
- }
- if(c[0] == '>')
- {
+ }
+ if (c[0] == '>') {
--nestingLevel;
- if (nestingLevel == 0)
- {
+ if (nestingLevel == 0) {
break;
- }
}
}
- for ( ; *c; ++c)
- {
+ }
+ for (; *c; ++c) {
// Capture the part after the genex and before the next ';'
- if(c[0] == ';')
- {
+ if (c[0] == ';') {
--c;
break;
- }
}
+ }
const std::string::size_type traversed = (c - cStart) + 1;
output.push_back(preGenex + "$<" + input.substr(pos, traversed));
pos += traversed;
lastPos = pos;
- }
- if (lastPos < input.size())
- {
+ }
+ if (lastPos < input.size()) {
cmSystemTools::ExpandListArgument(input.substr(lastPos), output);
- }
+ }
}
-std::string cmGeneratorExpression::Preprocess(const std::string &input,
+std::string cmGeneratorExpression::Preprocess(const std::string& input,
PreprocessContext context,
bool resolveRelative)
{
- if (context == StripAllGeneratorExpressions)
- {
+ if (context == StripAllGeneratorExpressions) {
return stripAllGeneratorExpressions(input);
- }
- else if (context == BuildInterface || context == InstallInterface)
- {
+ } else if (context == BuildInterface || context == InstallInterface) {
return stripExportInterface(input, context, resolveRelative);
- }
+ }
assert(0 && "cmGeneratorExpression::Preprocess called with invalid args");
return std::string();
}
-std::string::size_type cmGeneratorExpression::Find(const std::string &input)
+std::string::size_type cmGeneratorExpression::Find(const std::string& input)
{
const std::string::size_type openpos = input.find("$<");
- if (openpos != std::string::npos
- && input.find(">", openpos) != std::string::npos)
- {
+ if (openpos != std::string::npos &&
+ input.find(">", openpos) != std::string::npos) {
return openpos;
- }
+ }
return std::string::npos;
}
-bool cmGeneratorExpression::IsValidTargetName(const std::string &input)
+bool cmGeneratorExpression::IsValidTargetName(const std::string& input)
{
// The ':' is supported to allow use with IMPORTED targets. At least
// Qt 4 and 5 IMPORTED targets use ':' as the namespace delimiter.
@@ -445,16 +379,14 @@ bool cmGeneratorExpression::IsValidTargetName(const std::string &input)
return targetNameValidator.find(input);
}
-void
-cmCompiledGeneratorExpression::GetMaxLanguageStandard(
- const cmGeneratorTarget* tgt,
- std::map<std::string, std::string>& mapping)
+void cmCompiledGeneratorExpression::GetMaxLanguageStandard(
+ const cmGeneratorTarget* tgt, std::map<std::string, std::string>& mapping)
{
typedef std::map<cmGeneratorTarget const*,
- std::map<std::string, std::string> > MapType;
+ std::map<std::string, std::string> >
+ MapType;
MapType::const_iterator it = this->MaxLanguageStandard.find(tgt);
- if (it != this->MaxLanguageStandard.end())
- {
+ if (it != this->MaxLanguageStandard.end()) {
mapping = it->second;
- }
+ }
}