intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-08 17:07:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Add location info to category/protocol AST's

Browse Source 
- Rewrite categories.

llvm-svn: 43501
This commit is contained in:
Steve Naroff
2007-10-30 13:30:57 +00:00
parent b508c53c63
commit 5448cf6d61
7 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clang/AST/Decl.cpp
View File

@@ -345,7 +345,7 @@ void ObjcProtocolDecl::addMethods(ObjcMethodDecl **insMethods,
unsigned numInsMembers,
ObjcMethodDecl **clsMethods,
unsigned numClsMembers,
SourceLocation AtEndLoc) {
SourceLocation endLoc) {
NumInstanceMethods = numInsMembers;
if (numInsMembers) {
InstanceMethods = new ObjcMethodDecl*[numInsMembers];
@@ -356,6 +356,7 @@ void ObjcProtocolDecl::addMethods(ObjcMethodDecl **insMethods,
ClassMethods = new ObjcMethodDecl*[numClsMembers];
memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
}
AtEndLoc = endLoc;
}
/// addMethods - Insert instance and methods declarations into
@@ -365,7 +366,7 @@ void ObjcCategoryDecl::addMethods(ObjcMethodDecl **insMethods,
unsigned numInsMembers,
ObjcMethodDecl **clsMethods,
unsigned numClsMembers,
SourceLocation AtEndLoc) {
SourceLocation endLoc) {
NumInstanceMethods = numInsMembers;
if (numInsMembers) {
InstanceMethods = new ObjcMethodDecl*[numInsMembers];
@@ -376,6 +377,7 @@ void ObjcCategoryDecl::addMethods(ObjcMethodDecl **insMethods,
ClassMethods = new ObjcMethodDecl*[numClsMembers];
memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
}
AtEndLoc = endLoc;
}
/// addMethods - Insert instance and methods declarations into

54
clang/Driver/RewriteTest.cpp
View File

@@ -60,6 +60,8 @@ namespace {
void RewriteTabs();
void RewriteForwardClassDecl(ObjcClassDecl *Dcl);
void RewriteInterfaceDecl(ObjcInterfaceDecl *Dcl);
void RewriteCategoryDecl(ObjcCategoryDecl *Dcl);
void RewriteMethods(int nMethods, ObjcMethodDecl **Methods);
// Expression Rewriting.
Stmt *RewriteFunctionBody(Stmt *S);
@@ -122,6 +124,8 @@ void RewriteTest::HandleTopLevelDecl(Decl *D) {
SelGetUidFunctionDecl = FD;
} else if (ObjcInterfaceDecl *MD = dyn_cast<ObjcInterfaceDecl>(D)) {
RewriteInterfaceDecl(MD);
} else if (ObjcCategoryDecl *CD = dyn_cast<ObjcCategoryDecl>(D)) {
RewriteCategoryDecl(CD);
}
// If we have a decl in the main file, see if we should rewrite it.
if (SM->getDecomposedFileLoc(Loc).first == MainFileID)
@@ -264,6 +268,31 @@ void RewriteTest::RewriteForwardClassDecl(ObjcClassDecl *ClassDecl) {
typedefString.c_str(), typedefString.size());
}
void RewriteTest::RewriteMethods(int nMethods, ObjcMethodDecl **Methods) {
for (int i = 0; i < nMethods; i++) {
ObjcMethodDecl *Method = Methods[i];
SourceLocation Loc = Method->getLocStart();
Rewrite.ReplaceText(Loc, 0, "// ", 3);
// FIXME: handle methods that are declared across multiple lines.
}
}
void RewriteTest::RewriteCategoryDecl(ObjcCategoryDecl *CatDecl) {
SourceLocation LocStart = CatDecl->getLocStart();
// FIXME: handle category headers that are declared across multiple lines.
Rewrite.ReplaceText(LocStart, 0, "// ", 3);
RewriteMethods(CatDecl->getNumInstanceMethods(),
CatDecl->getInstanceMethods());
RewriteMethods(CatDecl->getNumClassMethods(),
CatDecl->getClassMethods());
// Lastly, comment out the @end.
Rewrite.ReplaceText(CatDecl->getAtEndLoc(), 0, "// ", 3);
}
void RewriteTest::RewriteInterfaceDecl(ObjcInterfaceDecl *ClassDecl) {
SourceLocation LocStart = ClassDecl->getLocStart();
@@ -280,28 +309,11 @@ void RewriteTest::RewriteInterfaceDecl(ObjcInterfaceDecl *ClassDecl) {
Rewrite.ReplaceText(LocStart, endBuf-startBuf,
ResultStr.c_str(), ResultStr.size());
int nInstanceMethods = ClassDecl->getNumInstanceMethods();
ObjcMethodDecl **instanceMethods = ClassDecl->getInstanceMethods();
RewriteMethods(ClassDecl->getNumInstanceMethods(),
ClassDecl->getInstanceMethods());
RewriteMethods(ClassDecl->getNumClassMethods(),
ClassDecl->getClassMethods());
for (int i = 0; i < nInstanceMethods; i++) {
ObjcMethodDecl *instanceMethod = instanceMethods[i];
SourceLocation Loc = instanceMethod->getLocStart();
Rewrite.ReplaceText(Loc, 0, "// ", 3);
// FIXME: handle methods that are declared across multiple lines.
}
int nClassMethods = ClassDecl->getNumClassMethods();
ObjcMethodDecl **classMethods = ClassDecl->getClassMethods();
for (int i = 0; i < nClassMethods; i++) {
ObjcMethodDecl *classMethod = classMethods[i];
SourceLocation Loc = classMethod->getLocStart();
Rewrite.ReplaceText(Loc, 0, "// ", 3);
// FIXME: handle methods that are declared across multiple lines.
}
// Lastly, comment out the @end.
Rewrite.ReplaceText(ClassDecl->getAtEndLoc(), 0, "// ", 3);
}

3
clang/Parse/ParseObjc.cpp
View File

@@ -157,7 +157,8 @@ Parser::DeclTy *Parser::ParseObjCAtInterfaceDeclaration(
DeclTy *CategoryType = Actions.ActOnStartCategoryInterface(atLoc,
nameId, nameLoc, categoryId, categoryLoc,
&ProtocolRefs[0], ProtocolRefs.size());
&ProtocolRefs[0], ProtocolRefs.size(),
endProtoLoc);
ParseObjCInterfaceDeclList(CategoryType, tok::objc_not_keyword);

3
clang/Sema/Sema.h
View File

@@ -489,7 +489,8 @@ public:
SourceLocation AtInterfaceLoc,
IdentifierInfo *ClassName, SourceLocation ClassLoc,
IdentifierInfo *CategoryName, SourceLocation CategoryLoc,
IdentifierInfo **ProtoRefNames, unsigned NumProtoRefs);
IdentifierInfo **ProtoRefNames, unsigned NumProtoRefs,
SourceLocation EndProtoLoc);
virtual DeclTy *ActOnStartClassImplementation(
SourceLocation AtClassImplLoc,

43
clang/Sema/SemaDecl.cpp
View File

@@ -1081,16 +1081,18 @@ Sema::DeclTy *Sema::ActOnStartProtocolInterface(
ObjcProtocols[ProtocolName] = PDecl;
}
/// Check then save referenced protocols
for (unsigned int i = 0; i != NumProtoRefs; i++) {
ObjcProtocolDecl* RefPDecl = ObjcProtocols[ProtoRefNames[i]];
if (!RefPDecl || RefPDecl->isForwardDecl())
Diag(ProtocolLoc, diag::err_undef_protocolref,
ProtoRefNames[i]->getName(),
ProtocolName->getName());
PDecl->setReferencedProtocols((int)i, RefPDecl);
if (NumProtoRefs) {
/// Check then save referenced protocols
for (unsigned int i = 0; i != NumProtoRefs; i++) {
ObjcProtocolDecl* RefPDecl = ObjcProtocols[ProtoRefNames[i]];
if (!RefPDecl || RefPDecl->isForwardDecl())
Diag(ProtocolLoc, diag::err_undef_protocolref,
ProtoRefNames[i]->getName(),
ProtocolName->getName());
PDecl->setReferencedProtocols((int)i, RefPDecl);
}
PDecl->setLocEnd(EndProtoLoc);
}
return PDecl;
}
@@ -1137,7 +1139,8 @@ Sema::DeclTy *Sema::ActOnStartCategoryInterface(
SourceLocation AtInterfaceLoc,
IdentifierInfo *ClassName, SourceLocation ClassLoc,
IdentifierInfo *CategoryName, SourceLocation CategoryLoc,
IdentifierInfo **ProtoRefNames, unsigned NumProtoRefs) {
IdentifierInfo **ProtoRefNames, unsigned NumProtoRefs,
SourceLocation EndProtoLoc) {
ObjcInterfaceDecl *IDecl = getObjCInterfaceDecl(ClassName);
/// Check that class of this category is already completely declared.
@@ -1161,17 +1164,19 @@ Sema::DeclTy *Sema::ActOnStartCategoryInterface(
if (!CDeclChain)
CDecl->insertNextClassCategory();
/// Check then save referenced protocols
for (unsigned int i = 0; i != NumProtoRefs; i++) {
ObjcProtocolDecl* RefPDecl = ObjcProtocols[ProtoRefNames[i]];
if (!RefPDecl || RefPDecl->isForwardDecl()) {
Diag(CategoryLoc, diag::err_undef_protocolref,
ProtoRefNames[i]->getName(),
CategoryName->getName());
if (NumProtoRefs) {
/// Check then save referenced protocols
for (unsigned int i = 0; i != NumProtoRefs; i++) {
ObjcProtocolDecl* RefPDecl = ObjcProtocols[ProtoRefNames[i]];
if (!RefPDecl || RefPDecl->isForwardDecl()) {
Diag(CategoryLoc, diag::err_undef_protocolref,
ProtoRefNames[i]->getName(),
CategoryName->getName());
}
CDecl->setCatReferencedProtocols((int)i, RefPDecl);
}
CDecl->setCatReferencedProtocols((int)i, RefPDecl);
CDecl->setLocEnd(EndProtoLoc);
}
return CDecl;
}

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

@@ -307,6 +307,9 @@ class ObjcProtocolDecl : public NamedDecl {
int NumClassMethods; // -1 if not defined
bool isForwardProtoDecl; // declared with @protocol.
SourceLocation EndLoc; // marks the '>' or identifier.
SourceLocation AtEndLoc; // marks the end of the entire interface.
public:
ObjcProtocolDecl(SourceLocation L, unsigned numRefProtos,
IdentifierInfo *Id, bool FD = false)
@@ -348,6 +351,14 @@ public:
bool isForwardDecl() const { return isForwardProtoDecl; }
void setForwardDecl(bool val) { isForwardProtoDecl = val; }
// Location information, modeled after the Stmt API.
SourceLocation getLocStart() const { return getLocation(); } // '@'protocol
SourceLocation getLocEnd() const { return EndLoc; }
void setLocEnd(SourceLocation LE) { EndLoc = LE; };
// We also need to record the @end location.
SourceLocation getAtEndLoc() const { return AtEndLoc; }
static bool classof(const Decl *D) { return D->getKind() == ObjcProtocol; }
static bool classof(const ObjcProtocolDecl *D) { return true; }
};
@@ -459,6 +470,8 @@ class ObjcCategoryDecl : public NamedDecl {
/// Next category belonging to this class
ObjcCategoryDecl *NextClassCategory;
SourceLocation EndLoc; // marks the '>' or identifier.
SourceLocation AtEndLoc; // marks the end of the entire interface.
public:
ObjcCategoryDecl(SourceLocation L, unsigned numRefProtocol,IdentifierInfo *Id)
: NamedDecl(ObjcCategory, L, Id),
@@ -502,6 +515,13 @@ public:
NextClassCategory = ClassInterface->getCategoryList();
ClassInterface->setCategoryList(this);
}
// Location information, modeled after the Stmt API.
SourceLocation getLocStart() const { return getLocation(); } // '@'interface
SourceLocation getLocEnd() const { return EndLoc; }
void setLocEnd(SourceLocation LE) { EndLoc = LE; };
// We also need to record the @end location.
SourceLocation getAtEndLoc() const { return AtEndLoc; }
static bool classof(const Decl *D) { return D->getKind() == ObjcCategory; }
static bool classof(const ObjcCategoryDecl *D) { return true; }

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

@@ -499,7 +499,8 @@ public:
IdentifierInfo *CategoryName,
SourceLocation CategoryLoc,
IdentifierInfo **ProtoRefNames,
unsigned NumProtoRefs) {
unsigned NumProtoRefs,
SourceLocation EndProtoLoc) {
return 0;
}
// ActOnStartClassImplementation - this action is called immdiately after