MyDeveloperDay updated this revision to Diff 395135. MyDeveloperDay added a comment.
Add the raw string literal cases CHANGES SINCE LAST ACTION https://reviews.llvm.org/D115938/new/ https://reviews.llvm.org/D115938 Files: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -4342,6 +4342,13 @@ TEST_F(FormatTest, HashInMacroDefinition) { EXPECT_EQ("#define A(c) L#c", format("#define A(c) L#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) u#c", format("#define A(c) u#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) U#c", format("#define A(c) U#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) u8#c", format("#define A(c) u8#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) LR#c", format("#define A(c) LR#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) uR#c", format("#define A(c) uR#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) UR#c", format("#define A(c) UR#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) u8R#c", format("#define A(c) u8R#c", getLLVMStyle())); verifyFormat("#define A \\\n b #c;", getLLVMStyleWithColumns(11)); verifyFormat("#define A \\\n" " { \\\n" Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -3225,7 +3225,13 @@ return false; if (Left.is(tok::period) || Right.is(tok::period)) return false; - if (Right.is(tok::hash) && Left.is(tok::identifier) && Left.TokenText == "L") + // u#str, U#str, L#str, u8#str + // uR#str, UR#str, LR#str, u8R#str + if (Right.is(tok::hash) && Left.is(tok::identifier) && + (Left.TokenText == "L" || Left.TokenText == "u" || + Left.TokenText == "U" || Left.TokenText == "u8" || + Left.TokenText == "LR" || Left.TokenText == "uR" || + Left.TokenText == "UR" || Left.TokenText == "u8R")) return false; if (Left.is(TT_TemplateCloser) && Left.MatchingParen && Left.MatchingParen->Previous &&
Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -4342,6 +4342,13 @@ TEST_F(FormatTest, HashInMacroDefinition) { EXPECT_EQ("#define A(c) L#c", format("#define A(c) L#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) u#c", format("#define A(c) u#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) U#c", format("#define A(c) U#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) u8#c", format("#define A(c) u8#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) LR#c", format("#define A(c) LR#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) uR#c", format("#define A(c) uR#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) UR#c", format("#define A(c) UR#c", getLLVMStyle())); + EXPECT_EQ("#define A(c) u8R#c", format("#define A(c) u8R#c", getLLVMStyle())); verifyFormat("#define A \\\n b #c;", getLLVMStyleWithColumns(11)); verifyFormat("#define A \\\n" " { \\\n" Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -3225,7 +3225,13 @@ return false; if (Left.is(tok::period) || Right.is(tok::period)) return false; - if (Right.is(tok::hash) && Left.is(tok::identifier) && Left.TokenText == "L") + // u#str, U#str, L#str, u8#str + // uR#str, UR#str, LR#str, u8R#str + if (Right.is(tok::hash) && Left.is(tok::identifier) && + (Left.TokenText == "L" || Left.TokenText == "u" || + Left.TokenText == "U" || Left.TokenText == "u8" || + Left.TokenText == "LR" || Left.TokenText == "uR" || + Left.TokenText == "UR" || Left.TokenText == "u8R")) return false; if (Left.is(TT_TemplateCloser) && Left.MatchingParen && Left.MatchingParen->Previous &&
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits