From: Dmitri Gribenko Date: Tue, 24 Jul 2012 21:44:16 +0000 (+0000) Subject: Comment diagnostics: add warning for multiple \param commands with duplicate X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6582277bfc8bb587602e2c0689b6b2ff4b9bef53;p=clang Comment diagnostics: add warning for multiple \param commands with duplicate parameter names. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160696 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/CommentSema.h b/include/clang/AST/CommentSema.h index f8b35d0c6f..56d61f1693 100644 --- a/include/clang/AST/CommentSema.h +++ b/include/clang/AST/CommentSema.h @@ -46,6 +46,13 @@ class Sema { /// Contains a valid value if \c IsThisDeclInspected is true. ArrayRef ParamVars; + /// Comment AST nodes that correspond to \c ParamVars for which we have + /// found a \\param command or NULL if no documentation was found so far. + /// + /// Has correct size and contains valid values if \c IsThisDeclInspected is + /// true. + llvm::SmallVector ParamVarDocs; + /// True if we extracted all important information from \c ThisDecl into /// \c Sema members. unsigned IsThisDeclInspected : 1; diff --git a/include/clang/Basic/DiagnosticCommentKinds.td b/include/clang/Basic/DiagnosticCommentKinds.td index 890606a85a..91aa5f19e6 100644 --- a/include/clang/Basic/DiagnosticCommentKinds.td +++ b/include/clang/Basic/DiagnosticCommentKinds.td @@ -63,6 +63,13 @@ def warn_doc_param_not_attached_to_a_function_decl : Warning< "a function declaration">, InGroup, DefaultIgnore; +def warn_doc_param_duplicate : Warning< + "parameter '%0' is already documented">, + InGroup, DefaultIgnore; + +def note_doc_param_previous : Note< + "previous documentation">; + def warn_doc_param_not_found : Warning< "parameter '%0' not found in the function declaration">, InGroup, DefaultIgnore; diff --git a/lib/AST/CommentSema.cpp b/lib/AST/CommentSema.cpp index 8fa8ab7d06..5301bfebe9 100644 --- a/lib/AST/CommentSema.cpp +++ b/lib/AST/CommentSema.cpp @@ -153,6 +153,15 @@ ParamCommandComment *Sema::actOnParamCommandParamNameArg( const unsigned ResolvedParamIndex = resolveParmVarReference(Arg, ParamVars); if (ResolvedParamIndex != ParamCommandComment::InvalidParamIndex) { Command->setParamIndex(ResolvedParamIndex); + if (ParamVarDocs[ResolvedParamIndex]) { + SourceRange ArgRange(ArgLocBegin, ArgLocEnd); + Diag(ArgLocBegin, diag::warn_doc_param_duplicate) + << Arg << ArgRange; + ParamCommandComment *PrevCommand = ParamVarDocs[ResolvedParamIndex]; + Diag(PrevCommand->getLocation(), diag::note_doc_param_previous) + << PrevCommand->getParamNameRange(); + } + ParamVarDocs[ResolvedParamIndex] = Command; return Command; } @@ -351,7 +360,6 @@ HTMLEndTagComment *Sema::actOnHTMLEndTag(SourceLocation LocBegin, FullComment *Sema::actOnFullComment( ArrayRef Blocks) { - SmallVector Params; return new (Allocator) FullComment(Blocks); } @@ -382,6 +390,7 @@ ArrayRef Sema::getParamVars() { } void Sema::inspectThisDecl() { + assert(!IsThisDeclInspected); if (!ThisDecl) { IsFunctionDecl = false; ParamVars = ArrayRef(); @@ -397,6 +406,7 @@ void Sema::inspectThisDecl() { IsFunctionDecl = false; ParamVars = ArrayRef(); } + ParamVarDocs.resize(ParamVars.size(), NULL); IsThisDeclInspected = true; } diff --git a/test/Sema/warn-documentation.cpp b/test/Sema/warn-documentation.cpp index 69e12b5097..b59c6e4c5b 100644 --- a/test/Sema/warn-documentation.cpp +++ b/test/Sema/warn-documentation.cpp @@ -166,6 +166,18 @@ class C { int test_param14(int bbb, int ccc); }; +// expected-warning@+3 {{parameter 'a' is already documented}} +// expected-note@+1 {{previous documentation}} +/// \param a Aaa. +/// \param a Aaa. +int test_param15(int a); + +// expected-warning@+4 {{parameter 'x2' is already documented}} +// expected-note@+2 {{previous documentation}} +/// \param x1 Aaa. +/// \param x2 Bbb. +/// \param x2 Ccc. +int test_param16(int x1, int x2, int x3); // expected-warning@+1 {{empty paragraph passed to '\brief' command}} int test1; ///< \brief\brief Aaa