From 002f9281e010202b87cc120195b67df06ef3e17f Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Fri, 26 Apr 2013 20:12:49 +0000 Subject: Comment parsing: -fparse-all-comments: recognize empty line comments In -fparse-all-comments mode empty '//' comments were recognized as RCK_Invalid, and were not merged with next and previous lines. Patch by Amin Shali. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@180625 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/RawCommentList.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/AST/RawCommentList.cpp') diff --git a/lib/AST/RawCommentList.cpp b/lib/AST/RawCommentList.cpp index 7816459380..fb85c142e3 100644 --- a/lib/AST/RawCommentList.cpp +++ b/lib/AST/RawCommentList.cpp @@ -21,8 +21,10 @@ using namespace clang; namespace { /// Get comment kind and bool describing if it is a trailing comment. -std::pair getCommentKind(StringRef Comment) { - if (Comment.size() < 3 || Comment[0] != '/') +std::pair getCommentKind(StringRef Comment, + bool ParseAllComments) { + const size_t MinCommentLength = ParseAllComments ? 2 : 3; + if ((Comment.size() < MinCommentLength) || Comment[0] != '/') return std::make_pair(RawComment::RCK_Invalid, false); RawComment::CommentKind K; @@ -76,7 +78,7 @@ RawComment::RawComment(const SourceManager &SourceMgr, SourceRange SR, if (!Merged) { // Guess comment kind. - std::pair K = getCommentKind(RawText); + std::pair K = getCommentKind(RawText, ParseAllComments); Kind = K.first; IsTrailingComment = K.second; -- cgit v1.2.3-70-g09d2