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

Fixed rendering of member variables with alias to template or alias template (t00014)

Browse Source
This commit is contained in:
Bartek Kryza
2022-02-22 13:02:04 +01:00
parent e8ebaad6c6
commit 1a5a7aefcb
21 changed files with 355 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/class_diagram/model/class.cc
View File

@@ -101,10 +101,10 @@ std::string class_::full_name(bool relative) const
using namespace clanguml::util;
std::ostringstream ostr;
if (relative)
if (relative && starts_with(get_namespace(), using_namespaces()))
ostr << ns_relative(using_namespaces(), name());
else
ostr << name();
ostr << name_and_ns();
if (!templates_.empty()) {
std::vector<std::string> tnames;

4
src/class_diagram/model/class.h
View File

@@ -37,9 +37,9 @@ public:
class_(const std::vector<std::string> &using_namespaces);
class_(const class_ &) = delete;
class_(class_ &&) = default;
class_(class_ &&) noexcept = delete;
class_ &operator=(const class_ &) = delete;
class_ &operator=(class_ &&) = default;
class_ &operator=(class_ &&) = delete;
bool is_struct() const;
void is_struct(bool is_struct);

38
src/class_diagram/model/diagram.cc
View File

@@ -21,14 +21,17 @@
#include "util/error.h"
#include "util/util.h"
#include <cassert>
#include <iostream>
namespace clanguml::class_diagram::model {
const std::vector<type_safe::object_ref<class_>> diagram::classes() const
const std::vector<type_safe::object_ref<const class_>> diagram::classes() const
{
return classes_;
}
const std::vector<type_safe::object_ref<enum_>> diagram::enums() const
const std::vector<type_safe::object_ref<const enum_>> diagram::enums() const
{
return enums_;
}
@@ -57,16 +60,32 @@ void diagram::add_package(std::unique_ptr<common::model::package> &&p)
{
LOG_DBG("Adding namespace package: {}, {}", p->name(), p->full_name(true));
add_element(p->get_namespace(), std::move(p));
auto ns = p->get_namespace();
add_element(ns, std::move(p));
}
void diagram::add_class(std::unique_ptr<class_> &&c)
{
LOG_DBG("Adding class: {}, {}", c->name(), c->full_name());
if (util::contains(c->name(), "::"))
throw std::runtime_error("Name cannot contain namespace: " + c->name());
if (util::contains(c->name(), "<"))
throw std::runtime_error("Name cannot contain <: " + c->name());
if (util::contains(c->name(), "*"))
throw std::runtime_error("Name cannot contain *: " + c->name());
if (!has_class(*c)) {
LOG_DBG("### ADDED CLASS WITH ADDRESS: {}", (void *)c.get());
classes_.emplace_back(*c);
add_element(c->get_namespace(), std::move(c));
auto ns = c->get_relative_namespace();
auto name = c->name();
add_element(ns, std::move(c));
ns.push_back(name);
const auto ccc = get_element<class_>(ns);
assert(ccc.value().name() == name);
}
else
LOG_DBG(
@@ -77,9 +96,12 @@ void diagram::add_enum(std::unique_ptr<enum_> &&e)
{
LOG_DBG("Adding enum: {}", e->name());
assert(!util::contains(e->name(), "::"));
if (!has_enum(*e)) {
enums_.emplace_back(*e);
add_element(e->get_namespace(), std::move(e));
auto ns = e->get_relative_namespace();
add_element(ns, std::move(e));
}
else
LOG_DBG("Enum {} already in the model", e->name());
@@ -90,13 +112,14 @@ std::string diagram::to_alias(const std::string &full_name) const
LOG_DBG("Looking for alias for {}", full_name);
for (const auto &c : classes_) {
if (c->full_name() == full_name) {
const auto &cc = c.get();
if (cc.full_name() == full_name) {
return c->alias();
}
}
for (const auto &e : enums_) {
if (e->full_name() == full_name) {
if (e.get().full_name() == full_name) {
return e->alias();
}
}
@@ -104,4 +127,5 @@ std::string diagram::to_alias(const std::string &full_name) const
throw error::uml_alias_missing(
fmt::format("Missing alias for {}", full_name));
}
}

10
src/class_diagram/model/diagram.h
View File

@@ -40,9 +40,9 @@ public:
diagram &operator=(const diagram &) = delete;
diagram &operator=(diagram &&) = default;
const std::vector<type_safe::object_ref<class_>> classes() const;
const std::vector<type_safe::object_ref<const class_>> classes() const;
const std::vector<type_safe::object_ref<enum_>> enums() const;
const std::vector<type_safe::object_ref<const enum_>> enums() const;
bool has_class(const class_ &c) const;
@@ -58,9 +58,11 @@ public:
std::string to_alias(const std::string &full_name) const;
friend void print_diagram_tree(const diagram &d, const int level);
private:
std::vector<type_safe::object_ref<class_>> classes_;
std::vector<type_safe::object_ref<enum_>> enums_;
std::vector<type_safe::object_ref<const class_, false>> classes_;
std::vector<type_safe::object_ref<const enum_, false>> enums_;
std::map<std::string, std::unique_ptr<type_alias>> type_aliases_;
};
}