diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/Sema.h | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 68 |
2 files changed, 71 insertions, 0 deletions
diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index da878f3f13b..4b6722abc64 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -652,6 +652,9 @@ public: llvm::SmallVector<DeclTy *, 8> & Protocols); + virtual void ComparePropertiesInBaseAndSuper(SourceLocation *PropertyLoc, + DeclTy *ClassInterface); + virtual void ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl, DeclTy **allMethods = 0, unsigned allNum = 0, DeclTy **allProperties = 0, unsigned pNum = 0); diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 61449fc4579..63c1350743c 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -246,6 +246,74 @@ Sema::FindProtocolDeclaration(SourceLocation TypeLoc, } } +/// DiagnosePropertyMismatch - Compares two properties for their +/// attributes and types and warns on a variety of inconsistancies. +/// +// TODO: Incomplete. +// +static void +DiagnosePropertyMismatch(ObjCPropertyDecl *Property, + ObjCPropertyDecl *SuperProperty) { + ObjCPropertyDecl::PropertyAttributeKind CAttr = + Property->getPropertyAttributes(); + ObjCPropertyDecl::PropertyAttributeKind SAttr = + SuperProperty->getPropertyAttributes(); + if ((CAttr & ObjCPropertyDecl::OBJC_PR_readonly) + && (SAttr & ObjCPropertyDecl::OBJC_PR_readwrite)) + ; // ??? + + if ((CAttr & ObjCPropertyDecl::OBJC_PR_copy) + != (SAttr & ObjCPropertyDecl::OBJC_PR_copy)) + ; // + else if ((CAttr & ObjCPropertyDecl::OBJC_PR_retain) + != (SAttr & ObjCPropertyDecl::OBJC_PR_retain)) + ; // ??? + + if ((CAttr & ObjCPropertyDecl::OBJC_PR_nonatomic) + != (SAttr & ObjCPropertyDecl::OBJC_PR_nonatomic)) + ; // + + if (Property->getSetterName() != SuperProperty->getSetterName()) + ; // + if (Property->getGetterName() != SuperProperty->getGetterName()) + ; // + + if (Property->getCanonicalType() != SuperProperty->getCanonicalType()) { + if ((CAttr & ObjCPropertyDecl::OBJC_PR_readonly) + && (SAttr & ObjCPropertyDecl::OBJC_PR_readonly)) + // && objc_compare_types(...)) + ; + else + ; // + } + +} + +/// ComparePropertiesInBaseAndSuper - This routine compares property +/// declarations in base and its super class, if any, and issues +/// diagnostics in a variety of inconsistant situations. +/// +void +Sema::ComparePropertiesInBaseAndSuper(SourceLocation *PropertyLoc, + DeclTy *D) { + ObjCInterfaceDecl *IDecl = + dyn_cast<ObjCInterfaceDecl>(static_cast<Decl *>(D)); + ObjCInterfaceDecl *SDecl = IDecl->getSuperClass(); + if (!SDecl) + return; + for (ObjCInterfaceDecl::classprop_iterator I = SDecl->classprop_begin(), + E = SDecl->classprop_end(); I != E; ++I) { + ObjCPropertyDecl *SuperPDecl = (*I); + // Does property in super class has declaration in current class? + for (ObjCInterfaceDecl::classprop_iterator I = IDecl->classprop_begin(), + E = IDecl->classprop_end(); I != E; ++I) { + ObjCPropertyDecl *PDecl = (*I); + if (SuperPDecl->getIdentifier() == PDecl->getIdentifier()) + DiagnosePropertyMismatch(PDecl, SuperPDecl); + } + } +} + /// ActOnForwardProtocolDeclaration - Action::DeclTy * Sema::ActOnForwardProtocolDeclaration(SourceLocation AtProtocolLoc, |
