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

data: Saving virtual abstraction of methods as TokenComponentAbstraction

Browse Source
This commit is contained in:
Eberhard Graether
2014-08-01 05:27:09 +02:00
parent 5893d0c776
commit 8950d679e1
14 changed files with 153 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/CMakeLists.txt
+2
View File
@@ -73,6 +73,8 @@ add_files(
data/graph/token_component/TokenComponent.cpp
data/graph/token_component/TokenComponent.h
data/graph/token_component/TokenComponentAbstraction.cpp
data/graph/token_component/TokenComponentAbstraction.h
data/graph/token_component/TokenComponentAccess.cpp
data/graph/token_component/TokenComponentAccess.h
data/graph/token_component/TokenComponentConst.cpp
src/lib/data/Storage.cpp
+26
View File
@@ -174,6 +174,7 @@ Id Storage::onMethodParsed(
LOG_ERROR("Method needs to have access type [public, protected, private] but has none.");
}
addAccess(node, access);
addAbstraction(node, abstraction);
addTokenLocation(node, location);
addTokenLocation(node, scopeLocation, true);
@@ -655,6 +656,31 @@ TokenComponentAccess* Storage::addAccess(Node* node, ParserClient::AccessType ac
return nullptr;
}
TokenComponentAbstraction::AbstractionType Storage::convertAbstractionType(ParserClient::AbstractionType abstraction) const
{
switch (abstraction)
{
case ABSTRACTION_VIRTUAL:
return TokenComponentAbstraction::ABSTRACTION_VIRTUAL;
case ABSTRACTION_PURE_VIRTUAL:
return TokenComponentAbstraction::ABSTRACTION_PURE_VIRTUAL;
case ABSTRACTION_NONE:
return TokenComponentAbstraction::ABSTRACTION_NONE;
}
}
TokenComponentAbstraction* Storage::addAbstraction(Node* node, ParserClient::AbstractionType abstraction)
{
if (abstraction != ABSTRACTION_NONE)
{
std::shared_ptr<TokenComponentAbstraction> ptr =
std::make_shared<TokenComponentAbstraction>(convertAbstractionType(abstraction));
node->addComponentAbstraction(ptr);
return ptr.get();
}
return nullptr;
}
Edge* Storage::addTypeEdge(Node* node, Edge::EdgeType edgeType, const DataType& type)
{
Node* typeNode = m_graph.createNodeHierarchy(type.getRawTypeName());
src/lib/data/Storage.h
+5
View File
@@ -7,6 +7,7 @@
#include "data/access/GraphAccess.h"
#include "data/access/LocationAccess.h"
#include "data/graph/Graph.h"
#include "data/graph/token_component/TokenComponentAbstraction.h"
#include "data/graph/token_component/TokenComponentAccess.h"
#include "data/location/TokenLocationCollection.h"
#include "data/parser/ParserClient.h"
@@ -97,6 +98,10 @@ protected:
private:
TokenComponentAccess::AccessType convertAccessType(ParserClient::AccessType access) const;
TokenComponentAccess* addAccess(Node* node, ParserClient::AccessType access);
TokenComponentAbstraction::AbstractionType convertAbstractionType(ParserClient::AbstractionType abstraction) const;
TokenComponentAbstraction* addAbstraction(Node* node, ParserClient::AbstractionType abstraction);
Edge* addTypeEdge(Node* node, Edge::EdgeType edgeType, const DataType& type);
Edge* addTypeEdge(Node* node, Edge::EdgeType edgeType, const ParseTypeUsage& typeUsage);
TokenLocation* addTokenLocation(Token* token, const ParseLocation& location, bool isScope = false);
src/lib/data/graph/Node.cpp
+17
View File
@@ -2,6 +2,7 @@
#include <sstream>
#include "data/graph/token_component/TokenComponentAbstraction.h"
#include "data/graph/token_component/TokenComponentConst.h"
#include "data/graph/token_component/TokenComponentStatic.h"
#include "data/graph/token_component/TokenComponentSignature.h"
@@ -196,6 +197,22 @@ bool Node::isEdge() const
return false;
}
void Node::addComponentAbstraction(std::shared_ptr<TokenComponentAbstraction> component)
{
if (getComponent<TokenComponentAbstraction>())
{
LOG_ERROR("TokenComponentAbstraction has been set before!");
}
else if (!isType(NODE_METHOD))
{
LOG_ERROR("TokenComponentAbstraction can't be set on node of type: " + getTypeString());
}
else
{
addComponent(component);
}
}
void Node::addComponentConst(std::shared_ptr<TokenComponentConst> component)
{
if (getComponent<TokenComponentConst>())
src/lib/data/graph/Node.h
+2
View File
@@ -9,6 +9,7 @@
#include "data/graph/Edge.h"
#include "data/graph/Token.h"
class TokenComponentAbstraction;
class TokenComponentConst;
class TokenComponentStatic;
class TokenComponentSignature;
@@ -65,6 +66,7 @@ public:
virtual bool isEdge() const;
// Component setters.
void addComponentAbstraction(std::shared_ptr<TokenComponentAbstraction> component);
void addComponentConst(std::shared_ptr<TokenComponentConst> component);
void addComponentStatic(std::shared_ptr<TokenComponentStatic> component);
void addComponentSignature(std::shared_ptr<TokenComponentSignature> component);
src/lib/data/graph/token_component/TokenComponentAbstraction.cpp
+34
View File
@@ -0,0 +1,34 @@
#include "data/graph/token_component/TokenComponentAbstraction.h"
TokenComponentAbstraction::TokenComponentAbstraction(AbstractionType abstraction)
: m_abstraction(abstraction)
{
}
TokenComponentAbstraction::~TokenComponentAbstraction()
{
}
std::shared_ptr<TokenComponent> TokenComponentAbstraction::copy() const
{
return std::make_shared<TokenComponentAbstraction>(*this);
}
TokenComponentAbstraction::AbstractionType TokenComponentAbstraction::getAbstraction() const
{
return m_abstraction;
}
std::string TokenComponentAbstraction::getAbstractionString() const
{
switch (m_abstraction)
{
case ABSTRACTION_VIRTUAL:
return "virtual";
case ABSTRACTION_PURE_VIRTUAL:
return "pure virtual";
case ABSTRACTION_NONE:
return "";
}
return "";
}
src/lib/data/graph/token_component/TokenComponentAbstraction.h
+31
View File
@@ -0,0 +1,31 @@
#ifndef TOKEN_COMPONENT_ABSTRACTION_H
#define TOKEN_COMPONENT_ABSTRACTION_H
#include <string>
#include "data/graph/token_component/TokenComponent.h"
class TokenComponentAbstraction
: public TokenComponent
{
public:
enum AbstractionType
{
ABSTRACTION_VIRTUAL,
ABSTRACTION_PURE_VIRTUAL,
ABSTRACTION_NONE
};
TokenComponentAbstraction(AbstractionType abstraction);
virtual ~TokenComponentAbstraction();
virtual std::shared_ptr<TokenComponent> copy() const;
AbstractionType getAbstraction() const;
std::string getAbstractionString() const;
private:
const AbstractionType m_abstraction;
};
#endif // TOKEN_COMPONENT_ABSTRACTION_H
src/lib/data/graph/token_component/TokenComponentAccess.h
+3 -4
View File
@@ -1,5 +1,5 @@
#ifndef TOKEN_COMPONENT_ACCESS
#define TOKEN_COMPONENT_ACCESS
#ifndef TOKEN_COMPONENT_ACCESS_H
#define TOKEN_COMPONENT_ACCESS_H
#include <string>
@@ -23,11 +23,10 @@ public:
virtual std::shared_ptr<TokenComponent> copy() const;
AccessType getAccess() const;
std::string getAccessString() const;
private:
const AccessType m_access;
};
#endif // TOKEN_COMPONENT_ACCESS
#endif // TOKEN_COMPONENT_ACCESS_H
src/lib/data/graph/token_component/TokenComponentConst.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef TOKEN_COMPONENT_CONST
#define TOKEN_COMPONENT_CONST
#ifndef TOKEN_COMPONENT_CONST_H
#define TOKEN_COMPONENT_CONST_H
#include "data/graph/token_component/TokenComponent.h"
@@ -10,4 +10,4 @@ public:
virtual std::shared_ptr<TokenComponent> copy() const;
};
#endif // TOKEN_COMPONENT_CONST
#endif // TOKEN_COMPONENT_CONST_H
src/lib/data/graph/token_component/TokenComponentDataType.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef TOKEN_COMPONENT_DATA_TYPE
#define TOKEN_COMPONENT_DATA_TYPE
#ifndef TOKEN_COMPONENT_DATA_TYPE_H
#define TOKEN_COMPONENT_DATA_TYPE_H
#include "data/graph/token_component/TokenComponent.h"
#include "data/type/DataTypeModifierStack.h"
@@ -24,4 +24,4 @@ private:
const DataTypeModifierStack m_modifierStack;
};
#endif // TOKEN_COMPONENT_DATA_TYPE
#endif // TOKEN_COMPONENT_DATA_TYPE_H
src/lib/data/graph/token_component/TokenComponentSignature.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef TOKEN_COMPONENT_SIGNATURE
#define TOKEN_COMPONENT_SIGNATURE
#ifndef TOKEN_COMPONENT_SIGNATURE_H
#define TOKEN_COMPONENT_SIGNATURE_H
#include <string>
@@ -20,4 +20,4 @@ private:
const std::string m_signature;
};
#endif // TOKEN_COMPONENT_SIGNATURE
#endif // TOKEN_COMPONENT_SIGNATURE_H
src/lib/data/graph/token_component/TokenComponentStatic.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef TOKEN_COMPONENT_STATIC
#define TOKEN_COMPONENT_STATIC
#ifndef TOKEN_COMPONENT_STATIC_H
#define TOKEN_COMPONENT_STATIC_H
#include "data/graph/token_component/TokenComponent.h"
@@ -10,4 +10,4 @@ public:
virtual std::shared_ptr<TokenComponent> copy() const;
};
#endif // TOKEN_COMPONENT_STATIC
#endif // TOKEN_COMPONENT_STATIC_H
src/test/CxxParserTestSuite.h
+14
View File
@@ -258,6 +258,20 @@ public:
TS_ASSERT_EQUALS(client->methods[1], "public void B::B() <6:1 <6:4 6:4> 8:1>");
}
void test_cxx_parser_finds_virtual_method()
{
std::shared_ptr<TestParserClient> client = parseCode(
"class B\n"
"{\n"
"public:\n"
" virtual void process();\n"
"};\n"
);
TS_ASSERT_EQUALS(client->methods.size(), 1);
TS_ASSERT_EQUALS(client->methods[0], "public virtual void B::process() <4:15 4:21>");
}
void test_cxx_parser_finds_pure_virtual_method()
{
std::shared_ptr<TestParserClient> client = parseCode(
src/test/StorageTestSuite.h
+7
View File
@@ -1,5 +1,6 @@
#include "cxxtest/TestSuite.h"
#include "data/graph/token_component/TokenComponentAbstraction.h"
#include "data/graph/token_component/TokenComponentAccess.h"
#include "data/graph/token_component/TokenComponentSignature.h"
#include "data/graph/token_component/TokenComponentStatic.h"
@@ -257,6 +258,12 @@ public:
TS_ASSERT_EQUALS(node->getFullName(), "Class::isMethod");
TS_ASSERT_EQUALS(node->getType(), Node::NODE_METHOD);
TS_ASSERT(node->getComponent<TokenComponentAbstraction>());
TS_ASSERT_EQUALS(
node->getComponent<TokenComponentAbstraction>()->getAbstraction(),
TokenComponentAbstraction::ABSTRACTION_VIRTUAL
);
Edge* memberEdge = node->getMemberEdge();
TS_ASSERT(memberEdge);
TS_ASSERT_EQUALS(memberEdge->getType(), Edge::EDGE_MEMBER);