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

Ensure no duplicated relationships

Browse Source
This commit is contained in:
Bartek Kryza
2021-09-02 22:28:57 +02:00
parent ba978221c7
commit be8d0fd5ca
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/puml/class_diagram_generator.h
View File

@@ -206,11 +206,12 @@ public:
std::set<std::string> rendered_relations; std::set<std::string> rendered_relations;
std::stringstream all_relations_str; std::stringstream all_relations_str;
std::set<std::string> unique_relations;
for (const auto &r : c.relationships) { for (const auto &r : c.relationships) {
if (!m_config.should_include_relationship(name(r.type))) if (!m_config.should_include_relationship(name(r.type)))
continue; continue;
LOG_DBG("===== Processing relationship {}", to_string(r.type)); LOG_DBG("== Processing relationship {}", to_string(r.type));
std::stringstream relstr; std::stringstream relstr;
std::string destination; std::string destination;
@@ -231,7 +232,7 @@ public:
destination = r.destination; destination = r.destination;
} }
LOG_DBG("========= Destination is: {}", destination); LOG_DBG("=== Destination is: {}", destination);
std::string puml_relation; std::string puml_relation;
if (!r.multiplicity_source.empty()) if (!r.multiplicity_source.empty())
@@ -252,14 +253,18 @@ public:
rendered_relations.emplace(r.label); rendered_relations.emplace(r.label);
} }
relstr << '\n'; if (unique_relations.count(relstr.str()) == 0) {
unique_relations.emplace(relstr.str());
LOG_DBG("Adding relation {}", relstr.str()); relstr << '\n';
all_relations_str << relstr.str(); LOG_DBG("=== Adding relation {}", relstr.str());
all_relations_str << relstr.str();
}
} }
catch (error::uml_alias_missing &e) { catch (error::uml_alias_missing &e) {
LOG_ERROR("Skipping {} relation from {} to {} due " LOG_ERROR("=== Skipping {} relation from {} to {} due "
"to: {}", "to: {}",
to_string(r.type), c.full_name(uns), destination, e.what()); to_string(r.type), c.full_name(uns), destination, e.what());
} }
@@ -297,8 +302,9 @@ public:
ostr << relstr.str(); ostr << relstr.str();
} }
catch (error::uml_alias_missing &e) { catch (error::uml_alias_missing &e) {
LOG_ERROR("Skipping inheritance relation from {} to {} due " LOG_ERROR(
"to: {}", "=== Skipping inheritance relation from {} to {} due "
"to: {}",
b.name, c.name, e.what()); b.name, c.name, e.what());
} }
} }