From 1b7bbb72f94762e6747adf5636bb9aa599f7a1fb Mon Sep 17 00:00:00 2001 From: Clement Courbet Date: Thu, 17 May 2018 06:46:15 +0000 Subject: [PATCH] Fix rL332458: [AST] Added a helper to extract a user-friendly text of a comment. Older gcc versions do not support raw string literals within macros. llvm-svn: 332576 --- clang/unittests/AST/CommentTextTest.cpp | 30 +++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/clang/unittests/AST/CommentTextTest.cpp b/clang/unittests/AST/CommentTextTest.cpp index 05003b599ea6..04475f1c1061 100644 --- a/clang/unittests/AST/CommentTextTest.cpp +++ b/clang/unittests/AST/CommentTextTest.cpp @@ -58,49 +58,54 @@ For example, this result. That's about it.)"; // Two-slash comments. - EXPECT_EQ(ExpectedOutput, formatComment( + auto Formatted = formatComment( R"cpp( // This function does this and that. // For example, // Runnning it in that case will give you // this result. -// That's about it.)cpp")); +// That's about it.)cpp"); + EXPECT_EQ(ExpectedOutput, Formatted); // Three-slash comments. - EXPECT_EQ(ExpectedOutput, formatComment( + Formatted = formatComment( R"cpp( /// This function does this and that. /// For example, /// Runnning it in that case will give you /// this result. -/// That's about it.)cpp")); +/// That's about it.)cpp"); + EXPECT_EQ(ExpectedOutput, Formatted); // Block comments. - EXPECT_EQ(ExpectedOutput, formatComment( + Formatted = formatComment( R"cpp( /* This function does this and that. * For example, * Runnning it in that case will give you * this result. - * That's about it.*/)cpp")); + * That's about it.*/)cpp"); + EXPECT_EQ(ExpectedOutput, Formatted); // Doxygen-style block comments. - EXPECT_EQ(ExpectedOutput, formatComment( + Formatted = formatComment( R"cpp( /** This function does this and that. * For example, * Runnning it in that case will give you * this result. - * That's about it.*/)cpp")); + * That's about it.*/)cpp"); + EXPECT_EQ(ExpectedOutput, Formatted); // Weird indentation. - EXPECT_EQ(ExpectedOutput, formatComment( + Formatted = formatComment( R"cpp( // This function does this and that. // For example, // Runnning it in that case will give you // this result. - // That's about it.)cpp")); + // That's about it.)cpp"); + EXPECT_EQ(ExpectedOutput, Formatted); // clang-format on } @@ -111,11 +116,12 @@ R"(\brief This is the brief part of the comment. \param a something about a. @param b something about b.)"; - EXPECT_EQ(ExpectedOutput, formatComment( + auto Formatted = formatComment( R"cpp( /// \brief This is the brief part of the comment. /// \param a something about a. -/// @param b something about b.)cpp")); +/// @param b something about b.)cpp"); + EXPECT_EQ(ExpectedOutput, Formatted); // clang-format on } -- 2.34.1