ObjCCategoryImplDecl and ObjCImplementation do not derive directly from DeclContext but from a new abstract ObjCImplDecl.

Reflect this change on the "DeclContext hierarchy".

llvm-svn: 76137
This commit is contained in:
Argyrios Kyrtzidis 2009-07-17 01:19:49 +00:00
parent bffa89f42c
commit c6756ab0ae
3 changed files with 14 additions and 16 deletions

View File

@ -37,6 +37,7 @@ class ObjCCategoryDecl;
class ObjCProtocolDecl;
class ObjCImplementationDecl;
class ObjCCategoryImplDecl;
class ObjCImplDecl;
class LinkageSpecDecl;
class BlockDecl;
class DeclarationName;
@ -393,8 +394,7 @@ public:
/// TagDecl
/// ObjCMethodDecl
/// ObjCContainerDecl
/// ObjCCategoryImplDecl
/// ObjCImplementationDecl
/// ObjCImpl
/// LinkageSpecDecl
/// BlockDecl
///

View File

@ -132,8 +132,7 @@ DECL_CONTEXT(TranslationUnit)
DECL_CONTEXT(Namespace)
DECL_CONTEXT(LinkageSpec)
DECL_CONTEXT(ObjCMethod)
DECL_CONTEXT(ObjCCategoryImpl)
DECL_CONTEXT(ObjCImplementation)
DECL_CONTEXT_BASE(ObjCImpl)
DECL_CONTEXT_BASE(Tag)
DECL_CONTEXT_BASE(Function)
DECL_CONTEXT_BASE(ObjCContainer)

View File

@ -883,6 +883,17 @@ public:
SourceLocation getLocStart() const { return getLocation(); }
SourceLocation getLocEnd() const { return EndLoc; }
void setLocEnd(SourceLocation LE) { EndLoc = LE; };
static bool classof(const Decl *D) {
return D->getKind() >= ObjCImplFirst && D->getKind() <= ObjCImplLast;
}
static bool classof(const ObjCImplDecl *D) { return true; }
static DeclContext *castToDeclContext(const ObjCImplDecl *D) {
return static_cast<DeclContext *>(const_cast<ObjCImplDecl*>(D));
}
static ObjCImplDecl *castFromDeclContext(const DeclContext *DC) {
return static_cast<ObjCImplDecl *>(const_cast<DeclContext*>(DC));
}
};
/// ObjCCategoryImplDecl - An object of this class encapsulates a category
@ -931,12 +942,6 @@ public:
static bool classof(const Decl *D) { return D->getKind() == ObjCCategoryImpl;}
static bool classof(const ObjCCategoryImplDecl *D) { return true; }
static DeclContext *castToDeclContext(const ObjCCategoryImplDecl *D) {
return static_cast<DeclContext *>(const_cast<ObjCCategoryImplDecl*>(D));
}
static ObjCCategoryImplDecl *castFromDeclContext(const DeclContext *DC) {
return static_cast<ObjCCategoryImplDecl *>(const_cast<DeclContext*>(DC));
}
};
/// ObjCImplementationDecl - Represents a class definition - this is where
@ -1010,12 +1015,6 @@ public:
return D->getKind() == ObjCImplementation;
}
static bool classof(const ObjCImplementationDecl *D) { return true; }
static DeclContext *castToDeclContext(const ObjCImplementationDecl *D) {
return static_cast<DeclContext *>(const_cast<ObjCImplementationDecl*>(D));
}
static ObjCImplementationDecl *castFromDeclContext(const DeclContext *DC) {
return static_cast<ObjCImplementationDecl *>(const_cast<DeclContext*>(DC));
}
};
/// ObjCCompatibleAliasDecl - Represents alias of a class. This alias is