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

Added recursive call generated in sequence diagram test case

Browse Source
This commit is contained in:
Bartek Kryza
2022-11-30 21:11:11 +01:00
parent 73f399c8a0
commit 68241ea9c8
7 changed files with 114 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
View File

@@ -77,22 +77,29 @@ void generator::generate_return(const message &m, std::ostream &ostr) const
}
}
void generator::generate_activity(const activity &a, std::ostream &ostr) const
void generator::generate_activity(const activity &a, std::ostream &ostr,
std::set<common::model::diagram_element::id_t> &visited) const
{
for (const auto &m : a.messages) {
visited.emplace(m.from);
const auto &to = m_model.get_participant<model::participant>(m.to);
if (!to)
continue;
LOG_DBG("Generating message {} --> {}", m.from, m.to);
generate_call(m, ostr);
ostr << "activate " << to.value().alias() << std::endl;
if (m_model.sequences.find(m.to) != m_model.sequences.end()) {
LOG_DBG("Creating activity {} --> {} - missing sequence {}", m.from,
m.to, m.to);
generate_activity(m_model.sequences[m.to], ostr);
if (visited.find(m.to) ==
visited.end()) { // break infinite recursion on recursive calls
LOG_DBG("Creating activity {} --> {} - missing sequence {}",
m.from, m.to, m.to);
generate_activity(m_model.sequences[m.to], ostr, visited);
}
}
else
LOG_DBG("Skipping activity {} --> {} - missing sequence {}", m.from,
@@ -165,7 +172,7 @@ void generator::generate(std::ostream &ostr) const
for (const auto &sf : m_config.start_from()) {
if (sf.location_type == source_location::location_t::function) {
std::int64_t start_from;
common::model::diagram_element::id_t start_from;
for (const auto &[k, v] : m_model.sequences) {
const auto &caller = *m_model.participants.at(v.from);
std::string vfrom = caller.full_name(false);
@@ -175,7 +182,9 @@ void generator::generate(std::ostream &ostr) const
break;
}
}
generate_activity(m_model.sequences[start_from], ostr);
std::set<common::model::diagram_element::id_t> visited_participants;
generate_activity(
m_model.sequences[start_from], ostr, visited_participants);
}
else {
// TODO: Add support for other sequence start location types

3
src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
View File

@@ -55,7 +55,8 @@ public:
void generate_participant(std::ostream &ostr, common::id_t id) const;
void generate_activity(const clanguml::sequence_diagram::model::activity &a,
std::ostream &ostr) const;
std::ostream &ostr,
std::set<common::model::diagram_element::id_t> &visited) const;
void generate(std::ostream &ostr) const;