diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index 42ce46f1..fc15435c 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -1456,8 +1456,8 @@ void GraphController::handleMessage(MessageColorSchemeTest* message) createEdges( 900000, Edge::EDGE_TEMPLATE_ARGUMENT, Node::NODE_TYPE, Node::NODE_TYPE); createEdges(1000000, Edge::EDGE_TEMPLATE_DEFAULT_ARGUMENT, Node::NODE_TYPE, Node::NODE_TYPE); - createEdges(1100000, Edge::EDGE_TEMPLATE_SPECIALIZATION_OF, Node::NODE_TYPE, Node::NODE_TYPE); - createEdges(1200000, Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION_OF, Node::NODE_METHOD, Node::NODE_METHOD); + createEdges(1100000, Edge::EDGE_TEMPLATE_SPECIALIZATION, Node::NODE_TYPE, Node::NODE_TYPE); + createEdges(1200000, Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION, Node::NODE_METHOD, Node::NODE_METHOD); std::vector focusedTokenIds; std::vector activeTokenIds; diff --git a/src/lib/data/graph/Edge.cpp b/src/lib/data/graph/Edge.cpp index 0ea9ce53..7b34fd79 100644 --- a/src/lib/data/graph/Edge.cpp +++ b/src/lib/data/graph/Edge.cpp @@ -35,10 +35,10 @@ Edge::EdgeType Edge::intToType(int value) return EDGE_TYPE_ARGUMENT; case EDGE_TEMPLATE_DEFAULT_ARGUMENT: return EDGE_TEMPLATE_DEFAULT_ARGUMENT; - case EDGE_TEMPLATE_SPECIALIZATION_OF: - return EDGE_TEMPLATE_SPECIALIZATION_OF; - case EDGE_TEMPLATE_MEMBER_SPECIALIZATION_OF: - return EDGE_TEMPLATE_MEMBER_SPECIALIZATION_OF; + case EDGE_TEMPLATE_SPECIALIZATION: + return EDGE_TEMPLATE_SPECIALIZATION; + case EDGE_TEMPLATE_MEMBER_SPECIALIZATION: + return EDGE_TEMPLATE_MEMBER_SPECIALIZATION; case EDGE_INCLUDE: return EDGE_INCLUDE; case EDGE_IMPORT: @@ -159,9 +159,9 @@ std::string Edge::getTypeString(EdgeType type) return "type_argument"; case EDGE_TEMPLATE_DEFAULT_ARGUMENT: return "template_default_argument"; - case EDGE_TEMPLATE_SPECIALIZATION_OF: + case EDGE_TEMPLATE_SPECIALIZATION: return "template_specialization"; - case EDGE_TEMPLATE_MEMBER_SPECIALIZATION_OF: + case EDGE_TEMPLATE_MEMBER_SPECIALIZATION: return "template_member_specialization"; case EDGE_INCLUDE: return "include"; diff --git a/src/lib/data/graph/Edge.h b/src/lib/data/graph/Edge.h index 0498872c..ccadb357 100644 --- a/src/lib/data/graph/Edge.h +++ b/src/lib/data/graph/Edge.h @@ -28,8 +28,8 @@ public: EDGE_TEMPLATE_ARGUMENT = 0x40, EDGE_TYPE_ARGUMENT = 0x80, EDGE_TEMPLATE_DEFAULT_ARGUMENT = 0x100, - EDGE_TEMPLATE_SPECIALIZATION_OF = 0x200, - EDGE_TEMPLATE_MEMBER_SPECIALIZATION_OF = 0x400, + EDGE_TEMPLATE_SPECIALIZATION = 0x200, + EDGE_TEMPLATE_MEMBER_SPECIALIZATION = 0x400, EDGE_INCLUDE = 0x800, EDGE_IMPORT = 0x1000, EDGE_AGGREGATION = 0x2000, diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp index 5d64813c..01da90c4 100644 --- a/src/lib/data/parser/ParserClientImpl.cpp +++ b/src/lib/data/parser/ParserClientImpl.cpp @@ -164,10 +164,10 @@ Edge::EdgeType ParserClientImpl::referenceKindToEdgeType(ReferenceKind reference return Edge::EDGE_TYPE_ARGUMENT; case REFERENCE_TEMPLATE_DEFAULT_ARGUMENT: return Edge::EDGE_TEMPLATE_DEFAULT_ARGUMENT; - case REFERENCE_TEMPLATE_SPECIALIZATION_OF: - return Edge::EDGE_TEMPLATE_SPECIALIZATION_OF; - case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION_OF: - return Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION_OF; + case REFERENCE_TEMPLATE_SPECIALIZATION: + return Edge::EDGE_TEMPLATE_SPECIALIZATION; + case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION: + return Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION; case REFERENCE_INCLUDE: return Edge::EDGE_INCLUDE; case REFERENCE_IMPORT: diff --git a/src/lib/data/parser/ReferenceKind.cpp b/src/lib/data/parser/ReferenceKind.cpp index 4ab8f8a0..41b428d0 100644 --- a/src/lib/data/parser/ReferenceKind.cpp +++ b/src/lib/data/parser/ReferenceKind.cpp @@ -20,10 +20,10 @@ ReferenceKind intToReferenceKind(int v) return REFERENCE_TYPE_ARGUMENT; case REFERENCE_TEMPLATE_DEFAULT_ARGUMENT: return REFERENCE_TEMPLATE_DEFAULT_ARGUMENT; - case REFERENCE_TEMPLATE_SPECIALIZATION_OF: - return REFERENCE_TEMPLATE_SPECIALIZATION_OF; - case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION_OF: - return REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION_OF; + case REFERENCE_TEMPLATE_SPECIALIZATION: + return REFERENCE_TEMPLATE_SPECIALIZATION; + case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION: + return REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION; case REFERENCE_INCLUDE: return REFERENCE_INCLUDE; case REFERENCE_IMPORT: diff --git a/src/lib/data/parser/ReferenceKind.h b/src/lib/data/parser/ReferenceKind.h index 5c8965bc..f14cbb57 100644 --- a/src/lib/data/parser/ReferenceKind.h +++ b/src/lib/data/parser/ReferenceKind.h @@ -12,8 +12,8 @@ enum ReferenceKind REFERENCE_TEMPLATE_ARGUMENT = 6, REFERENCE_TYPE_ARGUMENT = 7, REFERENCE_TEMPLATE_DEFAULT_ARGUMENT = 8, - REFERENCE_TEMPLATE_SPECIALIZATION_OF = 9, - REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION_OF = 10, + REFERENCE_TEMPLATE_SPECIALIZATION = 9, + REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION = 10, REFERENCE_INCLUDE = 11, REFERENCE_IMPORT = 12, REFERENCE_MACRO_USAGE = 13 diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp index 732f741f..3c095630 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp @@ -102,7 +102,7 @@ void CxxAstVisitorComponentIndexer::visitClassTemplateSpecializationDecl(clang:: } m_client->recordReference( - REFERENCE_TEMPLATE_SPECIALIZATION_OF, // TODO: call this REFERENCE_TEMPLATE_SPECIALIZATION and reverse the following arguments + REFERENCE_TEMPLATE_SPECIALIZATION, getAstVisitor()->getDeclNameCache()->getValue(specializedFromDecl), getAstVisitor()->getDeclNameCache()->getValue(d), getParseLocation(d->getLocation()) @@ -174,7 +174,7 @@ void CxxAstVisitorComponentIndexer::visitFunctionDecl(clang::FunctionDecl* d) m_client->recordSymbol(referencedName, SYMBOL_FUNCTION, ACCESS_NONE, DEFINITION_NONE); m_client->recordReference( - REFERENCE_TEMPLATE_SPECIALIZATION_OF, // TODO: call this REFERENCE_TEMPLATE_SPECIALIZATION and reverse the following arguments + REFERENCE_TEMPLATE_SPECIALIZATION, referencedName, getAstVisitor()->getDeclNameCache()->getValue(d), getParseLocation(d->getLocation()) @@ -214,7 +214,7 @@ void CxxAstVisitorComponentIndexer::visitCXXMethodDecl(clang::CXXMethodDecl* d) m_client->recordSymbol(referencedName, SYMBOL_FUNCTION, ACCESS_NONE, DEFINITION_NONE); m_client->recordReference( - REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION_OF, + REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION, referencedName, getAstVisitor()->getDeclNameCache()->getValue(d), getParseLocation(d->getLocation()) diff --git a/src/test/helper/TestParserClient.h b/src/test/helper/TestParserClient.h index 9199a4c4..2d89cb13 100644 --- a/src/test/helper/TestParserClient.h +++ b/src/test/helper/TestParserClient.h @@ -84,10 +84,10 @@ public: case REFERENCE_TEMPLATE_DEFAULT_ARGUMENT: referenceContainer = &templateDefaultArgumentTypes; break; - case REFERENCE_TEMPLATE_SPECIALIZATION_OF: + case REFERENCE_TEMPLATE_SPECIALIZATION: referenceContainer = &templateSpecializations; break; - case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION_OF: + case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION: referenceContainer = &templateMemberSpecializations; break; case REFERENCE_INCLUDE: