From d4d749ae3484ef702dd6ed38b3d8a55fd61276e2 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 4 Mar 2023 11:51:52 +0100
Subject: [PATCH] Fixed nested anonymous namespace regression

---
 .../visitor/translation_unit_visitor.cc       | 34 +++++++++++--------
 src/common/clang_utils.cc                     | 17 ----------
 src/common/clang_utils.h                      |  3 --
 3 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index dfec7160..8f082185 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -167,11 +167,6 @@ bool translation_unit_visitor::VisitEnumDecl(clang::EnumDecl *enm)
         e.constants().push_back(ev->getNameAsString());
     }
 
-    auto namespace_declaration = common::get_enclosing_namespace(enm);
-    if (namespace_declaration.has_value()) {
-        e.set_namespace(namespace_declaration.value());
-    }
-
     if (diagram().should_include(qualified_name))
         diagram().add_enum(std::move(e_ptr));
 
@@ -202,10 +197,13 @@ bool translation_unit_visitor::VisitClassTemplateSpecializationDecl(
 
     auto &template_specialization = *template_specialization_ptr;
 
-    process_template_specialization_children(cls, template_specialization);
+    if (cls->hasBody()) {
+        process_template_specialization_children(cls, template_specialization);
+    }
 
-    // Process template specialization bases
-    process_class_bases(cls, template_specialization);
+    if (cls->hasDefinition())
+        // Process template specialization bases
+        process_class_bases(cls, template_specialization);
 
     const auto maybe_id =
         get_ast_local_id(cls->getSpecializedTemplate()->getID());
@@ -1035,10 +1033,8 @@ void translation_unit_visitor::process_record_containment(
     auto parent_name = static_cast<const clang::RecordDecl *>(parent)
                            ->getQualifiedNameAsString();
 
-    auto namespace_declaration = common::get_enclosing_namespace(parent);
-    if (namespace_declaration.has_value()) {
-        element.set_namespace(namespace_declaration.value());
-    }
+    auto namespace_declaration = common::get_tag_namespace(record);
+    element.set_namespace(namespace_declaration);
 
     if (const auto *record_decl =
             clang::dyn_cast<clang::RecordDecl>(record.getParent());
@@ -1150,8 +1146,10 @@ void translation_unit_visitor::process_template_specialization_children(
         }
     }
 
-    for (const auto *friend_declaration : cls->friends()) {
-        process_friend(*friend_declaration, c);
+    if (cls->hasFriends()) {
+        for (const auto *friend_declaration : cls->friends()) {
+            process_friend(*friend_declaration, c);
+        }
     }
 }
 
@@ -1747,6 +1745,14 @@ translation_unit_visitor::process_template_specialization(
 
     template_instantiation.is_struct(cls->isStruct());
 
+    process_record_parent(cls, template_instantiation, namespace_{});
+
+    if (!template_instantiation.is_nested()) {
+        template_instantiation.set_name(common::get_tag_name(*cls));
+        template_instantiation.set_id(
+            common::to_id(template_instantiation.full_name(false)));
+    }
+
     process_comment(*cls, template_instantiation);
     set_source_location(*cls, template_instantiation);
 
diff --git a/src/common/clang_utils.cc b/src/common/clang_utils.cc
index 33b088f5..543a40b3 100644
--- a/src/common/clang_utils.cc
+++ b/src/common/clang_utils.cc
@@ -43,23 +43,6 @@ model::access_t access_specifier_to_access_t(
     return access;
 }
 
-std::optional<clanguml::common::model::namespace_> get_enclosing_namespace(
-    const clang::DeclContext *decl)
-{
-    if (!decl->getEnclosingNamespaceContext()->isNamespace())
-        return {};
-
-    const auto *namespace_declaration =
-        clang::cast<clang::NamespaceDecl>(decl->getEnclosingNamespaceContext());
-
-    if (namespace_declaration == nullptr) {
-        return {};
-    }
-
-    return clanguml::common::model::namespace_{
-        common::get_qualified_name(*namespace_declaration)};
-}
-
 model::namespace_ get_tag_namespace(const clang::TagDecl &declaration)
 {
     model::namespace_ ns;
diff --git a/src/common/clang_utils.h b/src/common/clang_utils.h
index 4cc0d547..0ed46aa5 100644
--- a/src/common/clang_utils.h
+++ b/src/common/clang_utils.h
@@ -75,9 +75,6 @@ model::namespace_ get_tag_namespace(const clang::TagDecl &declaration);
 model::namespace_ get_template_namespace(
     const clang::TemplateDecl &declaration);
 
-std::optional<clanguml::common::model::namespace_> get_enclosing_namespace(
-    const clang::DeclContext *decl);
-
 std::string to_string(const clang::QualType &type, const clang::ASTContext &ctx,
     bool try_canonical = true);