summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpressionDAGChecker.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/cmGeneratorExpressionDAGChecker.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/cmGeneratorExpressionDAGChecker.cxx')
-rw-r--r--Source/cmGeneratorExpressionDAGChecker.cxx213
1 files changed, 99 insertions, 114 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 17bafde..c700156 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -16,63 +16,62 @@
#include "cmLocalGenerator.h"
cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
- const cmListFileBacktrace &backtrace,
- const std::string &target,
- const std::string &property,
- const GeneratorExpressionContent *content,
- cmGeneratorExpressionDAGChecker *parent)
- : Parent(parent), Target(target), Property(property),
- Content(content), Backtrace(backtrace), TransitivePropertiesOnly(false)
+ const cmListFileBacktrace& backtrace, const std::string& target,
+ const std::string& property, const GeneratorExpressionContent* content,
+ cmGeneratorExpressionDAGChecker* parent)
+ : Parent(parent)
+ , Target(target)
+ , Property(property)
+ , Content(content)
+ , Backtrace(backtrace)
+ , TransitivePropertiesOnly(false)
{
Initialize();
}
cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
- const std::string &target,
- const std::string &property,
- const GeneratorExpressionContent *content,
- cmGeneratorExpressionDAGChecker *parent)
- : Parent(parent), Target(target), Property(property),
- Content(content), Backtrace(), TransitivePropertiesOnly(false)
+ const std::string& target, const std::string& property,
+ const GeneratorExpressionContent* content,
+ cmGeneratorExpressionDAGChecker* parent)
+ : Parent(parent)
+ , Target(target)
+ , Property(property)
+ , Content(content)
+ , Backtrace()
+ , TransitivePropertiesOnly(false)
{
Initialize();
}
-void
-cmGeneratorExpressionDAGChecker::Initialize()
+void cmGeneratorExpressionDAGChecker::Initialize()
{
- const cmGeneratorExpressionDAGChecker *top = this;
- const cmGeneratorExpressionDAGChecker *p = this->Parent;
- while (p)
- {
+ const cmGeneratorExpressionDAGChecker* top = this;
+ const cmGeneratorExpressionDAGChecker* p = this->Parent;
+ while (p) {
top = p;
p = p->Parent;
- }
+ }
this->CheckResult = this->CheckGraph();
-#define TEST_TRANSITIVE_PROPERTY_METHOD(METHOD) \
- top->METHOD () ||
+#define TEST_TRANSITIVE_PROPERTY_METHOD(METHOD) top->METHOD() ||
- if (CheckResult == DAG && (
- CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(TEST_TRANSITIVE_PROPERTY_METHOD)
- false)
- )
+ if (CheckResult == DAG && (CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(
+ TEST_TRANSITIVE_PROPERTY_METHOD) false))
#undef TEST_TRANSITIVE_PROPERTY_METHOD
- {
- std::map<std::string, std::set<std::string> >::const_iterator it
- = top->Seen.find(this->Target);
- if (it != top->Seen.end())
- {
- const std::set<std::string> &propSet = it->second;
- if (propSet.find(this->Property) != propSet.end())
- {
+ {
+ std::map<std::string, std::set<std::string> >::const_iterator it =
+ top->Seen.find(this->Target);
+ if (it != top->Seen.end()) {
+ const std::set<std::string>& propSet = it->second;
+ if (propSet.find(this->Property) != propSet.end()) {
this->CheckResult = ALREADY_SEEN;
return;
- }
}
- const_cast<cmGeneratorExpressionDAGChecker *>(top)
- ->Seen[this->Target].insert(this->Property);
}
+ const_cast<cmGeneratorExpressionDAGChecker*>(top)
+ ->Seen[this->Target]
+ .insert(this->Property);
+ }
}
cmGeneratorExpressionDAGChecker::Result
@@ -82,158 +81,144 @@ cmGeneratorExpressionDAGChecker::Check() const
}
void cmGeneratorExpressionDAGChecker::ReportError(
- cmGeneratorExpressionContext *context,
- const std::string &expr)
+ cmGeneratorExpressionContext* context, const std::string& expr)
{
- if (this->CheckResult == DAG)
- {
+ if (this->CheckResult == DAG) {
return;
- }
+ }
context->HadError = true;
- if (context->Quiet)
- {
+ if (context->Quiet) {
return;
- }
+ }
- const cmGeneratorExpressionDAGChecker *parent = this->Parent;
+ const cmGeneratorExpressionDAGChecker* parent = this->Parent;
- if (parent && !parent->Parent)
- {
+ if (parent && !parent->Parent) {
std::ostringstream e;
e << "Error evaluating generator expression:\n"
<< " " << expr << "\n"
- << "Self reference on target \""
- << context->HeadTarget->GetName() << "\".\n";
- context->LG->GetCMakeInstance()
- ->IssueMessage(cmake::FATAL_ERROR, e.str(),
- parent->Backtrace);
+ << "Self reference on target \"" << context->HeadTarget->GetName()
+ << "\".\n";
+ context->LG->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+ parent->Backtrace);
return;
- }
+ }
{
- std::ostringstream e;
- /* clang-format off */
+ std::ostringstream e;
+ /* clang-format off */
e << "Error evaluating generator expression:\n"
<< " " << expr << "\n"
<< "Dependency loop found.";
- /* clang-format on */
- context->LG->GetCMakeInstance()
- ->IssueMessage(cmake::FATAL_ERROR, e.str(),
- context->Backtrace);
+ /* clang-format on */
+ context->LG->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+ context->Backtrace);
}
int loopStep = 1;
- while (parent)
- {
+ while (parent) {
std::ostringstream e;
e << "Loop step " << loopStep << "\n"
<< " "
<< (parent->Content ? parent->Content->GetOriginalExpression() : expr)
<< "\n";
- context->LG->GetCMakeInstance()
- ->IssueMessage(cmake::FATAL_ERROR, e.str(),
- parent->Backtrace);
+ context->LG->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+ parent->Backtrace);
parent = parent->Parent;
++loopStep;
- }
+ }
}
cmGeneratorExpressionDAGChecker::Result
cmGeneratorExpressionDAGChecker::CheckGraph() const
{
- const cmGeneratorExpressionDAGChecker *parent = this->Parent;
- while (parent)
- {
- if (this->Target == parent->Target && this->Property == parent->Property)
- {
+ const cmGeneratorExpressionDAGChecker* parent = this->Parent;
+ while (parent) {
+ if (this->Target == parent->Target && this->Property == parent->Property) {
return (parent == this->Parent) ? SELF_REFERENCE : CYCLIC_REFERENCE;
- }
- parent = parent->Parent;
}
+ parent = parent->Parent;
+ }
return DAG;
}
bool cmGeneratorExpressionDAGChecker::GetTransitivePropertiesOnly()
{
- const cmGeneratorExpressionDAGChecker *top = this;
- const cmGeneratorExpressionDAGChecker *parent = this->Parent;
- while (parent)
- {
+ const cmGeneratorExpressionDAGChecker* top = this;
+ const cmGeneratorExpressionDAGChecker* parent = this->Parent;
+ while (parent) {
top = parent;
parent = parent->Parent;
- }
+ }
return top->TransitivePropertiesOnly;
}
-bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(const char *tgt)
+bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(const char* tgt)
{
- const cmGeneratorExpressionDAGChecker *top = this;
- const cmGeneratorExpressionDAGChecker *parent = this->Parent;
- while (parent)
- {
+ const cmGeneratorExpressionDAGChecker* top = this;
+ const cmGeneratorExpressionDAGChecker* parent = this->Parent;
+ while (parent) {
top = parent;
parent = parent->Parent;
- }
+ }
- const char *prop = top->Property.c_str();
+ const char* prop = top->Property.c_str();
- if (tgt)
- {
+ if (tgt) {
return top->Target == tgt && strcmp(prop, "LINK_LIBRARIES") == 0;
- }
+ }
- return (strcmp(prop, "LINK_LIBRARIES") == 0
- || strcmp(prop, "LINK_INTERFACE_LIBRARIES") == 0
- || strcmp(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
- || cmHasLiteralPrefix(prop, "LINK_INTERFACE_LIBRARIES_")
- || cmHasLiteralPrefix(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES_"))
- || strcmp(prop, "INTERFACE_LINK_LIBRARIES") == 0;
+ return (strcmp(prop, "LINK_LIBRARIES") == 0 ||
+ strcmp(prop, "LINK_INTERFACE_LIBRARIES") == 0 ||
+ strcmp(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES") == 0 ||
+ cmHasLiteralPrefix(prop, "LINK_INTERFACE_LIBRARIES_") ||
+ cmHasLiteralPrefix(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES_")) ||
+ strcmp(prop, "INTERFACE_LINK_LIBRARIES") == 0;
}
std::string cmGeneratorExpressionDAGChecker::TopTarget() const
{
- const cmGeneratorExpressionDAGChecker *top = this;
- const cmGeneratorExpressionDAGChecker *parent = this->Parent;
- while (parent)
- {
+ const cmGeneratorExpressionDAGChecker* top = this;
+ const cmGeneratorExpressionDAGChecker* parent = this->Parent;
+ while (parent) {
top = parent;
parent = parent->Parent;
- }
+ }
return top->Target;
}
-enum TransitiveProperty {
+enum TransitiveProperty
+{
#define DEFINE_ENUM_ENTRY(NAME) NAME,
CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(DEFINE_ENUM_ENTRY)
#undef DEFINE_ENUM_ENTRY
- TransitivePropertyTerminal
+ TransitivePropertyTerminal
};
-template<TransitiveProperty>
+template <TransitiveProperty>
bool additionalTest(const char* const)
{
return false;
}
-template<>
+template <>
bool additionalTest<COMPILE_DEFINITIONS>(const char* const prop)
{
return cmHasLiteralPrefix(prop, "COMPILE_DEFINITIONS_");
}
-#define DEFINE_TRANSITIVE_PROPERTY_METHOD(METHOD, PROPERTY) \
-bool cmGeneratorExpressionDAGChecker::METHOD() const \
-{ \
- const char* const prop = this->Property.c_str(); \
- if (strcmp(prop, #PROPERTY) == 0 \
- || strcmp(prop, "INTERFACE_" #PROPERTY) == 0) \
- { \
- return true; \
- } \
- return additionalTest<PROPERTY>(prop); \
-}
+#define DEFINE_TRANSITIVE_PROPERTY_METHOD(METHOD, PROPERTY) \
+ bool cmGeneratorExpressionDAGChecker::METHOD() const \
+ { \
+ const char* const prop = this->Property.c_str(); \
+ if (strcmp(prop, #PROPERTY) == 0 || \
+ strcmp(prop, "INTERFACE_" #PROPERTY) == 0) { \
+ return true; \
+ } \
+ return additionalTest<PROPERTY>(prop); \
+ }
CM_FOR_EACH_TRANSITIVE_PROPERTY(DEFINE_TRANSITIVE_PROPERTY_METHOD)