diff options
| author | Daniel Jasper <djasper@google.com> | 2013-01-14 15:40:57 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-01-14 15:40:57 +0000 |
| commit | e0b15ea7edeceb41decddfeabaf6fac935ed7baf (patch) | |
| tree | 3fe021e7d898e5ea132bcf16b613710bd1eea48a /unittests/Format/FormatTest.cpp | |
| parent | d3e8074ac9b8b2c3068b6b1dab8867f43b902715 (diff) | |
Put simple preprocessor directives on a single line.
Before: #define A \
A
After: #define A A
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172423 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Format/FormatTest.cpp')
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index e5279c442f..c088089211 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -50,8 +50,8 @@ protected: if (JustReplacedNewline) MessedUp[i - 1] = '\n'; InComment = true; - } else if (MessedUp[i] == '#' && JustReplacedNewline) { - MessedUp[i - 1] = '\n'; + } else if (MessedUp[i] == '#' && (JustReplacedNewline || i == 0)) { + if (i != 0) MessedUp[i - 1] = '\n'; InPreprocessorDirective = true; } else if (MessedUp[i] == '\\' && MessedUp[i + 1] == '\n') { MessedUp[i] = ' '; @@ -469,7 +469,7 @@ TEST_F(FormatTest, BreaksOnHashWhenDirectiveIsInvalid) { TEST_F(FormatTest, UnescapedEndOfLineEndsPPDirective) { EXPECT_EQ("#line 42 \"test\"\n", format("# \\\n line \\\n 42 \\\n \"test\"\n")); - EXPECT_EQ("#define A \\\n B\n", + EXPECT_EQ("#define A B\n", format("# \\\n define \\\n A \\\n B\n", getLLVMStyleWithColumns(12))); } @@ -477,9 +477,8 @@ TEST_F(FormatTest, UnescapedEndOfLineEndsPPDirective) { TEST_F(FormatTest, EndOfFileEndsPPDirective) { EXPECT_EQ("#line 42 \"test\"", format("# \\\n line \\\n 42 \\\n \"test\"")); - EXPECT_EQ("#define A \\\n B", - format("# \\\n define \\\n A \\\n B", - getLLVMStyleWithColumns(12))); + EXPECT_EQ("#define A B", + format("# \\\n define \\\n A \\\n B")); } TEST_F(FormatTest, IndentsPPDirectiveInReducedSpace) { @@ -491,6 +490,13 @@ TEST_F(FormatTest, IndentsPPDirectiveInReducedSpace) { verifyFormat("#define A( \\\n B)", getLLVMStyleWithColumns(12)); verifyFormat("#define AA(\\\n B)", getLLVMStyleWithColumns(12)); verifyFormat("#define A( \\\n A, B)", getLLVMStyleWithColumns(12)); + + verifyFormat("#define A A\n#define A A"); + verifyFormat("#define A(X) A\n#define A A"); + + verifyFormat("#define Something Other", getLLVMStyleWithColumns(24)); + verifyFormat("#define Something \\\n" + " Other", getLLVMStyleWithColumns(23)); } TEST_F(FormatTest, HandlePreprocessorDirectiveContext) { @@ -548,8 +554,7 @@ TEST_F(FormatTest, HashInMacroDefinition) { verifyFormat("#define A(a, b, c) \\\n" " void a##b##c()", getLLVMStyleWithColumns(22)); - verifyFormat("#define A \\\n" - " void # ## #", getLLVMStyleWithColumns(22)); + verifyFormat("#define A void # ## #", getLLVMStyleWithColumns(22)); } TEST_F(FormatTest, IndentPreprocessorDirectivesAtZero) { @@ -605,8 +610,7 @@ TEST_F(FormatTest, LayoutStatementsAroundPreprocessorDirectives) { "functionCallTo(someOtherFunction(\n" " withSomeParameters, whichInSequence,\n" " areLongerThanALine(andAnotherCall,\n" - "#define A \\\n" - " B\n" + "#define A B\n" " withMoreParamters,\n" " whichStronglyInfluenceTheLayout),\n" " andMoreParameters),\n" |