[cfe-commits] r159706 - in /cfe/trunk: include/clang/AST/OperationKinds.h include/clang/AST/RawCommentList.h lib/AST/RawCommentList.cpp lib/Sema/Sema.cpp
Abramo Bagnara
abramo.bagnara at gmail.com
Wed Jul 4 00:30:26 PDT 2012
Author: abramo
Date: Wed Jul 4 02:30:26 2012
New Revision: 159706
URL: http://llvm.org/viewvc/llvm-project?rev=159706&view=rev
Log:
Renamed RawComment kinds to avoid name clash.
Modified:
cfe/trunk/include/clang/AST/OperationKinds.h
cfe/trunk/include/clang/AST/RawCommentList.h
cfe/trunk/lib/AST/RawCommentList.cpp
cfe/trunk/lib/Sema/Sema.cpp
Modified: cfe/trunk/include/clang/AST/OperationKinds.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/OperationKinds.h?rev=159706&r1=159705&r2=159706&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/OperationKinds.h (original)
+++ cfe/trunk/include/clang/AST/OperationKinds.h Wed Jul 4 02:30:26 2012
@@ -291,7 +291,7 @@
CK_CopyAndAutoreleaseBlockObject
};
-#define CK_Invalid ((CastKind) -1)
+static const CastKind CK_Invalid = static_cast<CastKind>(-1);
enum BinaryOperatorKind {
// Operators listed in order of precedence.
Modified: cfe/trunk/include/clang/AST/RawCommentList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RawCommentList.h?rev=159706&r1=159705&r2=159706&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/RawCommentList.h (original)
+++ cfe/trunk/include/clang/AST/RawCommentList.h Wed Jul 4 02:30:26 2012
@@ -21,17 +21,17 @@
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 @@
}
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 @@
/// 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.
Modified: cfe/trunk/lib/AST/RawCommentList.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RawCommentList.cpp?rev=159706&r1=159705&r2=159706&view=diff
==============================================================================
--- cfe/trunk/lib/AST/RawCommentList.cpp (original)
+++ cfe/trunk/lib/AST/RawCommentList.cpp Wed Jul 4 02:30:26 2012
@@ -19,19 +19,19 @@
/// 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] != '/')
- 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 @@
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 @@
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 @@
IsAlmostTrailingComment = RawText.startswith("//<") ||
RawText.startswith("/*<");
} else {
- Kind = CK_Merged;
+ Kind = RCK_Merged;
IsTrailingComment = mergedCommentIsTrailingComment(RawText);
}
}
Modified: cfe/trunk/lib/Sema/Sema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=159706&r1=159705&r2=159706&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.cpp (original)
+++ cfe/trunk/lib/Sema/Sema.cpp Wed Jul 4 02:30:26 2012
@@ -1029,10 +1029,10 @@
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:
More information about the cfe-commits
mailing list