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

Teach clang_getCursorLocation() to return the locations of references 

rather than the locations that refer to.

llvm-svn: 93812
This commit is contained in:
Douglas Gregor 2010-01-18 23:41:10 +00:00
parent 0c90d43b70
commit 7ecd020cf2
3 changed files with 111 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
clang/tools/CIndex/CIndex.cpp
View File

@ -350,58 +350,6 @@ void CDeclVisitor::VisitVarDecl(VarDecl *ND) {
Call(CXCursor_VarDecl, ND);
}
static SourceLocation getLocationFromCursor(CXCursor C,
SourceManager &SourceMgr,
NamedDecl *ND) {
if (clang_isReference(C.kind)) {
if (Decl *D = getCursorReferringDecl(C))
return D->getLocation();
switch (C.kind) {
case CXCursor_ObjCClassRef:
return getCursorObjCClassRef(C).second;
case CXCursor_ObjCSuperClassRef:
return getCursorObjCSuperClassRef(C).second;
case CXCursor_ObjCProtocolRef:
return getCursorObjCProtocolRef(C).second;
case CXCursor_ObjCSelectorRef: {
ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(getCursorStmt(C));
assert(OME && "getLocationFromCursor(): Missing message expr");
return OME->getLeftLoc(); /* FIXME: should be a range */
}
case CXCursor_VarRef:
case CXCursor_FunctionRef:
case CXCursor_EnumConstantRef: {
DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(getCursorStmt(C));
assert(DRE && "getLocationFromCursor(): Missing decl ref expr");
return DRE->getLocation();
}
default:
return SourceLocation();
}
} else { // We have a declaration or a definition.
SourceLocation SLoc;
switch (ND->getKind()) {
case Decl::ObjCInterface: {
SLoc = dyn_cast<ObjCInterfaceDecl>(ND)->getClassLoc();
break;
}
case Decl::ObjCProtocol: {
SLoc = ND->getLocation(); /* FIXME: need to get the name location. */
break;
}
default: {
SLoc = ND->getLocation();
break;
}
}
if (SLoc.isInvalid())
return SourceLocation();
return SourceMgr.getSpellingLoc(SLoc); // handles macro instantiations.
}
}
CXString CIndexer::createCXString(const char *String, bool DupString){
CXString Str;
if (DupString) {
@ -791,12 +739,12 @@ CXString clang_getCursorSpelling(CXCursor C) {
}
case CXCursor_ObjCProtocolRef: {
ObjCProtocolDecl *OID = getCursorObjCProtocolRef(C).first;
assert(OID && "getLocationFromCursor(): Missing protocol decl");
assert(OID && "getCursorSpelling(): Missing protocol decl");
return CIndexer::createCXString(OID->getIdentifier()->getNameStart());
}
case CXCursor_ObjCSelectorRef: {
ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(getCursorStmt(C));
assert(OME && "getLocationFromCursor(): Missing message expr");
assert(OME && "getCursorSpelling(): Missing message expr");
return CIndexer::createCXString(OME->getSelector().getAsString().c_str(),
true);
}
@ -804,7 +752,7 @@ CXString clang_getCursorSpelling(CXCursor C) {
case CXCursor_FunctionRef:
case CXCursor_EnumConstantRef: {
DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(getCursorStmt(C));
assert(DRE && "getLocationFromCursor(): Missing decl ref expr");
assert(DRE && "getCursorSpelling(): Missing decl ref expr");
return CIndexer::createCXString(DRE->getDecl()->getIdentifier()
->getNameStart());
}
@ -888,9 +836,11 @@ CXCursor clang_getCursor(CXTranslationUnit CTUnit, const char *source_name,
if (Dcl) {
if (Stm) {
if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(Stm))
return MakeCXCursor(TranslateDeclRefExpr(DRE), Dcl, Stm);
return MakeCXCursor(TranslateDeclRefExpr(DRE), Dcl, Stm,
CXXUnit->getASTContext());
else if (ObjCMessageExpr *MExp = dyn_cast<ObjCMessageExpr>(Stm))
return MakeCXCursor(CXCursor_ObjCSelectorRef, Dcl, MExp);
return MakeCXCursor(CXCursor_ObjCSelectorRef, Dcl, MExp,
CXXUnit->getASTContext());
// Fall through...treat as a decl, not a ref.
}
if (ALoc.isNamedRef()) {
@ -952,8 +902,51 @@ CXDecl clang_getCursorDecl(CXCursor C) {
CXSourceLocation clang_getCursorLocation(CXCursor C) {
if (clang_isReference(C.kind)) {
// FIXME: Return the location of the reference, not of the underlying
// declaration (which may not even exist!).
switch (C.kind) {
case CXCursor_ObjCSuperClassRef: {
std::pair<ObjCInterfaceDecl *, SourceLocation> P
= getCursorObjCSuperClassRef(C);
SourceManager &SM = P.first->getASTContext().getSourceManager();
return translateSourceLocation(SM, P.second);
}
case CXCursor_ObjCProtocolRef: {
std::pair<ObjCProtocolDecl *, SourceLocation> P
= getCursorObjCProtocolRef(C);
SourceManager &SM = P.first->getASTContext().getSourceManager();
return translateSourceLocation(SM, P.second);
}
case CXCursor_ObjCClassRef: {
std::pair<ObjCInterfaceDecl *, SourceLocation> P
= getCursorObjCClassRef(C);
SourceManager &SM = P.first->getASTContext().getSourceManager();
return translateSourceLocation(SM, P.second);
}
case CXCursor_ObjCSelectorRef:
case CXCursor_ObjCIvarRef:
case CXCursor_VarRef:
case CXCursor_FunctionRef:
case CXCursor_EnumConstantRef:
case CXCursor_MemberRef: {
Expr *E = getCursorExpr(C);
SourceManager &SM = getCursorContext(C).getSourceManager();
if (ObjCMessageExpr *Msg = dyn_cast<ObjCMessageExpr>(E))
return translateSourceLocation(SM, /*FIXME:*/Msg->getLeftLoc());
if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(E))
return translateSourceLocation(SM, DRE->getLocation());
if (MemberExpr *Member = dyn_cast<MemberExpr>(E))
return translateSourceLocation(SM, Member->getMemberLoc());
if (ObjCIvarRefExpr *Ivar = dyn_cast<ObjCIvarRefExpr>(E))
return translateSourceLocation(SM, Ivar->getLocation());
return translateSourceLocation(SM, E->getLocStart());
}
default:
// FIXME: Need a way to enumerate all non-reference cases.
llvm_unreachable("Missed a reference kind");
}
}
if (!getCursorDecl(C)) {
@ -961,10 +954,12 @@ CXSourceLocation clang_getCursorLocation(CXCursor C) {
return empty;
}
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
SourceManager &SM = ND->getASTContext().getSourceManager();
return translateSourceLocation(SM, getLocationFromCursor(C, SM, ND));
Decl *D = getCursorDecl(C);
SourceManager &SM = D->getASTContext().getSourceManager();
SourceLocation Loc = D->getLocation();
if (ObjCInterfaceDecl *Class = dyn_cast<ObjCInterfaceDecl>(D))
Loc = Class->getClassLoc();
return translateSourceLocation(SM, Loc);
}
void clang_getDefinitionSpellingAndExtent(CXCursor C,

53
clang/tools/CIndex/CXCursor.cpp
View File

@ -26,9 +26,10 @@ CXCursor cxcursor::MakeCXCursor(CXCursorKind K, Decl *D) {
return C;
}
CXCursor cxcursor::MakeCXCursor(CXCursorKind K, Decl *D, Stmt *S) {
CXCursor cxcursor::MakeCXCursor(CXCursorKind K, Decl *D, Stmt *S,
ASTContext &Context) {
assert(clang_isReference(K));
CXCursor C = { K, { D, S, 0 } };
CXCursor C = { K, { D, S, &Context } };
return C;
}
@ -140,8 +141,52 @@ Stmt *cxcursor::getCursorStmt(CXCursor Cursor) {
return (Stmt *)Cursor.data[1];
}
Decl *cxcursor::getCursorReferringDecl(CXCursor Cursor) {
return (Decl *)Cursor.data[2];
ASTContext &cxcursor::getCursorContext(CXCursor Cursor) {
switch (Cursor.kind) {
case CXCursor_TypedefDecl:
case CXCursor_StructDecl:
case CXCursor_UnionDecl:
case CXCursor_ClassDecl:
case CXCursor_EnumDecl:
case CXCursor_FieldDecl:
case CXCursor_EnumConstantDecl:
case CXCursor_FunctionDecl:
case CXCursor_VarDecl:
case CXCursor_ParmDecl:
case CXCursor_ObjCInterfaceDecl:
case CXCursor_ObjCCategoryDecl:
case CXCursor_ObjCProtocolDecl:
case CXCursor_ObjCPropertyDecl:
case CXCursor_ObjCIvarDecl:
case CXCursor_ObjCInstanceMethodDecl:
case CXCursor_ObjCClassMethodDecl:
case CXCursor_FunctionDefn:
case CXCursor_ObjCClassDefn:
case CXCursor_ObjCCategoryDefn:
case CXCursor_ObjCInstanceMethodDefn:
case CXCursor_ObjCClassMethodDefn:
return static_cast<Decl *>(Cursor.data[0])->getASTContext();
case CXCursor_ObjCSuperClassRef:
case CXCursor_ObjCProtocolRef:
case CXCursor_ObjCClassRef:
return static_cast<Decl *>(Cursor.data[0])->getASTContext();
case CXCursor_ObjCSelectorRef:
case CXCursor_ObjCIvarRef:
case CXCursor_VarRef:
case CXCursor_FunctionRef:
case CXCursor_EnumConstantRef:
case CXCursor_MemberRef:
return *static_cast<ASTContext *>(Cursor.data[2]);
case CXCursor_InvalidFile:
case CXCursor_NoDeclFound:
case CXCursor_NotImplemented:
llvm_unreachable("No context in an invalid cursor");
}
llvm_unreachable("No context available");
}
bool cxcursor::operator==(CXCursor X, CXCursor Y) {

6
clang/tools/CIndex/CXCursor.h
View File

@ -20,6 +20,7 @@
namespace clang {
class ASTContext;
class Decl;
class Expr;
class NamedDecl;
@ -30,7 +31,8 @@ class Stmt;
namespace cxcursor {
CXCursor MakeCXCursor(CXCursorKind K, clang::Decl *D);
CXCursor MakeCXCursor(CXCursorKind K, clang::Decl *D, clang::Stmt *S);
CXCursor MakeCXCursor(CXCursorKind K, clang::Decl *D, clang::Stmt *S,
ASTContext &Context);
CXCursor MakeCXCursor(clang::Decl *D);
/// \brief Create an Objective-C superclass reference at the given location.
@ -61,7 +63,7 @@ std::pair<ObjCInterfaceDecl *, SourceLocation>
Decl *getCursorDecl(CXCursor Cursor);
Expr *getCursorExpr(CXCursor Cursor);
Stmt *getCursorStmt(CXCursor Cursor);
Decl *getCursorReferringDecl(CXCursor Cursor);
ASTContext &getCursorContext(CXCursor Cursor);
bool operator==(CXCursor X, CXCursor Y);