replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch to diagnose inconsistancies between properties declared in current and 

its super class. This patch is incomplete.

llvm-svn: 50228
This commit is contained in:
Fariborz Jahanian 2008-04-24 19:58:34 +00:00
parent 608eeef5ce
commit 0a070ff570
3 changed files with 79 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/include/clang/Parse/Action.h
View File

@ -718,8 +718,14 @@ public:
llvm::SmallVector<DeclTy *, 8> &
Protocols) {
}
/// ComparePropertiesInBaseAndSuper - This routine compares property
/// declarations in base and its super class, if any, and issues
/// diagnostics in a variety of inconsistant situations.
///
virtual void ComparePropertiesInBaseAndSuper(SourceLocation *PropertyLoc,
DeclTy *ClassInterface) {
}
//===----------------------- Obj-C Expressions --------------------------===//
virtual ExprResult ParseObjCStringLiteral(SourceLocation *AtLocs,

3
clang/lib/Sema/Sema.h
View File

@ -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);

68
clang/lib/Sema/SemaDeclObjC.cpp
View File

@ -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,