fix: preserve extraction mode when copying members from derived classes

Fixes #1119

Author: mizvekov

src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp

@@ -98,16 +98,6 @@ inheritBaseMembers(
     std::vector<SymbolID>& derived,
     std::vector<SymbolID> const& base)
 {
-    Symbol const* derivedInfo = nullptr;
-    auto const getDerivedInfo = [&]() -> Symbol const*
-    {
-        if (!derivedInfo)
-        {
-            derivedInfo = corpus_.find(derivedId);
-        }
-        return derivedInfo;
-    };
-
     for (SymbolID const& otherID: base)
     {
         // Find the info from the base class
@@ -173,14 +163,6 @@ inheritBaseMembers(
                 std::format("{}-{}", toBase16Str(otherCopy->Parent),
                             toBase16Str(otherInfo.id)));
             derived.push_back(otherCopy->id);
-            // Get the extraction mode from the derived class
-            if (otherCopy->Extraction == ExtractionMode::Dependency ||
-                otherCopy->Extraction == ExtractionMode::ImplementationDefined)
-            {
-                Symbol const* derivedInfoPtr = getDerivedInfo();
-                MRDOCS_CHECK_OR_CONTINUE(derivedInfoPtr);
-                otherCopy->Extraction = derivedInfoPtr->Extraction;
-            }
             corpus_.info_.insert(std::move(otherCopy));
         }
     }

test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc

@@ -36,27 +36,6 @@ struct A
 | 
 |===
 
-=== Member Functions
-
-[cols=1]
-|===
-| Name
-| link:#A-value[`value`] 
-|===
-
-[#A-value]
-== link:#A[A]::value
-
-=== Synopsis
-
-Declared in `<extract‐implicit‐specializations.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-int&
-value();
-----
-
 [#B-00]
 == B
 

test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html

@@ -51,35 +51,8 @@ <h2>Base Classes</h2>
 </tbody>
 </table>
 </div>
-<h2>Member Functions</h2>
-<table style="table-layout: fixed; width: 100%;">
-<thead>
-<tr>
-<th>Name</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a href="#A-value"><code>value</code></a> </td></tr>
-</tbody>
-</table>
-
 
 
-</div>
-<div>
-<div>
-<h2 id="A-value">A::value</h2>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;extract-implicit-specializations.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">int&
-value();</code>
-</pre>
-</div>
 </div>
 <div>
 <div>

test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.xml

@@ -7,14 +7,6 @@
     <base>
       <type id="Bu/3QcmNOdsc7RSM3OKHnuCxGPU=" name="B&lt;int&gt;"/>
     </base>
-    <function name="value" id="i2Kh9WfDseks8Lnr/kapVaR9r4g=">
-      <file short-path="extract-implicit-specializations.cpp" source-path="extract-implicit-specializations.cpp" line="3"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type name="int"/>
-        </type>
-      </return>
-    </function>
   </struct>
   <template>
     <tparam name="T" class="type"/>

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

@@ -318,8 +318,6 @@ class derived
 | 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.
 |===
 
 === Protected Member Functions
@@ -333,10 +331,6 @@ class derived
 | This function should shadow the excluded_base function.
 | link:#base-do_derived_shadowed[`do_derived_shadowed`] 
 | This function should be shadowed by derived classes.
-| link:#derived-do_excluded_inherited[`do_excluded_inherited`] 
-| This function should be inherited by derived classes.
-| link:#derived-do_shadowed[`do_shadowed`] 
-| This function should be shadowed by derived classes.
 |===
 
 [#derived-derived_shadowed]
@@ -377,51 +371,6 @@ do_derived_shadowed();
 
 A class that derives from base and excluded_base
 
-[#derived-excluded_inherited]
-== link:#derived[derived]::excluded_inherited
-
-This function should be inherited by derived classes.
-
-=== Synopsis
-
-Declared in `<copy‐dependencies.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded_base&
-excluded_inherited();
-----
-
-[#derived-do_excluded_inherited]
-== link:#derived[derived]::do_excluded_inherited
-
-This function should be inherited by derived classes.
-
-=== Synopsis
-
-Declared in `<copy‐dependencies.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded_base&
-do_excluded_inherited();
-----
-
-[#derived-do_shadowed]
-== link:#derived[derived]::do_shadowed
-
-This function should be shadowed by derived classes.
-
-=== Synopsis
-
-Declared in `<copy‐dependencies.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded_base&
-do_shadowed();
-----
-
 [#private_derived]
 == private_derived
 
@@ -547,12 +496,6 @@ class protected_derived
 | This function should shadow the excluded_base function.
 | link:#base-do_derived_shadowed[`do_derived_shadowed`] 
 | This function should be shadowed by derived classes.
-| link:#protected_derived-do_excluded_inherited[`do_excluded_inherited`] 
-| This function should be inherited by derived classes.
-| link:#protected_derived-do_shadowed[`do_shadowed`] 
-| This function should be shadowed by derived classes.
-| link:#protected_derived-excluded_inherited[`excluded_inherited`] 
-| This function should be inherited by derived classes.
 |===
 
 [#protected_derived-derived_shadowed]
@@ -593,50 +536,5 @@ do_derived_shadowed();
 
 A class that should inherit functions as protected.
 
-[#protected_derived-do_excluded_inherited]
-== link:#protected_derived[protected_derived]::do_excluded_inherited
-
-This function should be inherited by derived classes.
-
-=== Synopsis
-
-Declared in `<copy‐dependencies.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded_base&
-do_excluded_inherited();
-----
-
-[#protected_derived-do_shadowed]
-== link:#protected_derived[protected_derived]::do_shadowed
-
-This function should be shadowed by derived classes.
-
-=== Synopsis
-
-Declared in `<copy‐dependencies.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded_base&
-do_shadowed();
-----
-
-[#protected_derived-excluded_inherited]
-== link:#protected_derived[protected_derived]::excluded_inherited
-
-This function should be inherited by derived classes.
-
-=== Synopsis
-
-Declared in `<copy‐dependencies.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded_base&
-excluded_inherited();
-----
-
 
 [.small]#Created with https://www.mrdocs.com[MrDocs]#

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

@@ -368,8 +368,7 @@ <h2>Member Functions</h2>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td>This function should shadow the excluded_base function.</td></tr><tr>
 <td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td>This function should shadow the base class function.</td></tr><tr>
 <td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td>This function should be indirectly inherited by derived classes.</td></tr><tr>
-<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td>This function should shadow the base class function.</td></tr><tr>
-<td><a href="#derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td>This function should be inherited by derived classes.</td></tr>
+<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td>This function should shadow the base class function.</td></tr>
 </tbody>
 </table>
 
@@ -385,9 +384,7 @@ <h2>Protected Member Functions</h2>
 <tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td>This function should be inherited by derived classes.</td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td>This function should shadow the excluded_base function.</td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td>This function should be shadowed by derived classes.</td></tr><tr>
-<td><a href="#derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td>This function should be inherited by derived classes.</td></tr><tr>
-<td><a href="#derived-do_shadowed"><code>do_shadowed</code></a> </td><td>This function should be shadowed by derived classes.</td></tr>
+<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td>This function should be shadowed by derived classes.</td></tr>
 </tbody>
 </table>
 
@@ -437,57 +434,6 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-excluded_inherited">derived::excluded_inherited</h2>
-<div>
-<p>This function should be inherited by derived classes.</p>
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-excluded_inherited();</code>
-</pre>
-</div>
-</div>
-<div>
-<div>
-<h2 id="derived-do_excluded_inherited">derived::do_excluded_inherited</h2>
-<div>
-<p>This function should be inherited by derived classes.</p>
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-do_excluded_inherited();</code>
-</pre>
-</div>
-</div>
-<div>
-<div>
-<h2 id="derived-do_shadowed">derived::do_shadowed</h2>
-<div>
-<p>This function should be shadowed by derived classes.</p>
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-do_shadowed();</code>
-</pre>
-</div>
-</div>
-<div>
-<div>
 <h2 id="private_derived">private_derived</h2>
 <div>
 <p>A class that uses private inheritance only</p>
@@ -625,10 +571,7 @@ <h2>Protected Member Functions</h2>
 <td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td>This function should be indirectly inherited by derived classes.</td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td>This function should be inherited by derived classes.</td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td>This function should shadow the excluded_base function.</td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td>This function should be shadowed by derived classes.</td></tr><tr>
-<td><a href="#protected_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td>This function should be inherited by derived classes.</td></tr><tr>
-<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td>This function should be shadowed by derived classes.</td></tr><tr>
-<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td>This function should be inherited by derived classes.</td></tr>
+<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td>This function should be shadowed by derived classes.</td></tr>
 </tbody>
 </table>
 
@@ -676,57 +619,6 @@ <h3>Return Value</h3>
 A class that should inherit functions as protected.
 </div>
 </div>
-<div>
-<div>
-<h2 id="protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</h2>
-<div>
-<p>This function should be inherited by derived classes.</p>
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-do_excluded_inherited();</code>
-</pre>
-</div>
-</div>
-<div>
-<div>
-<h2 id="protected_derived-do_shadowed">protected_derived::do_shadowed</h2>
-<div>
-<p>This function should be shadowed by derived classes.</p>
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-do_shadowed();</code>
-</pre>
-</div>
-</div>
-<div>
-<div>
-<h2 id="protected_derived-excluded_inherited">protected_derived::excluded_inherited</h2>
-<div>
-<p>This function should be inherited by derived classes.</p>
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-excluded_inherited();</code>
-</pre>
-</div>
-</div>
 
 </div>
 <div>