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

Added regex support to elements filter

Browse Source
This commit is contained in:
Bartek Kryza
2023-06-05 23:05:35 +02:00
parent 3430d5422a
commit 399b7e1907
8 changed files with 170 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,8 @@ tvl::value_t namespace_filter::match(
[&e](const auto &nsit) { return e.get_namespace().starts_with(nsit); });
}
element_filter::element_filter(filter_t type, std::vector<std::string> elements)
element_filter::element_filter(
filter_t type, std::vector<config::string_or_regex> elements)
: filter_visitor{type}
, elements_{std::move(elements)}
{
@@ -227,8 +228,8 @@ tvl::value_t element_filter::match(
{
return tvl::any_of(
elements_.begin(), elements_.end(), [&e](const auto &el) {
return (e.full_name(false) == el) ||
(fmt::format("::{}", e.full_name(false)) == el);
return ((el == e.full_name(false)) ||
(el == fmt::format("::{}", e.full_name(false))));
});
}

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

@@ -125,14 +125,15 @@ private:
};
struct element_filter : public filter_visitor {
element_filter(filter_t type, std::vector<std::string> elements);
element_filter(
filter_t type, std::vector<config::string_or_regex> elements);
~element_filter() override = default;
tvl::value_t match(const diagram &d, const element &e) const override;
private:
std::vector<std::string> elements_;
std::vector<config::string_or_regex> elements_;
};
struct element_type_filter : public filter_visitor {