Fixed handling of nested anonymous arrays of structs

bkryza · Jun 1, 2024 · d599bb6 · d599bb6
1 parent c9b3f92
commit d599bb6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1795,6 +1795,10 @@ void translation_unit_visitor::process_field(
         relationship_hint = relationship_t::kAssociation;
         field_type = field_type.getNonReferenceType();
     }
+    else if (field_type->isArrayType()) {
+        relationship_hint = relationship_t::kAggregation;
+        field_type = field_type->getAsArrayTypeUnsafe()->getElementType();
+    }
     else if (field_type->isRValueReferenceType()) {
         field_type = field_type.getNonReferenceType();
     }

diff --git a/src/common/clang_utils.cc b/src/common/clang_utils.cc
@@ -116,6 +116,12 @@ std::string get_tag_name(const clang::TagDecl &declaration)
 std::string to_string(const clang::QualType &type, const clang::ASTContext &ctx,
     bool try_canonical)
 {
+    if (type->isArrayType()) {
+        return fmt::format("{}[]",
+            to_string(type->getAsArrayTypeUnsafe()->getElementType(), ctx,
+                try_canonical));
+    }
+
     clang::PrintingPolicy print_policy(ctx.getLangOpts());
     print_policy.SuppressScope = 0;
     print_policy.PrintCanonicalTypes = 0;
@@ -150,8 +156,8 @@ std::string to_string(const clang::QualType &type, const clang::ASTContext &ctx,
         result = "(anonymous)";
     else if (util::contains(result, "unnamed struct") ||
         util::contains(result, "unnamed union")) {
-        auto declarationTag = type->getAsTagDecl();
-        if (declarationTag == NULL) {
+        const auto *declarationTag = type->getAsTagDecl();
+        if (declarationTag == nullptr) {
             result = "(unnamed undeclared)";
         }
         else {

diff --git a/tests/t00037/t00037.cc b/tests/t00037/t00037.cc
@@ -1,6 +1,8 @@
 namespace clanguml {
 namespace t00037 {
 
+constexpr auto LENGTH{10ULL};
+
 class ST {
 public:
     struct {
@@ -10,6 +12,11 @@ class ST {
         double z;
     } dimensions;
 
+    struct {
+        int len;
+        int flags;
+    } __attribute__((packed)) bars[LENGTH];
+
 private:
     struct {
         double c{1.0};

diff --git a/tests/t00037/test_case.h b/tests/t00037/test_case.h
@@ -30,9 +30,11 @@ TEST_CASE("t00037")
         REQUIRE(IsClass(src, "A"));
         REQUIRE(IsClass(src, "ST::(units)"));
         REQUIRE(IsClass(src, "ST::(dimensions)"));
+        REQUIRE(IsClass(src, "ST::(bars)"));
 
         REQUIRE(
             IsAggregation<Public>(src, "ST", "ST::(dimensions)", "dimensions"));
         REQUIRE(IsAggregation<Private>(src, "ST", "ST::(units)", "units"));
+        REQUIRE(IsAggregation<Public>(src, "ST", "ST::(bars)", "bars"));
     });
 }