[cfe-commits] r60373 - in /cfe/trunk: lib/Lex/Lexer.cpp test/Parser/objc-try-catch-1.m

[Douglas Gregor]

Author: dgregor
Date: Mon Dec  1 15:46:47 2008
New Revision: 60373

URL: http://llvm.org/viewvc/llvm-project?rev=60373&view=rev
Log:
Objective-C keywords are not always identifiers. Some are also C++ keywords

Modified:
    cfe/trunk/lib/Lex/Lexer.cpp
    cfe/trunk/test/Parser/objc-try-catch-1.m

Modified: cfe/trunk/lib/Lex/Lexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Lexer.cpp?rev=60373&r1=60372&r2=60373&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/Lexer.cpp (original)
+++ cfe/trunk/lib/Lex/Lexer.cpp Mon Dec  1 15:46:47 2008
@@ -41,8 +41,9 @@
 
 /// 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.

Modified: cfe/trunk/test/Parser/objc-try-catch-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/objc-try-catch-1.m?rev=60373&r1=60372&r2=60373&view=diff

==============================================================================
--- cfe/trunk/test/Parser/objc-try-catch-1.m (original)
+++ cfe/trunk/test/Parser/objc-try-catch-1.m Mon Dec  1 15:46:47 2008
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s
-
+// RUN: clang -fsyntax-only -verify %s &&
+// RUN: clang -fsyntax-only -verify -x objective-c++ %s
 void * proc();
 
 @interface NSConstantString