[libclang] Introduce CXIdxEntityLanguage that indicates the language

of an indexed entity.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146067 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h
index 52390217b0df5f166dc4c3c7f7eff863b7da30ee..5d1e19ead05f5da77cc467c046338d9b1a07cc17 100644 (file)
--- a/include/clang-c/Index.h
+++ b/include/clang-c/Index.h
@@ -4134,11 +4134,17 @@ typedef enum {
   CXIdxEntity_CXXConstructor        = 22,
   CXIdxEntity_CXXDestructor         = 23,
   CXIdxEntity_CXXConversionFunction = 24,
-  CXIdxEntity_CXXTypeAlias          = 25,
-  CXIdxEntity_CXXInstanceVariable   = 26
+  CXIdxEntity_CXXTypeAlias          = 25
 
 } CXIdxEntityKind;
 
+typedef enum {
+  CXIdxEntityLang_None = 0,
+  CXIdxEntityLang_C    = 1,
+  CXIdxEntityLang_ObjC = 2,
+  CXIdxEntityLang_CXX  = 3
+} CXIdxEntityLanguage;
+
 /**
  * \brief Extra C++ template information for an entity. This can apply to:
  * CXIdxEntity_Function
@@ -4159,6 +4165,7 @@ typedef enum {
 typedef struct {
   CXIdxEntityKind kind;
   CXIdxEntityCXXTemplateKind templateKind;
+  CXIdxEntityLanguage lang;
   const char *name;
   const char *USR;
   CXCursor cursor;

diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index 7d571a0dbe170f3b6ff7de156db4dac2ecdf4bf5..fb41d1374470a76cce8dd0026068ed4371af2e78 100644 (file)
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -1641,7 +1641,6 @@ static const char *getEntityKindString(CXIdxEntityKind kind) {
   case CXIdxEntity_CXXNamespace: return "namespace";
   case CXIdxEntity_CXXNamespaceAlias: return "namespace-alias";
   case CXIdxEntity_CXXStaticVariable: return "c++-static-var";
-  case CXIdxEntity_CXXInstanceVariable: return "c++-instance-var";
   case CXIdxEntity_CXXStaticMethod: return "c++-static-method";
   case CXIdxEntity_CXXInstanceMethod: return "c++-instance-method";
   case CXIdxEntity_CXXConstructor: return "constructor";
@@ -1665,6 +1664,17 @@ static const char *getEntityTemplateKindString(CXIdxEntityCXXTemplateKind kind)
   return 0;
 }
 
+static const char *getEntityLanguageString(CXIdxEntityLanguage kind) {
+  switch (kind) {
+  case CXIdxEntityLang_None: return "<none>";
+  case CXIdxEntityLang_C: return "C";
+  case CXIdxEntityLang_ObjC: return "ObjC";
+  case CXIdxEntityLang_CXX: return "C++";
+  }
+  assert(0 && "Garbage language kind");
+  return 0;
+}
+
 static void printEntityInfo(const char *cb,
                             CXClientData client_data,
                             const CXIdxEntityInfo *info) {
@@ -1684,6 +1694,7 @@ static void printEntityInfo(const char *cb,
 
   printf("%s: kind: %s%s", cb, getEntityKindString(info->kind),
          getEntityTemplateKindString(info->templateKind));
+  printf(" | lang: %s", getEntityLanguageString(info->lang));
   printf(" | name: %s", name);
   printf(" | USR: %s", info->USR);
 }

diff --git a/tools/libclang/IndexingContext.cpp b/tools/libclang/IndexingContext.cpp
index 3f934be8a006da2a70826d5376b8a8cdc76337e1..bb00acfea372ce0c948a509d232bfd6a462cb38e 100644 (file)
--- a/tools/libclang/IndexingContext.cpp
+++ b/tools/libclang/IndexingContext.cpp
@@ -705,6 +705,7 @@ void IndexingContext::getEntityInfo(const NamedDecl *D,
   EntityInfo.IndexCtx = this;
   EntityInfo.kind = CXIdxEntity_Unexposed;
   EntityInfo.templateKind = CXIdxEntity_NonTemplate;
+  EntityInfo.lang = CXIdxEntityLang_C;
 
   if (const TagDecl *TD = dyn_cast<TagDecl>(D)) {
     switch (TD->getTagKind()) {
@@ -713,15 +714,18 @@ void IndexingContext::getEntityInfo(const NamedDecl *D,
     case TTK_Union:
       EntityInfo.kind = CXIdxEntity_Union; break;
     case TTK_Class:
-      EntityInfo.kind = CXIdxEntity_CXXClass; break;
+      EntityInfo.kind = CXIdxEntity_CXXClass;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     case TTK_Enum:
       EntityInfo.kind = CXIdxEntity_Enum; break;
     }
 
     if (const CXXRecordDecl *CXXRec = dyn_cast<CXXRecordDecl>(D)) {
-      if (TD->getTagKind() == TTK_Struct &&
-          CXXRec->hasDefinition() && !CXXRec->isPOD())
-        EntityInfo.kind = CXIdxEntity_CXXClass;
+      // FIXME: isPOD check is not sufficient, a POD can contain methods,
+      // we want a isCStructLike check.
+      if (CXXRec->hasDefinition() && !CXXRec->isPOD())
+        EntityInfo.lang = CXIdxEntityLang_CXX;
     }
 
     if (isa<ClassTemplatePartialSpecializationDecl>(D)) {
@@ -739,50 +743,77 @@ void IndexingContext::getEntityInfo(const NamedDecl *D,
       break;
     case Decl::Var:
       EntityInfo.kind = CXIdxEntity_Variable;
-      if (isa<CXXRecordDecl>(D->getDeclContext()))
+      if (isa<CXXRecordDecl>(D->getDeclContext())) {
         EntityInfo.kind = CXIdxEntity_CXXStaticVariable;
+        EntityInfo.lang = CXIdxEntityLang_CXX;
+      }
       break;
     case Decl::Field:
       EntityInfo.kind = CXIdxEntity_Field;
       if (const CXXRecordDecl *
-            CXXRec = dyn_cast<CXXRecordDecl>(D->getDeclContext()))
+            CXXRec = dyn_cast<CXXRecordDecl>(D->getDeclContext())) {
+        // FIXME: isPOD check is not sufficient, a POD can contain methods,
+        // we want a isCStructLike check.
         if (!CXXRec->isPOD())
-          EntityInfo.kind = CXIdxEntity_CXXInstanceVariable;
+          EntityInfo.lang = CXIdxEntityLang_CXX;
+      }
       break;
     case Decl::EnumConstant:
       EntityInfo.kind = CXIdxEntity_EnumConstant; break;
     case Decl::ObjCInterface:
-      EntityInfo.kind = CXIdxEntity_ObjCClass; break;
+      EntityInfo.kind = CXIdxEntity_ObjCClass;
+      EntityInfo.lang = CXIdxEntityLang_ObjC;
+      break;
     case Decl::ObjCProtocol:
-      EntityInfo.kind = CXIdxEntity_ObjCProtocol; break;
+      EntityInfo.kind = CXIdxEntity_ObjCProtocol;
+      EntityInfo.lang = CXIdxEntityLang_ObjC;
+      break;
     case Decl::ObjCCategory:
-      EntityInfo.kind = CXIdxEntity_ObjCCategory; break;
+      EntityInfo.kind = CXIdxEntity_ObjCCategory;
+      EntityInfo.lang = CXIdxEntityLang_ObjC;
+      break;
     case Decl::ObjCMethod:
       if (cast<ObjCMethodDecl>(D)->isInstanceMethod())
         EntityInfo.kind = CXIdxEntity_ObjCInstanceMethod;
       else
         EntityInfo.kind = CXIdxEntity_ObjCClassMethod;
+      EntityInfo.lang = CXIdxEntityLang_ObjC;
       break;
     case Decl::ObjCProperty:
-      EntityInfo.kind = CXIdxEntity_ObjCProperty; break;
+      EntityInfo.kind = CXIdxEntity_ObjCProperty;
+      EntityInfo.lang = CXIdxEntityLang_ObjC;
+      break;
     case Decl::ObjCIvar:
-      EntityInfo.kind = CXIdxEntity_ObjCIvar; break;
+      EntityInfo.kind = CXIdxEntity_ObjCIvar;
+      EntityInfo.lang = CXIdxEntityLang_ObjC;
+      break;
     case Decl::Namespace:
-      EntityInfo.kind = CXIdxEntity_CXXNamespace; break;
+      EntityInfo.kind = CXIdxEntity_CXXNamespace;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     case Decl::NamespaceAlias:
-      EntityInfo.kind = CXIdxEntity_CXXNamespaceAlias; break;
+      EntityInfo.kind = CXIdxEntity_CXXNamespaceAlias;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     case Decl::CXXConstructor:
-      EntityInfo.kind = CXIdxEntity_CXXConstructor; break;
+      EntityInfo.kind = CXIdxEntity_CXXConstructor;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     case Decl::CXXDestructor:
-      EntityInfo.kind = CXIdxEntity_CXXDestructor; break;
+      EntityInfo.kind = CXIdxEntity_CXXDestructor;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     case Decl::CXXConversion:
-      EntityInfo.kind = CXIdxEntity_CXXConversionFunction; break;
+      EntityInfo.kind = CXIdxEntity_CXXConversionFunction;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     case Decl::CXXMethod: {
       const CXXMethodDecl *MD = cast<CXXMethodDecl>(D);
       if (MD->isStatic())
         EntityInfo.kind = CXIdxEntity_CXXStaticMethod;
       else
         EntityInfo.kind = CXIdxEntity_CXXInstanceMethod;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
       break;
     }
     case Decl::ClassTemplate:
@@ -813,7 +844,9 @@ void IndexingContext::getEntityInfo(const NamedDecl *D,
       EntityInfo.templateKind = CXIdxEntity_Template;
       break;
     case Decl::TypeAlias:
-      EntityInfo.kind = CXIdxEntity_CXXTypeAlias; break;
+      EntityInfo.kind = CXIdxEntity_CXXTypeAlias;
+      EntityInfo.lang = CXIdxEntityLang_CXX;
+      break;
     default:
       break;
     }
@@ -828,6 +861,9 @@ void IndexingContext::getEntityInfo(const NamedDecl *D,
       EntityInfo.templateKind = CXIdxEntity_TemplateSpecialization;
   }
 
+  if (EntityInfo.templateKind != CXIdxEntity_NonTemplate)
+    EntityInfo.lang = CXIdxEntityLang_CXX;
+
   if (IdentifierInfo *II = D->getIdentifier()) {
     EntityInfo.name = SA.toCStr(II->getName());