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

Refactored include diagram generator to util::for_each

Browse Source
This commit is contained in:
Bartek Kryza
2022-04-23 17:58:44 +02:00
parent cc22494c79
commit 8ba5689662
2 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/include_diagram/generators/plantuml/include_diagram_generator.cc
View File

@@ -30,28 +30,31 @@ generator::generator(diagram_config &config, diagram_model &model)
void generator::generate_relationships(
const source_file &f, std::ostream &ostr) const
{
if (!util::contains(m_generated_aliases, f.alias()))
return;
LOG_DBG("Generating relationships for file {}", f.full_name(true));
namespace plantuml_common = clanguml::common::generators::plantuml;
if (f.type() == common::model::source_file_t::kDirectory) {
for (const auto &file : f) {
util::for_each(f, [this, &ostr](const auto &file) {
generate_relationships(
dynamic_cast<const source_file &>(*file), ostr);
}
});
}
else {
for (const auto &r : f.relationships()) {
if (m_model.should_include(r.type()) &&
// make sure we only generate relationships for elements
// included in the diagram
util::contains(m_generated_aliases, r.destination()) &&
util::contains(m_generated_aliases, f.alias())) {
util::for_each_if(
f.relationships(),
[this, &f](const auto &r) {
return m_model.should_include(r.type()) &&
util::contains(m_generated_aliases, r.destination());
},
[this, &f, &ostr](const auto &r) {
ostr << f.alias() << " "
<< plantuml_common::to_plantuml(r.type(), r.style()) << " "
<< r.destination() << '\n';
}
}
});
}
}
@@ -63,9 +66,11 @@ void generator::generate(const source_file &f, std::ostream &ostr) const
ostr << "folder \"" << f.name();
ostr << "\" as " << f.alias();
ostr << " {\n";
for (const auto &file : f) {
util::for_each(f, [this, &ostr](const auto &file) {
generate(dynamic_cast<const source_file &>(*file), ostr);
}
});
ostr << "}" << '\n';
m_generated_aliases.emplace(f.alias());
@@ -92,16 +97,20 @@ void generator::generate(std::ostream &ostr) const
generate_plantuml_directives(ostr, m_config.puml().before);
// Generate files and folders
for (const auto &p : m_model) {
if (p->type() == common::model::source_file_t::kDirectory ||
m_model.should_include(*p))
generate(dynamic_cast<source_file &>(*p), ostr);
}
util::for_each_if(
m_model,
[this](const auto &f) {
return f->type() == common::model::source_file_t::kDirectory ||
m_model.should_include(*f);
},
[this, &ostr](const auto &f) {
generate(dynamic_cast<source_file &>(*f), ostr);
});
// Process file include relationships
for (const auto &p : m_model) {
generate_relationships(dynamic_cast<source_file &>(*p), ostr);
}
util::for_each(m_model, [this, &ostr](const auto &f) {
generate_relationships(dynamic_cast<source_file &>(*f), ostr);
});
generate_config_layout_hints(ostr);

11
src/util/util.h
View File

@@ -224,5 +224,16 @@ template <typename T, typename F> void for_each(const T &collection, F &&func)
std::forward<decltype(func)>(func));
}
template <typename T, typename C, typename F>
void for_each_if(const T &collection, C &&cond, F &&func)
{
std::for_each(std::begin(collection), std::end(collection),
[cond = std::forward<decltype(cond)>(cond),
func = std::forward<decltype(func)>(func)](const auto &e) {
if (cond(e))
func(e);
});
}
} // namespace util
} // namespace clanguml