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

Make CXCursor's data opaque. 

llvm-svn: 93561
This commit is contained in:
Douglas Gregor 2010-01-15 21:56:13 +00:00
parent e0da4b6cff
commit c58d05bcf9
5 changed files with 82 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang-c/Index.h
View File

@ -137,9 +137,7 @@ struct CXUnsavedFile {
typedef struct {
enum CXCursorKind kind;
CXDecl decl;
CXStmt stmt; /* expression reference */
CXDecl referringDecl;
void *data[3];
} CXCursor;
/* A unique token for looking up "visible" CXDecls from a CXTranslationUnit. */

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

@ -190,7 +190,7 @@ private:
if (ND->isImplicit())
return;
CXCursor C = { CK, ND, 0, 0 };
CXCursor C = { CK, { ND, 0, 0 } };
Callback(Root, C, CData);
}
@ -291,7 +291,7 @@ class CDeclVisitor : public DeclVisitor<CDeclVisitor> {
if (ND->getPCHLevel() > MaxPCHLevel)
return;
CXCursor C = { CK, ND, 0, 0 };
CXCursor C = { CK, { ND, 0, 0 } };
Callback(CDecl, C, CData);
}
public:
@ -412,14 +412,13 @@ static SourceLocation getLocationFromCursor(CXCursor C,
NamedDecl *ND) {
if (clang_isReference(C.kind)) {
if (Decl *D = static_cast<Decl*>(C.referringDecl))
if (Decl *D = getCursorReferringDecl(C))
return D->getLocation();
switch (C.kind) {
case CXCursor_ObjCClassRef: {
if (isa<ObjCInterfaceDecl>(ND)) {
// FIXME: This is a hack (storing the parent decl in the stmt slot).
NamedDecl *parentDecl = static_cast<NamedDecl *>(C.stmt);
NamedDecl *parentDecl = getCursorInterfaceParent(C);
return parentDecl->getLocation();
}
ObjCCategoryDecl *OID = dyn_cast<ObjCCategoryDecl>(ND);
@ -437,16 +436,14 @@ static SourceLocation getLocationFromCursor(CXCursor C,
return OID->getLocation();
}
case CXCursor_ObjCSelectorRef: {
ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(
static_cast<Stmt *>(C.stmt));
ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(getCursorStmt(C));
assert(OME && "clang_getCursorLine(): 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>(
static_cast<Stmt *>(C.stmt));
DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(getCursorStmt(C));
assert(DRE && "clang_getCursorLine(): Missing decl ref expr");
return DRE->getLocation();
}
@ -868,9 +865,8 @@ static Decl *getDeclFromExpr(Stmt *E) {
extern "C" {
CXString clang_getCursorSpelling(CXCursor C) {
assert(C.decl && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
assert(ND && "CXCursor has null decl");
if (clang_isReference(C.kind)) {
switch (C.kind) {
case CXCursor_ObjCSuperClassRef: {
@ -894,8 +890,7 @@ CXString clang_getCursorSpelling(CXCursor C) {
return CIndexer::createCXString(OID->getIdentifier()->getNameStart());
}
case CXCursor_ObjCSelectorRef: {
ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(
static_cast<Stmt *>(C.stmt));
ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(getCursorStmt(C));
assert(OME && "clang_getCursorLine(): Missing message expr");
return CIndexer::createCXString(OME->getSelector().getAsString().c_str(),
true);
@ -903,8 +898,7 @@ CXString clang_getCursorSpelling(CXCursor C) {
case CXCursor_VarRef:
case CXCursor_FunctionRef:
case CXCursor_EnumConstantRef: {
DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(
static_cast<Stmt *>(C.stmt));
DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(getCursorStmt(C));
assert(DRE && "clang_getCursorLine(): Missing decl ref expr");
return CIndexer::createCXString(DRE->getDecl()->getIdentifier()
->getNameStart());
@ -913,7 +907,7 @@ CXString clang_getCursorSpelling(CXCursor C) {
return CIndexer::createCXString("<not implemented>");
}
}
return clang_getDeclSpelling(C.decl);
return clang_getDeclSpelling(getCursorDecl(C));
}
const char *clang_getCursorKindSpelling(enum CXCursorKind Kind) {
@ -993,11 +987,11 @@ CXCursor clang_getCursor(CXTranslationUnit CTUnit, const char *source_name,
}
if (ALoc.isNamedRef()) {
if (isa<ObjCInterfaceDecl>(Dcl)) {
CXCursor C = { CXCursor_ObjCClassRef, Dcl, ALoc.getParentDecl(), 0 };
CXCursor C = { CXCursor_ObjCClassRef, { Dcl, ALoc.getParentDecl(), 0 }};
return C;
}
if (isa<ObjCProtocolDecl>(Dcl)) {
CXCursor C = { CXCursor_ObjCProtocolRef, Dcl, ALoc.getParentDecl(), 0 };
CXCursor C = {CXCursor_ObjCProtocolRef, {Dcl, ALoc.getParentDecl(), 0}};
return C;
}
}
@ -1011,8 +1005,7 @@ CXCursor clang_getNullCursor(void) {
}
unsigned clang_equalCursors(CXCursor X, CXCursor Y) {
return X.kind == Y.kind && X.decl == Y.decl && X.stmt == Y.stmt &&
X.referringDecl == Y.referringDecl;
return X == Y;
}
CXCursor clang_getCursorFromDecl(CXDecl AnonDecl) {
@ -1043,24 +1036,24 @@ CXCursorKind clang_getCursorKind(CXCursor C) {
CXDecl clang_getCursorDecl(CXCursor C) {
if (clang_isDeclaration(C.kind))
return C.decl;
return getCursorDecl(C);
if (clang_isReference(C.kind)) {
if (C.stmt) {
if (getCursorStmt(C)) {
if (C.kind == CXCursor_ObjCClassRef ||
C.kind == CXCursor_ObjCProtocolRef)
return static_cast<Stmt *>(C.stmt);
return getCursorStmt(C);
else
return getDeclFromExpr(static_cast<Stmt *>(C.stmt));
return getDeclFromExpr(getCursorStmt(C));
} else
return C.decl;
return getCursorDecl(C);
}
return 0;
}
unsigned clang_getCursorLine(CXCursor C) {
assert(C.decl && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
assert(getCursorDecl(C) && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
SourceLocation SLoc = getLocationFromCursor(C, SourceMgr, ND);
@ -1068,8 +1061,8 @@ unsigned clang_getCursorLine(CXCursor C) {
}
unsigned clang_getCursorColumn(CXCursor C) {
assert(C.decl && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
assert(getCursorDecl(C) && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
SourceLocation SLoc = getLocationFromCursor(C, SourceMgr, ND);
@ -1077,8 +1070,8 @@ unsigned clang_getCursorColumn(CXCursor C) {
}
const char *clang_getCursorSource(CXCursor C) {
assert(C.decl && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
assert(getCursorDecl(C) && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
SourceLocation SLoc = getLocationFromCursor(C, SourceMgr, ND);
@ -1100,8 +1093,8 @@ const char *clang_getCursorSource(CXCursor C) {
}
CXFile clang_getCursorSourceFile(CXCursor C) {
assert(C.decl && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
assert(getCursorDecl(C) && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
return (void *)
@ -1116,8 +1109,8 @@ void clang_getDefinitionSpellingAndExtent(CXCursor C,
unsigned *startColumn,
unsigned *endLine,
unsigned *endColumn) {
assert(C.decl && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
assert(getCursorDecl(C) && "CXCursor has null decl");
NamedDecl *ND = static_cast<NamedDecl *>(getCursorDecl(C));
FunctionDecl *FD = dyn_cast<FunctionDecl>(ND);
CompoundStmt *Body = dyn_cast<CompoundStmt>(FD->getBody());

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

@ -13,17 +13,46 @@
#include "CXCursor.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Expr.h"
using namespace clang;
CXCursor cxcursor::MakeCXCursor(CXCursorKind K, Decl *D) {
CXCursor C = { K, D, 0, 0 };
CXCursor C = { K, { D, 0, 0 } };
return C;
}
CXCursor cxcursor::MakeCXCursor(CXCursorKind K, Decl *D, Stmt *S) {
assert(clang_isReference(K));
CXCursor C = { K, D, S, 0 };
CXCursor C = { K, { D, S, 0 } };
return C;
}
Decl *cxcursor::getCursorDecl(CXCursor Cursor) {
return (Decl *)Cursor.data[0];
}
Expr *cxcursor::getCursorExpr(CXCursor Cursor) {
return dyn_cast_or_null<Expr>(getCursorStmt(Cursor));
}
Stmt *cxcursor::getCursorStmt(CXCursor Cursor) {
return (Stmt *)Cursor.data[1];
}
Decl *cxcursor::getCursorReferringDecl(CXCursor Cursor) {
return (Decl *)Cursor.data[2];
}
NamedDecl *cxcursor::getCursorInterfaceParent(CXCursor Cursor) {
assert(Cursor.kind == CXCursor_ObjCClassRef);
assert(isa<ObjCInterfaceDecl>(getCursorDecl(Cursor)));
// FIXME: This is a hack (storing the parent decl in the stmt slot).
return static_cast<NamedDecl *>(Cursor.data[1]);
}
bool cxcursor::operator==(CXCursor X, CXCursor Y) {
return X.kind == Y.kind && X.data[0] == Y.data[0] && X.data[1] == Y.data[1] &&
X.data[2] == Y.data[2];
}

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

@ -19,6 +19,8 @@
namespace clang {
class Decl;
class Expr;
class NamedDecl;
class Stmt;
namespace cxcursor {
@ -26,6 +28,18 @@ namespace cxcursor {
CXCursor MakeCXCursor(CXCursorKind K, clang::Decl *D);
CXCursor MakeCXCursor(CXCursorKind K, clang::Decl *D, clang::Stmt *S);
Decl *getCursorDecl(CXCursor Cursor);
Expr *getCursorExpr(CXCursor Cursor);
Stmt *getCursorStmt(CXCursor Cursor);
Decl *getCursorReferringDecl(CXCursor Cursor);
NamedDecl *getCursorInterfaceParent(CXCursor Cursor);
bool operator==(CXCursor X, CXCursor Y);
inline bool operator!=(CXCursor X, CXCursor Y) {
return !(X == Y);
}
}} // end namespace: clang::cxcursor
#endif

14
clang/tools/c-index-test/c-index-test.c
View File

@ -111,11 +111,11 @@ static void TranslationUnitVisitor(CXTranslationUnit Unit, CXCursor Cursor,
basename(clang_getCString(string)));
clang_disposeString(string);
PrintDeclExtent(Cursor.decl);
PrintDeclExtent(Cursor.data[0]);
printf("\n");
clang_loadDeclaration(Cursor.decl, DeclVisitor, 0);
clang_loadDeclaration(Cursor.data[0], DeclVisitor, 0);
}
}
@ -152,7 +152,7 @@ static void FunctionScanVisitor(CXTranslationUnit Unit, CXCursor Cursor,
printf("// %s: %s:%d:%d: ", FileCheckPrefix, GetCursorSource(Ref),
curLine, curColumn);
PrintCursor(Ref);
string = clang_getDeclSpelling(Ref.decl);
string = clang_getDeclSpelling(Ref.data[0]);
printf(" [Context:%s]\n", clang_getCString(string));
clang_disposeString(string);
}
@ -166,13 +166,13 @@ static void FunctionScanVisitor(CXTranslationUnit Unit, CXCursor Cursor,
static void USRDeclVisitor(CXDecl D, CXCursor C, CXClientData Filter) {
if (!Filter || (C.kind == *(enum CXCursorKind *)Filter)) {
CXString USR = clang_getDeclUSR(C.decl);
CXString USR = clang_getDeclUSR(C.data[0]);
if (!USR.Spelling) {
clang_disposeString(USR);
return;
}
printf("// %s: %s %s", FileCheckPrefix, GetCursorSource(C), USR.Spelling);
PrintDeclExtent(C.decl);
PrintDeclExtent(C.data[0]);
printf("\n");
clang_disposeString(USR);
}
@ -180,9 +180,9 @@ static void USRDeclVisitor(CXDecl D, CXCursor C, CXClientData Filter) {
static void USRVisitor(CXTranslationUnit Unit, CXCursor Cursor,
CXClientData Filter) {
if (Cursor.decl) {
if (Cursor.data[0]) {
/* USRDeclVisitor(Unit, Cursor.decl, Cursor, Filter);*/
clang_loadDeclaration(Cursor.decl, USRDeclVisitor, 0);
clang_loadDeclaration(Cursor.data[0], USRDeclVisitor, 0);
}
}