Fixed formatting

This commit is contained in:
Bartek Kryza
2022-11-01 21:52:34 +01:00
parent c2d9596e7c
commit 6df8c790f5
5 changed files with 17 additions and 21 deletions

View File

@@ -113,7 +113,7 @@ void generator::generate_participants(std::ostream &ostr) const
ostr << "participant \"" ostr << "participant \""
<< m_config.using_namespace().relative( << m_config.using_namespace().relative(
participant.full_name(false)) participant.full_name(false))
<< "\" as " << participant.alias()<< '\n'; << "\" as " << participant.alias() << '\n';
} }
} }

View File

@@ -29,10 +29,10 @@ common::model::diagram_t diagram::type() const
} }
common::optional_ref<common::model::diagram_element> diagram::get( common::optional_ref<common::model::diagram_element> diagram::get(
const std::string & full_name) const const std::string &full_name) const
{ {
for(const auto& [id, participant] : participants) { for (const auto &[id, participant] : participants) {
if(participant->full_name(false) == full_name) if (participant->full_name(false) == full_name)
return {*participant}; return {*participant};
} }
@@ -42,7 +42,7 @@ common::optional_ref<common::model::diagram_element> diagram::get(
common::optional_ref<common::model::diagram_element> diagram::get( common::optional_ref<common::model::diagram_element> diagram::get(
const common::model::diagram_element::id_t id) const const common::model::diagram_element::id_t id) const
{ {
if(participants.find(id) != participants.end()) if (participants.find(id) != participants.end())
return {*participants.at(id)}; return {*participants.at(id)};
return {}; return {};

View File

@@ -433,9 +433,10 @@ bool translation_unit_visitor::VisitCallExpr(clang::CallExpr *expr)
set_ast_local_id(callee_function->getID(), f_ptr->id()); set_ast_local_id(callee_function->getID(), f_ptr->id());
diagram().add_participant(std::move(f_ptr)); diagram().add_participant(std::move(f_ptr));
// This is not optimal way to check whether the callee declaration // This is not optimal way to check whether the callee
// is implicit or explicit (we don't want implicit declarations // declaration is implicit or explicit (we don't want implicit
// as separate participants), but is there a better way? // declarations as separate participants), but is there a better
// way?
is_implicit = true; is_implicit = true;
} }

View File

@@ -9,10 +9,8 @@ template <typename T> T m2(T p) { return m3<T>(p); }
template <typename T> T m1(T p) { return m2<T>(p); } template <typename T> T m1(T p) { return m2<T>(p); }
template<> [[maybe_unused]] int m4<int>(int p) { return p+2; } template <> [[maybe_unused]] int m4<int>(int p) { return p + 2; }
int main() { int main() { return m1<int>(0); }
return m1<int>(0);
}
} }
} }

View File

@@ -122,18 +122,16 @@ struct HasCallWithResultMatcher : ContainsMatcher {
ContainsMatcher HasCall(std::string const &from, std::string const &message, ContainsMatcher HasCall(std::string const &from, std::string const &message,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{ {
return ContainsMatcher( return ContainsMatcher(CasedString(
CasedString(fmt::format("{} -> {} : {}()", from, from, message), fmt::format("{} -> {} : {}()", from, from, message), caseSensitivity));
caseSensitivity));
} }
ContainsMatcher HasCall(std::string const &from, std::string const &to, ContainsMatcher HasCall(std::string const &from, std::string const &to,
std::string const &message, std::string const &message,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{ {
return ContainsMatcher( return ContainsMatcher(CasedString(
CasedString(fmt::format("{} -> {} : {}()", from, to, message), fmt::format("{} -> {} : {}()", from, to, message), caseSensitivity));
caseSensitivity));
} }
auto HasCallWithResponse(std::string const &from, std::string const &to, auto HasCallWithResponse(std::string const &from, std::string const &to,
@@ -141,10 +139,9 @@ auto HasCallWithResponse(std::string const &from, std::string const &to,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{ {
return HasCallWithResultMatcher( return HasCallWithResultMatcher(
CasedString(fmt::format("{} -> {} : {}()", from, to, message),
caseSensitivity),
CasedString( CasedString(
fmt::format("{} --> {}", to, from), caseSensitivity)); fmt::format("{} -> {} : {}()", from, to, message), caseSensitivity),
CasedString(fmt::format("{} --> {}", to, from), caseSensitivity));
} }
struct AliasMatcher { struct AliasMatcher {