With this commit, we now successfully parse "Cocoa.h"!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41303 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index d4017bba1a978641d0f96f0dca29c6d0c421f72d..e5c5bb97b2c33483ecf3afd8ceeb43fa4e170f10 100644 (file)
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -356,8 +356,7 @@ void Parser::ParseSpecifierQualifierList(DeclSpec &DS) {
 /// [GNU]   '_Decimal128'
 /// [GNU]   typeof-specifier
 /// [OBJC]  class-name objc-protocol-refs[opt]    [TODO]
-/// [OBJC]  typedef-name objc-protocol-refs       [TODO]
-/// [OBJC]  objc-protocol-refs                    [TODO]
+/// [OBJC]  typedef-name objc-protocol-refs[opt]  [TODO]
 ///       type-qualifier:
 ///         'const'
 ///         'volatile'
@@ -384,7 +383,15 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS) {
                                                CurScope)) {
           isInvalid = DS.SetTypeSpecType(DeclSpec::TST_typedef, Loc, PrevSpec,
                                          TypeRep);
-          break;
+          if (isInvalid)
+            break;
+          else { // FIXME: restrict this to "id" and ObjC classnames.
+            DS.Range.setEnd(Tok.getLocation());
+            ConsumeToken(); // The identifier
+            if (Tok.getKind() == tok::less)
+              ParseObjCProtocolReferences();
+            continue;
+          }
         }
       }
       // FALL THROUGH.

diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index 4aaaecc7578d234ab741a6df8d97661689541f06..4f4bdfe01244aa65b8749dfabaefb4c9517e3acd 100644 (file)
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -301,6 +301,20 @@ IdentifierInfo *Parser::ParseObjCSelector() {
   return II;
 }
 
+///   objc-type-qualifier: one of
+///     in out inout bycopy byref oneway
+///
+///   FIXME: remove the string compares...
+bool Parser::isObjCTypeQualifier() {
+  if (Tok.getKind() == tok::identifier) {
+    const char *qual = Tok.getIdentifierInfo()->getName();
+    return (strcmp(qual, "in") == 0) || (strcmp(qual, "out") == 0) ||
+           (strcmp(qual, "inout") == 0) || (strcmp(qual, "oneway") == 0) ||
+           (strcmp(qual, "bycopy") == 0) || (strcmp(qual, "byref") == 0);
+  }
+  return false;
+}
+
 ///   objc-type-name:
 ///     '(' objc-type-qualifiers[opt] type-name ')'
 ///     '(' objc-type-qualifiers[opt] ')'
@@ -309,14 +323,14 @@ IdentifierInfo *Parser::ParseObjCSelector() {
 ///     objc-type-qualifier
 ///     objc-type-qualifiers objc-type-qualifier
 ///
-///   objc-type-qualifier: one of
-///     in out inout bycopy byref oneway
-///
 void Parser::ParseObjCTypeName() {
   assert(Tok.getKind() == tok::l_paren && "expected (");
   
   SourceLocation LParenLoc = ConsumeParen(), RParenLoc;
   
+  while (isObjCTypeQualifier())
+    ConsumeToken();
+
   if (isTypeSpecifierQualifier()) {
     //TypeTy *Ty = ParseTypeName();
     //assert(Ty && "Parser::ParseObjCTypeName(): missing type");

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 7ad9a0f659463e1cd01c1030b97f4b43c8cb55e9..90988791deddde7fc05a2fb9c6aaad1bb031c6a5 100644 (file)
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -267,6 +267,7 @@ private:
   DeclTy *ParseObjCAtAliasDeclaration();
   
   IdentifierInfo *ParseObjCSelector();
+  bool isObjCTypeQualifier();
   void ParseObjCTypeName();
   void ParseObjCMethodRequirement();
   void ParseObjCMethodPrototype();