diff options
Diffstat (limited to 'include/clang')
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 3 | ||||
| -rw-r--r-- | include/clang/Lex/IdentifierTable.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index bd0b2fb32e..d0eeada474 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -41,7 +41,8 @@ //===----------------------------------------------------------------------===// // These have meaning after a '#' at the start of a line. These define enums in -// the tok::pp_* namespace. +// the tok::pp_* namespace. Note that IdentifierInfo::getPPKeywordID must be +// manually updated if something is added here. PPKEYWORD(not_keyword) // C99 6.10.1 - Conditional Inclusion. diff --git a/include/clang/Lex/IdentifierTable.h b/include/clang/Lex/IdentifierTable.h index ed9f971f45..d987285df4 100644 --- a/include/clang/Lex/IdentifierTable.h +++ b/include/clang/Lex/IdentifierTable.h @@ -39,7 +39,6 @@ namespace clang { class IdentifierInfo { tok::TokenKind TokenID : 8; // Front-end token ID or tok::identifier. unsigned BuiltinID : 9; // ID if this is a builtin (__builtin_inf). - tok::PPKeywordKind PPID : 5; // ID for preprocessor command like #'ifdef'. tok::ObjCKeywordKind ObjCID : 5; // ID for objc @ keyword like @'protocol'. bool HasMacro : 1; // True if there is a #define for this. bool IsExtension : 1; // True if identifier is a lang extension. @@ -86,8 +85,7 @@ public: /// getPPKeywordID - Return the preprocessor keyword ID for this identifier. /// For example, define will return tok::pp_define. - tok::PPKeywordKind getPPKeywordID() const { return PPID; } - void setPPKeywordID(tok::PPKeywordKind ID) { PPID = ID; } + tok::PPKeywordKind getPPKeywordID() const; /// getObjCKeywordID - Return the Objective-C keyword ID for the this /// identifier. For example, 'class' will return tok::objc_class if ObjC is |