From e06a8887d8ee8831619c558a459f1f17dbe8e4d0 Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Wed, 4 Jul 2012 07:30:26 +0000 Subject: [PATCH] Renamed RawComment kinds to avoid name clash. llvm-svn: 159706 --- clang/include/clang/AST/OperationKinds.h | 2 +- clang/include/clang/AST/RawCommentList.h | 24 ++++++++++++------------ clang/lib/AST/RawCommentList.cpp | 22 +++++++++++----------- clang/lib/Sema/Sema.cpp | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/clang/include/clang/AST/OperationKinds.h b/clang/include/clang/AST/OperationKinds.h index 258637d7f9bd..63594141ac66 100644 --- a/clang/include/clang/AST/OperationKinds.h +++ b/clang/include/clang/AST/OperationKinds.h @@ -291,7 +291,7 @@ enum CastKind { CK_CopyAndAutoreleaseBlockObject }; -#define CK_Invalid ((CastKind) -1) +static const CastKind CK_Invalid = static_cast(-1); enum BinaryOperatorKind { // Operators listed in order of precedence. diff --git a/clang/include/clang/AST/RawCommentList.h b/clang/include/clang/AST/RawCommentList.h index dc8bbad1d5a7..299502acb6be 100644 --- a/clang/include/clang/AST/RawCommentList.h +++ b/clang/include/clang/AST/RawCommentList.h @@ -21,17 +21,17 @@ class ASTReader; class RawComment { public: enum CommentKind { - CK_Invalid, ///< Invalid comment - CK_OrdinaryBCPL, ///< Any normal BCPL comments - CK_OrdinaryC, ///< Any normal C comment - CK_BCPLSlash, ///< \code /// stuff \endcode - CK_BCPLExcl, ///< \code //! stuff \endcode - CK_JavaDoc, ///< \code /** stuff */ \endcode - CK_Qt, ///< \code /*! stuff */ \endcode, also used by HeaderDoc - CK_Merged ///< Two or more documentation comments merged together + RCK_Invalid, ///< Invalid comment + RCK_OrdinaryBCPL, ///< Any normal BCPL comments + RCK_OrdinaryC, ///< Any normal C comment + RCK_BCPLSlash, ///< \code /// stuff \endcode + RCK_BCPLExcl, ///< \code //! stuff \endcode + RCK_JavaDoc, ///< \code /** stuff */ \endcode + RCK_Qt, ///< \code /*! stuff */ \endcode, also used by HeaderDoc + RCK_Merged ///< Two or more documentation comments merged together }; - RawComment() : Kind(CK_Invalid), IsAlmostTrailingComment(false) { } + RawComment() : Kind(RCK_Invalid), IsAlmostTrailingComment(false) { } RawComment(const SourceManager &SourceMgr, SourceRange SR, bool Merged = false); @@ -41,11 +41,11 @@ public: } bool isInvalid() const LLVM_READONLY { - return Kind == CK_Invalid; + return Kind == RCK_Invalid; } bool isMerged() const LLVM_READONLY { - return Kind == CK_Merged; + return Kind == RCK_Merged; } /// Returns true if it is a comment that should be put after a member: @@ -67,7 +67,7 @@ public: /// Returns true if this comment is not a documentation comment. bool isOrdinary() const LLVM_READONLY { - return (Kind == CK_OrdinaryBCPL) || (Kind == CK_OrdinaryC); + return (Kind == RCK_OrdinaryBCPL) || (Kind == RCK_OrdinaryC); } /// Returns true if this comment any kind of a documentation comment. diff --git a/clang/lib/AST/RawCommentList.cpp b/clang/lib/AST/RawCommentList.cpp index e7b86dffb283..791215103f0a 100644 --- a/clang/lib/AST/RawCommentList.cpp +++ b/clang/lib/AST/RawCommentList.cpp @@ -19,19 +19,19 @@ namespace { /// Get comment kind and bool describing if it is a trailing comment. std::pair getCommentKind(StringRef Comment) { if (Comment.size() < 3 || Comment[0] != '/') - return std::make_pair(RawComment::CK_Invalid, false); + return std::make_pair(RawComment::RCK_Invalid, false); RawComment::CommentKind K; if (Comment[1] == '/') { if (Comment.size() < 3) - return std::make_pair(RawComment::CK_OrdinaryBCPL, false); + return std::make_pair(RawComment::RCK_OrdinaryBCPL, false); if (Comment[2] == '/') - K = RawComment::CK_BCPLSlash; + K = RawComment::RCK_BCPLSlash; else if (Comment[2] == '!') - K = RawComment::CK_BCPLExcl; + K = RawComment::RCK_BCPLExcl; else - return std::make_pair(RawComment::CK_OrdinaryBCPL, false); + return std::make_pair(RawComment::RCK_OrdinaryBCPL, false); } else { assert(Comment.size() >= 4); @@ -40,14 +40,14 @@ std::pair getCommentKind(StringRef Comment) { if (Comment[1] != '*' || Comment[Comment.size() - 2] != '*' || Comment[Comment.size() - 1] != '/') - return std::make_pair(RawComment::CK_Invalid, false); + return std::make_pair(RawComment::RCK_Invalid, false); if (Comment[2] == '*') - K = RawComment::CK_JavaDoc; + K = RawComment::RCK_JavaDoc; else if (Comment[2] == '!') - K = RawComment::CK_Qt; + K = RawComment::RCK_Qt; else - return std::make_pair(RawComment::CK_OrdinaryC, false); + return std::make_pair(RawComment::RCK_OrdinaryC, false); } const bool TrailingComment = (Comment.size() > 3) && (Comment[3] == '<'); return std::make_pair(K, TrailingComment); @@ -65,7 +65,7 @@ RawComment::RawComment(const SourceManager &SourceMgr, SourceRange SR, BeginLineValid(false), EndLineValid(false) { // Extract raw comment text, if possible. if (SR.getBegin() == SR.getEnd() || getRawText(SourceMgr).empty()) { - Kind = CK_Invalid; + Kind = RCK_Invalid; return; } @@ -78,7 +78,7 @@ RawComment::RawComment(const SourceManager &SourceMgr, SourceRange SR, IsAlmostTrailingComment = RawText.startswith("//<") || RawText.startswith("/*<"); } else { - Kind = CK_Merged; + Kind = RCK_Merged; IsTrailingComment = mergedCommentIsTrailingComment(RawText); } } diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index 42d5fb748109..0569a3725c90 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -1029,10 +1029,10 @@ void Sema::ActOnComment(SourceRange Comment) { Comment.getBegin().getLocWithOffset(3)); StringRef MagicMarkerText; switch (RC.getKind()) { - case RawComment::CK_OrdinaryBCPL: + case RawComment::RCK_OrdinaryBCPL: MagicMarkerText = "///<"; break; - case RawComment::CK_OrdinaryC: + case RawComment::RCK_OrdinaryC: MagicMarkerText = "/**<"; break; default: