diff options
| author | Dmitri Gribenko <gribozavr@gmail.com> | 2013-04-26 20:12:49 +0000 |
|---|---|---|
| committer | Dmitri Gribenko <gribozavr@gmail.com> | 2013-04-26 20:12:49 +0000 |
| commit | 002f9281e010202b87cc120195b67df06ef3e17f (patch) | |
| tree | 06d46ba00c48f8225284312cb7f1d41423580a59 | |
| parent | a2c3646c35dd09d21b74826240aa916545b1873f (diff) | |
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
| -rw-r--r-- | lib/AST/RawCommentList.cpp | 8 | ||||
| -rw-r--r-- | test/Index/parse-all-comments.c | 6 |
2 files changed, 11 insertions, 3 deletions
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<RawComment::CommentKind, bool> getCommentKind(StringRef Comment) { - if (Comment.size() < 3 || Comment[0] != '/') +std::pair<RawComment::CommentKind, bool> 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<CommentKind, bool> K = getCommentKind(RawText); + std::pair<CommentKind, bool> K = getCommentKind(RawText, ParseAllComments); Kind = K.first; IsTrailingComment = K.second; diff --git a/test/Index/parse-all-comments.c b/test/Index/parse-all-comments.c index ac31f5b74e..f8b0449f20 100644 --- a/test/Index/parse-all-comments.c +++ b/test/Index/parse-all-comments.c @@ -28,6 +28,11 @@ void isdoxy6(void); /** But there are other blocks that are part of the comment, too. IS_DOXYGEN_END */ void multi_line_comment_plus_ordinary(int); +// MULTILINE COMMENT +// +// WITH EMPTY LINE +void multi_line_comment_empty_line(int); + #endif // RUN: rm -rf %t @@ -54,3 +59,4 @@ void multi_line_comment_plus_ordinary(int); // CHECK: parse-all-comments.c:19:6: FunctionDecl=isdoxy5:{{.*}} isdoxy5 IS_DOXYGEN_SINGLE // CHECK: parse-all-comments.c:22:6: FunctionDecl=isdoxy6:{{.*}} isdoxy6 IS_DOXYGEN_SINGLE // CHECK: parse-all-comments.c:29:6: FunctionDecl=multi_line_comment_plus_ordinary:{{.*}} BLOCK_ORDINARY_COMMENT {{.*}} ORDINARY COMMENT {{.*}} IS_DOXYGEN_START {{.*}} IS_DOXYGEN_END +// CHECK: parse-all-comments.c:34:6: FunctionDecl=multi_line_comment_empty_line:{{.*}} MULTILINE COMMENT{{.*}}\n{{.*}}\n{{.*}} WITH EMPTY LINE |