[cfe-commits] r159309 - in /cfe/trunk: lib/AST/CommentBriefParser.cpp test/Index/annotate-comments.cpp
Dmitri Gribenko
gribozavr at gmail.com
Wed Jun 27 17:01:41 PDT 2012
Author: gribozavr
Date: Wed Jun 27 19:01:41 2012
New Revision: 159309
URL: http://llvm.org/viewvc/llvm-project?rev=159309&view=rev
Log:
Teach \brief parser about commands that start a new paragraph implicitly
Modified:
cfe/trunk/lib/AST/CommentBriefParser.cpp
cfe/trunk/test/Index/annotate-comments.cpp
Modified: cfe/trunk/lib/AST/CommentBriefParser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/CommentBriefParser.cpp?rev=159309&r1=159308&r2=159309&view=diff
==============================================================================
--- cfe/trunk/lib/AST/CommentBriefParser.cpp (original)
+++ cfe/trunk/lib/AST/CommentBriefParser.cpp Wed Jun 27 19:01:41 2012
@@ -16,7 +16,6 @@
std::string Paragraph;
bool InFirstParagraph = true;
bool InBrief = false;
- bool BriefDone = false;
while (Tok.isNot(tok::eof)) {
if (Tok.is(tok::text)) {
@@ -26,11 +25,24 @@
continue;
}
- if (!BriefDone && Tok.is(tok::command) && Tok.getCommandName() == "brief") {
- Paragraph.clear();
- InBrief = true;
- ConsumeToken();
- continue;
+ if (Tok.is(tok::command)) {
+ StringRef Name = Tok.getCommandName();
+ if (Name == "brief") {
+ Paragraph.clear();
+ InBrief = true;
+ ConsumeToken();
+ continue;
+ }
+ // Check if this command implicitly starts a new paragraph.
+ if (Name == "param" || Name == "result" || Name == "return" ||
+ Name == "returns") {
+ // We found an implicit paragraph end.
+ InFirstParagraph = false;
+ if (InBrief) {
+ InBrief = false;
+ break;
+ }
+ }
}
if (Tok.is(tok::newline)) {
@@ -44,7 +56,7 @@
InFirstParagraph = false;
if (InBrief) {
InBrief = false;
- BriefDone = true;
+ break;
}
}
continue;
Modified: cfe/trunk/test/Index/annotate-comments.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/annotate-comments.cpp?rev=159309&r1=159308&r2=159309&view=diff
==============================================================================
--- cfe/trunk/test/Index/annotate-comments.cpp (original)
+++ cfe/trunk/test/Index/annotate-comments.cpp Wed Jun 27 19:01:41 2012
@@ -198,6 +198,11 @@
#define FOO
void notdoxy46(void);
+/// IS_DOXYGEN_START Aaa bbb
+/// \param ccc
+/// \returns ddd IS_DOXYGEN_END
+void isdoxy47(int);
+
#endif
// RUN: rm -rf %t
@@ -265,4 +270,5 @@
// CHECK: annotate-comments.cpp:185:6: FunctionDecl=isdoxy44:{{.*}} BriefComment=[ IS_DOXYGEN_START Aaa bbb\n ccc.\n]
// CHECK: annotate-comments.cpp:195:6: FunctionDecl=isdoxy45:{{.*}} BriefComment=[\n Ddd eee.\n Fff.\n]
+// CHECK: annotate-comments.cpp:204:6: FunctionDecl=isdoxy47:{{.*}} BriefComment=[ IS_DOXYGEN_START Aaa bbb\n ]
More information about the cfe-commits
mailing list