matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored sequence diagram generator to cppast

Browse Source
This commit is contained in:
Bartek Kryza
2021-10-14 23:41:25 +02:00
parent d7c127d624
commit 4a4dff119f
15 changed files with 190 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/config/config.cc
View File

@@ -151,21 +151,35 @@ template <> struct convert<scope_t> {
}
};
template <> struct convert<std::vector<source_location::variant>> {
static bool decode(
const Node &node, std::vector<source_location::variant> &rhs)
template <> struct convert<std::vector<source_location>> {
static bool decode(const Node &node, std::vector<source_location> &rhs)
{
for (auto it = node.begin(); it != node.end(); ++it) {
const YAML::Node &n = *it;
if (n["usr"]) {
rhs.emplace_back(n["usr"].as<source_location::usr>());
source_location loc;
loc.location_type = source_location::location_t::usr;
loc.location = n["usr"].as<std::string>();
rhs.emplace_back(std::move(loc));
}
else if (n["marker"]) {
rhs.emplace_back(n["marker"].as<source_location::marker>());
source_location loc;
loc.location_type = source_location::location_t::marker;
loc.location = n["marker"].as<std::string>();
rhs.emplace_back(std::move(loc));
}
else if (n["file"] && n["line"]) {
rhs.emplace_back(std::make_pair(
n["file"].as<std::string>(), n["line"].as<int>()));
source_location loc;
loc.location_type = source_location::location_t::fileline;
loc.location = n["file"].as<std::string>() + ":" +
n["line"].as<std::string>();
rhs.emplace_back(std::move(loc));
}
else if (n["function"]) {
source_location loc;
loc.location_type = source_location::location_t::function;
loc.location = n["function"].as<std::string>();
rhs.emplace_back(std::move(loc));
}
else {
return false;
@@ -261,7 +275,7 @@ template <> struct convert<sequence_diagram> {
return false;
if (node["start_from"])
rhs.start_from = node["start_from"].as<decltype(rhs.start_from)>();
rhs.start_from = node["start_from"].as<std::vector<source_location>>();
return true;
}

12
src/config/config.h
View File

@@ -81,13 +81,9 @@ struct diagram {
};
struct source_location {
using usr = std::string;
using marker = std::string;
using file = std::pair<std::string, int>;
// std::variant requires unique types, so we cannot add
// marker here, we need sth like boost::mp_unique
// type function
using variant = std::variant<usr, /* marker, */ file>;
enum class location_t { usr, marker, fileline, function };
location_t location_type;
std::string location;
};
struct class_diagram : public diagram {
@@ -102,7 +98,7 @@ struct class_diagram : public diagram {
struct sequence_diagram : public diagram {
virtual ~sequence_diagram() = default;
std::vector<source_location::variant> start_from;
std::vector<source_location> start_from;
};
struct config {