summaryrefslogtreecommitdiffstats
path: root/Source/cmConditionEvaluator.h
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/cmConditionEvaluator.h
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/cmConditionEvaluator.h')
-rw-r--r--Source/cmConditionEvaluator.h101
1 files changed, 45 insertions, 56 deletions
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index 3ed512d..3f8c984 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -22,75 +22,64 @@ class cmConditionEvaluator
public:
typedef std::list<cmExpandedCommandArgument> cmArgumentList;
- cmConditionEvaluator(cmMakefile& makefile,
- cmListFileContext const& context,
+ cmConditionEvaluator(cmMakefile& makefile, cmListFileContext const& context,
cmListFileBacktrace const& bt);
// this is a shared function for both If and Else to determine if the
// arguments were valid, and if so, was the response true. If there is
// an error, the errorString will be set.
- bool IsTrue(const std::vector<cmExpandedCommandArgument> &args,
- std::string &errorString,
- cmake::MessageType &status);
+ bool IsTrue(const std::vector<cmExpandedCommandArgument>& args,
+ std::string& errorString, cmake::MessageType& status);
private:
// Filter the given variable definition based on policy CMP0054.
const char* GetDefinitionIfUnquoted(
- const cmExpandedCommandArgument& argument) const;
+ const cmExpandedCommandArgument& argument) const;
const char* GetVariableOrString(
- const cmExpandedCommandArgument& argument) const;
+ const cmExpandedCommandArgument& argument) const;
bool IsKeyword(std::string const& keyword,
- cmExpandedCommandArgument& argument) const;
-
- bool GetBooleanValue(
- cmExpandedCommandArgument& arg) const;
-
- bool GetBooleanValueOld(
- cmExpandedCommandArgument const& arg, bool one) const;
-
- bool GetBooleanValueWithAutoDereference(
- cmExpandedCommandArgument &newArg,
- std::string &errorString,
- cmake::MessageType &status,
- bool oneArg = false) const;
-
- void IncrementArguments(
- cmArgumentList &newArgs,
- cmArgumentList::iterator &argP1,
- cmArgumentList::iterator &argP2) const;
-
- void HandlePredicate(bool value, int &reducible,
- cmArgumentList::iterator &arg,
- cmArgumentList &newArgs,
- cmArgumentList::iterator &argP1,
- cmArgumentList::iterator &argP2) const;
-
- void HandleBinaryOp(bool value, int &reducible,
- cmArgumentList::iterator &arg,
- cmArgumentList &newArgs,
- cmArgumentList::iterator &argP1,
- cmArgumentList::iterator &argP2);
-
- bool HandleLevel0(cmArgumentList &newArgs,
- std::string &errorString,
- cmake::MessageType &status);
-
- bool HandleLevel1(cmArgumentList &newArgs,
- std::string &, cmake::MessageType &);
-
- bool HandleLevel2(cmArgumentList &newArgs,
- std::string &errorString,
- cmake::MessageType &status);
-
- bool HandleLevel3(cmArgumentList &newArgs,
- std::string &errorString,
- cmake::MessageType &status);
-
- bool HandleLevel4(cmArgumentList &newArgs,
- std::string &errorString,
- cmake::MessageType &status);
+ cmExpandedCommandArgument& argument) const;
+
+ bool GetBooleanValue(cmExpandedCommandArgument& arg) const;
+
+ bool GetBooleanValueOld(cmExpandedCommandArgument const& arg,
+ bool one) const;
+
+ bool GetBooleanValueWithAutoDereference(cmExpandedCommandArgument& newArg,
+ std::string& errorString,
+ cmake::MessageType& status,
+ bool oneArg = false) const;
+
+ void IncrementArguments(cmArgumentList& newArgs,
+ cmArgumentList::iterator& argP1,
+ cmArgumentList::iterator& argP2) const;
+
+ void HandlePredicate(bool value, int& reducible,
+ cmArgumentList::iterator& arg, cmArgumentList& newArgs,
+ cmArgumentList::iterator& argP1,
+ cmArgumentList::iterator& argP2) const;
+
+ void HandleBinaryOp(bool value, int& reducible,
+ cmArgumentList::iterator& arg, cmArgumentList& newArgs,
+ cmArgumentList::iterator& argP1,
+ cmArgumentList::iterator& argP2);
+
+ bool HandleLevel0(cmArgumentList& newArgs, std::string& errorString,
+ cmake::MessageType& status);
+
+ bool HandleLevel1(cmArgumentList& newArgs, std::string&,
+ cmake::MessageType&);
+
+ bool HandleLevel2(cmArgumentList& newArgs, std::string& errorString,
+ cmake::MessageType& status);
+
+ bool HandleLevel3(cmArgumentList& newArgs, std::string& errorString,
+ cmake::MessageType& status);
+
+ bool HandleLevel4(cmArgumentList& newArgs, std::string& errorString,
+ cmake::MessageType& status);
cmMakefile& Makefile;
cmListFileContext ExecutionContext;