diff --git a/clang/Driver/ASTConsumers.cpp b/clang/Driver/ASTConsumers.cpp index defa7a151151..727c57ab41b9 100644 --- a/clang/Driver/ASTConsumers.cpp +++ b/clang/Driver/ASTConsumers.cpp @@ -320,7 +320,7 @@ void DeclPrinter::PrintObjCInterfaceDecl(ObjCInterfaceDecl *OID) { ObjCPropertyDecl::propdecl_iterator I = PDecl->propdecl_begin(), E = PDecl->propdecl_end(); - Out << ' ' << (*I)->getType().getAsString() + Out << ' ' << PDecl->getType().getAsString() << ' ' << (*I)->getName(); for (++I; I != E; ++I) diff --git a/clang/include/clang/AST/DeclObjC.h b/clang/include/clang/AST/DeclObjC.h index f286e2f87dc0..951b43d36add 100644 --- a/clang/include/clang/AST/DeclObjC.h +++ b/clang/include/clang/AST/DeclObjC.h @@ -27,6 +27,7 @@ class ObjCMethodDecl; class ObjCProtocolDecl; class ObjCCategoryDecl; class ObjCPropertyDecl; +class FieldDeclarator; /// ObjCMethodDecl - Represents an instance or class method declaration. /// ObjC methods can be declared within 4 contexts: class interfaces, @@ -833,7 +834,7 @@ public: /// from the class interface to the class implementation (but I digress:-) /// class ObjCImplementationDecl : public NamedDecl { - /// Class interface for this category implementation + /// Class interface for this implementation ObjCInterfaceDecl *ClassInterface; /// Implementation Class's super class. @@ -954,33 +955,32 @@ public: OBJC_PR_setter = 0x80 }; private: + QualType DeclType; // List of property name declarations - // FIXME: Property is not an ivar. - ObjCIvarDecl **PropertyDecls; + NamedDecl **PropertyDecls; unsigned NumPropertyDecls; unsigned PropertyAttributes : 8; IdentifierInfo *GetterName; // getter name of NULL if no getter IdentifierInfo *SetterName; // setter name of NULL if no setter - ObjCPropertyDecl(SourceLocation L) - : Decl(ObjCProperty, L), PropertyDecls(0), NumPropertyDecls(0), + ObjCPropertyDecl(SourceLocation L, QualType T) + : Decl(ObjCProperty, L), DeclType(T), + PropertyDecls(0), NumPropertyDecls(0), PropertyAttributes(OBJC_PR_noattr), GetterName(0), SetterName(0) {} public: - static ObjCPropertyDecl *Create(ASTContext &C, SourceLocation L); - - typedef ObjCIvarDecl * const *propdecl_iterator; + static ObjCPropertyDecl *Create(ASTContext &C, SourceLocation L, QualType T); + QualType getType() const { return DeclType; } + typedef NamedDecl * const *propdecl_iterator; propdecl_iterator propdecl_begin() const { return PropertyDecls; } propdecl_iterator propdecl_end() const { return PropertyDecls+NumPropertyDecls; } unsigned propdecl_size() const { return NumPropertyDecls; } bool propdecl_empty() const { return NumPropertyDecls == 0; } - - /// setPropertyDeclLists - Set the property decl list to the specified array - /// of decls. - void setPropertyDeclLists(ObjCIvarDecl **Properties, unsigned NumProp); - + NamedDecl **getPropertyDecls() { return PropertyDecls; } + void setNumPropertyDecls(unsigned num) { NumPropertyDecls = num; } + void setPropertyDecls(NamedDecl **Nd) { PropertyDecls = Nd; } PropertyAttributeKind getPropertyAttributes() const { return PropertyAttributeKind(PropertyAttributes); } diff --git a/clang/include/clang/Parse/Action.h b/clang/include/clang/Parse/Action.h index 2243f99c3b59..167b5af98e28 100644 --- a/clang/include/clang/Parse/Action.h +++ b/clang/include/clang/Parse/Action.h @@ -24,6 +24,7 @@ namespace clang { class ObjCDeclSpec; class Declarator; class AttributeList; + class FieldDeclarator; // Parse. class Scope; class Action; @@ -648,8 +649,9 @@ public: return; } // ActOnAddObjCProperties - called to build one property AST - virtual DeclTy *ActOnAddObjCProperties (SourceLocation AtLoc, - DeclTy **allProperties, unsigned NumProperties, ObjCDeclSpec &DS) { + virtual DeclTy *ActOnAddObjCProperties (Scope *S, SourceLocation AtLoc, + FieldDeclarator *PropertyDeclarators, unsigned NumPropertyDeclarators, + ObjCDeclSpec &ODS) { return 0; } diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index 0b73ca5b5783..6e348cab08b3 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/lib/AST/DeclObjC.cpp @@ -110,9 +110,10 @@ ObjCCompatibleAliasDecl::Create(ASTContext &C, } ObjCPropertyDecl *ObjCPropertyDecl::Create(ASTContext &C, - SourceLocation L) { + SourceLocation L, + QualType T) { void *Mem = C.getAllocator().Allocate(); - return new (Mem) ObjCPropertyDecl(L); + return new (Mem) ObjCPropertyDecl(L, T); } //===----------------------------------------------------------------------===// @@ -432,15 +433,5 @@ ObjCInterfaceDecl *ObjCMethodDecl::getClassInterface() { return 0; } -void ObjCPropertyDecl::setPropertyDeclLists(ObjCIvarDecl **Properties, - unsigned NumProp) { - assert(PropertyDecls == 0 && "Properties already set"); - if (NumProp == 0) return; - NumPropertyDecls = NumProp; - - PropertyDecls = new ObjCIvarDecl*[NumProp]; - memcpy(PropertyDecls, Properties, NumProp*sizeof(ObjCIvarDecl*)); -} - diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp index 4e8790b40fff..cc57bdc70041 100644 --- a/clang/lib/Parse/ParseObjc.cpp +++ b/clang/lib/Parse/ParseObjc.cpp @@ -392,26 +392,15 @@ Parser::DeclTy *Parser::ParseObjCPropertyDecl(DeclTy *interfaceDecl, DeclSpec DS; llvm::SmallVector FieldDeclarators; ParseStructDeclaration(DS, FieldDeclarators); - - // Convert them all to fields. - for (unsigned i = 0, e = FieldDeclarators.size(); i != e; ++i) { - FieldDeclarator &FD = FieldDeclarators[i]; - // Install the declarator into interfaceDecl. - DeclTy *Field = Actions.ActOnIvar(CurScope, - DS.getSourceRange().getBegin(), - FD.D, FD.BitfieldSize, - tok::objc_not_keyword); - PropertyDecls.push_back(Field); - } - + if (Tok.is(tok::semi)) ConsumeToken(); else { Diag(Tok, diag::err_expected_semi_decl_list); SkipUntil(tok::r_brace, true, true); } - return Actions.ActOnAddObjCProperties(AtLoc, &PropertyDecls[0], - PropertyDecls.size(), OCDS); + return Actions.ActOnAddObjCProperties(CurScope, AtLoc, &FieldDeclarators[0], + FieldDeclarators.size(), OCDS); } /// objc-method-proto: diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index 1626f0d51c76..cf22f6808873 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -643,11 +643,10 @@ public: DeclTy **allMethods = 0, unsigned allNum = 0, DeclTy **allProperties = 0, unsigned pNum = 0); - virtual DeclTy *ActOnAddObjCProperties(SourceLocation AtLoc, - DeclTy **allProperties, + virtual DeclTy *ActOnAddObjCProperties(Scope *S, SourceLocation AtLoc, + FieldDeclarator *allProperties, unsigned NumProperties, - ObjCDeclSpec &DS); - + ObjCDeclSpec &ODS); virtual DeclTy *ActOnMethodDeclaration( SourceLocation BeginLoc, // location of the + or -. SourceLocation EndLoc, // location of the ; or {. diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 776a50f6f2ac..7eb132ec404e 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -886,43 +886,52 @@ Sema::DeclTy *Sema::ActOnMethodDeclaration( return ObjCMethod; } -Sema::DeclTy *Sema::ActOnAddObjCProperties(SourceLocation AtLoc, - DeclTy **allProperties, - unsigned NumProperties, - ObjCDeclSpec &DS) { - ObjCPropertyDecl *PDecl = ObjCPropertyDecl::Create(Context, AtLoc); +Sema::DeclTy *Sema::ActOnAddObjCProperties(Scope *S, SourceLocation AtLoc, + FieldDeclarator *propertyDeclarators, + unsigned NumPropertyDeclarators, + ObjCDeclSpec &ODS) { + FieldDeclarator &FD = propertyDeclarators[0]; + QualType T = GetTypeForDeclarator(FD.D, S); + ObjCPropertyDecl *PDecl = ObjCPropertyDecl::Create(Context, AtLoc, T); - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_readonly) + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_readonly) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_readonly); - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_getter) { + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_getter) { PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_getter); - PDecl->setGetterName(DS.getGetterName()); + PDecl->setGetterName(ODS.getGetterName()); } - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_setter) { + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_setter) { PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_setter); - PDecl->setSetterName(DS.getSetterName()); + PDecl->setSetterName(ODS.getSetterName()); } - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_assign) + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_assign) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_assign); - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_readwrite) + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_readwrite) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_readwrite); - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_retain) + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_retain) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_retain); - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_copy) + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_copy) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_copy); - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_nonatomic) + if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_nonatomic) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_nonatomic); - if (NumProperties != 0) - PDecl->setPropertyDeclLists((ObjCIvarDecl**)allProperties, NumProperties); - + if (NumPropertyDeclarators != 0) { + NamedDecl **propertyName = new NamedDecl*[NumPropertyDeclarators]; + PDecl->setPropertyDecls(propertyName); + PDecl->setNumPropertyDecls(NumPropertyDeclarators); + for (unsigned i = 0; i < NumPropertyDeclarators; i++) { + Declarator &D = propertyDeclarators[i].D; + propertyName[i] = new NamedDecl(Decl::ObjCProperty, + D.getIdentifierLoc(), D.getIdentifier()); + } + } return PDecl; }