summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex/Lexer.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2008-12-01 21:46:47 +0000
committerDouglas Gregor <dgregor@apple.com>2008-12-01 21:46:47 +0000
commit90abb6dead060f19fefe1f62f761881d72495cc9 (patch)
treec5e43e4d715a4124ea6f8c171d0517db02899854 /clang/lib/Lex/Lexer.cpp
parentdce30aa0f9406227783f9e290db0c4a84e2d9fdd (diff)
downloadbcm5719-llvm-90abb6dead060f19fefe1f62f761881d72495cc9.tar.gz
bcm5719-llvm-90abb6dead060f19fefe1f62f761881d72495cc9.zip
Objective-C keywords are not always identifiers. Some are also C++ keywords
llvm-svn: 60373
Diffstat (limited to 'clang/lib/Lex/Lexer.cpp')
-rw-r--r--clang/lib/Lex/Lexer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index d72c319d97c..f85cfd9f0f0 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -41,8 +41,9 @@ static void InitCharacterInfo();
/// isObjCAtKeyword - Return true if we have an ObjC keyword identifier.
bool Token::isObjCAtKeyword(tok::ObjCKeywordKind objcKey) const {
- return is(tok::identifier) &&
- getIdentifierInfo()->getObjCKeywordID() == objcKey;
+ if (IdentifierInfo *II = getIdentifierInfo())
+ return II->getObjCKeywordID() == objcKey;
+ return false;
}
/// getObjCKeywordID - Return the ObjC keyword kind.
OpenPOWER on IntegriCloud