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

Refactored config method from h to cc file

Browse Source
This commit is contained in:
Bartek Kryza
2022-02-06 00:12:38 +01:00
parent 8117dfefab
commit b2f34bcfe8
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/config/config.cc
View File

@@ -51,6 +51,36 @@ std::string to_string(const diagram_type t)
} }
} }
void plantuml::append(const plantuml &r)
{
before.insert(before.end(), r.before.begin(), r.before.end());
after.insert(after.end(), r.after.begin(), r.after.end());
}
void inheritable_diagram_options::inherit(
const inheritable_diagram_options &parent)
{
if (!glob.has_value && parent.glob.has_value)
glob.append(parent.glob());
if (!using_namespace.has_value && parent.using_namespace.has_value)
using_namespace.append(parent.using_namespace());
if (!include_relations_also_as_members.has_value &&
parent.include_relations_also_as_members.has_value)
include_relations_also_as_members.append(
parent.include_relations_also_as_members());
if (!include.has_value && parent.include.has_value)
include.append(parent.include());
if (!exclude.has_value && parent.exclude.has_value)
exclude.append(parent.exclude());
if (!puml.has_value && parent.puml.has_value)
puml.append(parent.puml());
}
bool diagram::should_include_entities(const std::string &ent) bool diagram::should_include_entities(const std::string &ent)
{ {
for (const auto &ex : exclude().entity_types) { for (const auto &ex : exclude().entity_types) {

40
src/config/config.h
View File

@@ -38,11 +38,7 @@ struct plantuml {
std::vector<std::string> before; std::vector<std::string> before;
std::vector<std::string> after; std::vector<std::string> after;
void append(const plantuml &r) void append(const plantuml &r);
{
before.insert(before.end(), r.before.begin(), r.before.end());
after.insert(after.end(), r.after.begin(), r.after.end());
}
}; };
struct filter { struct filter {
@@ -70,14 +66,12 @@ enum class diagram_type { class_diagram, sequence_diagram, package_diagram };
std::string to_string(const diagram_type t); std::string to_string(const diagram_type t);
template <typename T> void append_value(T &l, const T &r) { l = r; } template <typename T> void append_value(T &l, const T &r) { l = r; }
// template<> void append_value<bool>(bool &l, const bool&r) {l = r;}
template <typename T> struct option { template <typename T> struct option {
option(const std::string &name_) option(const std::string &name_)
: name{name_} : name{name_}
{ {
} }
option(const std::string &name_, const T &initial_value) option(const std::string &name_, const T &initial_value)
: name{name_} : name{name_}
, value{initial_value} , value{initial_value}
@@ -85,11 +79,6 @@ template <typename T> struct option {
{ {
} }
std::string name;
T value;
bool has_value{false};
void append(const T &r) void append(const T &r)
{ {
append_value(value, r); append_value(value, r);
@@ -106,6 +95,10 @@ template <typename T> struct option {
T &operator()() { return value; } T &operator()() { return value; }
const T &operator()() const { return value; } const T &operator()() const { return value; }
std::string name;
T value;
bool has_value{false};
}; };
struct inheritable_diagram_options { struct inheritable_diagram_options {
@@ -117,28 +110,7 @@ struct inheritable_diagram_options {
option<filter> exclude{"exclude"}; option<filter> exclude{"exclude"};
option<plantuml> puml{"plantuml"}; option<plantuml> puml{"plantuml"};
void inherit(const inheritable_diagram_options &parent) void inherit(const inheritable_diagram_options &parent);
{
if (!glob.has_value && parent.glob.has_value)
glob.append(parent.glob());
if (!using_namespace.has_value && parent.using_namespace.has_value)
using_namespace.append(parent.using_namespace());
if (!include_relations_also_as_members.has_value &&
parent.include_relations_also_as_members.has_value)
include_relations_also_as_members.append(
parent.include_relations_also_as_members());
if (!include.has_value && parent.include.has_value)
include.append(parent.include());
if (!exclude.has_value && parent.exclude.has_value)
exclude.append(parent.exclude());
if (!puml.has_value && parent.puml.has_value)
puml.append(parent.puml());
}
}; };
struct diagram : public inheritable_diagram_options { struct diagram : public inheritable_diagram_options {