maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

This predicate is just a generic "issuperclass" predicate, move it to the 

ObjCInterfaceType as a method.

llvm-svn: 49306
This commit is contained in:
Chris Lattner 2008-04-07 04:13:03 +00:00
parent ddfdaf9a69
commit ae1b6078e3
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang/include/clang/AST/DeclObjC.h
View File

@ -315,13 +315,26 @@ public:
ObjCCategoryDecl* getCategoryList() const { return CategoryList; }
void setCategoryList(ObjCCategoryDecl *category) {
CategoryList = category;
CategoryList = category;
}
/// isSuperClassOf - Return true if this class is the specified class or is a
/// super class of the specified interface class.
bool isSuperClassOf(const ObjCInterfaceDecl *I) const {
// If RHS is derived from LHS it is OK; else it is not OK.
while (I != NULL) {
if (this == I)
return true;
I = I->getSuperClass();
}
return false;
}
ObjCIvarDecl *lookupInstanceVariable(IdentifierInfo *ivarName,
ObjCInterfaceDecl *&clsDeclared);
// Get the local instance method declared in this interface.
ObjCMethodDecl *getInstanceMethod(Selector &Sel) {
ObjCMethodDecl *getInstanceMethod(Selector Sel) {
for (instmeth_iterator I = instmeth_begin(), E = instmeth_end();
I != E; ++I) {
if ((*I)->getSelector() == Sel)
@ -330,7 +343,7 @@ public:
return 0;
}
// Get the local class method declared in this interface.
ObjCMethodDecl *getClassMethod(Selector &Sel) {
ObjCMethodDecl *getClassMethod(Selector Sel) {
for (classmeth_iterator I = classmeth_begin(), E = classmeth_end();
I != E; ++I) {
if ((*I)->getSelector() == Sel)

23
clang/lib/AST/ASTContext.cpp
View File

@ -1443,20 +1443,6 @@ bool ASTContext::objcTypesAreCompatible(QualType LHS, QualType RHS) {
return false;
}
/// isCompatibleInterfaceAssign - Return true if it is ok to assign a
/// pointer from the RHS interface to the LHS interface. This is true if the
/// RHS is exactly LHS or if it is a subclass of LHS.
static bool isCompatibleInterfaceAssign(ObjCInterfaceDecl *LHS,
ObjCInterfaceDecl *RHS) {
// If RHS is derived from LHS it is OK; else it is not OK.
while (RHS != NULL) {
if (RHS == LHS)
return true;
RHS = RHS->getSuperClass();
}
return false;
}
bool ASTContext::QualifiedInterfaceTypesAreCompatible(QualType lhs,
QualType rhs) {
const ObjCQualifiedInterfaceType *lhsQI =
@ -1465,7 +1451,9 @@ bool ASTContext::QualifiedInterfaceTypesAreCompatible(QualType lhs,
rhs->getAsObjCQualifiedInterfaceType();
assert(lhsQI && rhsQI && "QualifiedInterfaceTypesAreCompatible - bad type");
if (!isCompatibleInterfaceAssign(lhsQI->getDecl(), rhsQI->getDecl()))
// Verify that the base decls are compatible, the RHS must be a subclass of
// the LHS.
if (!lhsQI->getDecl()->isSuperClassOf(rhsQI->getDecl()))
return false;
// All protocols in lhs must have a presence in rhs.
@ -1857,8 +1845,9 @@ bool ASTContext::typesAreCompatible(QualType LHS_NC, QualType RHS_NC) {
case Type::Builtin:
return builtinTypesAreCompatible(LHS, RHS);
case Type::ObjCInterface:
return isCompatibleInterfaceAssign(cast<ObjCInterfaceType>(LHS)->getDecl(),
cast<ObjCInterfaceType>(RHS)->getDecl());
// The LHS must be a superclass of the RHS.
return cast<ObjCInterfaceType>(LHS)->getDecl()->isSuperClassOf(
cast<ObjCInterfaceType>(RHS)->getDecl());
case Type::Vector:
case Type::OCUVector:
return vectorTypesAreCompatible(LHS, RHS);