summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpressionLexer.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/cmGeneratorExpressionLexer.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/cmGeneratorExpressionLexer.cxx')
-rw-r--r--Source/cmGeneratorExpressionLexer.cxx45
1 files changed, 20 insertions, 25 deletions
diff --git a/Source/cmGeneratorExpressionLexer.cxx b/Source/cmGeneratorExpressionLexer.cxx
index 6a1ddf4..5a4eccc 100644
--- a/Source/cmGeneratorExpressionLexer.cxx
+++ b/Source/cmGeneratorExpressionLexer.cxx
@@ -11,68 +11,63 @@
============================================================================*/
#include "cmGeneratorExpressionLexer.h"
-
cmGeneratorExpressionLexer::cmGeneratorExpressionLexer()
- : SawBeginExpression(false), SawGeneratorExpression(false)
+ : SawBeginExpression(false)
+ , SawGeneratorExpression(false)
{
-
}
-static void InsertText(const char *upto, const char *c,
- std::vector<cmGeneratorExpressionToken> &result)
+static void InsertText(const char* upto, const char* c,
+ std::vector<cmGeneratorExpressionToken>& result)
{
- if (upto != c)
- {
+ if (upto != c) {
result.push_back(cmGeneratorExpressionToken(
- cmGeneratorExpressionToken::Text, upto, c - upto));
- }
+ cmGeneratorExpressionToken::Text, upto, c - upto));
+ }
}
-std::vector<cmGeneratorExpressionToken>
-cmGeneratorExpressionLexer::Tokenize(const std::string& input)
+std::vector<cmGeneratorExpressionToken> cmGeneratorExpressionLexer::Tokenize(
+ const std::string& input)
{
std::vector<cmGeneratorExpressionToken> result;
- const char *c = input.c_str();
- const char *upto = c;
+ const char* c = input.c_str();
+ const char* upto = c;
- for ( ; *c; ++c)
- {
- switch(*c)
- {
+ for (; *c; ++c) {
+ switch (*c) {
case '$':
- if(c[1] == '<')
- {
+ if (c[1] == '<') {
InsertText(upto, c, result);
result.push_back(cmGeneratorExpressionToken(
- cmGeneratorExpressionToken::BeginExpression, c, 2));
+ cmGeneratorExpressionToken::BeginExpression, c, 2));
upto = c + 2;
++c;
SawBeginExpression = true;
- }
+ }
break;
case '>':
InsertText(upto, c, result);
result.push_back(cmGeneratorExpressionToken(
- cmGeneratorExpressionToken::EndExpression, c, 1));
+ cmGeneratorExpressionToken::EndExpression, c, 1));
upto = c + 1;
SawGeneratorExpression = SawBeginExpression;
break;
case ':':
InsertText(upto, c, result);
result.push_back(cmGeneratorExpressionToken(
- cmGeneratorExpressionToken::ColonSeparator, c, 1));
+ cmGeneratorExpressionToken::ColonSeparator, c, 1));
upto = c + 1;
break;
case ',':
InsertText(upto, c, result);
result.push_back(cmGeneratorExpressionToken(
- cmGeneratorExpressionToken::CommaSeparator, c, 1));
+ cmGeneratorExpressionToken::CommaSeparator, c, 1));
upto = c + 1;
break;
default:
break;
- }
+ }
}
InsertText(upto, c, result);