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

Fixed type aliases handling

Browse Source
This commit is contained in:
Bartek Kryza
2024-01-25 00:33:08 +01:00
parent 9376b856cc
commit 757b4d0947
9 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/config/config.cc
View File

@@ -226,8 +226,15 @@ std::string inheritable_diagram_options::simplify_template_type(
type_aliases_longer_first_t aliases;
aliases.insert(type_aliases().begin(), type_aliases().end());
for (const auto &[pattern, replacement] : aliases) {
util::replace_all(full_name, pattern, replacement);
bool matched{true};
while (matched) {
auto matched_in_iteration{false};
for (const auto &[pattern, replacement] : aliases) {
matched_in_iteration =
util::replace_all(full_name, pattern, replacement) ||
matched_in_iteration;
}
matched = matched_in_iteration;
}
return full_name;

12
src/config/config.h
View File

@@ -458,8 +458,18 @@ struct relationship_hint_t {
using relationship_hints_t = std::map<std::string, relationship_hint_t>;
using type_aliases_t = std::map<std::string, std::string>;
struct type_aliases_longer_first_comparator {
bool operator()(const std::string &a, const std::string &b) const
{
if (a.size() == b.size())
return a > b;
return a.size() > b.size();
}
};
using type_aliases_longer_first_t =
std::map<std::string, std::string, std::greater<>>;
std::map<std::string, std::string, type_aliases_longer_first_comparator>;
enum class location_t { marker, fileline, function };