From 90abb6dead060f19fefe1f62f761881d72495cc9 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 1 Dec 2008 21:46:47 +0000 Subject: Objective-C keywords are not always identifiers. Some are also C++ keywords llvm-svn: 60373 --- clang/lib/Lex/Lexer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'clang/lib/Lex/Lexer.cpp') 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. -- cgit v1.2.3