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

Added regex support to context filter

Browse Source
This commit is contained in:
Bartek Kryza
2023-06-08 18:55:10 +02:00
parent b0501d4bfb
commit 658bceee4b
6 changed files with 154 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/common/model/diagram_filter.cc
View File

@@ -430,7 +430,8 @@ tvl::value_t access_filter::match(
[&a](const auto &access) { return a == access; });
}
context_filter::context_filter(filter_t type, std::vector<std::string> context)
context_filter::context_filter(
filter_t type, std::vector<common::string_or_regex> context)
: filter_visitor{type}
, context_{std::move(context)}
{
@@ -447,48 +448,50 @@ tvl::value_t context_filter::match(const diagram &d, const element &e) const
return {};
return tvl::any_of(context_.begin(), context_.end(),
[&e, &d](const auto &context_root_name) {
const auto &context_root =
[&e, &d](const auto &context_root_pattern) {
const auto &context_roots =
static_cast<const class_diagram::model::diagram &>(d)
.find<class_diagram::model::class_>(context_root_name);
.find<class_diagram::model::class_>(context_root_pattern);
if (context_root.has_value()) {
// This is a direct match to the context root
if (context_root.value().id() == e.id())
return true;
for (auto &context_root : context_roots) {
if (context_root.has_value()) {
// This is a direct match to the context root
if (context_root.value().id() == e.id())
return true;
// Return a positive match if the element e is in a direct
// relationship with any of the context_root's
for (const relationship &rel :
context_root.value().relationships()) {
if (d.should_include(rel.type()) &&
rel.destination() == e.id())
return true;
}
for (const relationship &rel : e.relationships()) {
if (d.should_include(rel.type()) &&
rel.destination() == context_root.value().id())
return true;
}
// Return a positive match if the context_root is a parent
// of the element
for (const class_diagram::model::class_parent &p :
context_root.value().parents()) {
if (p.name() == e.full_name(false))
return true;
}
if (dynamic_cast<const class_diagram::model::class_ *>(&e) !=
nullptr) {
for (const class_diagram::model::class_parent &p :
static_cast<const class_diagram::model::class_ &>(e)
.parents()) {
if (p.name() == context_root.value().full_name(false))
// Return a positive match if the element e is in a direct
// relationship with any of the context_root's
for (const relationship &rel :
context_root.value().relationships()) {
if (d.should_include(rel.type()) &&
rel.destination() == e.id())
return true;
}
for (const relationship &rel : e.relationships()) {
if (d.should_include(rel.type()) &&
rel.destination() == context_root.value().id())
return true;
}
// Return a positive match if the context_root is a parent
// of the element
for (const class_diagram::model::class_parent &p :
context_root.value().parents()) {
if (p.name() == e.full_name(false))
return true;
}
if (dynamic_cast<const class_diagram::model::class_ *>(
&e) != nullptr) {
for (const class_diagram::model::class_parent &p :
static_cast<const class_diagram::model::class_ &>(e)
.parents()) {
if (p.name() ==
context_root.value().full_name(false))
return true;
}
}
}
}
return false;
});
}

4
src/common/model/diagram_filter.h
View File

@@ -363,14 +363,14 @@ private:
};
struct context_filter : public filter_visitor {
context_filter(filter_t type, std::vector<std::string> context);
context_filter(filter_t type, std::vector<common::string_or_regex> context);
~context_filter() override = default;
tvl::value_t match(const diagram &d, const element &r) const override;
private:
std::vector<std::string> context_;
std::vector<common::string_or_regex> context_;
};
struct paths_filter : public filter_visitor {

12
src/common/types.h
View File

@@ -127,6 +127,18 @@ public:
return *value_;
}
T &operator*()
{
assert(value_ != nullptr);
return *value_;
}
const T &operator*() const
{
assert(value_ != nullptr);
return *value_;
}
void reset() { value_ = nullptr; }
T *get() const { return value_; }

2
src/config/config.h
View File

@@ -107,7 +107,7 @@ struct filter {
std::vector<std::string> dependencies;
std::vector<std::string> context;
std::vector<common::string_or_regex> context;
std::vector<std::filesystem::path> paths;