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

Fixed handling of relationships to nested structs

Browse Source
This commit is contained in:
Bartek Kryza
2024-06-18 22:00:50 +02:00
parent fa94022c58
commit 9a43ebe739
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/class_diagram/model/diagram.cc
View File

@@ -241,10 +241,17 @@ void diagram::remove_redundant_dependencies()
} }
util::erase_if(c.get().relationships(), util::erase_if(c.get().relationships(),
[&dependency_relationships_to_remove](const auto &r) { [&dependency_relationships_to_remove, &c](const auto &r) {
return r.type() == relationship_t::kDependency && if (r.type() != relationship_t::kDependency)
return false;
auto has_another_relationship_to_destination =
dependency_relationships_to_remove.count(r.destination()) > dependency_relationships_to_remove.count(r.destination()) >
0; 0;
auto is_self_dependency = r.destination() == c.get().id();
return has_another_relationship_to_destination ||
is_self_dependency;
}); });
} }
} }

8
src/class_diagram/visitor/translation_unit_visitor.cc
View File

@@ -1433,13 +1433,13 @@ bool translation_unit_visitor::find_relationships(const clang::QualType &type,
} }
} }
else if (type->getAsCXXRecordDecl() != nullptr) { else if (type->getAsCXXRecordDecl() != nullptr) {
const auto target_id = common::to_id(*type->getAsCXXRecordDecl()); relationships.emplace_back(
relationships.emplace_back(target_id, relationship_hint); type->getAsCXXRecordDecl()->getID(), relationship_hint);
result = true; result = true;
} }
else { else {
const auto target_id = common::to_id(*type->getAsRecordDecl()); relationships.emplace_back(
relationships.emplace_back(target_id, relationship_hint); type->getAsRecordDecl()->getID(), relationship_hint);
result = true; result = true;
} }
} }

2
tests/t00076/test_case.h
View File

@@ -43,5 +43,7 @@ TEST_CASE("t00076")
REQUIRE(!IsClass(src, "H")); REQUIRE(!IsClass(src, "H"));
REQUIRE(!IsClass(src, "EE")); REQUIRE(!IsClass(src, "EE"));
REQUIRE(!IsClass(src, "GGG")); REQUIRE(!IsClass(src, "GGG"));
REQUIRE(IsAssociation<Public>(src, "B", "B::BB"));
}); });
} }

2
tests/test_cases.cc
View File

@@ -668,7 +668,7 @@ int main(int argc, char *argv[])
std::vector<const char *> argvv = { std::vector<const char *> argvv = {
"clang-uml", "--config", "./test_config_data/simple.yml"}; "clang-uml", "--config", "./test_config_data/simple.yml"};
argvv.push_back("-vvv"); argvv.push_back("-q");
clih.handle_options(argvv.size(), argvv.data()); clih.handle_options(argvv.size(), argvv.data());