diff --git a/.gitignore b/.gitignore index 9b66230074..fe65040f97 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ /share/mrdocs/clang/ /docs/modules/reference /.gdbinit -/.lldbinit \ No newline at end of file +/.lldbinit +/.github/node_modules/ \ No newline at end of file diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp index f3a0a4c476..a73e29d067 100644 --- a/src/lib/AST/ASTVisitor.cpp +++ b/src/lib/AST/ASTVisitor.cpp @@ -212,23 +212,15 @@ traverseMembers(InfoTy& I, DeclTy const* DC) !std::derived_from && std::derived_from) { - // We only need members of regular symbols and see-below namespaces - // - If symbol is SeeBelow we want the members if it's a namespace - MRDOCS_CHECK_OR( - I.Extraction != ExtractionMode::SeeBelow || - I.Kind == SymbolKind::Namespace); - - // - If symbol is a Dependency, we only want the members if - // the traversal mode is BaseClass - MRDOCS_CHECK_OR( - I.Extraction != ExtractionMode::Dependency || - mode_ == TraversalMode::BaseClass); - - // - If symbol is ImplementationDefined, we only want the members if - // the traversal mode is BaseClass - MRDOCS_CHECK_OR( - I.Extraction != ExtractionMode::ImplementationDefined || - mode_ == TraversalMode::BaseClass); + // Only traverse hidden members (dep/impl-defined/see-below records) when + // we're already visiting a base class tree. + if (mode_ != TraversalMode::BaseClass) + { + MRDOCS_CHECK_OR( + I.Extraction == ExtractionMode::Regular + || (I.Extraction == ExtractionMode::SeeBelow + && I.Kind == SymbolKind::Namespace)); + } // There are many implicit declarations, especially in the // translation unit declaration, so we preemtively skip them here. @@ -681,6 +673,33 @@ populate( clang::QualType const BT = B.getType(); auto BaseType = toType(BT, BaseClass); + // When inheriting base members, only revisit bases whose extraction mode + // isn’t regular so we pick up their members/docs. + if (config_->inheritBaseMembers != PublicSettings::BaseMemberInheritance::Never) + { + if (auto const* baseDecl = BT->getAsCXXRecordDecl()) + { + if (auto const* baseDef = baseDecl->getDefinition(); + baseDef) + { + if (auto const* baseInfo = find(baseDef); + baseInfo) + { + if (baseInfo->Extraction != ExtractionMode::Regular) + { + ScopeExitRestore s(mode_, TraversalMode::BaseClass); + traverse(baseDef); + } + } + else + { + ScopeExitRestore s(mode_, TraversalMode::BaseClass); + traverse(baseDef); + } + } + } + } + // If we're going to copy the members from the specialization, // we need to instantiate and traverse the specialization // as a dependency. diff --git a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp index dc56b86e30..6054da83e3 100644 --- a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp +++ b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp @@ -85,7 +85,7 @@ shouldCopy(Config const& config, Symbol const& M) { if (config->inheritBaseMembers == PublicSettings::BaseMemberInheritance::CopyDependencies) { - return M.Extraction == ExtractionMode::Dependency; + return M.Extraction != ExtractionMode::Regular; } return config->inheritBaseMembers == PublicSettings::BaseMemberInheritance::CopyAll; } @@ -98,6 +98,16 @@ inheritBaseMembers( std::vector& derived, std::vector 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 @@ -164,12 +174,12 @@ inheritBaseMembers( toBase16Str(otherInfo.id))); derived.push_back(otherCopy->id); // Get the extraction mode from the derived class - if (otherCopy->Extraction == ExtractionMode::Dependency) + if (otherCopy->Extraction == ExtractionMode::Dependency || + otherCopy->Extraction == ExtractionMode::ImplementationDefined) { - Symbol* derivedInfoPtr = corpus_.find(derivedId); + Symbol const* derivedInfoPtr = getDerivedInfo(); MRDOCS_CHECK_OR_CONTINUE(derivedInfoPtr); - Symbol const& derivedInfo = *derivedInfoPtr; - otherCopy->Extraction = derivedInfo.Extraction; + otherCopy->Extraction = derivedInfoPtr->Extraction; } corpus_.info_.insert(std::move(otherCopy)); } diff --git a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc index 0a99f31923..beaff2caf2 100644 --- a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc +++ b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc @@ -10,7 +10,7 @@ |=== | Name | link:#A[`A`] -| link:#B[`B`] +| link:#B-00[`B`] |=== [#A] @@ -23,7 +23,7 @@ Declared in `<no‐extract‐implicit‐specializations&period [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A - : link:#B[B<int>] + : link:#B-00[B<int>] ---- === Base Classes @@ -32,7 +32,7 @@ struct A |=== |Name|Description -| `link:#B[B<int>]` +| `link:#B-00[B<int>]` | |=== @@ -41,10 +41,10 @@ struct A [cols=1] |=== | Name -| link:#B-value[`value`] +| link:#B-00-value[`value`] |=== -[#B] +[#B-00] == B === Synopsis @@ -62,7 +62,7 @@ struct B; [cols=1] |=== | Name -| link:#B-value[`value`] +| link:#B-00-value[`value`] |=== === Derived Classes @@ -75,8 +75,8 @@ struct B; | |=== -[#B-value] -== link:#B[B]::value +[#B-00-value] +== link:#B-00[B]::value === Synopsis diff --git a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html index 10d24cf799..643b47916a 100644 --- a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html +++ b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html @@ -19,7 +19,7 @@

Types

A -B +B @@ -34,7 +34,7 @@

Synopsis

Declared in <no-extract-implicit-specializations.cpp> 
 struct A
-    : B<int>
+    : B<int>
@@ -47,7 +47,7 @@

Base Classes

-B<int> +B<int>
@@ -60,7 +60,7 @@

Member Functions

-value +value @@ -69,7 +69,7 @@

Member Functions

-

B

+

B

Synopsis

@@ -89,7 +89,7 @@

Member Functions

-value +value @@ -113,7 +113,7 @@

Derived Classes

-

B::value

+

B::value

Synopsis

diff --git a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.adoc b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.adoc new file mode 100644 index 0000000000..7cfbb1d5d3 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.adoc @@ -0,0 +1,78 @@ += Reference +:mrdocs: + +[#index] +== Global namespace + +=== Types + +[cols=1] +|=== +| Name +| link:#derived[`derived`] +|=== + +[#derived] +== derived + +=== Synopsis + +Declared in `<impl‐defined‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct derived + : /* implementation-defined */ +---- + +=== Base Classes + +[cols="1,4"] +|=== +|Name|Description + +| `/* implementation-defined */` +| +|=== + +=== Member Functions + +[cols="1,4"] +|=== +| Name| Description +| link:#derived-do_it[`do_it`] +| Do the thing +| link:#derived-own[`own`] +| +|=== + +[#derived-do_it] +== link:#derived[derived]::do_it + +Do the thing + +=== Synopsis + +Declared in `<impl‐defined‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +void +do_it(); +---- + +[#derived-own] +== link:#derived[derived]::own + +=== Synopsis + +Declared in `<impl‐defined‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +void +own(); +---- + + +[.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.cpp b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.cpp new file mode 100644 index 0000000000..386d666c62 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.cpp @@ -0,0 +1,14 @@ +// Repro for cppalliance/mrdocs#1107: documentation carried from hidden bases. +namespace detail { + +struct base_detail { + /// Do the thing + void do_it(); +}; + +} // detail + +struct derived : detail::base_detail +{ + void own(); +}; diff --git a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.html b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.html new file mode 100644 index 0000000000..e59b1e0f25 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.html @@ -0,0 +1,107 @@ + + +Reference + + +
+

Reference

+
+
+

+
+

Types

+ + + + + + + + + + +
Name
derived
+ +
+
+
+

derived

+
+
+

Synopsis

+
+Declared in <impl-defined-base.cpp>
+
+struct derived
+    : /* implementation-defined */
+
+
+
+

Base Classes

+ + + + + + + + + + +
NameDescription
/* implementation-defined */
+
+

Member Functions

+ + + + + + + + + + + +
NameDescription
do_it Do the thing
own
+ + + +
+
+
+

derived::do_it

+
+

Do the thing

+
+
+
+

Synopsis

+
+Declared in <impl-defined-base.cpp>
+
+void
+do_it();
+
+
+
+
+
+

derived::own

+
+
+

Synopsis

+
+Declared in <impl-defined-base.cpp>
+
+void
+own();
+
+
+
+ +
+
+

Created with MrDocs

+
+ + \ No newline at end of file diff --git a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml new file mode 100644 index 0000000000..ef50202af5 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + Do the thing + + + + + + + + + + + + + + + Do the thing + + + + + + + + + diff --git a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.yml b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.yml new file mode 100644 index 0000000000..23c398fed4 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.yml @@ -0,0 +1,4 @@ +implementation-defined: + - detail +inherit-base-members: copy-dependencies +warn-no-paramdoc: false diff --git a/test-files/golden-tests/config/inherit-base-members/see-below-base.adoc b/test-files/golden-tests/config/inherit-base-members/see-below-base.adoc new file mode 100644 index 0000000000..8cbcae2ac4 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/see-below-base.adoc @@ -0,0 +1,109 @@ += Reference +:mrdocs: + +[#index] +== Global namespace + +=== Namespaces + +[cols=1] +|=== +| Name +| link:#see_below_ns[`see_below_ns`] +|=== + +=== Types + +[cols=1] +|=== +| Name +| link:#derived_see[`derived_see`] +|=== + +[#see_below_ns] +== see_below_ns + +=== Types + +[cols=1] +|=== +| Name +| link:#see_below_ns-base_see[`base_see`] +|=== + +[#see_below_ns-base_see] +== link:#see_below_ns[see_below_ns]::base_see + +=== Synopsis + +Declared in `<see‐below‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct base_see { /* see-below */ }; +---- + +[#derived_see] +== derived_see + +=== Synopsis + +Declared in `<see‐below‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct derived_see + : link:#see_below_ns-base_see[see_below_ns::base_see] +---- + +=== Base Classes + +[cols="1,4"] +|=== +|Name|Description + +| `link:#see_below_ns-base_see[see_below_ns::base_see]` +| +|=== + +=== Member Functions + +[cols="1,4"] +|=== +| Name| Description +| link:#derived_see-do_other[`do_other`] +| Describes the see‐below member +| link:#derived_see-own[`own`] +| +|=== + +[#derived_see-do_other] +== link:#derived_see[derived_see]::do_other + +Describes the see‐below member + +=== Synopsis + +Declared in `<see‐below‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +void +do_other(); +---- + +[#derived_see-own] +== link:#derived_see[derived_see]::own + +=== Synopsis + +Declared in `<see‐below‐base.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +void +own(); +---- + + +[.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/config/inherit-base-members/see-below-base.cpp b/test-files/golden-tests/config/inherit-base-members/see-below-base.cpp new file mode 100644 index 0000000000..490561c3d0 --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/see-below-base.cpp @@ -0,0 +1,14 @@ +// Coverage for see-below bases retaining inherited documentation. +namespace see_below_ns { + +struct base_see { + /// Describes the see-below member + void do_other(); +}; + +} // see_below_ns + +struct derived_see : see_below_ns::base_see +{ + void own(); +}; diff --git a/test-files/golden-tests/config/inherit-base-members/see-below-base.html b/test-files/golden-tests/config/inherit-base-members/see-below-base.html new file mode 100644 index 0000000000..e6a3baa51a --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/see-below-base.html @@ -0,0 +1,153 @@ + + +Reference + + +
+

Reference

+
+
+

+
+

Namespaces

+ + + + + + + + + + +
Name
see_below_ns
+ +

Types

+ + + + + + + + + + +
Name
derived_see
+ +
+
+
+

see_below_ns

+
+

Types

+ + + + + + + + + + +
Name
base_see
+ +
+
+
+

see_below_ns::base_see

+
+
+

Synopsis

+
+Declared in <see-below-base.cpp>
+
+struct base_see { /* see-below */ };
+
+
+ + +
+
+
+

derived_see

+
+
+

Synopsis

+
+Declared in <see-below-base.cpp>
+
+struct derived_see
+    : see_below_ns::base_see
+
+
+
+

Base Classes

+ + + + + + + + + + +
NameDescription
see_below_ns::base_see
+
+

Member Functions

+ + + + + + + + + + + +
NameDescription
do_other Describes the see-below member
own
+ + + +
+
+
+

derived_see::do_other

+
+

Describes the see-below member

+
+
+
+

Synopsis

+
+Declared in <see-below-base.cpp>
+
+void
+do_other();
+
+
+
+
+
+

derived_see::own

+
+
+

Synopsis

+
+Declared in <see-below-base.cpp>
+
+void
+own();
+
+
+
+ +
+
+

Created with MrDocs

+
+ + \ No newline at end of file diff --git a/test-files/golden-tests/config/inherit-base-members/see-below-base.xml b/test-files/golden-tests/config/inherit-base-members/see-below-base.xml new file mode 100644 index 0000000000..f1f6a19e0c --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/see-below-base.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + Describes the see-below member + + + + + + + + + diff --git a/test-files/golden-tests/config/inherit-base-members/see-below-base.yml b/test-files/golden-tests/config/inherit-base-members/see-below-base.yml new file mode 100644 index 0000000000..dd6f8c97ad --- /dev/null +++ b/test-files/golden-tests/config/inherit-base-members/see-below-base.yml @@ -0,0 +1,4 @@ +see-below: + - see_below_ns::base_see +inherit-base-members: copy-dependencies +warn-no-paramdoc: false diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc index 3c6c2f5cbe..c25cc38a45 100644 --- a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc +++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc @@ -60,7 +60,7 @@ | link:#R9[`R9`] | link:#S0-0cf[`S0`] | link:#S0-0be[`S0<0>`] -| link:#S0-08[`S0<10>`] +| link:#S0-087[`S0<10>`] | link:#S0-0e[`S0<12>`] | link:#S0-09e4[`S0<15>`] | link:#S0-07a[`S0<18>`] @@ -175,7 +175,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R10 - : link:#S0-08-S1-S2-08-S4[S0<10>::S1::S2<11>::S4<‐1>] + : link:#S0-087-S1-S2-08-S4-08[S0<10>::S1::S2<11>::S4<‐1>] ---- === Base Classes @@ -184,7 +184,7 @@ struct R10 |=== |Name|Description -| `link:#S0-08-S1-S2-08-S4[S0<10>::S1::S2<11>::S4<‐1>]` +| `link:#S0-087-S1-S2-08-S4-08[S0<10>::S1::S2<11>::S4<‐1>]` | |=== @@ -267,7 +267,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R14 - : link:#S0-07a-S5[S0<18>::S5<‐1>] + : link:#S0-07a-S5-07[S0<18>::S5<‐1>] ---- === Base Classes @@ -276,7 +276,7 @@ struct R14 |=== |Name|Description -| `link:#S0-07a-S5[S0<18>::S5<‐1>]` +| `link:#S0-07a-S5-07[S0<18>::S5<‐1>]` | |=== @@ -382,7 +382,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R19 - : link:#S0-0a2-S5-02-S6-S7[S0<25>::S5<26>::S6::S7<‐1>] + : link:#S0-0a2-S5-02-S6-S7-01[S0<25>::S5<26>::S6::S7<‐1>] ---- === Base Classes @@ -391,7 +391,7 @@ struct R19 |=== |Name|Description -| `link:#S0-0a2-S5-02-S6-S7[S0<25>::S5<26>::S6::S7<‐1>]` +| `link:#S0-0a2-S5-02-S6-S7-01[S0<25>::S5<26>::S6::S7<‐1>]` | |=== @@ -537,7 +537,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R24 - : link:#S0-033-S5-0f-S6-S7-0d-S9[S0<36>::S5<37>::S6::S7<38>::S9<‐1>] + : link:#S0-033-S5-0f-S6-S7-0d-S9-02[S0<36>::S5<37>::S6::S7<38>::S9<‐1>] ---- === Base Classes @@ -546,7 +546,7 @@ struct R24 |=== |Name|Description -| `link:#S0-033-S5-0f-S6-S7-0d-S9[S0<36>::S5<37>::S6::S7<38>::S9<‐1>]` +| `link:#S0-033-S5-0f-S6-S7-0d-S9-02[S0<36>::S5<37>::S6::S7<38>::S9<‐1>]` | |=== @@ -797,7 +797,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R32 - : link:#S0-0b6-S1-S2[S0<4, bool>::S1::S2<5, bool>] + : link:#S0-0b6-S1-S2-06[S0<4, bool>::S1::S2<5, bool>] ---- === Base Classes @@ -806,7 +806,7 @@ struct R32 |=== |Name|Description -| `link:#S0-0b6-S1-S2[S0<4, bool>::S1::S2<5, bool>]` +| `link:#S0-0b6-S1-S2-06[S0<4, bool>::S1::S2<5, bool>]` | |=== @@ -820,7 +820,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R33 - : link:#S0-023-S1-S2[S0<6, bool>::S1::S2<7, int>] + : link:#S0-023-S1-S2-0f[S0<6, bool>::S1::S2<7, int>] ---- === Base Classes @@ -829,7 +829,7 @@ struct R33 |=== |Name|Description -| `link:#S0-023-S1-S2[S0<6, bool>::S1::S2<7, int>]` +| `link:#S0-023-S1-S2-0f[S0<6, bool>::S1::S2<7, int>]` | |=== @@ -900,7 +900,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R36 - : link:#S0-0cd-S1-S2-05-S4[S0<12, bool>::S1::S2<13, bool>::S4<14, bool>] + : link:#S0-0cd-S1-S2-05-S4-00[S0<12, bool>::S1::S2<13, bool>::S4<14, bool>] ---- === Base Classes @@ -909,7 +909,7 @@ struct R36 |=== |Name|Description -| `link:#S0-0cd-S1-S2-05-S4[S0<12, bool>::S1::S2<13, bool>::S4<14, bool>]` +| `link:#S0-0cd-S1-S2-05-S4-00[S0<12, bool>::S1::S2<13, bool>::S4<14, bool>]` | |=== @@ -923,7 +923,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R37 - : link:#S0-000-S1-S2-03-S4[S0<15, bool>::S1::S2<16, bool>::S4<17, int>] + : link:#S0-000-S1-S2-03-S4-0b[S0<15, bool>::S1::S2<16, bool>::S4<17, int>] ---- === Base Classes @@ -932,7 +932,7 @@ struct R37 |=== |Name|Description -| `link:#S0-000-S1-S2-03-S4[S0<15, bool>::S1::S2<16, bool>::S4<17, int>]` +| `link:#S0-000-S1-S2-03-S4-0b[S0<15, bool>::S1::S2<16, bool>::S4<17, int>]` | |=== @@ -972,7 +972,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R39 - : link:#S0-002-S5[S0<19, bool>::S5<20, bool>] + : link:#S0-002-S5-08[S0<19, bool>::S5<20, bool>] ---- === Base Classes @@ -981,7 +981,7 @@ struct R39 |=== |Name|Description -| `link:#S0-002-S5[S0<19, bool>::S5<20, bool>]` +| `link:#S0-002-S5-08[S0<19, bool>::S5<20, bool>]` | |=== @@ -1018,7 +1018,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R40 - : link:#S0-003-S5[S0<21, bool>::S5<22, int>] + : link:#S0-003-S5-0c[S0<21, bool>::S5<22, int>] ---- === Base Classes @@ -1027,7 +1027,7 @@ struct R40 |=== |Name|Description -| `link:#S0-003-S5[S0<21, bool>::S5<22, int>]` +| `link:#S0-003-S5-0c[S0<21, bool>::S5<22, int>]` | |=== @@ -1106,7 +1106,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R43 - : link:#S0-007-S5-0d-S6-S7[S0<27, bool>::S5<28, bool>::S6::S7<29, int>] + : link:#S0-007-S5-0d-S6-S7-0d[S0<27, bool>::S5<28, bool>::S6::S7<29, int>] ---- === Base Classes @@ -1115,7 +1115,7 @@ struct R43 |=== |Name|Description -| `link:#S0-007-S5-0d-S6-S7[S0<27, bool>::S5<28, bool>::S6::S7<29, int>]` +| `link:#S0-007-S5-0d-S6-S7-0d[S0<27, bool>::S5<28, bool>::S6::S7<29, int>]` | |=== @@ -1129,7 +1129,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R44 - : link:#S0-021-S5-0b-S6-S7[S0<30, bool>::S5<31, bool>::S6::S7<32, bool>] + : link:#S0-021-S5-0b-S6-S7-0f[S0<30, bool>::S5<31, bool>::S6::S7<32, bool>] ---- === Base Classes @@ -1138,7 +1138,7 @@ struct R44 |=== |Name|Description -| `link:#S0-021-S5-0b-S6-S7[S0<30, bool>::S5<31, bool>::S6::S7<32, bool>]` +| `link:#S0-021-S5-0b-S6-S7-0f[S0<30, bool>::S5<31, bool>::S6::S7<32, bool>]` | |=== @@ -1209,7 +1209,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R47 - : link:#S0-0206-S5-08-S6-S7-01-S9[S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>] + : link:#S0-0206-S5-08-S6-S7-01-S9-0f[S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>] ---- === Base Classes @@ -1218,7 +1218,7 @@ struct R47 |=== |Name|Description -| `link:#S0-0206-S5-08-S6-S7-01-S9[S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>]` +| `link:#S0-0206-S5-08-S6-S7-01-S9-0f[S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>]` | |=== @@ -1232,7 +1232,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R48 - : link:#S0-05291-S5-0e-S6-S7-0f-S9[S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>] + : link:#S0-05291-S5-0e-S6-S7-0f-S9-06[S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>] ---- === Base Classes @@ -1241,7 +1241,7 @@ struct R48 |=== |Name|Description -| `link:#S0-05291-S5-0e-S6-S7-0f-S9[S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>]` +| `link:#S0-05291-S5-0e-S6-S7-0f-S9-06[S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>]` | |=== @@ -1255,7 +1255,7 @@ Declared in `<class‐template‐specializations‐1.cp [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R5 - : link:#S0-073-S1-S2[S0<3>::S1::S2<‐1>] + : link:#S0-073-S1-S2-0f[S0<3>::S1::S2<‐1>] ---- === Base Classes @@ -1264,7 +1264,7 @@ struct R5 |=== |Name|Description -| `link:#S0-073-S1-S2[S0<3>::S1::S2<‐1>]` +| `link:#S0-073-S1-S2-0f[S0<3>::S1::S2<‐1>]` | |=== @@ -1798,7 +1798,7 @@ struct link:#S0-0cf[S0]<0>; | |=== -[#S0-08] +[#S0-087] == link:#S0-0cf[S0]<10> === Synopsis @@ -1816,8 +1816,8 @@ struct link:#S0-0cf[S0]<10>; [cols=1] |=== | Name -| link:#S0-08-S1[`S1`] -| link:#S0-08-S5[`S5`] +| link:#S0-087-S1[`S1`] +| link:#S0-087-S5[`S5`] |=== === Member Functions @@ -1825,11 +1825,11 @@ struct link:#S0-0cf[S0]<10>; [cols=1] |=== | Name -| link:#S0-08-f0[`f0`] +| link:#S0-087-f0[`f0`] |=== -[#S0-08-S1] -== link:#S0-08[S0<10>]::S1 +[#S0-087-S1] +== link:#S0-087[S0<10>]::S1 === Synopsis @@ -1845,8 +1845,8 @@ struct S1; [cols=1] |=== | Name -| link:#S0-08-S1-S2-0b[`S2`] -| link:#S0-08-S1-S2-08[`S2<11>`] +| link:#S0-087-S1-S2-0b[`S2`] +| link:#S0-087-S1-S2-08[`S2<11>`] |=== === Member Functions @@ -1854,11 +1854,11 @@ struct S1; [cols=1] |=== | Name -| link:#S0-08-S1-f1[`f1`] +| link:#S0-087-S1-f1[`f1`] |=== -[#S0-08-S1-S2-0b] -== link:#S0-08[S0<10>]::link:#S0-08-S1[S1]::S2 +[#S0-087-S1-S2-0b] +== link:#S0-087[S0<10>]::link:#S0-087-S1[S1]::S2 === Synopsis @@ -1872,8 +1872,8 @@ template< struct S2; ---- -[#S0-08-S1-S2-08] -== link:#S0-08[S0<10>]::link:#S0-08-S1[S1]::link:#S0-0cf-S1-S2[S2]<11> +[#S0-087-S1-S2-08] +== link:#S0-087[S0<10>]::link:#S0-087-S1[S1]::link:#S0-0cf-S1-S2[S2]<11> === Synopsis @@ -1890,8 +1890,8 @@ struct link:#S0-0cf-S1-S2[S2]<11>; [cols=1] |=== | Name -| link:#S0-08-S1-S2-08-S3[`S3`] -| link:#S0-08-S1-S2-08-S4[`S4`] +| link:#S0-087-S1-S2-08-S3[`S3`] +| link:#S0-087-S1-S2-08-S4-08[`S4`] |=== === Member Functions @@ -1899,11 +1899,11 @@ struct link:#S0-0cf-S1-S2[S2]<11>; [cols=1] |=== | Name -| link:#S0-08-S1-S2-08-f2[`f2`] +| link:#S0-087-S1-S2-08-f2[`f2`] |=== -[#S0-08-S1-S2-08-S3] -== link:#S0-08[S0<10>]::link:#S0-08-S1[S1]::link:#S0-08-S1-S2-08[S2<11>]::S3 +[#S0-087-S1-S2-08-S3] +== link:#S0-087[S0<10>]::link:#S0-087-S1[S1]::link:#S0-087-S1-S2-08[S2<11>]::S3 === Synopsis @@ -1914,8 +1914,8 @@ Declared in `<class‐template‐specializations‐1.cp struct S3; ---- -[#S0-08-S1-S2-08-S4] -== link:#S0-08[S0<10>]::link:#S0-08-S1[S1]::link:#S0-08-S1-S2-08[S2<11>]::S4 +[#S0-087-S1-S2-08-S4-08] +== link:#S0-087[S0<10>]::link:#S0-087-S1[S1]::link:#S0-087-S1-S2-08[S2<11>]::S4 === Synopsis @@ -1939,8 +1939,8 @@ struct S4; | |=== -[#S0-08-S1-S2-08-f2] -== link:#S0-08[S0<10>]::link:#S0-08-S1[S1]::link:#S0-08-S1-S2-08[S2<11>]::f2 +[#S0-087-S1-S2-08-f2] +== link:#S0-087[S0<10>]::link:#S0-087-S1[S1]::link:#S0-087-S1-S2-08[S2<11>]::f2 === Synopsis @@ -1952,8 +1952,8 @@ void f2(); ---- -[#S0-08-S1-f1] -== link:#S0-08[S0<10>]::link:#S0-08-S1[S1]::f1 +[#S0-087-S1-f1] +== link:#S0-087[S0<10>]::link:#S0-087-S1[S1]::f1 === Synopsis @@ -1965,8 +1965,8 @@ void f1(); ---- -[#S0-08-S5] -== link:#S0-08[S0<10>]::S5 +[#S0-087-S5] +== link:#S0-087[S0<10>]::S5 === Synopsis @@ -1980,8 +1980,8 @@ template< struct S5; ---- -[#S0-08-f0] -== link:#S0-08[S0<10>]::f0 +[#S0-087-f0] +== link:#S0-087[S0<10>]::f0 === Synopsis @@ -2454,7 +2454,7 @@ struct link:#S0-0cf[S0]<18>; |=== | Name | link:#S0-07a-S1[`S1`] -| link:#S0-07a-S5[`S5`] +| link:#S0-07a-S5-07[`S5`] |=== === Member Functions @@ -2477,7 +2477,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S1; ---- -[#S0-07a-S5] +[#S0-07a-S5-07] == link:#S0-07a[S0<18>]::S5 === Synopsis @@ -3046,7 +3046,7 @@ struct S6; [cols=1] |=== | Name -| link:#S0-0a2-S5-02-S6-S7[`S7`] +| link:#S0-0a2-S5-02-S6-S7-01[`S7`] |=== === Member Functions @@ -3057,7 +3057,7 @@ struct S6; | link:#S0-0a2-S5-02-S6-f6[`f6`] |=== -[#S0-0a2-S5-02-S6-S7] +[#S0-0a2-S5-02-S6-S7-01] == link:#S0-0a2[S0<25>]::link:#S0-0a2-S5-02[S5<26>]::link:#S0-0a2-S5-02-S6[S6]::S7 === Synopsis @@ -3385,7 +3385,7 @@ struct S1; [cols=1] |=== | Name -| link:#S0-073-S1-S2[`S2`] +| link:#S0-073-S1-S2-0f[`S2`] |=== === Member Functions @@ -3396,7 +3396,7 @@ struct S1; | link:#S0-073-S1-f1[`f1`] |=== -[#S0-073-S1-S2] +[#S0-073-S1-S2-0f] == link:#S0-073[S0<3>]::link:#S0-073-S1[S1]::S2 === Synopsis @@ -4055,7 +4055,7 @@ struct link:#S0-0cf-S5-S6-S7[S7]<38>; |=== | Name | link:#S0-033-S5-0f-S6-S7-0d-S8[`S8`] -| link:#S0-033-S5-0f-S6-S7-0d-S9[`S9`] +| link:#S0-033-S5-0f-S6-S7-0d-S9-02[`S9`] |=== === Member Functions @@ -4078,7 +4078,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S8; ---- -[#S0-033-S5-0f-S6-S7-0d-S9] +[#S0-033-S5-0f-S6-S7-0d-S9-02] == link:#S0-033[S0<36>]::link:#S0-033-S5-0f[S5<37>]::link:#S0-033-S5-0f-S6[S6]::link:#S0-033-S5-0f-S6-S7-0d[S7<38>]::S9 === Synopsis @@ -5513,7 +5513,7 @@ struct link:#S0-0cf-S1-S2[S2]<13, bool>; |=== | Name | link:#S0-0cd-S1-S2-05-S3[`S3`] -| link:#S0-0cd-S1-S2-05-S4[`S4`] +| link:#S0-0cd-S1-S2-05-S4-00[`S4`] |=== === Member Functions @@ -5536,7 +5536,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S3; ---- -[#S0-0cd-S1-S2-05-S4] +[#S0-0cd-S1-S2-05-S4-00] == link:#S0-0cd[S0<12, bool>]::link:#S0-0cd-S1[S1]::link:#S0-0cd-S1-S2-05[S2<13, bool>]::S4 === Synopsis @@ -5708,7 +5708,7 @@ struct link:#S0-0cf-S1-S2[S2]<16, bool>; |=== | Name | link:#S0-000-S1-S2-03-S3[`S3`] -| link:#S0-000-S1-S2-03-S4[`S4`] +| link:#S0-000-S1-S2-03-S4-0b[`S4`] |=== === Member Functions @@ -5731,7 +5731,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S3; ---- -[#S0-000-S1-S2-03-S4] +[#S0-000-S1-S2-03-S4-0b] == link:#S0-000[S0<15, bool>]::link:#S0-000-S1[S1]::link:#S0-000-S1-S2-03[S2<16, bool>]::S4 === Synopsis @@ -5909,7 +5909,7 @@ struct link:#S0-0cf[S0]<19, bool>; |=== | Name | link:#S0-002-S1[`S1`] -| link:#S0-002-S5[`S5`] +| link:#S0-002-S5-08[`S5`] |=== === Member Functions @@ -5932,7 +5932,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S1; ---- -[#S0-002-S5] +[#S0-002-S5-08] == link:#S0-002[S0<19, bool>]::S5 === Synopsis @@ -6113,7 +6113,7 @@ struct link:#S0-0cf[S0]<21, bool>; |=== | Name | link:#S0-003-S1[`S1`] -| link:#S0-003-S5[`S5`] +| link:#S0-003-S5-0c[`S5`] |=== === Member Functions @@ -6136,7 +6136,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S1; ---- -[#S0-003-S5] +[#S0-003-S5-0c] == link:#S0-003[S0<21, bool>]::S5 === Synopsis @@ -6636,7 +6636,7 @@ struct S6; [cols=1] |=== | Name -| link:#S0-007-S5-0d-S6-S7[`S7`] +| link:#S0-007-S5-0d-S6-S7-0d[`S7`] |=== === Member Functions @@ -6647,7 +6647,7 @@ struct S6; | link:#S0-007-S5-0d-S6-f6[`f6`] |=== -[#S0-007-S5-0d-S6-S7] +[#S0-007-S5-0d-S6-S7-0d] == link:#S0-007[S0<27, bool>]::link:#S0-007-S5-0d[S5<28, bool>]::link:#S0-007-S5-0d-S6[S6]::S7 === Synopsis @@ -6939,7 +6939,7 @@ struct S6; [cols=1] |=== | Name -| link:#S0-021-S5-0b-S6-S7[`S7`] +| link:#S0-021-S5-0b-S6-S7-0f[`S7`] |=== === Member Functions @@ -6950,7 +6950,7 @@ struct S6; | link:#S0-021-S5-0b-S6-f6[`f6`] |=== -[#S0-021-S5-0b-S6-S7] +[#S0-021-S5-0b-S6-S7-0f] == link:#S0-021[S0<30, bool>]::link:#S0-021-S5-0b[S5<31, bool>]::link:#S0-021-S5-0b-S6[S6]::S7 === Synopsis @@ -7685,7 +7685,7 @@ struct link:#S0-0cf-S5-S6-S7[S7]<41, bool>; |=== | Name | link:#S0-0206-S5-08-S6-S7-01-S8[`S8`] -| link:#S0-0206-S5-08-S6-S7-01-S9[`S9`] +| link:#S0-0206-S5-08-S6-S7-01-S9-0f[`S9`] |=== === Member Functions @@ -7708,7 +7708,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S8; ---- -[#S0-0206-S5-08-S6-S7-01-S9] +[#S0-0206-S5-08-S6-S7-01-S9-0f] == link:#S0-0206[S0<39, bool>]::link:#S0-0206-S5-08[S5<40, bool>]::link:#S0-0206-S5-08-S6[S6]::link:#S0-0206-S5-08-S6-S7-01[S7<41, bool>]::S9 === Synopsis @@ -7832,7 +7832,7 @@ struct S1; [cols=1] |=== | Name -| link:#S0-0b6-S1-S2[`S2`] +| link:#S0-0b6-S1-S2-06[`S2`] |=== === Member Functions @@ -7843,7 +7843,7 @@ struct S1; | link:#S0-0b6-S1-f1[`f1`] |=== -[#S0-0b6-S1-S2] +[#S0-0b6-S1-S2-06] == link:#S0-0b6[S0<4, bool>]::link:#S0-0b6-S1[S1]::S2 === Synopsis @@ -8059,7 +8059,7 @@ struct link:#S0-0cf-S5-S6-S7[S7]<45, bool>; |=== | Name | link:#S0-05291-S5-0e-S6-S7-0f-S8[`S8`] -| link:#S0-05291-S5-0e-S6-S7-0f-S9[`S9`] +| link:#S0-05291-S5-0e-S6-S7-0f-S9-06[`S9`] |=== === Member Functions @@ -8082,7 +8082,7 @@ Declared in `<class‐template‐specializations‐1.cp struct S8; ---- -[#S0-05291-S5-0e-S6-S7-0f-S9] +[#S0-05291-S5-0e-S6-S7-0f-S9-06] == link:#S0-05291[S0<43, bool>]::link:#S0-05291-S5-0e[S5<44, bool>]::link:#S0-05291-S5-0e-S6[S6]::link:#S0-05291-S5-0e-S6-S7-0f[S7<45, bool>]::S9 === Synopsis @@ -8206,7 +8206,7 @@ struct S1; [cols=1] |=== | Name -| link:#S0-023-S1-S2[`S2`] +| link:#S0-023-S1-S2-0f[`S2`] |=== === Member Functions @@ -8217,7 +8217,7 @@ struct S1; | link:#S0-023-S1-f1[`f1`] |=== -[#S0-023-S1-S2] +[#S0-023-S1-S2-0f] == link:#S0-023[S0<6, bool>]::link:#S0-023-S1[S1]::S2 === Synopsis diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.html b/test-files/golden-tests/symbols/record/class-template-specializations-1.html index b75e69271b..0ae1e698cf 100644 --- a/test-files/golden-tests/symbols/record/class-template-specializations-1.html +++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.html @@ -69,7 +69,7 @@

Types

R9 S0 S0<0> -S0<10> +S0<10> S0<12> S0<15> S0<18> @@ -210,7 +210,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp>
 struct R10
-    : S0<10>::S1::S2<11>::S4<-1>
+    : S0<10>::S1::S2<11>::S4<-1>
@@ -223,7 +223,7 @@

Base Classes

-S0<10>::S1::S2<11>::S4<-1> +S0<10>::S1::S2<11>::S4<-1>
@@ -330,7 +330,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp>
 struct R14
-    : S0<18>::S5<-1>
+    : S0<18>::S5<-1>
@@ -343,7 +343,7 @@

Base Classes

-S0<18>::S5<-1> +S0<18>::S5<-1>
@@ -480,7 +480,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R19
-    : S0<25>::S5<26>::S6::S7<-1>
+    : S0<25>::S5<26>::S6::S7<-1>
@@ -493,7 +493,7 @@

Base Classes

-S0<25>::S5<26>::S6::S7<-1> +S0<25>::S5<26>::S6::S7<-1>
@@ -687,7 +687,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R24
-    : S0<36>::S5<37>::S6::S7<38>::S9<-1>
+    : S0<36>::S5<37>::S6::S7<38>::S9<-1>
@@ -700,7 +700,7 @@

Base Classes

-S0<36>::S5<37>::S6::S7<38>::S9<-1> +S0<36>::S5<37>::S6::S7<38>::S9<-1>
@@ -1040,7 +1040,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R32
-    : S0<4, bool>::S1::S2<5, bool>
+    : S0<4, bool>::S1::S2<5, bool>
@@ -1053,7 +1053,7 @@

Base Classes

-S0<4, bool>::S1::S2<5, bool> +S0<4, bool>::S1::S2<5, bool>
@@ -1070,7 +1070,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R33
-    : S0<6, bool>::S1::S2<7, int>
+    : S0<6, bool>::S1::S2<7, int>
@@ -1083,7 +1083,7 @@

Base Classes

-S0<6, bool>::S1::S2<7, int> +S0<6, bool>::S1::S2<7, int>
@@ -1176,7 +1176,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R36
-    : S0<12, bool>::S1::S2<13, bool>::S4<14, bool>
+    : S0<12, bool>::S1::S2<13, bool>::S4<14, bool>
@@ -1189,7 +1189,7 @@

Base Classes

-S0<12, bool>::S1::S2<13, bool>::S4<14, bool> +S0<12, bool>::S1::S2<13, bool>::S4<14, bool>
@@ -1206,7 +1206,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R37
-    : S0<15, bool>::S1::S2<16, bool>::S4<17, int>
+    : S0<15, bool>::S1::S2<16, bool>::S4<17, int>
@@ -1219,7 +1219,7 @@

Base Classes

-S0<15, bool>::S1::S2<16, bool>::S4<17, int> +S0<15, bool>::S1::S2<16, bool>::S4<17, int>
@@ -1269,7 +1269,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R39
-    : S0<19, bool>::S5<20, bool>
+    : S0<19, bool>::S5<20, bool>
@@ -1282,7 +1282,7 @@

Base Classes

-S0<19, bool>::S5<20, bool> +S0<19, bool>::S5<20, bool>
@@ -1329,7 +1329,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R40
-    : S0<21, bool>::S5<22, int>
+    : S0<21, bool>::S5<22, int>
@@ -1342,7 +1342,7 @@

Base Classes

-S0<21, bool>::S5<22, int> +S0<21, bool>::S5<22, int>
@@ -1448,7 +1448,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R43
-    : S0<27, bool>::S5<28, bool>::S6::S7<29, int>
+    : S0<27, bool>::S5<28, bool>::S6::S7<29, int>
@@ -1461,7 +1461,7 @@

Base Classes

-S0<27, bool>::S5<28, bool>::S6::S7<29, int> +S0<27, bool>::S5<28, bool>::S6::S7<29, int>
@@ -1478,7 +1478,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R44
-    : S0<30, bool>::S5<31, bool>::S6::S7<32, bool>
+    : S0<30, bool>::S5<31, bool>::S6::S7<32, bool>
@@ -1491,7 +1491,7 @@

Base Classes

-S0<30, bool>::S5<31, bool>::S6::S7<32, bool> +S0<30, bool>::S5<31, bool>::S6::S7<32, bool>
@@ -1584,7 +1584,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R47
-    : S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>
+    : S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>
@@ -1597,7 +1597,7 @@

Base Classes

-S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int> +S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>
@@ -1614,7 +1614,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R48
-    : S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>
+    : S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>
@@ -1627,7 +1627,7 @@

Base Classes

-S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool> +S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>
@@ -1644,7 +1644,7 @@

Synopsis

Declared in <class-template-specializations-1.cpp> 
 struct R5
-    : S0<3>::S1::S2<-1>
+    : S0<3>::S1::S2<-1>
@@ -1657,7 +1657,7 @@

Base Classes

-S0<3>::S1::S2<-1> +S0<3>::S1::S2<-1>
@@ -2357,7 +2357,7 @@

Derived Classes

-

S0<10>

+

S0<10>

Synopsis

@@ -2377,8 +2377,8 @@

Types

-S1 -S5 +S1 +S5 @@ -2391,7 +2391,7 @@

Member Functions

-f0 +f0 @@ -2400,7 +2400,7 @@

Member Functions

-

S0<10>::S1

+

S0<10>::S1

Synopsis

@@ -2419,8 +2419,8 @@

Types

-S2 -S2<11> +S2 +S2<11> @@ -2433,7 +2433,7 @@

Member Functions

-f1 +f1 @@ -2442,7 +2442,7 @@

Member Functions

-

S0<10>::S1::S2

+

S0<10>::S1::S2

Synopsis

@@ -2460,7 +2460,7 @@

Synopsis

-

S0<10>::S1::S2<11>

+

S0<10>::S1::S2<11>

Synopsis

@@ -2480,8 +2480,8 @@

Types

-S3 -S4 +S3 +S4 @@ -2494,7 +2494,7 @@

Member Functions

-f2 +f2 @@ -2503,7 +2503,7 @@

Member Functions

-

S0<10>::S1::S2<11>::S3

+

S0<10>::S1::S2<11>::S3

Synopsis

@@ -2518,7 +2518,7 @@

Synopsis

-

S0<10>::S1::S2<11>::S4

+

S0<10>::S1::S2<11>::S4

Synopsis

@@ -2551,7 +2551,7 @@

Derived Classes

-

S0<10>::S1::S2<11>::f2

+

S0<10>::S1::S2<11>::f2

Synopsis

@@ -2565,7 +2565,7 @@

Synopsis

-

S0<10>::S1::f1

+

S0<10>::S1::f1

Synopsis

@@ -2579,7 +2579,7 @@

Synopsis

-

S0<10>::S5

+

S0<10>::S5

Synopsis

@@ -2597,7 +2597,7 @@

Synopsis

-

S0<10>::f0

+

S0<10>::f0

Synopsis

@@ -3206,7 +3206,7 @@

Types

S1 -S5 +S5 @@ -3243,7 +3243,7 @@

Synopsis

-

S0<18>::S5

+

S0<18>::S5

Synopsis

@@ -3986,7 +3986,7 @@

Types

-S7 +S7 @@ -4008,7 +4008,7 @@

Member Functions

-

S0<25>::S5<26>::S6::S7

+

S0<25>::S5<26>::S6::S7

Synopsis

@@ -4429,7 +4429,7 @@

Types

-S2 +S2 @@ -4451,7 +4451,7 @@

Member Functions

-

S0<3>::S1::S2

+

S0<3>::S1::S2

Synopsis

@@ -5308,7 +5308,7 @@

Types

S8 -S9 +S9 @@ -5345,7 +5345,7 @@

Synopsis

-

S0<36>::S5<37>::S6::S7<38>::S9

+

S0<36>::S5<37>::S6::S7<38>::S9

Synopsis

@@ -7207,7 +7207,7 @@

Types

S3 -S4 +S4 @@ -7244,7 +7244,7 @@

Synopsis

-

S0<12, bool>::S1::S2<13, bool>::S4

+

S0<12, bool>::S1::S2<13, bool>::S4

Synopsis

@@ -7461,7 +7461,7 @@

Types

S3 -S4 +S4 @@ -7498,7 +7498,7 @@

Synopsis

-

S0<15, bool>::S1::S2<16, bool>::S4

+

S0<15, bool>::S1::S2<16, bool>::S4

Synopsis

@@ -7717,7 +7717,7 @@

Types

S1 -S5 +S5 @@ -7754,7 +7754,7 @@

Synopsis

-

S0<19, bool>::S5

+

S0<19, bool>::S5

Synopsis

@@ -7985,7 +7985,7 @@

Types

S1 -S5 +S5 @@ -8022,7 +8022,7 @@

Synopsis

-

S0<21, bool>::S5

+

S0<21, bool>::S5

Synopsis

@@ -8677,7 +8677,7 @@

Types

-S7 +S7 @@ -8699,7 +8699,7 @@

Member Functions

-

S0<27, bool>::S5<28, bool>::S6::S7

+

S0<27, bool>::S5<28, bool>::S6::S7

Synopsis

@@ -9075,7 +9075,7 @@

Types

-S7 +S7 @@ -9097,7 +9097,7 @@

Member Functions

-

S0<30, bool>::S5<31, bool>::S6::S7

+

S0<30, bool>::S5<31, bool>::S6::S7

Synopsis

@@ -10051,7 +10051,7 @@

Types

S8 -S9 +S9 @@ -10088,7 +10088,7 @@

Synopsis

-

S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9

+

S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9

Synopsis

@@ -10239,7 +10239,7 @@

Types

-S2 +S2 @@ -10261,7 +10261,7 @@

Member Functions

-

S0<4, bool>::S1::S2

+

S0<4, bool>::S1::S2

Synopsis

@@ -10540,7 +10540,7 @@

Types

S8 -S9 +S9 @@ -10577,7 +10577,7 @@

Synopsis

-

S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9

+

S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9

Synopsis

@@ -10728,7 +10728,7 @@

Types

-S2 +S2 @@ -10750,7 +10750,7 @@

Member Functions

-

S0<6, bool>::S1::S2

+

S0<6, bool>::S1::S2

Synopsis

diff --git a/test-files/golden-tests/symbols/record/local-class.adoc b/test-files/golden-tests/symbols/record/local-class.adoc index bef0eb1120..f40c549f6b 100644 --- a/test-files/golden-tests/symbols/record/local-class.adoc +++ b/test-files/golden-tests/symbols/record/local-class.adoc @@ -9,6 +9,7 @@ [cols=1] |=== | Name +| link:#A[`A`] | link:#B[`B`] |=== @@ -20,6 +21,39 @@ | link:#f[`f`] |=== +[#A] +== A + +=== Synopsis + +Declared in `<local‐class.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct A; +---- + +=== Member Functions + +[cols=1] +|=== +| Name +| link:#A-g[`g`] +|=== + +[#A-g] +== link:#A[A]::g + +=== Synopsis + +Declared in `<local‐class.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +void +g(); +---- + [#B] == B diff --git a/test-files/golden-tests/symbols/record/local-class.html b/test-files/golden-tests/symbols/record/local-class.html index 382d28e211..6be9d60e8c 100644 --- a/test-files/golden-tests/symbols/record/local-class.html +++ b/test-files/golden-tests/symbols/record/local-class.html @@ -18,6 +18,7 @@

Types

+A B @@ -35,6 +36,48 @@

Functions

+
+
+
+

A

+
+
+

Synopsis

+
+Declared in <local-class.cpp>
+
+struct A;
+
+
+

Member Functions

+ + + + + + + + + + +
Name
g
+ + + +
+
+
+

A::g

+
+
+

Synopsis

+
+Declared in <local-class.cpp>
+
+void
+g();
+
+
diff --git a/test-files/golden-tests/symbols/record/local-class.xml b/test-files/golden-tests/symbols/record/local-class.xml index 7784bdd368..8e9dbd542a 100644 --- a/test-files/golden-tests/symbols/record/local-class.xml +++ b/test-files/golden-tests/symbols/record/local-class.xml @@ -2,6 +2,12 @@ + + + + + + diff --git a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc index 05ecc912f3..f4f4446b18 100644 --- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc +++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc @@ -12,7 +12,7 @@ | link:#R0[`R0`] | link:#R1[`R1`] | link:#R2[`R2`] -| link:#S0-0c[`S0`] +| link:#S0-0cf[`S0`] | link:#S0-09[`S0<2>`] | link:#S0-073[`S0<3>`] | link:#S0-0e[`S0<5>`] @@ -31,7 +31,7 @@ Declared in `<template‐specialization‐inheritance.cpp> [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using U1 = link:#S0-0c[S0<4>]; +using U1 = link:#S0-0cf[S0<4>]; ---- [#U2] @@ -68,7 +68,7 @@ Declared in `<template‐specialization‐inheritance.cpp> [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R0 - : link:#S0-0c[S0<1>] + : link:#S0-0cf[S0<1>] ---- === Base Classes @@ -77,7 +77,7 @@ struct R0 |=== |Name|Description -| `link:#S0-0c[S0<1>]` +| `link:#S0-0cf[S0<1>]` | |=== @@ -86,7 +86,7 @@ struct R0 [cols=1] |=== | Name -| link:#S0-0c-S1[`S1`] +| link:#S0-0cf-S1[`S1`] |=== [#R1] @@ -135,7 +135,7 @@ struct R2 | |=== -[#S0-0c] +[#S0-0cf] == S0 === Synopsis @@ -155,7 +155,7 @@ struct S0; [cols=1] |=== | Name -| link:#S0-0c-S1[`S1`] +| link:#S0-0cf-S1[`S1`] |=== === Derived Classes @@ -168,8 +168,8 @@ struct S0; | |=== -[#S0-0c-S1] -== link:#S0-0c[S0]::S1 +[#S0-0cf-S1] +== link:#S0-0cf[S0]::S1 === Synopsis @@ -181,7 +181,7 @@ struct S1; ---- [#S0-09] -== link:#S0-0c[S0]<2> +== link:#S0-0cf[S0]<2> === Synopsis @@ -190,7 +190,7 @@ Declared in `<template‐specialization‐inheritance.cpp> [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- template<> -struct link:#S0-0c[S0]<2>; +struct link:#S0-0cf[S0]<2>; ---- === Types @@ -224,7 +224,7 @@ struct S1; |=== [#S0-073] -== link:#S0-0c[S0]<3> +== link:#S0-0cf[S0]<3> === Synopsis @@ -233,7 +233,7 @@ Declared in `<template‐specialization‐inheritance.cpp> [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- template<> -struct link:#S0-0c[S0]<3>; +struct link:#S0-0cf[S0]<3>; ---- === Derived Classes @@ -247,7 +247,7 @@ struct link:#S0-0c[S0]<3>; |=== [#S0-0e] -== link:#S0-0c[S0]<5> +== link:#S0-0cf[S0]<5> === Synopsis @@ -256,7 +256,7 @@ Declared in `<template‐specialization‐inheritance.cpp> [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- template<> -struct link:#S0-0c[S0]<5>; +struct link:#S0-0cf[S0]<5>; ---- === Types @@ -280,7 +280,7 @@ struct S1; ---- [#S0-07e] -== link:#S0-0c[S0]<6> +== link:#S0-0cf[S0]<6> === Synopsis @@ -289,7 +289,7 @@ Declared in `<template‐specialization‐inheritance.cpp> [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- template<> -struct link:#S0-0c[S0]<6>; +struct link:#S0-0cf[S0]<6>; ---- diff --git a/test-files/golden-tests/symbols/record/template-specialization-inheritance.html b/test-files/golden-tests/symbols/record/template-specialization-inheritance.html index 5f6f76e319..bdbc9c219e 100644 --- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.html +++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.html @@ -21,7 +21,7 @@

Types

R0 R1 R2 -S0 +S0 S0<2> S0<3> S0<5> @@ -42,7 +42,7 @@

Synopsis

Declared in <template-specialization-inheritance.cpp>
-using U1 = S0<4>;
+using U1 = S0<4>;
@@ -82,7 +82,7 @@

Synopsis

Declared in <template-specialization-inheritance.cpp>
 struct R0
-    : S0<1>
+    : S0<1>
@@ -95,7 +95,7 @@

Base Classes

-S0<1> +S0<1>
@@ -108,7 +108,7 @@

Types

-S1 +S1 @@ -177,7 +177,7 @@

Base Classes

-

S0

+

S0

Synopsis

@@ -199,7 +199,7 @@

Types

-S1 +S1 @@ -223,7 +223,7 @@

Derived Classes

-

S0::S1

+

S0::S1

Synopsis

@@ -246,7 +246,7 @@

Synopsis

Declared in <template-specialization-inheritance.cpp>
 template<>
-struct S0<2>;
+struct S0<2>;

Types

@@ -305,7 +305,7 @@

Synopsis

Declared in <template-specialization-inheritance.cpp>
 template<>
-struct S0<3>;
+struct S0<3>;
@@ -336,7 +336,7 @@

Synopsis

Declared in <template-specialization-inheritance.cpp>
 template<>
-struct S0<5>;
+struct S0<5>;

Types

@@ -380,7 +380,7 @@

Synopsis

Declared in <template-specialization-inheritance.cpp>
 template<>
-struct S0<6>;
+struct S0<6>;
diff --git a/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc b/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc index 0cacfee3ca..d970b98f98 100644 --- a/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc +++ b/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc @@ -28,7 +28,7 @@ [cols=1] |=== | Name -| link:#N-A[`A`] +| link:#N-A-03[`A`] | link:#N-D[`D`] | link:#N-B[`B`] | link:#N-C[`C`] @@ -44,7 +44,7 @@ Declared in `<dependency‐propagation.cpp>` [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- template<typename T> -using B = link:#N-A[A<T>]; +using B = link:#N-A-03[A<T>]; ---- [#N-C] @@ -60,7 +60,7 @@ template<typename T> using C = link:#N-B[B<T>]; ---- -[#N-A] +[#N-A-03] == link:#N[N]::A === Synopsis diff --git a/test-files/golden-tests/symbols/typedef/dependency-propagation.html b/test-files/golden-tests/symbols/typedef/dependency-propagation.html index 392f9981bc..aa790e4ba7 100644 --- a/test-files/golden-tests/symbols/typedef/dependency-propagation.html +++ b/test-files/golden-tests/symbols/typedef/dependency-propagation.html @@ -49,7 +49,7 @@

Types

-A +A D B C @@ -67,7 +67,7 @@

Synopsis

Declared in <dependency-propagation.cpp>
 template<typename T>
-using B = A<T>;
+using B = A<T>;
@@ -87,7 +87,7 @@

Synopsis

-

N::A

+

N::A

Synopsis