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

Fixed class inner class and enum relationship generation

Browse Source
This commit is contained in:
Bartek Kryza
2021-03-24 11:30:08 +01:00
parent a26cfb6d60
commit ff2a08c3c6
4 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/uml/class_diagram_visitor.cc
View File

@@ -19,11 +19,11 @@
#include <cppast/cpp_array_type.hpp>
#include <cppast/cpp_entity_kind.hpp>
#include <cppast/cpp_enum.hpp>
#include <cppast/cpp_member_function.hpp>
#include <cppast/cpp_member_variable.hpp>
#include <cppast/cpp_template.hpp>
#include <cppast/cpp_variable.hpp>
#include <cppast/cpp_enum.hpp>
#include <spdlog/spdlog.h>
namespace clanguml {
@@ -71,17 +71,17 @@ void tu_visitor::operator()(const cppast::cpp_entity &file)
cppast::visit(file,
[&, this](const cppast::cpp_entity &e, cppast::visitor_info info) {
if (e.kind() == cppast::cpp_entity_kind::class_t) {
spdlog::debug("{}'{}' - {}", prefix,
cx::util::full_name(e), cppast::to_string(e.kind()));
spdlog::debug("{}'{}' - {}", prefix, cx::util::full_name(e),
cppast::to_string(e.kind()));
auto &cls = static_cast<const cppast::cpp_class &>(e);
if (ctx.config.should_include(cx::util::fully_prefixed(cls)))
process_class_declaration(cls);
}
else if(e.kind() == cppast::cpp_entity_kind::enum_t) {
spdlog::debug("{}'{}' - {}", prefix,
cx::util::full_name(e), cppast::to_string(e.kind()));
else if (e.kind() == cppast::cpp_entity_kind::enum_t) {
spdlog::debug("{}'{}' - {}", prefix, cx::util::full_name(e),
cppast::to_string(e.kind()));
auto &enm = static_cast<const cppast::cpp_enum &>(e);
@@ -91,16 +91,32 @@ void tu_visitor::operator()(const cppast::cpp_entity &file)
});
}
void tu_visitor::process_enum_declaration(const cppast::cpp_enum &enm) {
void tu_visitor::process_enum_declaration(const cppast::cpp_enum &enm)
{
enum_ e;
e.name = cx::util::full_name(enm);
for(const auto& ev : enm) {
if(ev.kind() == cppast::cpp_entity_kind::enum_value_t) {
for (const auto &ev : enm) {
if (ev.kind() == cppast::cpp_entity_kind::enum_value_t) {
e.constants.push_back(ev.name());
}
}
// Find if class is contained in another class
for (auto cur = enm.parent(); cur; cur = cur.value().parent()) {
// find nearest parent class, if any
if (cur.value().kind() == cppast::cpp_entity_kind::class_t) {
class_relationship containment;
containment.type = relationship_t::kContainment;
containment.destination = cx::util::full_name(cur.value());
e.relationships.emplace_back(std::move(containment));
spdlog::debug("Added relationship {} +-- {}", e.name,
containment.destination);
break;
}
}
ctx.d.add_enum(std::move(e));
}
@@ -199,6 +215,22 @@ void tu_visitor::process_class_declaration(const cppast::cpp_class &cls)
}
}
// Find if class is contained in another class
for (auto cur = cls.parent(); cur; cur = cur.value().parent()) {
// find nearest parent class, if any
if (cur.value().kind() == cppast::cpp_entity_kind::class_t) {
class_relationship containment;
containment.type = relationship_t::kContainment;
containment.destination = cx::util::full_name(cur.value());
c.relationships.emplace_back(std::move(containment));
spdlog::debug("Added relationship {} +-- {}",
c.full_name(ctx.config.using_namespace),
containment.destination);
break;
}
}
ctx.d.add_class(std::move(c));
}