data: cleaned up TokenLocation classes

* removed self assiged locationId
* show errors after parse again
This commit is contained in:
Eberhard Graether
2015-08-27 22:14:12 +02:00
parent 2044ff9723
commit 9bcf7d2f0f
14 changed files with 54 additions and 137 deletions
+2 -2
View File
@@ -40,7 +40,7 @@ void Graph::forEachToken(std::function<void(Token*)> func) const
forEachEdge(func);
}
Node* Graph::addNode(Id id, Node::NodeType type, std::shared_ptr<TokenComponentName> nameComponent)
Node* Graph::createNode(Id id, Node::NodeType type, std::shared_ptr<TokenComponentName> nameComponent)
{
Node* n = getNodeById(id);
if (n)
@@ -53,7 +53,7 @@ Node* Graph::addNode(Id id, Node::NodeType type, std::shared_ptr<TokenComponentN
return node.get();
}
Edge* Graph::addEdge(Id id, Edge::EdgeType type, Node* from, Node* to)
Edge* Graph::createEdge(Id id, Edge::EdgeType type, Node* from, Node* to)
{
Edge* e = getEdgeById(id);
if (e)
+2 -2
View File
@@ -20,8 +20,8 @@ public:
void forEachEdge(std::function<void(Edge*)> func) const;
void forEachToken(std::function<void(Token*)> func) const;
Node* addNode(Id id, Node::NodeType type, std::shared_ptr<TokenComponentName> nameComponent);
Edge* addEdge(Id id, Edge::EdgeType type, Node* from, Node* to);
Node* createNode(Id id, Node::NodeType type, std::shared_ptr<TokenComponentName> nameComponent);
Edge* createEdge(Id id, Edge::EdgeType type, Node* from, Node* to);
size_t getNodeCount() const;
size_t getEdgeCount() const;