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

data: added Node type NODE_ENUM_CONSTANT

Browse Source
This commit is contained in:
Eberhard Graether
2015-02-10 14:28:53 +01:00
parent 0b9a2bf4a1
commit b8f6b4be4e
15 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/graph/Edge.cpp
+2 -2
View File
@@ -190,7 +190,7 @@ bool Edge::checkType() const
case EDGE_MEMBER:
if (!m_from->isType(typeMask | Node::NODE_NAMESPACE) ||
(!m_from->isType(Node::NODE_UNDEFINED | Node::NODE_NAMESPACE) && m_to->isType(Node::NODE_NAMESPACE)) ||
(m_from->isType(Node::NODE_ENUM) && !m_to->isType(Node::NODE_FIELD)))
(m_from->isType(Node::NODE_ENUM) && !m_to->isType(Node::NODE_ENUM_CONSTANT)))
{
break;
}
@@ -235,7 +235,7 @@ bool Edge::checkType() const
return true;
case EDGE_USAGE:
if (!m_from->isType(functionMask) || !m_to->isType(variableMask))
if (!m_from->isType(functionMask) || !m_to->isType(variableMask | Node::NODE_ENUM_CONSTANT))
{
break;
}
src/lib/data/graph/Node.cpp
+2
View File
@@ -336,6 +336,8 @@ std::string Node::getTypeString(NodeType type) const
return "namespace";
case NODE_ENUM:
return "enum";
case NODE_ENUM_CONSTANT:
return "enum constant";
case NODE_TYPEDEF:
return "typedef";
case NODE_TEMPLATE_PARAMETER_TYPE:
src/lib/data/graph/Node.h
+4 -2
View File
@@ -26,6 +26,7 @@ public:
NODE_UNDEFINED_FUNCTION = 0x2,
NODE_UNDEFINED_VARIABLE = 0x4,
NODE_UNDEFINED_TYPE = 0x8,
NODE_STRUCT = 0x10,
NODE_CLASS = 0x20,
NODE_GLOBAL_VARIABLE = 0x40,
@@ -34,8 +35,9 @@ public:
NODE_METHOD = 0x200,
NODE_NAMESPACE = 0x400,
NODE_ENUM = 0x800,
NODE_TYPEDEF = 0x1000,
NODE_TEMPLATE_PARAMETER_TYPE = 0x2000
NODE_ENUM_CONSTANT = 0x1000,
NODE_TYPEDEF = 0x2000,
NODE_TEMPLATE_PARAMETER_TYPE = 0x4000
};
Node(NodeType type, std::shared_ptr<TokenComponentName> nameComponent);
src/lib/data/graph/filter/GraphFilterConductor.cpp
+3
View File
@@ -125,6 +125,9 @@ void GraphFilterConductor::filterCommandNode(const QueryCommand* node, const Fil
case QueryCommand::COMMAND_ENUM:
GraphFilterCommandNodeType(Node::NODE_ENUM).apply(in, out);
break;
case QueryCommand::COMMAND_ENUM_CONSTANT:
GraphFilterCommandNodeType(Node::NODE_ENUM_CONSTANT).apply(in, out);
break;
case QueryCommand::COMMAND_TYPEDEF:
GraphFilterCommandNodeType(Node::NODE_TYPEDEF).apply(in, out);
break;