diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/DeclObjC.cpp | 15 | ||||
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 17 | ||||
| -rw-r--r-- | lib/Sema/Sema.h | 7 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 47 |
4 files changed, 37 insertions, 49 deletions
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp index 0b73ca5b57..6e348cab08 100644 --- a/lib/AST/DeclObjC.cpp +++ b/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<ObjCPropertyDecl>(); - 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/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 4e8790b40f..cc57bdc700 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -392,26 +392,15 @@ Parser::DeclTy *Parser::ParseObjCPropertyDecl(DeclTy *interfaceDecl, DeclSpec DS; llvm::SmallVector<FieldDeclarator, 8> 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/lib/Sema/Sema.h b/lib/Sema/Sema.h index 1626f0d51c..cf22f68088 100644 --- a/lib/Sema/Sema.h +++ b/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/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 776a50f6f2..7eb132ec40 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/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); - - if (DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_readonly) +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 (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; } |