Initial support for concept dependency relationships in class diagrams

src/common/clang_utils.cc

@@ -90,6 +90,14 @@ model::namespace_ get_tag_namespace(const clang::TagDecl &declaration)
     return ns;
 }
 
+model::namespace_ get_template_namespace(const clang::TemplateDecl &declaration)
+{
+    model::namespace_ ns{declaration.getQualifiedNameAsString()};
+    ns.pop_back();
+
+    return ns;
+}
+
 std::string get_tag_name(const clang::TagDecl &declaration)
 {
     auto base_name = declaration.getNameAsString();

src/common/clang_utils.h

@@ -72,6 +72,9 @@ template <typename T> std::string get_qualified_name(const T &declaration)
 
 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);
 

src/common/model/template_parameter.cc

@@ -138,6 +138,8 @@ std::string template_parameter::to_string(
 {
     using clanguml::common::model::namespace_;
 
+    assert(!(!type().empty() && concept_constraint().has_value()));
+
     std::string res;
     if (!type().empty()) {
         if (!relative)
@@ -146,8 +148,17 @@ std::string template_parameter::to_string(
             res += namespace_{type()}.relative_to(using_namespace).to_string();
     }
 
+    if (concept_constraint()) {
+        if (!relative)
+            res += namespace_{concept_constraint().value()}.to_string();
+        else
+            res += namespace_{concept_constraint().value()}
+                       .relative_to(using_namespace)
+                       .to_string();
+    }
+
     if (!name().empty()) {
-        if (!type().empty())
+        if (!type().empty() || concept_constraint())
             res += " ";
         if (!relative)
             res += namespace_{name()}.to_string();
@@ -216,4 +227,14 @@ bool template_parameter::find_nested_relationships(
     return added_aggregation_relationship;
 }
 
+void template_parameter::set_concept_constraint(std::string constraint)
+{
+    concept_constraint_ = std::move(constraint);
+}
+
+const std::optional<std::string> &template_parameter::concept_constraint() const
+{
+    return concept_constraint_;
+}
+
 } // namespace clanguml::common::model

src/common/model/template_parameter.h

@@ -100,6 +100,9 @@ public:
         const std::function<bool(const std::string &full_name)> &should_include)
         const;
 
+    void set_concept_constraint(std::string constraint);
+    const std::optional<std::string> &concept_constraint() const;
+
 private:
     /// Represents the type of non-type template parameters
     /// e.g. 'int'
@@ -125,6 +128,10 @@ private:
     /// Whether the argument specializes argument pack from parent template
     bool is_pack_{false};
 
+    /// Stores optional fully qualified name of constraint for this template
+    /// parameter
+    std::optional<std::string> concept_constraint_;
+
     // Nested template parameters
     std::vector<template_parameter> template_params_;