nested

Author: K-ballo

src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp

@@ -221,10 +221,22 @@ operator()(RecordInfo& I)
         operator()(*baseRecord);
         inheritBaseMembers(I, *baseRecord, baseI.Access);
     }
-    finalizeRecords(I.Interface.Public.Records);
-    finalizeRecords(I.Interface.Protected.Records);
-    finalizeRecords(I.Interface.Private.Records);
     finalized_.emplace(I.id);
+
+    auto RecordMembers =
+        I.Members | 
+        std::views::filter([this](MemberInfo const& member) {
+            return member.Kind == InfoKind::Record;
+        }) | 
+        std::ranges::views::transform(&MemberInfo::id);
+    for (SymbolID const& memberId: RecordMembers)
+    {
+        Info* infoPtr = corpus_.find(memberId);
+        MRDOCS_CHECK_OR_CONTINUE(infoPtr);
+        auto* record = infoPtr->asRecordPtr();
+        MRDOCS_CHECK_OR_CONTINUE(record);
+        operator()(*record);
+    }
 }
 
 } // clang::mrdocs

test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc

@@ -61,8 +61,6 @@ class base
 | This function should shadow the excluded_base function.
 | link:#base-derived_shadowed[`derived_shadowed`] 
 | This function should be shadowed by derived classes.
-| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
-| This function should be indirectly inherited by derived classes.
 |===
 
 === Protected Member Functions
@@ -71,6 +69,8 @@ class base
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
+| This function should be indirectly inherited by derived classes.
 | link:#base-do_base_inherited[`do_base_inherited`] 
 | This function should be inherited by derived classes.
 | link:#base-do_base_shadowed[`do_base_shadowed`] 
@@ -225,6 +225,14 @@ class base_base;
 | Description
 | link:#base_base-base_base_inherited[`base_base_inherited`] 
 | This function should be indirectly inherited by derived classes.
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
 | This function should be indirectly inherited by derived classes.
 |===
@@ -319,10 +327,6 @@ class derived
 | This function should shadow the excluded_base function.
 | link:#derived-derived_shadowed[`derived_shadowed`] 
 | This function should shadow the base class function.
-| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
-| This function should be indirectly inherited by derived classes.
-| link:#derived-do_derived_shadowed[`do_derived_shadowed`] 
-| This function should shadow the base class function.
 | link:#derived-excluded_inherited[`excluded_inherited`] 
 | This function should be inherited by derived classes.
 |===
@@ -333,10 +337,14 @@ class derived
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
+| This function should be indirectly inherited by derived classes.
 | link:#base-do_base_inherited[`do_base_inherited`] 
 | This function should be inherited by derived classes.
 | link:#base-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
+| link:#derived-do_derived_shadowed[`do_derived_shadowed`] 
+| This function should shadow the base class function.
 | link:#derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#derived-do_shadowed[`do_shadowed`] 
@@ -362,40 +370,40 @@ derived_shadowed();
 
 A class that derives from base and excluded_base
 
-[#derived-do_derived_shadowed]
-== link:#derived[derived]::do_derived_shadowed
+[#derived-excluded_inherited]
+== link:#derived[derived]::excluded_inherited
 
-This function should shadow the base class function.
+This function should be inherited by derived classes.
 
 === Synopsis
 
 Declared in `<copy‐dependencies.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#derived[derived]&
-do_derived_shadowed();
+excluded_base&
+excluded_inherited();
 ----
 
-=== Return Value
-
-A class that derives from base and excluded_base
-
-[#derived-excluded_inherited]
-== link:#derived[derived]::excluded_inherited
+[#derived-do_derived_shadowed]
+== link:#derived[derived]::do_derived_shadowed
 
-This function should be inherited by derived classes.
+This function should shadow the base class function.
 
 === Synopsis
 
 Declared in `<copy‐dependencies.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-excluded_base&
-excluded_inherited();
+link:#derived[derived]&
+do_derived_shadowed();
 ----
 
+=== Return Value
+
+A class that derives from base and excluded_base
+
 [#derived-do_excluded_inherited]
 == link:#derived[derived]::do_excluded_inherited
 
@@ -456,10 +464,6 @@ class private_derived
 | This function should shadow the excluded_base function.
 | link:#private_derived-derived_shadowed[`derived_shadowed`] 
 | This function should shadow the base class function.
-| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
-| This function should be indirectly inherited by derived classes.
-| link:#private_derived-do_derived_shadowed[`do_derived_shadowed`] 
-| This function should shadow the base class function.
 | link:#private_derived-excluded_inherited[`excluded_inherited`] 
 | This function should be inherited by derived classes.
 |===
@@ -470,10 +474,14 @@ class private_derived
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
+| This function should be indirectly inherited by derived classes.
 | link:#base-do_base_inherited[`do_base_inherited`] 
 | This function should be inherited by derived classes.
 | link:#base-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
+| link:#private_derived-do_derived_shadowed[`do_derived_shadowed`] 
+| This function should shadow the base class function.
 | link:#private_derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#private_derived-do_shadowed[`do_shadowed`] 
@@ -499,40 +507,40 @@ derived_shadowed();
 
 A class that uses private inheritance only
 
-[#private_derived-do_derived_shadowed]
-== link:#private_derived[private_derived]::do_derived_shadowed
+[#private_derived-excluded_inherited]
+== link:#private_derived[private_derived]::excluded_inherited
 
-This function should shadow the base class function.
+This function should be inherited by derived classes.
 
 === Synopsis
 
 Declared in `<copy‐dependencies.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#private_derived[private_derived]&
-do_derived_shadowed();
+excluded_base&
+excluded_inherited();
 ----
 
-=== Return Value
-
-A class that uses private inheritance only
-
-[#private_derived-excluded_inherited]
-== link:#private_derived[private_derived]::excluded_inherited
+[#private_derived-do_derived_shadowed]
+== link:#private_derived[private_derived]::do_derived_shadowed
 
-This function should be inherited by derived classes.
+This function should shadow the base class function.
 
 === Synopsis
 
 Declared in `<copy‐dependencies.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-excluded_base&
-excluded_inherited();
+link:#private_derived[private_derived]&
+do_derived_shadowed();
 ----
 
+=== Return Value
+
+A class that uses private inheritance only
+
 [#private_derived-do_excluded_inherited]
 == link:#private_derived[private_derived]::do_excluded_inherited
 
@@ -605,10 +613,6 @@ class protected_derived
 | This function should shadow the excluded_base function.
 | link:#protected_derived-derived_shadowed[`derived_shadowed`] 
 | This function should shadow the base class function.
-| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
-| This function should be indirectly inherited by derived classes.
-| link:#protected_derived-do_derived_shadowed[`do_derived_shadowed`] 
-| This function should shadow the base class function.
 | link:#protected_derived-excluded_inherited[`excluded_inherited`] 
 | This function should be inherited by derived classes.
 |===
@@ -619,10 +623,14 @@ class protected_derived
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
+| This function should be indirectly inherited by derived classes.
 | link:#base-do_base_inherited[`do_base_inherited`] 
 | This function should be inherited by derived classes.
 | link:#base-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
+| link:#protected_derived-do_derived_shadowed[`do_derived_shadowed`] 
+| This function should shadow the base class function.
 | link:#protected_derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#protected_derived-do_shadowed[`do_shadowed`] 
@@ -648,40 +656,40 @@ derived_shadowed();
 
 A class that should inherit functions as protected.
 
-[#protected_derived-do_derived_shadowed]
-== link:#protected_derived[protected_derived]::do_derived_shadowed
+[#protected_derived-excluded_inherited]
+== link:#protected_derived[protected_derived]::excluded_inherited
 
-This function should shadow the base class function.
+This function should be inherited by derived classes.
 
 === Synopsis
 
 Declared in `<copy‐dependencies.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#protected_derived[protected_derived]&
-do_derived_shadowed();
+excluded_base&
+excluded_inherited();
 ----
 
-=== Return Value
-
-A class that should inherit functions as protected.
-
-[#protected_derived-excluded_inherited]
-== link:#protected_derived[protected_derived]::excluded_inherited
+[#protected_derived-do_derived_shadowed]
+== link:#protected_derived[protected_derived]::do_derived_shadowed
 
-This function should be inherited by derived classes.
+This function should shadow the base class function.
 
 === Synopsis
 
 Declared in `<copy‐dependencies.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-excluded_base&
-excluded_inherited();
+link:#protected_derived[protected_derived]&
+do_derived_shadowed();
 ----
 
+=== Return Value
+
+A class that should inherit functions as protected.
+
 [#protected_derived-do_excluded_inherited]
 == link:#protected_derived[protected_derived]::do_excluded_inherited
 

test-files/golden-tests/config/inherit-base-members/copy-dependencies.cpp

@@ -21,7 +21,7 @@ class base_base {
 public:
     /// This function should be indirectly inherited by derived classes.
     base_base& base_base_inherited();
-public:
+protected:
     /// This function should be indirectly inherited by derived classes.
     base_base& do_base_base_inherited();
 };
@@ -54,7 +54,7 @@ class derived
 public:
     /// This function should shadow the base class function.
     derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     derived& do_derived_shadowed();
 };
@@ -67,7 +67,7 @@ class protected_derived
 public:
     /// This function should shadow the base class function.
     protected_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     protected_derived& do_derived_shadowed();
 };
@@ -80,7 +80,7 @@ class private_derived
 public:
     /// This function should shadow the base class function.
     private_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     private_derived& do_derived_shadowed();
 };