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

Fixed t00033 after refactoring class diagram visitor

Browse Source
This commit is contained in:
Bartek Kryza
2022-02-23 21:25:28 +01:00
parent 2554008f85
commit 1c619a9695
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/class_diagram/model/diagram.cc
View File

@@ -78,7 +78,6 @@ void diagram::add_class(std::unique_ptr<class_> &&c)
throw std::runtime_error("Name cannot contain *: " + c->name()); throw std::runtime_error("Name cannot contain *: " + c->name());
if (!has_class(*c)) { if (!has_class(*c)) {
LOG_DBG("### ADDED CLASS WITH ADDRESS: {}", (void *)c.get());
classes_.emplace_back(*c); classes_.emplace_back(*c);
auto ns = c->get_relative_namespace(); auto ns = c->get_relative_namespace();
auto name = c->name(); auto name = c->name();

8
src/class_diagram/visitor/translation_unit_visitor.cc
View File

@@ -1592,9 +1592,11 @@ void translation_unit_visitor::
ctx.diagram().add_class(std::move(nested_tinst)); ctx.diagram().add_class(std::move(nested_tinst));
} }
if (ctx.config().should_include(tinst_ns, tinst_name) && if (ctx.config().should_include(tinst_ns, tinst_name)
ctx.config().should_include( // TODO: check why this breaks t00033:
cx::util::split_ns(tinst_dependency.destination()))) { // && ctx.config().should_include(
// cx::util::split_ns(tinst_dependency.destination()))
) {
LOG_DBG("Creating nested template dependency to template " LOG_DBG("Creating nested template dependency to template "
"instantiation {}, {} -> {}", "instantiation {}, {} -> {}",
fn, tinst.full_name(), tinst_dependency.destination()); fn, tinst.full_name(), tinst_dependency.destination());

2
src/config/config.cc
View File

@@ -164,7 +164,7 @@ bool diagram::should_include(const std::string &name_) const
return true; return true;
} }
spdlog::debug("Skipping from diagram: {}", name); LOG_DBG("Skipping from diagram: {}", name);
return false; return false;
} }