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

Fixed generation of internal clang-uml diagrams

Browse Source
This commit is contained in:
Bartek Kryza
2024-04-30 11:51:31 +02:00
parent 51c5b887a8
commit dfb4f38ded
4 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sequence_diagram/model/diagram.cc
View File

@@ -98,6 +98,11 @@ const activity &diagram::get_activity(common::id_t id) const
return sequences_.at(id);
}
bool diagram::has_activity(common::id_t id) const
{
return sequences_.count(id) > 0;
}
activity &diagram::get_activity(common::id_t id) { return sequences_.at(id); }
void diagram::add_message(model::message &&message)

8
src/sequence_diagram/model/diagram.h
View File

@@ -100,6 +100,14 @@ public:
*/
void add_active_participant(common::id_t id);
/**
* @brief Check if diagram has activity identified by caller id
*
* @param id Caller id representing the activity
* @return True, if an activity already exists
*/
bool has_activity(common::id_t id) const;
/**
* @brief Get reference to current activity of a participant
*

19
src/sequence_diagram/visitor/translation_unit_visitor.cc
View File

@@ -514,14 +514,14 @@ bool translation_unit_visitor::TraverseCallExpr(clang::CallExpr *expr)
if (source_manager().isInSystemHeader(expr->getSourceRange().getBegin()))
return true;
LOG_DBG("Entering call expression at {}",
LOG_TRACE("Entering call expression at {}",
expr->getBeginLoc().printToString(source_manager()));
context().enter_callexpr(expr);
RecursiveASTVisitor<translation_unit_visitor>::TraverseCallExpr(expr);
LOG_DBG("Leaving call expression at {}",
LOG_TRACE("Leaving call expression at {}",
expr->getBeginLoc().printToString(source_manager()));
context().leave_callexpr();
@@ -537,7 +537,7 @@ bool translation_unit_visitor::TraverseCXXMemberCallExpr(
if (source_manager().isInSystemHeader(expr->getSourceRange().getBegin()))
return true;
LOG_DBG("Entering member call expression at {}",
LOG_TRACE("Entering member call expression at {}",
expr->getBeginLoc().printToString(source_manager()));
context().enter_callexpr(expr);
@@ -545,7 +545,7 @@ bool translation_unit_visitor::TraverseCXXMemberCallExpr(
RecursiveASTVisitor<translation_unit_visitor>::TraverseCXXMemberCallExpr(
expr);
LOG_DBG("Leaving member call expression at {}",
LOG_TRACE("Leaving member call expression at {}",
expr->getBeginLoc().printToString(source_manager()));
context().leave_callexpr();
@@ -591,7 +591,7 @@ bool translation_unit_visitor::TraverseCXXTemporaryObjectExpr(
bool translation_unit_visitor::TraverseCXXConstructExpr(
clang::CXXConstructExpr *expr)
{
LOG_DBG("Entering cxx construct call expression at {}",
LOG_TRACE("Entering cxx construct call expression at {}",
expr->getBeginLoc().printToString(source_manager()));
context().enter_callexpr(expr);
@@ -601,7 +601,7 @@ bool translation_unit_visitor::TraverseCXXConstructExpr(
translation_unit_visitor::VisitCXXConstructExpr(expr);
LOG_DBG("Leaving member call expression at {}",
LOG_TRACE("Leaving member call expression at {}",
expr->getBeginLoc().printToString(source_manager()));
context().leave_callexpr();
@@ -1918,7 +1918,12 @@ void translation_unit_visitor::pop_message_to_diagram(clang::CallExpr *expr)
auto msg = std::move(call_expr_message_map_.at(expr));
auto caller_id = msg.from();
diagram().get_activity(caller_id).add_message(std::move(msg));
if (caller_id == 0)
return;
if (diagram().has_activity(caller_id))
diagram().get_activity(caller_id).add_message(std::move(msg));
call_expr_message_map_.erase(expr);
}