Author: alexfh Date: Tue Sep 10 08:41:43 2013 New Revision: 190408 URL: http://llvm.org/viewvc/llvm-project?rev=190408&view=rev Log: Don't divide L and #x in macro definitions. Fixes http://llvm.org/PR17144
Reviewers: djasper Reviewed By: djasper CC: cfe-commits, klimek Differential Revision: http://llvm-reviews.chandlerc.com/D1639 Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=190408&r1=190407&r2=190408&view=diff ============================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Tue Sep 10 08:41:43 2013 @@ -1286,6 +1286,8 @@ bool TokenAnnotator::spaceRequiredBetwee return false; if (Left.Type == TT_BlockComment && Left.TokenText.endswith("=*/")) return false; + if (Right.is(tok::hash) && Left.is(tok::identifier) && Left.TokenText == "L") + return false; return true; } Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=190408&r1=190407&r2=190408&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Tue Sep 10 08:41:43 2013 @@ -1930,6 +1930,7 @@ TEST_F(FormatTest, MacroDefinitionInside } TEST_F(FormatTest, HashInMacroDefinition) { + EXPECT_EQ("#define A(c) L#c", format("#define A(c) L#c", getLLVMStyle())); verifyFormat("#define A \\\n b #c;", getLLVMStyleWithColumns(11)); verifyFormat("#define A \\\n" " { \\\n" _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
