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

Refactored nested_trait to handle element hierarchy

Browse Source
This commit is contained in:
Bartek Kryza
2022-02-17 23:41:08 +01:00
parent 6afd522146
commit 97bf705047
10 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/model/nested_trait.h
View File

@@ -37,7 +37,7 @@ public:
virtual ~nested_trait() = default;
void add_element(std::unique_ptr<T> p)
template <typename V = T> void add_element(std::unique_ptr<V> p)
{
auto it = std::find_if(elements_.begin(), elements_.end(),
[&p](const auto &e) { return *e == *p; });
@@ -50,7 +50,8 @@ public:
}
}
void add_element(std::vector<std::string> path, std::unique_ptr<T> p)
template <typename V = T>
void add_element(std::vector<std::string> path, std::unique_ptr<V> p)
{
assert(p);
@@ -64,42 +65,55 @@ public:
auto parent = get_element(path);
if (parent)
parent.value().add_element(std::move(p));
if (parent && dynamic_cast<nested_trait<T> *>(&parent.value()))
dynamic_cast<nested_trait<T> &>(parent.value())
.template add_element<V>(std::move(p));
else
spdlog::error(
"No parent element found at: {}", fmt::join(path, "::"));
}
type_safe::optional_ref<T> get_element(std::vector<std::string> path) const
template <typename V = T>
auto get_element(std::vector<std::string> path) const
{
LOG_DBG("Getting nested element at path: {}", fmt::join(path, "::"));
if (path.empty() || !has_element(path.at(0))) {
LOG_WARN("Nested element {} not found in element",
fmt::join(path, "::"));
return {};
return type_safe::optional_ref<V>{};
}
auto p = get_element(path.at(0));
if (path.size() == 1)
return p;
return get_element<V>(path.at(0));
return p.value().get_element(
std::vector<std::string>(path.begin() + 1, path.end()));
auto p = get_element<T>(path.at(0));
if (!p)
return type_safe::optional_ref<V>{};
if (dynamic_cast<nested_trait<T> *>(&p.value()))
return dynamic_cast<nested_trait<T> &>(p.value()).get_element<V>(
std::vector<std::string>(path.begin() + 1, path.end()));
return type_safe::optional_ref<V>{};
}
type_safe::optional_ref<T> get_element(const std::string &name) const
template <typename V = T> auto get_element(const std::string &name) const
{
auto it = std::find_if(elements_.cbegin(), elements_.cend(),
[&](const auto &p) { return name == p->name(); });
if (it == elements_.end())
return {};
return type_safe::optional_ref<V>{};
assert(it->get() != nullptr);
return type_safe::ref(*(it->get()));
if (dynamic_cast<V *>(it->get()))
return type_safe::optional_ref<V>{
type_safe::ref<V>(dynamic_cast<V &>(*it->get()))};
return type_safe::optional_ref<V>{};
}
bool has_element(const std::string &name) const