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

Initial refactor of namespace handling

Browse Source
This commit is contained in:
Bartek Kryza
2022-03-04 23:38:18 +01:00
parent bee20e7f26
commit a67b459437
40 changed files with 620 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/model/element.cc
View File

@@ -26,12 +26,10 @@ namespace clanguml::common::model {
std::atomic_uint64_t element::m_nextId = 1;
element::element(const std::vector<std::string> &using_namespaces)
: using_namespace_{using_namespaces}
element::element(const namespace_ &using_namespace)
: using_namespace_{using_namespace}
, m_id{m_nextId++}
{
for (const auto &n : using_namespace_)
assert(!util::contains(n, "::"));
}
std::string element::alias() const { return fmt::format("C_{:010}", m_id); }
@@ -59,18 +57,12 @@ void element::add_relationship(relationship &&cr)
relationships_.emplace_back(std::move(cr));
}
void element::set_using_namespaces(const std::vector<std::string> &un)
void element::set_using_namespaces(const namespace_ &un)
{
for (const auto &n : un)
assert(!util::contains(n, "::"));
using_namespace_ = un;
}
const std::vector<std::string> &element::using_namespace() const
{
return using_namespace_;
}
const namespace_ &element::using_namespace() const { return ns_; }
std::vector<relationship> &element::relationships() { return relationships_; }
@@ -88,9 +80,8 @@ bool operator==(const element &l, const element &r)
std::ostream &operator<<(std::ostream &out, const element &rhs)
{
out << "(" << rhs.name() << ", ns=["
<< util::join(rhs.get_namespace(), "::") << "], full_name=["
<< rhs.full_name(true) << "])";
out << "(" << rhs.name() << ", ns=[" << rhs.get_namespace().to_string()
<< "], full_name=[" << rhs.full_name(true) << "])";
return out;
}