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

src: renamed "non_indexed" node type to "symbol"

Browse Source
This commit is contained in:
mlangkabel
2017-11-23 17:36:42 +01:00
parent a318ed1a40
commit d1b6667ac6
13 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+3 -3
View File
@@ -1190,7 +1190,7 @@ void GraphController::bundleNodesByType()
// bundleByType(nodes, NodeType::NODE_ENUM_CONSTANT, "Enum Constants");
// bundleByType(nodes, NodeType::NODE_TEMPLATE_PARAMETER_TYPE, "Template Parameter Types");
// bundleByType(nodes, NodeType::NODE_TYPE_PARAMETER, "Type Parameters");
// bundleByType(nodes, NodeType::NODE_NON_INDEXED, "Non-indexed Symbols");
// bundleByType(nodes, NodeType::NODE_SYMBOL, "Non-indexed Symbols");
if (nodes.size())
{
@@ -1313,7 +1313,7 @@ void GraphController::layoutNestingRecursive(DummyNode* node) const
}
else if (node->isBundleNode())
{
if (node->bundledNodeType.getType() != NodeType::NODE_NON_INDEXED)
if (node->bundledNodeType.getType() != NodeType::NODE_SYMBOL)
{
margins = GraphViewStyle::getMarginsForDataNode(node->bundledNodeType.getNodeStyle(), node->bundledNodeType.hasIcon(), false);
}
@@ -1643,7 +1643,7 @@ void GraphController::handleMessage(MessageColorSchemeTest* message)
createNodes( 0, NodeType::NODE_FUNCTION, NAME_DELIMITER_CXX);
createNodes(10, NodeType::NODE_GLOBAL_VARIABLE, NAME_DELIMITER_CXX);
createNodes(20, NodeType::NODE_NON_INDEXED, NAME_DELIMITER_CXX);
createNodes(20, NodeType::NODE_SYMBOL, NAME_DELIMITER_CXX);
createNodes(30, NodeType::NODE_TYPE, NAME_DELIMITER_CXX);
createNodes(40, NodeType::NODE_TYPEDEF, NAME_DELIMITER_CXX);
createNodes(50, NodeType::NODE_NAMESPACE, NAME_DELIMITER_CXX);
src/lib/component/controller/helper/DummyNode.h
+1 -1
View File
@@ -67,7 +67,7 @@ public:
, bundleId(0)
, layoutBucket(0, 0)
, bundledNodeCount(0)
, bundledNodeType(NodeType::NODE_NON_INDEXED)
, bundledNodeType(NodeType::NODE_SYMBOL)
, qualifierName(NAME_DELIMITER_UNKNOWN)
, textNode(false)
{
src/lib/data/NodeType.cpp
+10 -10
View File
@@ -25,10 +25,10 @@ bool NodeType::isFile() const
return ((m_type & mask) > 0);
}
bool NodeType::isNonIndexed() const
bool NodeType::isUnknownSymbol() const
{
const NodeType::TypeMask mask =
NodeType::NODE_NON_INDEXED;
NodeType::NODE_SYMBOL;
return ((m_type & mask) > 0);
}
@@ -36,7 +36,7 @@ bool NodeType::isInheritable() const
{
// what about java enums?
const NodeType::TypeMask mask =
NodeType::NODE_NON_INDEXED |
NodeType::NODE_SYMBOL |
NodeType::NODE_BUILTIN_TYPE |
NodeType::NODE_TYPE |
NodeType::NODE_STRUCT |
@@ -73,7 +73,7 @@ bool NodeType::isVariable() const
bool NodeType::isUsable() const
{
const NodeType::TypeMask mask =
NodeType::NODE_NON_INDEXED |
NodeType::NODE_SYMBOL |
NodeType::NODE_BUILTIN_TYPE |
NodeType::NODE_STRUCT |
NodeType::NODE_CLASS |
@@ -102,7 +102,7 @@ bool NodeType::isPotentialMember() const
bool NodeType::isCollapsible() const
{
const NodeType::TypeMask mask =
NodeType::NODE_NON_INDEXED |
NodeType::NODE_SYMBOL |
NodeType::NODE_TYPE |
NodeType::NODE_BUILTIN_TYPE |
NodeType::NODE_CLASS |
@@ -158,7 +158,7 @@ NodeType::StyleType NodeType::getNodeStyle() const
case NodeType::NODE_NAMESPACE:
case NodeType::NODE_PACKAGE:
return STYLE_PACKAGE;
case NodeType::NODE_NON_INDEXED:
case NodeType::NODE_SYMBOL:
case NodeType::NODE_TYPE:
case NodeType::NODE_BUILTIN_TYPE:
case NodeType::NODE_STRUCT:
@@ -240,15 +240,15 @@ NodeType::Type utility::intToType(int value)
return NodeType::NODE_UNION;
}
return NodeType::NODE_NON_INDEXED;
return NodeType::NODE_SYMBOL;
}
std::string utility::getReadableTypeString(NodeType::Type type)
{
switch (type)
{
case NodeType::NODE_NON_INDEXED:
return "non-indexed";
case NodeType::NODE_SYMBOL:
return "symbol";
case NodeType::NODE_BUILTIN_TYPE:
return "built-in type";
case NodeType::NODE_TYPE:
@@ -303,5 +303,5 @@ NodeType::Type utility::getTypeForReadableTypeString(const std::string str)
}
}
return NodeType::NODE_NON_INDEXED;
return NodeType::NODE_SYMBOL;
}
src/lib/data/NodeType.h
+2 -2
View File
@@ -15,7 +15,7 @@ public:
typedef int NodeType::TypeMask;
enum Type : NodeType::TypeMask
{ // make sure that the value of 0x0 is not used here because it doesn't work for bitmasking.
NODE_NON_INDEXED = 0x1,
NODE_SYMBOL = 0x1,
NODE_TYPE = 0x2,
NODE_BUILTIN_TYPE = 0x4,
@@ -56,7 +56,7 @@ public:
Type getType() const;
bool isFile() const;
bool isNonIndexed() const;
bool isUnknownSymbol() const;
bool isInheritable() const;
bool isPackage() const;
bool isCallable() const;
src/lib/data/access/StorageAccessProxy.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ NodeType StorageAccessProxy::getNodeTypeForNodeWithId(Id id) const
{
return m_subject->getNodeTypeForNodeWithId(id);
}
return NodeType(NodeType::NODE_NON_INDEXED);
return NodeType(NodeType::NODE_SYMBOL);
}
Id StorageAccessProxy::getIdForEdge(
src/lib/data/graph/Node.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ NodeType Node::getType() const
void Node::setType(NodeType type)
{
if (!isType(type.getType() | NodeType::NODE_NON_INDEXED))
if (!isType(type.getType() | NodeType::NODE_SYMBOL))
{
LOG_WARNING(
"Cannot change NodeType after it was already set from " + getReadableTypeString() + " to " + type.getReadableTypeString()
src/lib/data/parser/ParserClientImpl.cpp
+3 -3
View File
@@ -69,7 +69,7 @@ void ParserClientImpl::recordReference(
void ParserClientImpl::recordQualifierLocation(const NameHierarchy& qualifierName, const ParseLocation& location)
{
Id nodeId = addNodeHierarchy(qualifierName, NodeType::NODE_NON_INDEXED);
Id nodeId = addNodeHierarchy(qualifierName, NodeType::NODE_SYMBOL);
addSourceLocation(nodeId, location, locationTypeToInt(LOCATION_QUALIFIER));
}
@@ -140,7 +140,7 @@ NodeType ParserClientImpl::symbolKindToNodeType(SymbolKind symbolKind) const
default:
break;
}
return NodeType::NODE_NON_INDEXED;
return NodeType::NODE_SYMBOL;
}
Edge::EdgeType ParserClientImpl::referenceKindToEdgeType(ReferenceKind referenceKind) const
@@ -201,7 +201,7 @@ Id ParserClientImpl::addNodeHierarchy(NameHierarchy nameHierarchy, NodeType node
{
currentNameHierarchy.push(nameHierarchy[i]);
const bool currentIsLastElement = (i == nameHierarchy.size() - 1);
const NodeType currentType = (currentIsLastElement ? nodeType : NodeType::NODE_NON_INDEXED); // TODO: rename to unknown!
const NodeType currentType = (currentIsLastElement ? nodeType : NodeType::NODE_SYMBOL); // TODO: rename to unknown!
Id nodeId = addNode(currentType, currentNameHierarchy);
src/lib/data/parser/ParserClientImpl.h
+1 -1
View File
@@ -50,7 +50,7 @@ private:
NodeType symbolKindToNodeType(SymbolKind symbolType) const;
Edge::EdgeType referenceKindToEdgeType(ReferenceKind referenceKind) const;
void addAccess(Id nodeId, AccessKind access);
Id addNodeHierarchy(NameHierarchy nameHierarchy, NodeType nodeType = NodeType::NODE_NON_INDEXED);
Id addNodeHierarchy(NameHierarchy nameHierarchy, NodeType nodeType = NodeType::NODE_SYMBOL);
Id addNode(NodeType nodeType, NameHierarchy nameHierarchy);
void addFile(Id id, const FilePath& filePath, const std::string& modificationTime);
src/lib/data/search/SearchMatch.cpp
+2 -2
View File
@@ -96,7 +96,7 @@ std::string SearchMatch::getCommandName(CommandType type)
SearchMatch::SearchMatch()
: typeName("")
, nodeType(NodeType::NODE_NON_INDEXED)
, nodeType(NodeType::NODE_SYMBOL)
, searchType(SEARCH_NONE)
, hasChildren(false)
{
@@ -106,7 +106,7 @@ SearchMatch::SearchMatch(const std::string& query)
: name(query)
, text(query)
, typeName("")
, nodeType(NodeType::NODE_NON_INDEXED)
, nodeType(NodeType::NODE_SYMBOL)
, searchType(SEARCH_NONE)
, hasChildren(false)
{
src/lib/data/storage/PersistentStorage.cpp
+3 -4
View File
@@ -32,7 +32,7 @@ PersistentStorage::PersistentStorage(const FilePath& dbPath, const FilePath& boo
m_commandIndex.addNode(0, SearchMatch::getCommandName(SearchMatch::COMMAND_ALL));
m_commandIndex.addNode(0, SearchMatch::getCommandName(SearchMatch::COMMAND_ERROR));
// m_commandIndex.addNode(0, NodeType(NodeType::NODE_NON_INDEXED).getReadableTypeString());
// m_commandIndex.addNode(0, NodeType(NodeType::NODE_SYMBOL).getReadableTypeString());
// m_commandIndex.addNode(0, NodeType(NodeType::NODE_TYPE).getReadableTypeString());
m_commandIndex.addNode(0, NodeType(NodeType::NODE_BUILTIN_TYPE).getReadableTypeString());
m_commandIndex.addNode(0, NodeType(NodeType::NODE_NAMESPACE).getReadableTypeString());
@@ -678,8 +678,7 @@ std::vector<SearchMatch> PersistentStorage::getAutocompletionSymbolMatches(
match.typeName = match.nodeType.getReadableTypeString();
match.searchType = SearchMatch::SEARCH_TOKEN;
if (storageSymbolMap.find(firstNode->id) == storageSymbolMap.end() &&
!match.nodeType.isNonIndexed())
if (storageSymbolMap.find(firstNode->id) == storageSymbolMap.end())
{
match.typeName = "non-indexed " + match.typeName;
}
@@ -1735,7 +1734,7 @@ TooltipInfo PersistentStorage::getTooltipInfoForTokenIds(const std::vector<Id>&
info.title = "incomplete " + info.title;
}
}
else if (defKind == DEFINITION_NONE && type.getType() != NodeType::NODE_NON_INDEXED)
else if (defKind == DEFINITION_NONE)
{
info.title = "non-indexed " + info.title;
}
src/lib_gui/qt/view/QtGraphView.cpp
+1 -1
View File
@@ -666,7 +666,7 @@ MessageActivateTrail QtGraphView::getMessageActivateTrail(bool forward)
switch (node->getData()->getType().getType())
{
case NodeType::NODE_NON_INDEXED:
case NodeType::NODE_SYMBOL:
case NodeType::NODE_CLASS:
case NodeType::NODE_STRUCT:
case NodeType::NODE_INTERFACE:
src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp
+3 -3
View File
@@ -42,8 +42,8 @@ void QtGraphNodeBundle::onClick()
{
MessageGraphNodeBundleSplit(
m_tokenId,
m_type.getType() != NodeType::NODE_NON_INDEXED && getName() != "Anonymous Namespaces",
m_type.getType() != NodeType::NODE_NON_INDEXED
m_type.getType() != NodeType::NODE_SYMBOL && getName() != "Anonymous Namespaces",
m_type.getType() != NodeType::NODE_SYMBOL
).dispatch();
}
@@ -57,7 +57,7 @@ void QtGraphNodeBundle::moved(const Vec2i& oldPosition)
void QtGraphNodeBundle::updateStyle()
{
GraphViewStyle::NodeStyle style;
if (m_type.getType() != NodeType::NODE_NON_INDEXED)
if (m_type.getType() != NodeType::NODE_SYMBOL)
{
style = GraphViewStyle::getStyleForNodeType(m_type, true, false, m_isHovering, false, false);
}
src/test/GraphTestSuite.h
+23 -23
View File
@@ -90,7 +90,7 @@ public:
void test_nodes_are_nodes()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
TS_ASSERT(a.isNode());
TS_ASSERT(!a.isEdge());
@@ -98,8 +98,8 @@ public:
void test_edges_are_edges()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Edge e(3, Edge::EDGE_USAGE, &a, &b);
TS_ASSERT(!e.isNode());
@@ -114,7 +114,7 @@ public:
void test_set_type_of_node_from_non_indexed()
{
Node n(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node n(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
n.setType(NodeType(NodeType::NODE_CLASS));
TS_ASSERT_EQUALS(NodeType(NodeType::NODE_CLASS), n.getType());
}
@@ -146,8 +146,8 @@ public:
void test_get_type_of_edges()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Edge e(3, Edge::EDGE_USAGE, &a, &b);
TS_ASSERT_EQUALS(Edge::EDGE_USAGE, e.getType());
@@ -155,8 +155,8 @@ public:
void test_edge_can_be_copied_and_keeps_same_id()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Edge e(3, Edge::EDGE_USAGE, &a, &b);
Edge e2(e, &a, &b);
@@ -167,8 +167,8 @@ public:
void test_edge_type_bit_masking()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Edge e(3, Edge::EDGE_USAGE, &a, &b);
TS_ASSERT(e.isType(Edge::EDGE_MEMBER | Edge::EDGE_CALL | Edge::EDGE_USAGE));
@@ -177,9 +177,9 @@ public:
void test_node_finds_child_node()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node c(3, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("C", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node c(3, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("C", NAME_DELIMITER_CXX), false);
Edge e(4, Edge::EDGE_MEMBER, &a, &b);
Edge e2(5, Edge::EDGE_MEMBER, &a, &c);
@@ -196,9 +196,9 @@ public:
void test_node_can_not_find_child_node()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node c(3, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("C", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node c(3, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("C", NAME_DELIMITER_CXX), false);
Edge e(4, Edge::EDGE_MEMBER, &a, &b);
Edge e2(5, Edge::EDGE_MEMBER, &a, &c);
@@ -214,9 +214,9 @@ public:
void test_node_visits_child_nodes()
{
Node a(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node c(3, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("C", NAME_DELIMITER_CXX), false);
Node a(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node b(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node c(3, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("C", NAME_DELIMITER_CXX), false);
Edge e(4, Edge::EDGE_MEMBER, &a, &b);
Edge e2(5, Edge::EDGE_MEMBER, &a, &c);
@@ -236,8 +236,8 @@ public:
void test_graph_saves_nodes()
{
Graph graph;
Node* a = graph.createNode(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node* b = graph.createNode(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node* a = graph.createNode(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
Node* b = graph.createNode(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
TS_ASSERT_EQUALS(2, graph.getNodeCount());
TS_ASSERT_EQUALS(0, graph.getEdgeCount());
@@ -271,8 +271,8 @@ public:
{
Graph graph;
Node* a = graph.createNode(1, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("A", NAME_DELIMITER_CXX), false);
graph.createNode(2, NodeType(NodeType::NODE_NON_INDEXED), NameHierarchy("B", NAME_DELIMITER_CXX), false);
Node* a = graph.createNode(1, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("A", NAME_DELIMITER_CXX), false);
graph.createNode(2, NodeType(NodeType::NODE_SYMBOL), NameHierarchy("B", NAME_DELIMITER_CXX), false);
TS_ASSERT_EQUALS(2, graph.getNodeCount());
TS_ASSERT_EQUALS(0, graph.getEdgeCount());