diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/DeclObjC.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Parse/ParseObjc.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/Sema.h | 4 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 8 |
4 files changed, 14 insertions, 4 deletions
diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index 89f6d2c5019..0cb777d8deb 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/lib/AST/DeclObjC.cpp @@ -112,7 +112,8 @@ ObjCCompatibleAliasDecl::Create(ASTContext &C, ObjCPropertyDecl *ObjCPropertyDecl::Create(ASTContext &C, SourceLocation L, IdentifierInfo *Id, - QualType T) { + QualType T, + PropertyControl propControl) { void *Mem = C.getAllocator().Allocate<ObjCPropertyDecl>(); return new (Mem) ObjCPropertyDecl(L, Id, T); } diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp index d1b1c25c5a7..8d404a9aafc 100644 --- a/clang/lib/Parse/ParseObjc.cpp +++ b/clang/lib/Parse/ParseObjc.cpp @@ -271,7 +271,8 @@ void Parser::ParseObjCInterfaceDeclList(DeclTy *interfaceDecl, FieldDeclarator &FD = FieldDeclarators[i]; // Install the property declarator into interfaceDecl. DeclTy *Property = Actions.ActOnProperty(CurScope, - DS.getSourceRange().getBegin(), FD, OCDS); + DS.getSourceRange().getBegin(), FD, OCDS, + MethodImplKind); allProperties.push_back(Property); } continue; diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index 68a834c6b4c..6375fad0869 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -676,7 +676,9 @@ public: DeclTy **allProperties = 0, unsigned pNum = 0); virtual DeclTy *ActOnProperty(Scope *S, SourceLocation AtLoc, - FieldDeclarator &FD, ObjCDeclSpec &ODS); + FieldDeclarator &FD, ObjCDeclSpec &ODS, + tok::ObjCKeywordKind MethodImplKind); + virtual DeclTy *ActOnPropertyImplDecl(SourceLocation AtLoc, SourceLocation PropertyLoc, bool ImplKind, DeclTy *ClassImplDecl, diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index afac82ca76f..3b488108961 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -1022,7 +1022,8 @@ Sema::DeclTy *Sema::ActOnMethodDeclaration( Sema::DeclTy *Sema::ActOnProperty(Scope *S, SourceLocation AtLoc, FieldDeclarator &FD, - ObjCDeclSpec &ODS) { + ObjCDeclSpec &ODS, + tok::ObjCKeywordKind MethodImplKind) { QualType T = GetTypeForDeclarator(FD.D, S); ObjCPropertyDecl *PDecl = ObjCPropertyDecl::Create(Context, AtLoc, FD.D.getIdentifier(), T); @@ -1055,6 +1056,11 @@ Sema::DeclTy *Sema::ActOnProperty(Scope *S, SourceLocation AtLoc, if (ODS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_nonatomic) PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_nonatomic); + if (MethodImplKind == tok::objc_required) + PDecl->setPropertyImplementation(ObjCPropertyDecl::Required); + else if (MethodImplKind == tok::objc_optional) + PDecl->setPropertyImplementation(ObjCPropertyDecl::Optional); + return PDecl; } |
