diff options
author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2016-11-11 23:49:55 +0000 |
---|---|---|
committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2016-11-11 23:49:55 +0000 |
commit | 0e0e98c0156df7222fc19bb04c6d6b1ae647bf40 (patch) | |
tree | d29ec62f6f4c1ff2b2bdd9cc0f513f3f3596a63e /tools | |
parent | 8b5e03abf81fb7c48774494d3befb8ff9e1ad87e (diff) |
[index] Rename SymbolSubKind -> SymbolProperty, NFC.
This better reflects what it represents.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@286680 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/c-index-test/core_main.cpp | 4 | ||||
-rw-r--r-- | tools/libclang/CXIndexDataConsumer.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/c-index-test/core_main.cpp b/tools/c-index-test/core_main.cpp index 7b7acf0770..3e4052c93e 100644 --- a/tools/c-index-test/core_main.cpp +++ b/tools/c-index-test/core_main.cpp @@ -167,9 +167,9 @@ static bool printSourceSymbols(ArrayRef<const char *> Args) { static void printSymbolInfo(SymbolInfo SymInfo, raw_ostream &OS) { OS << getSymbolKindString(SymInfo.Kind); - if (SymInfo.SubKinds) { + if (SymInfo.Properties) { OS << '('; - printSymbolSubKinds(SymInfo.SubKinds, OS); + printSymbolProperties(SymInfo.Properties, OS); OS << ')'; } OS << '/' << getSymbolLanguageString(SymInfo.Lang); diff --git a/tools/libclang/CXIndexDataConsumer.cpp b/tools/libclang/CXIndexDataConsumer.cpp index 74d8f2415c..45198dd1b1 100644 --- a/tools/libclang/CXIndexDataConsumer.cpp +++ b/tools/libclang/CXIndexDataConsumer.cpp @@ -1142,7 +1142,7 @@ void CXIndexDataConsumer::translateLoc(SourceLocation Loc, static CXIdxEntityKind getEntityKindFromSymbolKind(SymbolKind K, SymbolLanguage L); static CXIdxEntityCXXTemplateKind -getEntityKindFromSymbolSubKinds(SymbolSubKindSet K); +getEntityKindFromSymbolProperties(SymbolPropertySet K); static CXIdxEntityLanguage getEntityLangFromSymbolLang(SymbolLanguage L); void CXIndexDataConsumer::getEntityInfo(const NamedDecl *D, @@ -1158,7 +1158,7 @@ void CXIndexDataConsumer::getEntityInfo(const NamedDecl *D, SymbolInfo SymInfo = getSymbolInfo(D); EntityInfo.kind = getEntityKindFromSymbolKind(SymInfo.Kind, SymInfo.Lang); - EntityInfo.templateKind = getEntityKindFromSymbolSubKinds(SymInfo.SubKinds); + EntityInfo.templateKind = getEntityKindFromSymbolProperties(SymInfo.Properties); EntityInfo.lang = getEntityLangFromSymbolLang(SymInfo.Lang); if (D->hasAttrs()) { @@ -1298,12 +1298,12 @@ static CXIdxEntityKind getEntityKindFromSymbolKind(SymbolKind K, SymbolLanguage } static CXIdxEntityCXXTemplateKind -getEntityKindFromSymbolSubKinds(SymbolSubKindSet K) { - if (K & (unsigned)SymbolSubKind::TemplatePartialSpecialization) +getEntityKindFromSymbolProperties(SymbolPropertySet K) { + if (K & (unsigned)SymbolProperty::TemplatePartialSpecialization) return CXIdxEntity_TemplatePartialSpecialization; - if (K & (unsigned)SymbolSubKind::TemplateSpecialization) + if (K & (unsigned)SymbolProperty::TemplateSpecialization) return CXIdxEntity_TemplateSpecialization; - if (K & (unsigned)SymbolSubKind::Generic) + if (K & (unsigned)SymbolProperty::Generic) return CXIdxEntity_Template; return CXIdxEntity_NonTemplate; } |