ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data: replace template member specialization edge by template specialization edge

Browse Source
This commit is contained in:
mlangkabel
2019-10-18 13:05:29 +02:00
committed by Eberhard Graether
parent 42cb917490
commit ee7dcc2d83
29 changed files with 1991 additions and 2014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+1 -1
View File
@@ -2685,7 +2685,7 @@ void GraphController::createLegendGraph()
Node* templateSpecializationNode = addNode(NodeType::NODE_TYPE, L"TemplateType<ArgumentType>", Vec2i(x, y + dy * ++i + 20), DEFINITION_IMPLICIT);
Node* templateSpecializationMethodNode = addNode(NodeType::NODE_METHOD, L"method", Vec2i(), DEFINITION_IMPLICIT);
addMember(templateSpecializationNode, templateSpecializationMethodNode);
addEdge(Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION, templateSpecializationMethodNode, templateMethodNode);
addEdge(Edge::EDGE_TEMPLATE_SPECIALIZATION, templateSpecializationMethodNode, templateMethodNode);
}
}
src/lib/component/view/GraphViewStyle.cpp
-1
View File
@@ -690,7 +690,6 @@ GraphViewStyle::EdgeStyle GraphViewStyle::getStyleForEdgeType(
case Edge::EDGE_TEMPLATE_SPECIALIZATION:
style.zValue = isActive ? 2 : -3;
case Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION:
style.arrowLength = 10;
style.arrowWidth = 13;
style.arrowClosed = true;
src/lib/data/graph/Edge.cpp
-4
View File
@@ -32,8 +32,6 @@ Edge::EdgeType Edge::intToType(int value)
return EDGE_TYPE_ARGUMENT;
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:
@@ -143,8 +141,6 @@ std::wstring Edge::getReadableTypeString(EdgeType type)
return L"type argument";
case EDGE_TEMPLATE_SPECIALIZATION:
return L"template specialization";
case EDGE_TEMPLATE_MEMBER_SPECIALIZATION:
return L"template member specialization";
case EDGE_INCLUDE:
return L"include";
case EDGE_IMPORT:
src/lib/data/graph/Edge.h
+1 -3
View File
@@ -24,7 +24,6 @@ public:
EDGE_OVERRIDE = 1 << 5,
EDGE_TYPE_ARGUMENT = 1 << 7,
EDGE_TEMPLATE_SPECIALIZATION = 1 << 9,
EDGE_TEMPLATE_MEMBER_SPECIALIZATION = 1 << 10,
EDGE_INCLUDE = 1 << 11,
EDGE_IMPORT = 1 << 12,
EDGE_AGGREGATION = 1 << 13,
@@ -37,8 +36,7 @@ public:
static int typeToInt(EdgeType type);
static EdgeType intToType(int value);
static const TypeMask LAYOUT_VERTICAL = EDGE_INHERITANCE | EDGE_OVERRIDE | EDGE_TEMPLATE_SPECIALIZATION |
EDGE_TEMPLATE_MEMBER_SPECIALIZATION;
static const TypeMask LAYOUT_VERTICAL = EDGE_INHERITANCE | EDGE_OVERRIDE | EDGE_TEMPLATE_SPECIALIZATION;
Edge(Id id, EdgeType type, Node* from, Node* to);
Edge(const Edge& other, Node* from, Node* to);
src/lib/data/parser/ParserClientImpl.cpp
-2
View File
@@ -171,8 +171,6 @@ Edge::EdgeType ParserClientImpl::referenceKindToEdgeType(ReferenceKind reference
return Edge::EDGE_TYPE_ARGUMENT;
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:
src/lib/data/parser/ReferenceKind.cpp
-2
View File
@@ -18,8 +18,6 @@ ReferenceKind intToReferenceKind(int v)
return REFERENCE_TYPE_ARGUMENT;
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:
src/lib/data/parser/ReferenceKind.h
-1
View File
@@ -11,7 +11,6 @@ enum ReferenceKind
REFERENCE_OVERRIDE = 5,
REFERENCE_TYPE_ARGUMENT = 7,
REFERENCE_TEMPLATE_SPECIALIZATION = 9,
REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION = 10,
REFERENCE_INCLUDE = 11,
REFERENCE_IMPORT = 12,
REFERENCE_MACRO_USAGE = 13,
src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp
+2 -2
View File
@@ -299,7 +299,7 @@ void CxxAstVisitorComponentIndexer::visitFieldDecl(clang::FieldDecl* d)
Id templateFieldId = getOrCreateSymbolId(templateFieldDecl);
m_client->recordSymbolKind(templateFieldId, SYMBOL_FIELD);
m_client->recordReference(
REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION,
REFERENCE_TEMPLATE_SPECIALIZATION,
templateFieldId,
fieldId,
location
@@ -755,7 +755,7 @@ void CxxAstVisitorComponentIndexer::recordTemplateMemberSpecialization(
Id symbolId = getOrCreateSymbolId(memberSpecializationInfo->getInstantiatedFrom());
m_client->recordSymbolKind(symbolId, symbolKind);
m_client->recordReference(
REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION,
REFERENCE_TEMPLATE_SPECIALIZATION,
symbolId,
contextId,
location
src/lib_gui/qt/view/QtCustomTrailView.cpp
-6
View File
@@ -617,13 +617,7 @@ Edge::TypeMask QtCustomTrailView::getCheckedEdgeTypes() const
if (filter->isEnabled() && filter->isChecked() && filter != m_edgeMember)
{
Edge::EdgeType type = Edge::getTypeForReadableTypeString(filter->text().toStdWString());
edgeTypes |= type;
if (type == Edge::EDGE_TEMPLATE_SPECIALIZATION)
{
edgeTypes |= Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION;
}
}
}
src/test/CxxParserTestSuite.h
+5 -5
View File
@@ -3434,7 +3434,7 @@ public:
);
TS_ASSERT(utility::containsElement<std::wstring>(
client->templateMemberSpecializations, L"int A<int>::foo() -> T A<typename T>::foo() <5:4 5:6>"
client->templateSpecializations, L"int A<int>::foo() -> T A<typename T>::foo() <5:4 5:6>"
));
}
@@ -3454,7 +3454,7 @@ public:
);
TS_ASSERT(utility::containsElement<std::wstring>(
client->templateMemberSpecializations, L"static int A<int>::foo -> static T A<typename T>::foo <5:11 5:13>"
client->templateSpecializations, L"static int A<int>::foo -> static T A<typename T>::foo <5:11 5:13>"
));
}
@@ -3474,7 +3474,7 @@ public:
);
TS_ASSERT(utility::containsElement<std::wstring>(
client->templateMemberSpecializations, L"int A<int>::foo -> T A<typename T>::foo <5:4 5:6>"
client->templateSpecializations, L"int A<int>::foo -> T A<typename T>::foo <5:4 5:6>"
));
}
@@ -3497,7 +3497,7 @@ public:
);
TS_ASSERT(utility::containsElement<std::wstring>(
client->templateMemberSpecializations, L"int A<int>::B::foo -> T A<typename T>::B::foo <7:5 7:7>"
client->templateSpecializations, L"int A<int>::B::foo -> T A<typename T>::B::foo <7:5 7:7>"
));
}
@@ -3517,7 +3517,7 @@ public:
);
TS_ASSERT(utility::containsElement<std::wstring>(
client->templateMemberSpecializations, L"A<int>::B -> A<typename T>::B <5:8 5:8>"
client->templateSpecializations, L"A<int>::B -> A<typename T>::B <5:8 5:8>"
));
}
src/test/helper/TestIntermediateStorage.h
-5
View File
@@ -316,7 +316,6 @@ public:
std::vector<std::wstring> annotationUses;
std::vector<std::wstring> typeArguments;
std::vector<std::wstring> templateSpecializations;
std::vector<std::wstring> templateMemberSpecializations;
std::vector<std::wstring> includes;
std::vector<std::wstring> imports;
@@ -385,8 +384,6 @@ private:
return L"REFERENCE_TYPE_ARGUMENT";
case Edge::EDGE_TEMPLATE_SPECIALIZATION:
return L"REFERENCE_TEMPLATE_SPECIALIZATION";
case Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION:
return L"REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION";
case Edge::EDGE_INCLUDE:
return L"REFERENCE_INCLUDE";
case Edge::EDGE_IMPORT:
@@ -465,8 +462,6 @@ private:
return &typeArguments;
case Edge::EDGE_TEMPLATE_SPECIALIZATION:
return &templateSpecializations;
case Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION:
return &templateMemberSpecializations;
case Edge::EDGE_INCLUDE:
return &includes;
case Edge::EDGE_IMPORT: