Removed dead code and improve test coverage

Author: bkryza

src/class_diagram/model/class.cc

@@ -93,12 +93,6 @@ std::string class_::base_template() const { return base_template_full_name_; }
 
 bool operator==(const class_ &l, const class_ &r) { return l.id() == r.id(); }
 
-void class_::add_type_alias(type_alias &&ta)
-{
-    LOG_DBG("Adding class alias: {} -> {}", ta.alias(), ta.underlying_type());
-    type_aliases_[ta.alias()] = std::move(ta);
-}
-
 std::string class_::full_name_no_ns() const
 {
     using namespace clanguml::util;

src/class_diagram/model/class.h

@@ -25,7 +25,6 @@
 #include "common/model/stylable_element.h"
 #include "common/types.h"
 #include "template_parameter.h"
-#include "type_alias.h"
 
 #include <string>
 #include <vector>
@@ -68,8 +67,6 @@ class class_ : public common::model::element,
 
     friend bool operator==(const class_ &l, const class_ &r);
 
-    void add_type_alias(type_alias &&ta);
-
     std::string full_name(bool relative = true) const override;
 
     std::string full_name_no_ns() const override;
@@ -100,7 +97,6 @@ class class_ : public common::model::element,
     std::vector<class_parent> bases_;
     std::vector<template_parameter> templates_;
     std::string base_template_full_name_;
-    std::map<std::string, type_alias> type_aliases_;
 
     std::string full_name_;
 };

src/class_diagram/model/diagram.cc

@@ -126,14 +126,6 @@ common::optional_ref<enum_> diagram::get_enum(
     return {};
 }
 
-void diagram::add_type_alias(std::unique_ptr<type_alias> &&ta)
-{
-    LOG_DBG(
-        "Adding global alias: {} -> {}", ta->alias(), ta->underlying_type());
-
-    type_aliases_[ta->alias()] = std::move(ta);
-}
-
 bool diagram::add_package(std::unique_ptr<common::model::package> &&p)
 {
     LOG_DBG("Adding namespace package: {}, {}", p->name(), p->full_name(true));

src/class_diagram/model/diagram.h

@@ -23,7 +23,6 @@
 #include "common/model/package.h"
 #include "common/types.h"
 #include "enum.h"
-#include "type_alias.h"
 
 #include <string>
 #include <unordered_set>
@@ -69,8 +68,6 @@ class diagram : public clanguml::common::model::diagram,
     common::optional_ref<enum_> get_enum(
         clanguml::common::model::diagram_element::id_t id) const;
 
-    void add_type_alias(std::unique_ptr<type_alias> &&ta);
-
     bool add_class(std::unique_ptr<class_> &&c);
 
     bool add_enum(std::unique_ptr<enum_> &&e);
@@ -93,8 +90,6 @@ class diagram : public clanguml::common::model::diagram,
     common::reference_vector<class_> classes_;
 
     common::reference_vector<enum_> enums_;
-
-    std::map<std::string, std::unique_ptr<type_alias>> type_aliases_;
 };
 } // namespace clanguml::class_diagram::model
 

src/class_diagram/model/type_alias.cc

@@ -149,9 +149,8 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const layout_hint &c)
 YAML::Emitter &operator<<(YAML::Emitter &out, const source_location &sc)
 {
     out << YAML::BeginMap;
-    out << YAML::Key << "location" << YAML::Value << sc.location;
-    out << YAML::Key << "location_type" << YAML::Value
-        << to_string(sc.location_type);
+    out << YAML::Key << to_string(sc.location_type) << YAML::Value
+        << sc.location;
     out << YAML::EndMap;
     return out;
 }

src/class_diagram/model/type_alias.h

@@ -96,6 +96,8 @@ void generator::generate(const source_file &f, std::ostream &ostr) const
 
 void generator::generate(std::ostream &ostr) const
 {
+    update_context();
+
     ostr << "@startuml" << '\n';
 
     if (m_config.puml)

src/config/yaml_emitters.cc

@@ -97,6 +97,8 @@ void generator::generate(const package &p, std::ostream &ostr) const
 
 void generator::generate(std::ostream &ostr) const
 {
+    update_context();
+
     ostr << "@startuml" << '\n';
 
     generate_plantuml_directives(ostr, m_config.puml().before);

src/include_diagram/generators/plantuml/include_diagram_generator.cc

@@ -369,6 +369,8 @@ bool generator::is_participant_generated(common::id_t id) const
 
 void generator::generate(std::ostream &ostr) const
 {
+    update_context();
+
     m_model.print();
 
     ostr << "@startuml" << std::endl;