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

Fixed skipping using_namespace when generating packages

Browse Source
This commit is contained in:
Bartek Kryza
2022-03-05 20:15:59 +01:00
parent f84e86ca6d
commit 768faaa1c8
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/class_diagram/generators/plantuml/class_diagram_generator.cc
View File

@@ -281,19 +281,25 @@ void generator::generate(
void generator::generate(const package &p, std::ostream &ostr,
std::ostream &relationships_ostr) const
{
const auto &uns = m_config.using_namespace();
if (m_config.generate_packages()) {
LOG_DBG("Generating package {}", p.name());
ostr << "package [" << p.name() << "] ";
ostr << "as " << p.alias();
// Don't generate packages from namespaces filtered out by
// using_namespace
if (!uns.starts_with(p.full_name(false))) {
ostr << "package [" << p.name() << "] ";
ostr << "as " << p.alias();
if (p.is_deprecated())
ostr << " <<deprecated>>";
if (p.is_deprecated())
ostr << " <<deprecated>>";
if (!p.style().empty())
ostr << " " << p.style();
if (!p.style().empty())
ostr << " " << p.style();
ostr << " {" << '\n';
ostr << " {" << '\n';
}
}
for (const auto &subpackage : p) {
@@ -316,7 +322,11 @@ void generator::generate(const package &p, std::ostream &ostr,
}
if (m_config.generate_packages()) {
ostr << "}" << '\n';
// Don't generate packages from namespaces filtered out by
// using_namespace
if (!uns.starts_with(p.full_name(false))) {
ostr << "}" << '\n';
}
}
generate_notes(ostr, p);