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

Refactored class template model

Browse Source
This commit is contained in:
Bartek Kryza
2022-05-09 23:30:22 +02:00
parent 641469d1bd
commit cf908434e2
9 changed files with 96 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ void class_::add_parent(class_parent &&parent)
bases_.emplace_back(std::move(parent));
}
void class_::add_template(class_template tmplt)
void class_::add_template(template_parameter tmplt)
{
templates_.emplace_back(std::move(tmplt));
}
@@ -73,7 +73,7 @@ const std::vector<class_method> &class_::methods() const { return methods_; }
const std::vector<class_parent> &class_::parents() const { return bases_; }
const std::vector<class_template> &class_::templates() const
const std::vector<template_parameter> &class_::templates() const
{
return templates_;
}

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

@@ -20,10 +20,10 @@
#include "class_member.h"
#include "class_method.h"
#include "class_parent.h"
#include "class_template.h"
#include "common/model/element.h"
#include "common/model/enums.h"
#include "common/model/stylable_element.h"
#include "template_parameter.h"
#include "type_alias.h"
#include <type_safe/reference.hpp>
@@ -55,12 +55,12 @@ public:
void add_member(class_member &&member);
void add_method(class_method &&method);
void add_parent(class_parent &&parent);
void add_template(class_template tmplt);
void add_template(template_parameter tmplt);
const std::vector<class_member> &members() const;
const std::vector<class_method> &methods() const;
const std::vector<class_parent> &parents() const;
const std::vector<class_template> &templates() const;
const std::vector<template_parameter> &templates() const;
void set_base_template(const std::string &full_name);
std::string base_template() const;
@@ -89,7 +89,7 @@ private:
std::vector<class_member> members_;
std::vector<class_method> methods_;
std::vector<class_parent> bases_;
std::vector<class_template> templates_;
std::vector<template_parameter> templates_;
std::string base_template_full_name_;
std::map<std::string, type_alias> type_aliases_;

44
src/class_diagram/model/class_template.cc → src/class_diagram/model/template_parameter.cc
View File

@@ -1,5 +1,5 @@
/**
* src/class_diagram/model/class_template.cc
* src/class_diagram/model/template_parameter.cc
*
* Copyright (c) 2021-2022 Bartek Kryza <bkryza@gmail.com>
*
@@ -16,14 +16,14 @@
* limitations under the License.
*/
#include "class_template.h"
#include "template_parameter.h"
#include <common/model/namespace.h>
#include <fmt/format.h>
namespace clanguml::class_diagram::model {
class_template::class_template(const std::string &type, const std::string &name,
const std::string &default_value, bool is_variadic)
template_parameter::template_parameter(const std::string &type,
const std::string &name, const std::string &default_value, bool is_variadic)
: default_value_{default_value}
, is_variadic_{is_variadic}
{
@@ -31,11 +31,11 @@ class_template::class_template(const std::string &type, const std::string &name,
set_type(type);
}
void class_template::set_type(const std::string &type) { type_ = type; }
void template_parameter::set_type(const std::string &type) { type_ = type; }
std::string class_template::type() const { return type_; }
std::string template_parameter::type() const { return type_; }
void class_template::set_name(const std::string &name)
void template_parameter::set_name(const std::string &name)
{
name_ = name;
// TODO: Add a configurable mapping for simplifying non-interesting
@@ -44,7 +44,7 @@ void class_template::set_name(const std::string &name)
util::replace_all(name_, "std::basic_string<wchar_t>", "std::wstring");
}
std::string class_template::name() const
std::string template_parameter::name() const
{
if (is_variadic_)
return name_ + "...";
@@ -52,21 +52,22 @@ std::string class_template::name() const
return name_;
}
void class_template::set_default_value(const std::string &value)
void template_parameter::set_default_value(const std::string &value)
{
default_value_ = value;
}
std::string class_template::default_value() const { return default_value_; }
std::string template_parameter::default_value() const { return default_value_; }
void class_template::is_variadic(bool is_variadic) noexcept
void template_parameter::is_variadic(bool is_variadic) noexcept
{
is_variadic_ = is_variadic;
}
bool class_template::is_variadic() const noexcept { return is_variadic_; }
bool template_parameter::is_variadic() const noexcept { return is_variadic_; }
bool class_template::is_specialization_of(const class_template &ct) const
bool template_parameter::is_specialization_of(
const template_parameter &ct) const
{
if ((ct.is_template_parameter() || ct.is_template_template_parameter()) &&
!is_template_parameter())
@@ -75,7 +76,18 @@ bool class_template::is_specialization_of(const class_template &ct) const
return false;
}
bool operator==(const class_template &l, const class_template &r)
void template_parameter::add_template_param(template_parameter &&ct)
{
template_params_.emplace_back(std::move(ct));
}
const std::vector<template_parameter> &
template_parameter::template_params() const
{
return template_params_;
}
bool operator==(const template_parameter &l, const template_parameter &r)
{
bool res{false};
@@ -95,12 +107,12 @@ bool operator==(const class_template &l, const class_template &r)
return res && (l.template_params_ == r.template_params_);
}
bool operator!=(const class_template &l, const class_template &r)
bool operator!=(const template_parameter &l, const template_parameter &r)
{
return !(l == r);
}
std::string class_template::to_string(
std::string template_parameter::to_string(
const clanguml::common::model::namespace_ &using_namespace) const
{
using clanguml::common::model::namespace_;

29
src/class_diagram/model/class_template.h → src/class_diagram/model/template_parameter.h
View File

@@ -1,5 +1,5 @@
/**
* src/class_diagram/model/class_template.h
* src/class_diagram/model/template_parameter.h
*
* Copyright (c) 2021-2022 Bartek Kryza <bkryza@gmail.com>
*
@@ -24,10 +24,16 @@
namespace clanguml::class_diagram::model {
class class_template {
/// @brief Represents template parameter or template parameter instantiation
///
/// This class can represent both template parameter and template parameter
/// instantiation, including variadic parameters and instantiations with
/// nested templates
class template_parameter {
public:
class_template(const std::string &type = "", const std::string &name = "",
const std::string &default_value = "", bool is_variadic = false);
template_parameter(const std::string &type = "",
const std::string &name = "", const std::string &default_value = "",
bool is_variadic = false);
void set_type(const std::string &type);
std::string type() const;
@@ -41,10 +47,12 @@ public:
void is_variadic(bool is_variadic) noexcept;
bool is_variadic() const noexcept;
bool is_specialization_of(const class_template &ct) const;
bool is_specialization_of(const template_parameter &ct) const;
friend bool operator==(const class_template &l, const class_template &r);
friend bool operator!=(const class_template &l, const class_template &r);
friend bool operator==(
const template_parameter &l, const template_parameter &r);
friend bool operator!=(
const template_parameter &l, const template_parameter &r);
bool is_template_parameter() const { return is_template_parameter_; }
@@ -66,7 +74,9 @@ public:
std::string to_string(
const clanguml::common::model::namespace_ &using_namespace) const;
std::vector<class_template> template_params_;
void add_template_param(template_parameter &&ct);
const std::vector<template_parameter> &template_params() const;
private:
/// Represents the type of non-type template parameters
@@ -89,5 +99,8 @@ private:
/// Whether the template parameter is variadic
bool is_variadic_{false};
// Nested template parameters
std::vector<template_parameter> template_params_;
};
}