[cfe-commits] r93928 - in /cfe/trunk: include/clang-c/Index.h tools/CIndex/CIndex.cpp tools/CIndex/CXCursor.cpp

[Douglas Gregor]

Author: dgregor
Date: Tue Jan 19 16:15:34 2010
New Revision: 93928

URL: http://llvm.org/viewvc/llvm-project?rev=93928&view=rev
Log:
Kill the unused and unnecessary CXCursor_MemberRef, twin to the
now-dead CXCursor_ObjCIvarRef.

Modified:
    cfe/trunk/include/clang-c/Index.h
    cfe/trunk/tools/CIndex/CIndex.cpp
    cfe/trunk/tools/CIndex/CXCursor.cpp

Modified: cfe/trunk/include/clang-c/Index.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=93928&r1=93927&r2=93928&view=diff

==============================================================================
--- cfe/trunk/include/clang-c/Index.h (original)
+++ cfe/trunk/include/clang-c/Index.h Tue Jan 19 16:15:34 2010
@@ -115,11 +115,10 @@
  CXCursor_ObjCClassRef                  = 42,
  
  CXCursor_ObjCSelectorRef               = 43, /* Expression references */
- CXCursor_VarRef                        = 45,
- CXCursor_FunctionRef                   = 46,
- CXCursor_EnumConstantRef               = 47,
- CXCursor_MemberRef                     = 48,
- CXCursor_LastRef                       = 48,
+ CXCursor_VarRef                        = 44,
+ CXCursor_FunctionRef                   = 45,
+ CXCursor_EnumConstantRef               = 46,
+ CXCursor_LastRef                       = 46,
  
  /* Error conditions */
  CXCursor_FirstInvalid                  = 70,

Modified: cfe/trunk/tools/CIndex/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.cpp?rev=93928&r1=93927&r2=93928&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.cpp (original)
+++ cfe/trunk/tools/CIndex/CIndex.cpp Tue Jan 19 16:15:34 2010
@@ -882,7 +882,6 @@
   case CXCursor_VarRef: return "VarRef";
   case CXCursor_FunctionRef: return "FunctionRef";
   case CXCursor_EnumConstantRef: return "EnumConstantRef";
-  case CXCursor_MemberRef: return "MemberRef";
 
   case CXCursor_InvalidFile: return "InvalidFile";
   case CXCursor_NoDeclFound: return "NoDeclFound";
@@ -1006,8 +1005,7 @@
     case CXCursor_ObjCSelectorRef:
     case CXCursor_VarRef:
     case CXCursor_FunctionRef:
-    case CXCursor_EnumConstantRef:
-    case CXCursor_MemberRef: {
+    case CXCursor_EnumConstantRef: {
       Expr *E = getCursorExpr(C);
       ASTContext &Context = getCursorContext(C);
       if (ObjCMessageExpr *Msg = dyn_cast<ObjCMessageExpr>(E))
@@ -1065,7 +1063,6 @@
       case CXCursor_VarRef:
       case CXCursor_FunctionRef:
       case CXCursor_EnumConstantRef:
-      case CXCursor_MemberRef:
         return translateSourceRange(getCursorContext(C), 
                                     getCursorExpr(C)->getSourceRange());
         
@@ -1104,8 +1101,7 @@
     case CXCursor_ObjCSelectorRef:
     case CXCursor_VarRef:
     case CXCursor_FunctionRef:
-    case CXCursor_EnumConstantRef:
-    case CXCursor_MemberRef: {
+    case CXCursor_EnumConstantRef: {
       Decl *D = getDeclFromExpr(getCursorExpr(C));
       if (D)
         return MakeCXCursor(D);

Modified: cfe/trunk/tools/CIndex/CXCursor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CXCursor.cpp?rev=93928&r1=93927&r2=93928&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CXCursor.cpp (original)
+++ cfe/trunk/tools/CIndex/CXCursor.cpp Tue Jan 19 16:15:34 2010
@@ -175,7 +175,6 @@
   case CXCursor_VarRef:
   case CXCursor_FunctionRef:
   case CXCursor_EnumConstantRef:
-  case CXCursor_MemberRef:
     return *static_cast<ASTContext *>(Cursor.data[2]);
   
   case CXCursor_InvalidFile: