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

Changed config option template_aliases to type_aliases

Browse Source
This commit is contained in:
Bartek Kryza
2022-09-05 23:43:57 +02:00
parent 381994df99
commit 27cf833b0d
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1985,8 +1985,8 @@ void translation_unit_visitor::finalize()
bool translation_unit_visitor::simplify_system_template(
template_parameter &ct, const std::string &full_name)
{
if (config().template_aliases().count(full_name) > 0) {
ct.set_name(config().template_aliases().at(full_name));
if (config().type_aliases().count(full_name) > 0) {
ct.set_name(config().type_aliases().at(full_name));
ct.clear_params();
return true;
}

41
src/config/config.cc
View File

@@ -105,7 +105,7 @@ void inheritable_diagram_options::inherit(
std::string inheritable_diagram_options::simplify_template_type(
std::string full_name) const
{
const auto &aliases = template_aliases();
const auto &aliases = type_aliases();
for (const auto &[pattern, replacement] : aliases) {
util::replace_all(full_name, pattern, replacement);
@@ -178,35 +178,34 @@ void class_diagram::initialize_relationship_hints()
}
}
void class_diagram::initialize_template_aliases()
void class_diagram::initialize_type_aliases()
{
if (!template_aliases().count("std::basic_string<char>")) {
template_aliases().insert({"std::basic_string<char>", "std::string"});
if (!type_aliases().count("std::basic_string<char>")) {
type_aliases().insert({"std::basic_string<char>", "std::string"});
}
if (!template_aliases().count("std::basic_string<char,std::char_traits<"
"char>,std::allocator<char>>")) {
template_aliases().insert({"std::basic_string<char,std::char_traits<"
"char>,std::allocator<char>>",
if (!type_aliases().count("std::basic_string<char,std::char_traits<"
"char>,std::allocator<char>>")) {
type_aliases().insert({"std::basic_string<char,std::char_traits<"
"char>,std::allocator<char>>",
"std::string"});
}
if (!template_aliases().count("std::basic_string<wchar_t>")) {
template_aliases().insert(
{"std::basic_string<wchar_t>", "std::wstring"});
if (!type_aliases().count("std::basic_string<wchar_t>")) {
type_aliases().insert({"std::basic_string<wchar_t>", "std::wstring"});
}
if (!template_aliases().count("std::basic_string<char16_t>")) {
template_aliases().insert(
if (!type_aliases().count("std::basic_string<char16_t>")) {
type_aliases().insert(
{"std::basic_string<char16_t>", "std::u16string"});
}
if (!template_aliases().count("std::basic_string<char32_t>")) {
template_aliases().insert(
if (!type_aliases().count("std::basic_string<char32_t>")) {
type_aliases().insert(
{"std::basic_string<char32_t>", "std::u32string"});
}
if (!template_aliases().count("std::integral_constant<bool,true>")) {
template_aliases().insert(
if (!type_aliases().count("std::integral_constant<bool,true>")) {
type_aliases().insert(
{"std::integral_constant<bool,true>", "std::true_type"});
}
if (!template_aliases().count("std::integral_constant<bool,false>")) {
template_aliases().insert(
if (!type_aliases().count("std::integral_constant<bool,false>")) {
type_aliases().insert(
{"std::integral_constant<bool,false>", "std::false_type"});
}
}
@@ -552,10 +551,10 @@ template <> struct convert<class_diagram> {
get_option(node, rhs.generate_method_arguments);
get_option(node, rhs.generate_packages);
get_option(node, rhs.relationship_hints);
get_option(node, rhs.template_aliases);
get_option(node, rhs.type_aliases);
rhs.initialize_relationship_hints();
rhs.initialize_template_aliases();
rhs.initialize_type_aliases();
return true;
}

6
src/config/config.h
View File

@@ -116,7 +116,7 @@ struct relationship_hint_t {
using relationship_hints_t = std::map<std::string, relationship_hint_t>;
using template_aliases_t = std::map<std::string, std::string>;
using type_aliases_t = std::map<std::string, std::string>;
std::string to_string(const hint_t t);
@@ -137,7 +137,7 @@ struct inheritable_diagram_options {
option<std::filesystem::path> relative_to{"relative_to"};
option<bool> generate_system_headers{"generate_system_headers", false};
option<relationship_hints_t> relationship_hints{"relationship_hints"};
option<template_aliases_t> template_aliases{"template_aliases"};
option<type_aliases_t> type_aliases{"type_aliases"};
void inherit(const inheritable_diagram_options &parent);
@@ -171,7 +171,7 @@ struct class_diagram : public diagram {
void initialize_relationship_hints();
void initialize_template_aliases();
void initialize_type_aliases();
};
struct sequence_diagram : public diagram {