1 files changed, 31 insertions, 2 deletions
diff --git a/tools/CIndex/CXCursor.cpp b/tools/CIndex/CXCursor.cpp
index a7a7dfca65..0c72e96900 100644
--- a/tools/CIndex/CXCursor.cpp
+++ b/tools/CIndex/CXCursor.cpp
@@ -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];
+}
+\ No newline at end of file