commit 52e78bd99293eadf539d95f4ea7dc181abeceec1
author Douglas Gregor <dgregor@apple.com> Wed Nov 18 22:56:13 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Nov 18 22:56:13 2009 +0000
tree fc098ef0b6a1e64ed27a908002e776b6f0b53aea
parent 108aadf972b1dd495d4e08323a4568238b646553

Code completion after @dynamic

llvm-svn: 89265

clang/lib/Parse/ParseObjc.cpp

diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 305ed16..216d934 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/lib/Parse/ParseObjc.cpp
@@ -1234,7 +1234,7 @@
 
   while (true) {
     if (Tok.is(tok::code_completion)) {
-      Actions.CodeCompleteObjCPropertySynthesize(CurScope, ObjCImpDecl);
+      Actions.CodeCompleteObjCPropertyDefinition(CurScope, ObjCImpDecl);
       ConsumeToken();
     }
     
@@ -1290,11 +1290,18 @@
   assert(Tok.isObjCAtKeyword(tok::objc_dynamic) &&
          "ParseObjCPropertyDynamic(): Expected '@dynamic'");
   SourceLocation loc = ConsumeToken(); // consume dynamic
-  if (Tok.isNot(tok::identifier)) {
-    Diag(Tok, diag::err_expected_ident);
-    return DeclPtrTy();
-  }
-  while (Tok.is(tok::identifier)) {
+  while (true) {
+    if (Tok.is(tok::code_completion)) {
+      Actions.CodeCompleteObjCPropertyDefinition(CurScope, ObjCImpDecl);
+      ConsumeToken();
+    }
+    
+    if (Tok.isNot(tok::identifier)) {
+      Diag(Tok, diag::err_expected_ident);
+      SkipUntil(tok::semi);
+      return DeclPtrTy();
+    }
+    
     IdentifierInfo *propertyId = Tok.getIdentifierInfo();
     SourceLocation propertyLoc = ConsumeToken(); // consume property name
     Actions.ActOnPropertyImplDecl(atLoc, propertyLoc, false, ObjCImpDecl,

clang/lib/Sema/Sema.h

diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index a4ff266..2c50b88 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -3661,7 +3661,7 @@
                                                  IdentifierInfo *ClassName);
   virtual void CodeCompleteObjCImplementationCategory(Scope *S, 
                                                     IdentifierInfo *ClassName);
-  virtual void CodeCompleteObjCPropertySynthesize(Scope *S, 
+  virtual void CodeCompleteObjCPropertyDefinition(Scope *S, 
                                                   DeclPtrTy ObjCImpDecl);
   virtual void CodeCompleteObjCPropertySynthesizeIvar(Scope *S, 
                                                   IdentifierInfo *PropertyName,

clang/lib/Sema/SemaCodeComplete.cpp

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 0090e24..6ba0591 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -2026,7 +2026,7 @@
   HandleCodeCompleteResults(this, CodeCompleter, Results.data(),Results.size());  
 }
 
-void Sema::CodeCompleteObjCPropertySynthesize(Scope *S, DeclPtrTy ObjCImpDecl) {
+void Sema::CodeCompleteObjCPropertyDefinition(Scope *S, DeclPtrTy ObjCImpDecl) {
   typedef CodeCompleteConsumer::Result Result;
   ResultBuilder Results(*this);