From 707de373913034e304bd8d1f3175655c8ee893ef Mon Sep 17 00:00:00 2001 From: Malte Langkabel Date: Mon, 4 Nov 2019 18:45:44 +0100 Subject: [PATCH] Clean up types (#9) * remove unused node and edge types * update version number --- core/include/EdgeKind.h | 17 +++++++---------- core/include/NodeKind.h | 9 ++++----- core/include/ReferenceKind.h | 3 --- core/include/SymbolKind.h | 1 - core/src/EdgeKind.cpp | 3 --- core/src/NodeKind.cpp | 1 - core/src/ReferenceKind.cpp | 6 ------ core/src/SymbolKind.cpp | 2 -- resources_swig/include/sourcetraildb.h | 4 ---- resources_swig/src/sourcetraildb.cpp | 8 -------- version.txt | 2 +- 11 files changed, 12 insertions(+), 44 deletions(-) diff --git a/core/include/EdgeKind.h b/core/include/EdgeKind.h index 68ac9b6..26d77ce 100644 --- a/core/include/EdgeKind.h +++ b/core/include/EdgeKind.h @@ -37,16 +37,13 @@ namespace sourcetrail CALL = 1 << 3, INHERITANCE = 1 << 4, OVERRIDE = 1 << 5, - TEMPLATE_ARGUMENT = 1 << 6, - TYPE_ARGUMENT = 1 << 7, - TEMPLATE_DEFAULT_ARGUMENT = 1 << 8, - TEMPLATE_SPECIALIZATION = 1 << 9, - TEMPLATE_MEMBER_SPECIALIZATION = 1 << 10, - INCLUDE = 1 << 11, - IMPORT = 1 << 12, - AGGREGATION = 1 << 13, - MACRO_USAGE = 1 << 14, - ANNOTATION_USAGE = 1 << 15 + TYPE_ARGUMENT = 1 << 6, + TEMPLATE_SPECIALIZATION = 1 << 7, + INCLUDE = 1 << 8, + IMPORT = 1 << 9, + AGGREGATION = 1 << 10, + MACRO_USAGE = 1 << 11, + ANNOTATION_USAGE = 1 << 12 }; int edgeKindToInt(EdgeKind kind); diff --git a/core/include/NodeKind.h b/core/include/NodeKind.h index 893b951..7f8ac53 100644 --- a/core/include/NodeKind.h +++ b/core/include/NodeKind.h @@ -41,11 +41,10 @@ namespace sourcetrail ENUM = 1 << 14, ENUM_CONSTANT = 1 << 15, TYPEDEF = 1 << 16, - TEMPLATE_PARAMETER = 1 << 17, - TYPE_PARAMETER = 1 << 18, - FILE = 1 << 19, - MACRO = 1 << 20, - UNION = 1 << 21 + TYPE_PARAMETER = 1 << 17, + FILE = 1 << 18, + MACRO = 1 << 19, + UNION = 1 << 20 }; int nodeKindToInt(NodeKind kind); diff --git a/core/include/ReferenceKind.h b/core/include/ReferenceKind.h index e7d443e..328f9ab 100644 --- a/core/include/ReferenceKind.h +++ b/core/include/ReferenceKind.h @@ -31,11 +31,8 @@ namespace sourcetrail CALL, INHERITANCE, OVERRIDE, - TEMPLATE_ARGUMENT, TYPE_ARGUMENT, - TEMPLATE_DEFAULT_ARGUMENT, TEMPLATE_SPECIALIZATION, - TEMPLATE_MEMBER_SPECIALIZATION, INCLUDE, IMPORT, MACRO_USAGE, diff --git a/core/include/SymbolKind.h b/core/include/SymbolKind.h index e8d5326..24e814e 100644 --- a/core/include/SymbolKind.h +++ b/core/include/SymbolKind.h @@ -42,7 +42,6 @@ namespace sourcetrail ENUM, ENUM_CONSTANT, TYPEDEF, - TEMPLATE_PARAMETER, TYPE_PARAMETER, MACRO, UNION diff --git a/core/src/EdgeKind.cpp b/core/src/EdgeKind.cpp index 17c90e4..d147a0b 100644 --- a/core/src/EdgeKind.cpp +++ b/core/src/EdgeKind.cpp @@ -34,11 +34,8 @@ namespace sourcetrail EdgeKind::CALL, EdgeKind::INHERITANCE, EdgeKind::OVERRIDE, - EdgeKind::TEMPLATE_ARGUMENT, EdgeKind::TYPE_ARGUMENT, - EdgeKind::TEMPLATE_DEFAULT_ARGUMENT, EdgeKind::TEMPLATE_SPECIALIZATION, - EdgeKind::TEMPLATE_MEMBER_SPECIALIZATION, EdgeKind::INCLUDE, EdgeKind::IMPORT, EdgeKind::AGGREGATION, diff --git a/core/src/NodeKind.cpp b/core/src/NodeKind.cpp index f7f8828..137c396 100644 --- a/core/src/NodeKind.cpp +++ b/core/src/NodeKind.cpp @@ -43,7 +43,6 @@ namespace sourcetrail NodeKind::ENUM, NodeKind::ENUM_CONSTANT, NodeKind::TYPEDEF, - NodeKind::TEMPLATE_PARAMETER, NodeKind::TYPE_PARAMETER, NodeKind::FILE, NodeKind::MACRO, diff --git a/core/src/ReferenceKind.cpp b/core/src/ReferenceKind.cpp index d748706..c6d8fac 100644 --- a/core/src/ReferenceKind.cpp +++ b/core/src/ReferenceKind.cpp @@ -34,16 +34,10 @@ namespace sourcetrail return EdgeKind::INHERITANCE; case ReferenceKind::OVERRIDE: return EdgeKind::OVERRIDE; - case ReferenceKind::TEMPLATE_ARGUMENT: - return EdgeKind::TEMPLATE_ARGUMENT; case ReferenceKind::TYPE_ARGUMENT: return EdgeKind::TYPE_ARGUMENT; - case ReferenceKind::TEMPLATE_DEFAULT_ARGUMENT: - return EdgeKind::TEMPLATE_DEFAULT_ARGUMENT; case ReferenceKind::TEMPLATE_SPECIALIZATION: return EdgeKind::TEMPLATE_SPECIALIZATION; - case ReferenceKind::TEMPLATE_MEMBER_SPECIALIZATION: - return EdgeKind::TEMPLATE_MEMBER_SPECIALIZATION; case ReferenceKind::INCLUDE: return EdgeKind::INCLUDE; case ReferenceKind::IMPORT: diff --git a/core/src/SymbolKind.cpp b/core/src/SymbolKind.cpp index b918df5..508b7f0 100644 --- a/core/src/SymbolKind.cpp +++ b/core/src/SymbolKind.cpp @@ -56,8 +56,6 @@ namespace sourcetrail return NodeKind::ENUM_CONSTANT; case SymbolKind::TYPEDEF: return NodeKind::TYPEDEF; - case SymbolKind::TEMPLATE_PARAMETER: - return NodeKind::TEMPLATE_PARAMETER; case SymbolKind::TYPE_PARAMETER: return NodeKind::TYPE_PARAMETER; case SymbolKind::MACRO: diff --git a/resources_swig/include/sourcetraildb.h b/resources_swig/include/sourcetraildb.h index bc68ed4..414796d 100644 --- a/resources_swig/include/sourcetraildb.h +++ b/resources_swig/include/sourcetraildb.h @@ -27,7 +27,6 @@ enum SymbolKind SYMBOL_ENUM, SYMBOL_ENUM_CONSTANT, SYMBOL_TYPEDEF, - SYMBOL_TEMPLATE_PARAMETER, SYMBOL_TYPE_PARAMETER, SYMBOL_MACRO, SYMBOL_UNION @@ -40,11 +39,8 @@ enum ReferenceKind REFERENCE_CALL, REFERENCE_INHERITANCE, REFERENCE_OVERRIDE, - REFERENCE_TEMPLATE_ARGUMENT, REFERENCE_TYPE_ARGUMENT, - REFERENCE_TEMPLATE_DEFAULT_ARGUMENT, REFERENCE_TEMPLATE_SPECIALIZATION, - REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION, REFERENCE_INCLUDE, REFERENCE_IMPORT, REFERENCE_MACRO_USAGE, diff --git a/resources_swig/src/sourcetraildb.cpp b/resources_swig/src/sourcetraildb.cpp index 9312923..20b5c8a 100644 --- a/resources_swig/src/sourcetraildb.cpp +++ b/resources_swig/src/sourcetraildb.cpp @@ -57,8 +57,6 @@ namespace return sourcetrail::SymbolKind::ENUM_CONSTANT; case SYMBOL_TYPEDEF: return sourcetrail::SymbolKind::TYPEDEF; - case SYMBOL_TEMPLATE_PARAMETER: - return sourcetrail::SymbolKind::TEMPLATE_PARAMETER; case SYMBOL_TYPE_PARAMETER: return sourcetrail::SymbolKind::TYPE_PARAMETER; case SYMBOL_MACRO: @@ -83,16 +81,10 @@ namespace return sourcetrail::ReferenceKind::INHERITANCE; case REFERENCE_OVERRIDE: return sourcetrail::ReferenceKind::OVERRIDE; - case REFERENCE_TEMPLATE_ARGUMENT: - return sourcetrail::ReferenceKind::TEMPLATE_ARGUMENT; case REFERENCE_TYPE_ARGUMENT: return sourcetrail::ReferenceKind::TYPE_ARGUMENT; - case REFERENCE_TEMPLATE_DEFAULT_ARGUMENT: - return sourcetrail::ReferenceKind::TEMPLATE_DEFAULT_ARGUMENT; case REFERENCE_TEMPLATE_SPECIALIZATION: return sourcetrail::ReferenceKind::TEMPLATE_SPECIALIZATION; - case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION: - return sourcetrail::ReferenceKind::TEMPLATE_MEMBER_SPECIALIZATION; case REFERENCE_INCLUDE: return sourcetrail::ReferenceKind::INCLUDE; case REFERENCE_IMPORT: diff --git a/version.txt b/version.txt index d689826..f684a06 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v2.db24.p0 +v3.db25.p0