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

Fixed root namespace handling

Browse Source
This commit is contained in:
Bartek Kryza
2022-06-18 17:48:57 +02:00
parent bb689db81a
commit c82002e8ee
9 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/model/path.h
View File

@@ -31,7 +31,13 @@ public:
path() = default;
path(const std::string &ns) { path_ = util::split(ns, Sep::value); }
explicit path(const std::string &ns)
{
if (ns.empty())
return;
path_ = util::split(ns, Sep::value);
}
path(container_type::const_iterator begin,
container_type::const_iterator end)
@@ -49,16 +55,22 @@ public:
path(std::initializer_list<std::string> ns)
{
if ((ns.size() == 1) && util::contains(*ns.begin(), Sep::value))
if ((ns.size() == 1) && util::contains(*ns.begin(), Sep::value)) {
path_ = util::split(*ns.begin(), Sep::value);
}
else if ((ns.size() == 1) && ns.begin()->empty()) {
}
else
path_ = ns;
}
explicit path(const std::vector<std::string> &ns)
{
if ((ns.size() == 1) && util::contains(*ns.begin(), Sep::value))
if ((ns.size() == 1) && util::contains(*ns.begin(), Sep::value)) {
path_ = util::split(*ns.begin(), Sep::value);
}
else if ((ns.size() == 1) && ns.begin()->empty()) {
}
else
path_ = ns;
}

2
src/common/model/source_file.h
View File

@@ -52,7 +52,7 @@ public:
source_file(const std::filesystem::path &p)
{
set_path(p.parent_path().string());
set_path({p.parent_path().string()});
set_name(p.filename());
is_absolute_ = p.is_absolute();
}