From 6738e430a9919f5a94893ade27c2845f89c2938d Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Sat, 4 May 2013 00:47:28 +0000
Subject: [PATCH] [doc parsing]: Make warning about unknown command tags off by
 default for now. Move diagnostic code to DiagnosticCommentKinds.td. //
 rdar://12381408

llvm-svn: 181081
---
 clang/include/clang/Basic/DiagnosticCommentKinds.td | 3 +++
 clang/include/clang/Basic/DiagnosticLexKinds.td     | 6 +-----
 clang/lib/AST/CommentLexer.cpp                      | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/clang/include/clang/Basic/DiagnosticCommentKinds.td b/clang/include/clang/Basic/DiagnosticCommentKinds.td
index 3880e0e5b4fa..3df03cdb3315 100644
--- a/clang/include/clang/Basic/DiagnosticCommentKinds.td
+++ b/clang/include/clang/Basic/DiagnosticCommentKinds.td
@@ -156,5 +156,8 @@ def warn_verbatim_block_end_without_start : Warning<
   "'%select{\\|@}0%1' command does not terminate a verbatim text block">,
   InGroup<Documentation>, DefaultIgnore;
 
+def warn_unknown_comment_command_name : Warning<
+  "unknown command tag name">, InGroup<Documentation>, DefaultIgnore;
+
 } // end of documentation issue category
 } // end of AST component
diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td
index fb0ab3c1a441..548823f1f0b8 100644
--- a/clang/include/clang/Basic/DiagnosticLexKinds.td
+++ b/clang/include/clang/Basic/DiagnosticLexKinds.td
@@ -27,10 +27,6 @@ def backslash_newline_space : Warning<
   "backslash and newline separated by space">,
   InGroup<DiagGroup<"backslash-newline-escape">>;
 
-// comment parsing
-def warn_unknown_comment_command_name : Warning<
-  "unknown command tag name">, InGroup<DiagGroup<"comment-command-tag">>;
-
 // Digraphs.
 def warn_cxx98_compat_less_colon_colon : Warning<
   "'<::' is treated as digraph '<:' (aka '[') followed by ':' in C++98">,
@@ -590,4 +586,4 @@ def warn_uncovered_module_header : Warning<
 def err_expected_id_building_module : Error<
   "expected a module name in '__building_module' expression">;
   
-}
\ No newline at end of file
+}
diff --git a/clang/lib/AST/CommentLexer.cpp b/clang/lib/AST/CommentLexer.cpp
index 82efac64ff5f..70410d61085d 100644
--- a/clang/lib/AST/CommentLexer.cpp
+++ b/clang/lib/AST/CommentLexer.cpp
@@ -1,6 +1,6 @@
 #include "clang/AST/CommentLexer.h"
-#include "clang/Lex/LexDiagnostic.h"
 #include "clang/AST/CommentCommandTraits.h"
+#include "clang/AST/CommentDiagnostic.h"
 #include "clang/Basic/CharInfo.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -354,8 +354,7 @@ void Lexer::lexCommentText(Token &T) {
         if (!Info) {
           formTokenWithChars(T, TokenPtr, tok::unknown_command);
           T.setUnknownCommandName(CommandName);
-          Diag(T.getLocation(),
-               diag::warn_unknown_comment_command_name);
+          Diag(T.getLocation(), diag::warn_unknown_comment_command_name);
           return;
         }
         if (Info->IsVerbatimBlockCommand) {