diff --git a/include/mrdocs/Metadata/Info/Enum.hpp b/include/mrdocs/Metadata/Info/Enum.hpp index 615197cb2..39b002ee0 100644 --- a/include/mrdocs/Metadata/Info/Enum.hpp +++ b/include/mrdocs/Metadata/Info/Enum.hpp @@ -17,7 +17,6 @@ #include #include #include -#include namespace clang::mrdocs { diff --git a/include/mrdocs/Metadata/Info/Friend.hpp b/include/mrdocs/Metadata/Info/Friend.hpp index 9ba3eb1a9..6819dff77 100644 --- a/include/mrdocs/Metadata/Info/Friend.hpp +++ b/include/mrdocs/Metadata/Info/Friend.hpp @@ -18,24 +18,20 @@ namespace clang::mrdocs { /** Info for friend declarations. + + - Friendship is not transitive + - Friendship is not inherited + - Access specifiers have no effect on the meaning of friend declarations */ struct FriendInfo final - : InfoCommonBase { /** Befriended symbol. */ - SymbolID FriendSymbol = SymbolID::invalid; + SymbolID id = SymbolID::invalid; /** Befriended type. */ - Polymorphic FriendType; - - //-------------------------------------------- - - explicit FriendInfo(SymbolID ID) noexcept - : InfoCommonBase(ID) - { - } + Polymorphic Type; }; MRDOCS_DECL @@ -52,20 +48,19 @@ tag_invoke( FriendInfo const& I, DomCorpus const* domCorpus) { - tag_invoke(t, io, dynamic_cast(I), domCorpus); - if (I.FriendSymbol) + if (I.id) { io.defer("name", [&I, domCorpus]{ - return dom::ValueFrom(I.FriendSymbol, domCorpus).get("name"); + return dom::ValueFrom(I.id, domCorpus).get("name"); }); - io.map("symbol", I.FriendSymbol); + io.map("symbol", I.id); } - else if (I.FriendType) + else if (I.Type) { io.defer("name", [&]{ - return dom::ValueFrom(I.FriendType, domCorpus).get("name"); + return dom::ValueFrom(I.Type, domCorpus).get("name"); }); - io.map("type", I.FriendType); + io.map("type", I.Type); } } diff --git a/include/mrdocs/Metadata/Info/InfoNodes.inc b/include/mrdocs/Metadata/Info/InfoNodes.inc index 0e687480e..64866eb9d 100644 --- a/include/mrdocs/Metadata/Info/InfoNodes.inc +++ b/include/mrdocs/Metadata/Info/InfoNodes.inc @@ -20,7 +20,6 @@ INFO(Enum) INFO(EnumConstant) INFO(Typedef) INFO(Variable) -INFO(Friend) INFO(Guide) INFO(NamespaceAlias) INFO(Using) diff --git a/include/mrdocs/Metadata/Info/Record.hpp b/include/mrdocs/Metadata/Info/Record.hpp index c0a534acb..0b5e750a1 100644 --- a/include/mrdocs/Metadata/Info/Record.hpp +++ b/include/mrdocs/Metadata/Info/Record.hpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -46,7 +47,6 @@ struct RecordTranche std::vector StaticVariables; std::vector Concepts; std::vector Guides; - std::vector Friends; std::vector Usings; }; @@ -60,7 +60,7 @@ allMembers(RecordTranche const& T) { // This is a trick to emulate views::concat in C++20 return std::views::transform( - std::views::iota(0, 12), + std::views::iota(0, 11), [&T](int const i) -> auto const& { switch (i) { @@ -74,8 +74,7 @@ allMembers(RecordTranche const& T) case 7: return T.StaticVariables; case 8: return T.Concepts; case 9: return T.Guides; - case 10: return T.Friends; - case 11: return T.Usings; + case 10: return T.Usings; default: throw std::out_of_range("Invalid index"); } } @@ -102,7 +101,6 @@ tag_invoke( io.map("staticVariables", dom::LazyArray(I.StaticVariables, domCorpus)); io.map("concepts", dom::LazyArray(I.Concepts, domCorpus)); io.map("guides", dom::LazyArray(I.Guides, domCorpus)); - io.map("friends", dom::LazyArray(I.Friends, domCorpus)); io.map("usings", dom::LazyArray(I.Usings, domCorpus)); } @@ -295,8 +293,14 @@ struct RecordInfo final */ std::vector Derived; + /** Lists of members. + */ RecordInterface Interface; + /** List of friends. + */ + std::vector Friends; + //-------------------------------------------- explicit RecordInfo(SymbolID const& ID) noexcept @@ -354,6 +358,7 @@ tag_invoke( io.map("derived", dom::LazyArray(I.Derived, domCorpus)); io.map("interface", I.Interface); io.map("template", I.Template); + io.map("friends", dom::LazyArray(I.Friends, domCorpus)); } /** Map the RecordInfo to a @ref dom::Value object. diff --git a/mrdocs.rnc b/mrdocs.rnc index 440b8853b..f1ba87798 100644 --- a/mrdocs.rnc +++ b/mrdocs.rnc @@ -187,10 +187,7 @@ grammar Friend = element friend { - Access ?, ID, - Location *, - Javadoc ?, ( element befriended { diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs index 9a0db29fc..8f65231a4 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs @@ -31,7 +31,7 @@ {{! Base classes }} {{#if (any_of_by symbol.bases "isPublic")}} {{#> markup/dynamic-level-h }}Base Classes{{/markup/dynamic-level-h}} -[,cols=2] +[cols=2] |=== | Name | Description @@ -58,7 +58,7 @@ {{#if symbol.constants}} {{#> markup/dynamic-level-h }}Members{{/markup/dynamic-level-h}} -[,cols=2] +[cols=2] |=== | Name | Description @@ -73,6 +73,25 @@ |=== {{/if}} +{{/if}} +{{! Friends }} +{{#if symbol.friends}} +{{#> markup/dynamic-level-h }}Friends{{/markup/dynamic-level-h}} +[cols=2] +|=== +| Name +| Description +{{#each symbol.friends }} +{{#if symbol}} +| {{#>markup/code}}{{> symbol/name symbol link=symbol }}{{/markup/code}} +| {{> javadoc/inline-brief symbol.doc.brief }} +{{else}} +| {{#>markup/code}}{{> type/declarator type }}{{/markup/code}} +| +{{/if}} +{{/each}} +|=== + {{/if}} {{! Using directives }} {{#if symbol.usingDirectives}} @@ -82,7 +101,7 @@ {{! Related symbols }} {{#if symbol.doc.related}} {{#> markup/dynamic-level-h }}Non-Member Functions{{/markup/dynamic-level-h}} -[,cols=2] +[cols=2] |=== | Name | Description @@ -96,7 +115,7 @@ {{! Derived classes }} {{#if symbol.derived}} {{#> markup/dynamic-level-h }}Derived Classes{{/markup/dynamic-level-h}} -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/friend.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/friend.hbs deleted file mode 100644 index f7306e707..000000000 --- a/share/mrdocs/addons/generator/common/partials/symbol/signature/friend.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{#if type~}} -friend {{>type/declarator type~}}; -{{~else if symbol~}} -{{> (concat 'symbol/signature/' (lookup . 'symbol.kind')) symbol isFriend=true~}} -{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/symbol/tranche.hbs b/share/mrdocs/addons/generator/common/partials/symbol/tranche.hbs index 24277ce66..1cd974f35 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/tranche.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/tranche.hbs @@ -31,7 +31,6 @@ {{>symbol/members-table members=tranche.staticFunctions title=(concat (select label (concat label " ") "") "Static Member Functions")}} {{>symbol/members-table members=tranche.variables title=(concat (select label (concat label " ") "") "Data Members")}} {{>symbol/members-table members=tranche.staticVariables title=(concat (select label (concat label " ") "") "Static Data Members")}} -{{>symbol/members-table members=tranche.friends title=(concat (select label (concat label " ") "") "Friends")}} {{>symbol/members-table members=tranche.aliases title=(concat (select label (concat label " ") "") "Aliases")}} {{>symbol/members-table members=tranche.usings title=(concat (select label (concat label " ") "") "Using Declarations")}} {{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs index d1f81eafa..f9351deb2 100644 --- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs @@ -98,6 +98,34 @@ {{/if}} +{{! Friends }} +{{#if symbol.friends}} +
+{{#> markup/dynamic-level-h }}Friends{{/markup/dynamic-level-h}} + + + + + + + + +{{#each symbol.friends }} + +{{#if symbol}} + + +{{else}} + + +{{/if}} + +{{/each}} +|=== + +
NameDescription
{{#>markup/code}}{{> symbol/name symbol link=symbol }}{{/markup/code}}{{> javadoc/inline-brief symbol.doc.brief }}{{#>markup/code}}{{> type/declarator type }}{{/markup/code}}
+
+{{/if}} {{! Using directives }} {{#if symbol.usingDirectives}}
diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp index e30510312..85fc06520 100644 --- a/src/lib/AST/ASTVisitor.cpp +++ b/src/lib/AST/ASTVisitor.cpp @@ -713,6 +713,26 @@ populate( B.isVirtual()); } } + + // Iterate over the friends of the class + if (D->hasDefinition() && D->hasFriends()) + { + for (FriendDecl const* FD : D->friends()) + { + // Check if the friend is a fundamental type + // Declaring a fundamental type like `int` as a friend of a + // class or struct does not have any practical effect. Thus, + // it's not considered part of the public API. + if (TypeSourceInfo const* TSI = FD->getFriendType()) + { + Type const* T = TSI->getType().getTypePtrOrNull(); + MRDOCS_CHECK_OR_CONTINUE(!T || !T->isBuiltinType()); + } + FriendInfo F; + populate(F, FD); + I.Friends.push_back(std::move(F)); + } + } } void @@ -1113,32 +1133,31 @@ populate( FriendInfo& I, FriendDecl const* D) { - // A NamedDecl nominated by a FriendDecl - // will be one of the following: - // - FunctionDecl - // - FunctionTemplateDecl - // - ClassTemplateDecl - if (NamedDecl* ND = D->getFriendDecl()) + if (TypeSourceInfo const* TSI = D->getFriendType()) { - generateID(ND, I.FriendSymbol); - // If this is a friend function declaration naming - // a previously undeclared function, traverse it. - // in addition to this, traverse the declaration if - // it's a class templates first declared as a friend - if((ND->isFunctionOrFunctionTemplate() && - ND->getFriendObjectKind() == Decl::FOK_Undeclared) || - (isa(ND) && ND->isFirstDecl())) - { - traverse(cast(ND)); - } + I.Type = toTypeInfo(TSI->getType()); + MRDOCS_CHECK_OR(I.Type->isNamed()); + auto const& NTI = dynamic_cast(*I.Type); + MRDOCS_CHECK_OR(NTI.Name); + I.id = NTI.Name->id; } - // Since a friend declaration which name non-class types - // will be ignored, a type nominated by a FriendDecl can - // essentially be anything - if (TypeSourceInfo const* TSI = D->getFriendType()) + else if (NamedDecl const* ND = D->getFriendDecl()) { - I.FriendType = toTypeInfo(TSI->getType()); + // ND can be a function or a class + ScopeExitRestore s(mode_, Dependency); + if (Info const* SI = traverse(dyn_cast(ND))) + { + I.id = SI->id; + } } + // The newly traversed info might need to inherit the + // documentation from the FriendDecl when the friend + // is the only declaration. + MRDOCS_CHECK_OR(isDocumented(D)); + Info* TI = find(I.id); + MRDOCS_CHECK_OR(TI); + MRDOCS_CHECK_OR(!TI->javadoc); + populate(TI->javadoc, D); } void @@ -1779,11 +1798,6 @@ addMember(RecordTranche& T, Info const& Member) addMember(T.Guides, *U); return; } - if (auto const* U = Member.asFriendPtr()) - { - addMember(T.Friends, *U); - return; - } if (auto const* U = Member.asUsingPtr()) { addMember(T.Usings, *U); diff --git a/src/lib/AST/ASTVisitor.hpp b/src/lib/AST/ASTVisitor.hpp index 45b0d55f3..27a9eb28d 100644 --- a/src/lib/AST/ASTVisitor.hpp +++ b/src/lib/AST/ASTVisitor.hpp @@ -252,6 +252,10 @@ class ASTVisitor */ TraversalMode mode_ = Regular; + /* A map which stores the Info types created by each decl. + */ + std::unordered_map friendDecls_; + public: /** Constructor for ASTVisitor. diff --git a/src/lib/AST/ClangHelpers.hpp b/src/lib/AST/ClangHelpers.hpp index 250b68e08..6340930f3 100644 --- a/src/lib/AST/ClangHelpers.hpp +++ b/src/lib/AST/ClangHelpers.hpp @@ -169,11 +169,6 @@ template <> struct InfoTypeFor : std::type_identity {}; -// Extract FriendInfo from FriendDecl -template <> -struct InfoTypeFor - : std::type_identity {}; - // Extract GuideInfo from CXXDeductionGuideDecl template <> struct InfoTypeFor diff --git a/src/lib/Gen/xml/XMLWriter.cpp b/src/lib/Gen/xml/XMLWriter.cpp index eb55bb6a7..76d903a42 100644 --- a/src/lib/Gen/xml/XMLWriter.cpp +++ b/src/lib/Gen/xml/XMLWriter.cpp @@ -285,19 +285,18 @@ writeFriend( { constexpr std::string_view friendTagName = "friend"; tags_.open(friendTagName, { - { I.Access }, { I.id } }); - writeSourceInfo(I); - - writeJavadoc(I.javadoc); - Attributes attrs = {}; - if(I.FriendSymbol) - attrs.push({I.FriendSymbol}); - else if(I.FriendType) - attrs.push({"type", toString(*I.FriendType)}); + if (I.id) + { + attrs.push({ I.id }); + } + else if (I.Type) + { + attrs.push({ "type", toString(*I.Type) }); + } tags_.write("befriended", {}, attrs); @@ -515,7 +514,7 @@ writeRecord( writeAttr(I.IsFinal, "is-final", tags_); writeAttr(I.IsFinalDestructor, "is-final-dtor", tags_); - for(auto const& B : I.Bases) + for (auto const& B : I.Bases) { tags_.open(baseTagName, { { B.Access }, @@ -525,6 +524,11 @@ writeRecord( tags_.close(baseTagName); } + for (FriendInfo const& F : I.Friends) + { + writeFriend(F); + } + writeJavadoc(I.javadoc); corpus_.traverse(I, *this); diff --git a/src/lib/Gen/xml/XMLWriter.hpp b/src/lib/Gen/xml/XMLWriter.hpp index 00603bb50..244acf0ef 100644 --- a/src/lib/Gen/xml/XMLWriter.hpp +++ b/src/lib/Gen/xml/XMLWriter.hpp @@ -68,6 +68,7 @@ class XMLWriter void writeSourceInfo(SourceInfo const& I); void writeLocation(Location const& loc, bool def = false); void writeJavadoc(std::optional const& javadoc); + void writeFriend(FriendInfo const& I); void openTemplate(const std::optional& I); void closeTemplate(const std::optional& I); diff --git a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp index 296f766ed..0a59c2f23 100644 --- a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp +++ b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp @@ -76,7 +76,6 @@ inheritBaseMembers( inheritBaseMembers(derivedId, derived.StaticVariables, base.StaticVariables); inheritBaseMembers(derivedId, derived.Concepts, base.Concepts); inheritBaseMembers(derivedId, derived.Guides, base.Guides); - inheritBaseMembers(derivedId, derived.Friends, base.Friends); } namespace { diff --git a/src/lib/Metadata/Finalizers/JavadocFinalizer.cpp b/src/lib/Metadata/Finalizers/JavadocFinalizer.cpp index 133ef0f6b..36932562d 100644 --- a/src/lib/Metadata/Finalizers/JavadocFinalizer.cpp +++ b/src/lib/Metadata/Finalizers/JavadocFinalizer.cpp @@ -1313,15 +1313,8 @@ setAutoRelates() // Check if already listed as friend if (auto* record = dynamic_cast(relatedRecordOrEnumPtr)) { - auto fromFriendIdToTypeID = [&](SymbolID const& id) -> SymbolID { - Info* friendInfo = corpus_.find(id); - MRDOCS_CHECK_OR(friendInfo, SymbolID::invalid); - auto const friendPtr = dynamic_cast(friendInfo); - MRDOCS_CHECK_OR(friendPtr, SymbolID::invalid); - return friendPtr->FriendSymbol; - }; using std::views::transform; - if (contains(transform(record->Interface.Public.Friends, fromFriendIdToTypeID), I.id)) + if (contains(transform(record->Friends, &FriendInfo::id), I.id)) { // Already listed as a public friend continue; diff --git a/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp b/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp index cf5e882b6..704ed19d6 100644 --- a/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp +++ b/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp @@ -255,7 +255,6 @@ sortMembers(RecordTranche& T) sortMembers(T.StaticVariables); sortMembers(T.Concepts); sortMembers(T.Guides); - sortMembers(T.Friends); sortMembers(T.Usings); } diff --git a/src/lib/Metadata/Info/Friend.cpp b/src/lib/Metadata/Info/Friend.cpp index 7b387997d..167304de6 100644 --- a/src/lib/Metadata/Info/Friend.cpp +++ b/src/lib/Metadata/Info/Friend.cpp @@ -18,15 +18,13 @@ namespace clang::mrdocs { void merge(FriendInfo& I, FriendInfo&& Other) { - MRDOCS_ASSERT(canMerge(I, Other)); - merge(I.asInfo(), std::move(Other.asInfo())); - if (!I.FriendSymbol) + if (!I.id) { - I.FriendSymbol = Other.FriendSymbol; + I.id = Other.id; } - if (!I.FriendType) + if (!I.Type) { - I.FriendType = std::move(Other.FriendType); + I.Type = std::move(Other.Type); } } diff --git a/src/lib/Metadata/Info/Record.cpp b/src/lib/Metadata/Info/Record.cpp index 00859cb8a..2d95ca8ff 100644 --- a/src/lib/Metadata/Info/Record.cpp +++ b/src/lib/Metadata/Info/Record.cpp @@ -9,8 +9,8 @@ // #include -#include #include +#include namespace clang::mrdocs { @@ -39,13 +39,31 @@ reduceSymbolIDs( { for(auto const& id : otherList) { - if (auto it = llvm::find(list, id); it != list.end()) + if (auto it = std::ranges::find(list, id); it != list.end()) { continue; } list.push_back(id); } } + +void +reduceSymbolIDs( + std::vector& list, + std::vector&& otherList) +{ + for(auto const& F : otherList) + { + auto it = std::ranges::find_if(list, [&F](auto const& other) { + return F.id == other.id; + }); + if (it != list.end()) + { + continue; + } + list.push_back(F); + } +} } // (anon) std::strong_ordering @@ -104,7 +122,6 @@ merge(RecordTranche& I, RecordTranche&& Other) reduceSymbolIDs(I.StaticVariables, std::move(Other.StaticVariables)); reduceSymbolIDs(I.Concepts, std::move(Other.Concepts)); reduceSymbolIDs(I.Guides, std::move(Other.Guides)); - reduceSymbolIDs(I.Friends, std::move(Other.Friends)); } void @@ -136,6 +153,7 @@ merge(RecordInfo& I, RecordInfo&& Other) { I.Template = std::move(Other.Template); } + reduceSymbolIDs(I.Friends, std::move(Other.Friends)); } template diff --git a/src/lib/Support/LegibleNames.cpp b/src/lib/Support/LegibleNames.cpp index bb8b1d5b1..c31f7fc01 100644 --- a/src/lib/Support/LegibleNames.cpp +++ b/src/lib/Support/LegibleNames.cpp @@ -226,10 +226,6 @@ class LegibleNames::Impl return getUnnamedInfoName(t); } } - else if constexpr(T::isFriend()) - { - return getUnnamedInfoName(t); - } return t.Name; }); } diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc index 093be7c51..aee32c15b 100644 --- a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc +++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc @@ -40,7 +40,7 @@ struct R; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/auto-relates/auto-relates.adoc b/test-files/golden-tests/config/auto-relates/auto-relates.adoc index c37540d40..3f36aadcc 100644 --- a/test-files/golden-tests/config/auto-relates/auto-relates.adoc +++ b/test-files/golden-tests/config/auto-relates/auto-relates.adoc @@ -50,7 +50,7 @@ class A; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/auto-relates/derived.adoc b/test-files/golden-tests/config/auto-relates/derived.adoc index 4b5c4d4dc..53e07d6ce 100644 --- a/test-files/golden-tests/config/auto-relates/derived.adoc +++ b/test-files/golden-tests/config/auto-relates/derived.adoc @@ -57,7 +57,7 @@ struct A === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -67,7 +67,7 @@ struct A === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -99,7 +99,7 @@ struct ABase; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -119,7 +119,7 @@ struct ABase; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -146,7 +146,7 @@ struct AView === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -156,7 +156,7 @@ struct AView === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -174,7 +174,7 @@ struct AView === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -199,7 +199,7 @@ struct AView2 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -209,7 +209,7 @@ struct AView2 === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/auto-relates/enum.adoc b/test-files/golden-tests/config/auto-relates/enum.adoc index 0dd3e03ea..aefd707ad 100644 --- a/test-files/golden-tests/config/auto-relates/enum.adoc +++ b/test-files/golden-tests/config/auto-relates/enum.adoc @@ -57,7 +57,7 @@ class Result; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -84,7 +84,7 @@ class SmallVector; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -108,7 +108,7 @@ enum class E : int; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/auto-relates/qualified.adoc b/test-files/golden-tests/config/auto-relates/qualified.adoc index bec8463fc..3a04f7688 100644 --- a/test-files/golden-tests/config/auto-relates/qualified.adoc +++ b/test-files/golden-tests/config/auto-relates/qualified.adoc @@ -112,7 +112,7 @@ struct B; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -200,7 +200,7 @@ struct A; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.adoc b/test-files/golden-tests/config/auto-relates/remove-friend.adoc index 9a1462ff3..5e7f1416f 100644 --- a/test-files/golden-tests/config/auto-relates/remove-friend.adoc +++ b/test-files/golden-tests/config/auto-relates/remove-friend.adoc @@ -46,13 +46,13 @@ class A; |=== | Name | Description -| <> +| `<>` | Friend function not listed as non‐member |=== === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -60,44 +60,6 @@ class A; | Non‐member function of A |=== -[#A-08friend] -== operator== - -Friend function not listed as non‐member - -=== Synopsis - -Declared in `<remove‐friend.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -bool -operator==( - <> const& lhs, - <> const& rhs); ----- - -=== Description - -Friends are already listed in the class definition. - -=== Return Value - -`true` if the objects are equal - -=== Parameters - -[cols=2] -|=== -| Name -| Description -| *lhs* -| The left‐hand side of the comparison -| *rhs* -| The right‐hand side of the comparison -|=== - [#to_string] == to_string diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.html b/test-files/golden-tests/config/auto-relates/remove-friend.html index f4e380249..b618c1cf6 100644 --- a/test-files/golden-tests/config/auto-relates/remove-friend.html +++ b/test-files/golden-tests/config/auto-relates/remove-friend.html @@ -57,24 +57,10 @@

Synopsis

-

Friends

- - - - - - - - - - - -
NameDescription
operator== Friend function not listed as non-member
-
-

Non-Member Functions

+

Friends

@@ -83,43 +69,16 @@

Non-Member Functions

- + + + + +|===
to_stringNon-member function of A
operator==Friend function not listed as non-member
- -
-
-

operator==

-
-Friend function not listed as non-member - -
-
-
-

Synopsis

-
-Declared in <remove-friend.cpp>
-
-
-friend
-bool
-operator==(
-    A const& lhs,
-    A const& rhs);
-
-
-
-

Description

-

Friends are already listed in the class definition.

-
-
-

Return Value

-true if the objects are equal -
-
-

Parameters

+

Non-Member Functions

@@ -128,14 +87,7 @@

Parameters

- - - - - - - - +
lhsThe left-hand side of the comparison
rhsThe right-hand side of the comparison
to_stringNon-member function of A
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.xml b/test-files/golden-tests/config/auto-relates/remove-friend.xml index f9349dac3..f5c8163f5 100644 --- a/test-files/golden-tests/config/auto-relates/remove-friend.xml +++ b/test-files/golden-tests/config/auto-relates/remove-friend.xml @@ -4,6 +4,9 @@ + + + A record with non-member functions @@ -12,28 +15,6 @@ to_string - - - - - Friend function not listed as non-member - - - Friends are already listed in the class definition. - - - true - if the objects are equal - - - The left-hand side of the comparison - - - The right-hand side of the comparison - - - - diff --git a/test-files/golden-tests/config/auto-relates/return-type.adoc b/test-files/golden-tests/config/auto-relates/return-type.adoc index 3d6801a81..86db80ca6 100644 --- a/test-files/golden-tests/config/auto-relates/return-type.adoc +++ b/test-files/golden-tests/config/auto-relates/return-type.adoc @@ -48,7 +48,7 @@ class A; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -77,7 +77,7 @@ class Result; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -104,7 +104,7 @@ class SmallVector; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/extract-implicit-specializations/base.adoc b/test-files/golden-tests/config/extract-implicit-specializations/base.adoc index 4057f9ed9..695bf77af 100644 --- a/test-files/golden-tests/config/extract-implicit-specializations/base.adoc +++ b/test-files/golden-tests/config/extract-implicit-specializations/base.adoc @@ -28,7 +28,7 @@ struct A === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -66,7 +66,7 @@ struct B; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc index 70bb89fc3..96715af37 100644 --- a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc +++ b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc @@ -28,7 +28,7 @@ struct A === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -80,7 +80,7 @@ struct B; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description 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 cab368312..fd88cbb19 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 @@ -28,7 +28,7 @@ struct A === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -67,7 +67,7 @@ struct B; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc b/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc index 4b835fe07..e08bb5a0f 100644 --- a/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc +++ b/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc @@ -29,7 +29,7 @@ class Base === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -49,7 +49,7 @@ class Base === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -123,7 +123,7 @@ class C === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -163,7 +163,7 @@ class ConstBase; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc index 698cae068..d06d9578e 100644 --- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc +++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc @@ -39,7 +39,7 @@ class base === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -81,7 +81,7 @@ class base === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -231,7 +231,7 @@ class base_base; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -295,7 +295,7 @@ class derived === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/inherit-base-members/copy.adoc b/test-files/golden-tests/config/inherit-base-members/copy.adoc index bdc5685b4..ce704b988 100644 --- a/test-files/golden-tests/config/inherit-base-members/copy.adoc +++ b/test-files/golden-tests/config/inherit-base-members/copy.adoc @@ -39,7 +39,7 @@ class base === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -81,7 +81,7 @@ class base === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -269,7 +269,7 @@ class base_base; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -333,7 +333,7 @@ class derived === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/inherit-base-members/never.adoc b/test-files/golden-tests/config/inherit-base-members/never.adoc index c812a06c1..eb1fc1456 100644 --- a/test-files/golden-tests/config/inherit-base-members/never.adoc +++ b/test-files/golden-tests/config/inherit-base-members/never.adoc @@ -39,7 +39,7 @@ class base === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -77,7 +77,7 @@ class base === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -227,7 +227,7 @@ class base_base; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -291,7 +291,7 @@ class derived === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/inherit-base-members/reference.adoc b/test-files/golden-tests/config/inherit-base-members/reference.adoc index 6d4a294c1..417027196 100644 --- a/test-files/golden-tests/config/inherit-base-members/reference.adoc +++ b/test-files/golden-tests/config/inherit-base-members/reference.adoc @@ -39,7 +39,7 @@ class base === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -81,7 +81,7 @@ class base === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -231,7 +231,7 @@ class base_base; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -295,7 +295,7 @@ class derived === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.adoc b/test-files/golden-tests/config/inherit-base-members/skip-special.adoc index aad83e88a..08b8b2eb9 100644 --- a/test-files/golden-tests/config/inherit-base-members/skip-special.adoc +++ b/test-files/golden-tests/config/inherit-base-members/skip-special.adoc @@ -37,7 +37,7 @@ class base === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -83,7 +83,7 @@ class base === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -239,7 +239,7 @@ class base_base; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -321,7 +321,7 @@ class derived === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc b/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc index 650d255c3..e8c10df44 100644 --- a/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc +++ b/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc @@ -39,7 +39,7 @@ class D === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -127,7 +127,7 @@ class E === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc index 0dab626ee..6a4f37391 100644 --- a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc +++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc @@ -117,7 +117,7 @@ struct regular; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -464,7 +464,7 @@ struct regular; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.adoc b/test-files/golden-tests/javadoc/copydoc/param-types.adoc index 4f6711274..373e69a31 100644 --- a/test-files/golden-tests/javadoc/copydoc/param-types.adoc +++ b/test-files/golden-tests/javadoc/copydoc/param-types.adoc @@ -94,7 +94,7 @@ struct Q; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -130,7 +130,7 @@ struct A; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -219,7 +219,7 @@ struct paramType; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -257,7 +257,7 @@ enum testEnum; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/javadoc/ref/ref.adoc b/test-files/golden-tests/javadoc/ref/ref.adoc index e65965cae..787c95e31 100644 --- a/test-files/golden-tests/javadoc/ref/ref.adoc +++ b/test-files/golden-tests/javadoc/ref/ref.adoc @@ -126,7 +126,7 @@ struct C; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -175,7 +175,7 @@ struct D === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/javadoc/relates/relates.adoc b/test-files/golden-tests/javadoc/relates/relates.adoc index d5a4a68b6..dbd29f34d 100644 --- a/test-files/golden-tests/javadoc/relates/relates.adoc +++ b/test-files/golden-tests/javadoc/relates/relates.adoc @@ -42,7 +42,7 @@ struct A; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/javadoc/returns/returns.adoc b/test-files/golden-tests/javadoc/returns/returns.adoc index 6f07dda79..ddb975e45 100644 --- a/test-files/golden-tests/javadoc/returns/returns.adoc +++ b/test-files/golden-tests/javadoc/returns/returns.adoc @@ -52,7 +52,7 @@ struct pair; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/enum/enum.adoc b/test-files/golden-tests/symbols/enum/enum.adoc index c9bff0521..48f34f9c0 100644 --- a/test-files/golden-tests/symbols/enum/enum.adoc +++ b/test-files/golden-tests/symbols/enum/enum.adoc @@ -37,7 +37,7 @@ enum E0; === Members -[,cols=2] +[cols=2] |=== | Name | Description @@ -66,7 +66,7 @@ enum E1 : char; === Members -[,cols=2] +[cols=2] |=== | Name | Description @@ -93,7 +93,7 @@ enum class E2 : int; === Members -[,cols=2] +[cols=2] |=== | Name | Description @@ -122,7 +122,7 @@ enum class E3 : char; === Members -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/friend/friend-1.adoc b/test-files/golden-tests/symbols/friend/friend-1.adoc index d16e7cc57..dd945a870 100644 --- a/test-files/golden-tests/symbols/friend/friend-1.adoc +++ b/test-files/golden-tests/symbols/friend/friend-1.adoc @@ -40,26 +40,10 @@ struct T; |=== | Name | Description -| <> +| `<>` | f |=== -[#T-08friend] -== f - -f - -=== Synopsis - -Declared in `<friend‐1.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#f] == f diff --git a/test-files/golden-tests/symbols/friend/friend-1.html b/test-files/golden-tests/symbols/friend/friend-1.html index 2706e21c7..cc2f999fc 100644 --- a/test-files/golden-tests/symbols/friend/friend-1.html +++ b/test-files/golden-tests/symbols/friend/friend-1.html @@ -51,8 +51,11 @@

Synopsis

+ + +

Friends

- +
@@ -61,32 +64,12 @@

Friends

- + + + +|===
Name
f f
ff
- - - -
-
-
-

f

-
-f - -
-
-
-

Synopsis

-
-Declared in <friend-1.cpp>
-
-
-friend
-void
-f();
-
-
diff --git a/test-files/golden-tests/symbols/friend/friend-1.xml b/test-files/golden-tests/symbols/friend/friend-1.xml index e9824b68a..28e4124a2 100644 --- a/test-files/golden-tests/symbols/friend/friend-1.xml +++ b/test-files/golden-tests/symbols/friend/friend-1.xml @@ -4,13 +4,7 @@ - - - - - f - - + diff --git a/test-files/golden-tests/symbols/friend/friend-2.adoc b/test-files/golden-tests/symbols/friend/friend-2.adoc index 7d45b7c18..b73d89b16 100644 --- a/test-files/golden-tests/symbols/friend/friend-2.adoc +++ b/test-files/golden-tests/symbols/friend/friend-2.adoc @@ -40,26 +40,10 @@ struct T; |=== | Name | Description -| <> +| `<>` | f |=== -[#T-08friend] -== f - -f - -=== Synopsis - -Declared in `<friend‐2.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#f] == f diff --git a/test-files/golden-tests/symbols/friend/friend-2.html b/test-files/golden-tests/symbols/friend/friend-2.html index d19e26111..859ac1b80 100644 --- a/test-files/golden-tests/symbols/friend/friend-2.html +++ b/test-files/golden-tests/symbols/friend/friend-2.html @@ -51,8 +51,11 @@

Synopsis

+ + +

Friends

- +
@@ -61,32 +64,12 @@

Friends

- + + + +|===
Name
f f
ff
- - - -
-
-
-

f

-
-f - -
-
-
-

Synopsis

-
-Declared in <friend-2.cpp>
-
-
-friend
-void
-f();
-
-
diff --git a/test-files/golden-tests/symbols/friend/friend-2.xml b/test-files/golden-tests/symbols/friend/friend-2.xml index dcfb1300c..fabb41894 100644 --- a/test-files/golden-tests/symbols/friend/friend-2.xml +++ b/test-files/golden-tests/symbols/friend/friend-2.xml @@ -4,13 +4,7 @@ - - - - - f - - + diff --git a/test-files/golden-tests/symbols/friend/friend-3.adoc b/test-files/golden-tests/symbols/friend/friend-3.adoc index 2f8e1ad49..b97c4b15e 100644 --- a/test-files/golden-tests/symbols/friend/friend-3.adoc +++ b/test-files/golden-tests/symbols/friend/friend-3.adoc @@ -41,26 +41,10 @@ struct T; |=== | Name | Description -| <> +| `<>` | T::f |=== -[#T-08friend] -== f - -T::f - -=== Synopsis - -Declared in `<friend‐3.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#U] == U @@ -75,26 +59,14 @@ struct U; === Friends -[cols=1] +[cols=2] |=== | Name -| <> +| Description +| `<>` +| T::f |=== -[#U-08friend] -== f - -=== Synopsis - -Declared in `<friend‐3.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#f] == f diff --git a/test-files/golden-tests/symbols/friend/friend-3.html b/test-files/golden-tests/symbols/friend/friend-3.html index 8400973c0..89fe8a565 100644 --- a/test-files/golden-tests/symbols/friend/friend-3.html +++ b/test-files/golden-tests/symbols/friend/friend-3.html @@ -52,8 +52,11 @@

Synopsis

+ + +

Friends

- +
@@ -62,32 +65,12 @@

Friends

- + + + +|===
Name
f T::f
fT::f
- - - -
-
-
-

f

-
-T::f - -
-
-
-

Synopsis

-
-Declared in <friend-3.cpp>
-
-
-friend
-void
-f();
-
-
@@ -104,37 +87,25 @@

Synopsis

+ + +

Friends

- +
+ - + + + +|===
NameDescription
f
fT::f
- - - -
-
-
-

f

-
-
-

Synopsis

-
-Declared in <friend-3.cpp>
-
-
-friend
-void
-f();
-
-
diff --git a/test-files/golden-tests/symbols/friend/friend-3.xml b/test-files/golden-tests/symbols/friend/friend-3.xml index cc67cd6f9..76b0ed508 100644 --- a/test-files/golden-tests/symbols/friend/friend-3.xml +++ b/test-files/golden-tests/symbols/friend/friend-3.xml @@ -4,20 +4,13 @@ - - - - - T::f - - + - - + diff --git a/test-files/golden-tests/symbols/friend/friend-4.adoc b/test-files/golden-tests/symbols/friend/friend-4.adoc index df8f3f146..0b25a3ee7 100644 --- a/test-files/golden-tests/symbols/friend/friend-4.adoc +++ b/test-files/golden-tests/symbols/friend/friend-4.adoc @@ -37,26 +37,14 @@ struct T; === Friends -[cols=1] +[cols=2] |=== | Name -| <> +| Description +| `<>` +| U::f |=== -[#T-08friend] -== f - -=== Synopsis - -Declared in `<friend‐4.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#U] == U @@ -75,26 +63,10 @@ struct U; |=== | Name | Description -| <> +| `<>` | U::f |=== -[#U-08friend] -== f - -U::f - -=== Synopsis - -Declared in `<friend‐4.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#f] == f diff --git a/test-files/golden-tests/symbols/friend/friend-4.html b/test-files/golden-tests/symbols/friend/friend-4.html index a120c4ac3..c9d0f43bd 100644 --- a/test-files/golden-tests/symbols/friend/friend-4.html +++ b/test-files/golden-tests/symbols/friend/friend-4.html @@ -52,37 +52,25 @@

Synopsis

+ + +

Friends

- +
+ - + + + +|===
NameDescription
f
fU::f
- - - -
-
-
-

f

-
-
-

Synopsis

-
-Declared in <friend-4.cpp>
-
-
-friend
-void
-f();
-
-
@@ -99,8 +87,11 @@

Synopsis

+ + +

Friends

- +
@@ -109,32 +100,12 @@

Friends

- + + + +|===
Name
f U::f
fU::f
- - - -
-
-
-

f

-
-U::f - -
-
-
-

Synopsis

-
-Declared in <friend-4.cpp>
-
-
-friend
-void
-f();
-
-
diff --git a/test-files/golden-tests/symbols/friend/friend-4.xml b/test-files/golden-tests/symbols/friend/friend-4.xml index 801af940a..e518a2cbb 100644 --- a/test-files/golden-tests/symbols/friend/friend-4.xml +++ b/test-files/golden-tests/symbols/friend/friend-4.xml @@ -4,20 +4,13 @@ - - + - - - - - U::f - - + diff --git a/test-files/golden-tests/symbols/friend/friend-5.adoc b/test-files/golden-tests/symbols/friend/friend-5.adoc index d68561431..61414d97f 100644 --- a/test-files/golden-tests/symbols/friend/friend-5.adoc +++ b/test-files/golden-tests/symbols/friend/friend-5.adoc @@ -37,26 +37,14 @@ struct T; === Friends -[cols=1] +[cols=2] |=== | Name -| <> +| Description +| `<>` +| f |=== -[#T-08friend] -== f - -=== Synopsis - -Declared in `<friend‐5.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#U] == U @@ -71,26 +59,14 @@ struct U; === Friends -[cols=1] +[cols=2] |=== | Name -| <> +| Description +| `<>` +| f |=== -[#U-08friend] -== f - -=== Synopsis - -Declared in `<friend‐5.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f(); ----- - [#f] == f diff --git a/test-files/golden-tests/symbols/friend/friend-5.html b/test-files/golden-tests/symbols/friend/friend-5.html index 4307f6710..29e4c80d2 100644 --- a/test-files/golden-tests/symbols/friend/friend-5.html +++ b/test-files/golden-tests/symbols/friend/friend-5.html @@ -52,37 +52,25 @@

Synopsis

+ + +

Friends

- +
+ - + + + +|===
NameDescription
f
ff
- - - -
-
-
-

f

-
-
-

Synopsis

-
-Declared in <friend-5.cpp>
-
-
-friend
-void
-f();
-
-
@@ -99,37 +87,25 @@

Synopsis

+ + +

Friends

- +
+ - + + + +|===
NameDescription
f
ff
- - - -
-
-
-

f

-
-
-

Synopsis

-
-Declared in <friend-5.cpp>
-
-
-friend
-void
-f();
-
-
diff --git a/test-files/golden-tests/symbols/friend/friend-5.xml b/test-files/golden-tests/symbols/friend/friend-5.xml index 60378b3e3..008bb1880 100644 --- a/test-files/golden-tests/symbols/friend/friend-5.xml +++ b/test-files/golden-tests/symbols/friend/friend-5.xml @@ -4,15 +4,13 @@ - - + - - + diff --git a/test-files/golden-tests/symbols/friend/friend-6.adoc b/test-files/golden-tests/symbols/friend/friend-6.adoc index 9ff805d52..10fd7bb8b 100644 --- a/test-files/golden-tests/symbols/friend/friend-6.adoc +++ b/test-files/golden-tests/symbols/friend/friend-6.adoc @@ -17,7 +17,7 @@ | <> | Struct V brief | <> -| +| Friend class Z brief |=== [#T] @@ -40,40 +40,10 @@ struct T; |=== | Name | Description -| <> +| `<>` | Friend class Z brief -| <> -| Friend int brief |=== -[#T-08friend-04cb] -== <> - -Friend class Z brief - -=== Synopsis - -Declared in `<friend‐6.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend <>; ----- - -[#T-08friend-04ce] -== int - -Friend int brief - -=== Synopsis - -Declared in `<friend‐6.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend int; ----- - [#U] == U @@ -94,24 +64,10 @@ struct U; |=== | Name | Description -| <> -| Friend T brief +| `<>` +| Struct T brief |=== -[#U-08friend] -== <> - -Friend T brief - -=== Synopsis - -Declared in `<friend‐6.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend <>; ----- - [#V] == V @@ -132,27 +88,15 @@ struct V; |=== | Name | Description -| <> -| Friend struct U brief +| `<>` +| Struct U brief |=== -[#V-08friend] -== <> - -Friend struct U brief - -=== Synopsis - -Declared in `<friend‐6.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend <>; ----- - [#Z] == Z +Friend class Z brief + === Synopsis Declared in `<friend‐6.cpp>` diff --git a/test-files/golden-tests/symbols/friend/friend-6.html b/test-files/golden-tests/symbols/friend/friend-6.html index 05490c357..9d5211aab 100644 --- a/test-files/golden-tests/symbols/friend/friend-6.html +++ b/test-files/golden-tests/symbols/friend/friend-6.html @@ -22,7 +22,7 @@

Types

T Struct T brief U Struct U brief V Struct V brief -Z +Z Friend class Z brief @@ -45,8 +45,11 @@

Synopsis

+ + +

Friends

- +
@@ -55,50 +58,12 @@

Friends

- - + + + +|===
Name
class Z Friend class Z brief
int Friend int brief
ZFriend class Z brief
- - - -
-
-
-

Z

-
-Friend class Z brief - -
-
-
-

Synopsis

-
-Declared in <friend-6.cpp>
-
-
-friend Z;
-
-
-
-
-
-
-

int

-
-Friend int brief - -
-
-
-

Synopsis

-
-Declared in <friend-6.cpp>
-
-
-friend int;
-
-
@@ -119,8 +84,11 @@

Synopsis

+ + +

Friends

- +
@@ -129,30 +97,12 @@

Friends

- + + + +|===
Name
T Friend T brief
TStruct T brief
- - - -
-
-
-

T

-
-Friend T brief - -
-
-
-

Synopsis

-
-Declared in <friend-6.cpp>
-
-
-friend T;
-
-
@@ -173,8 +123,11 @@

Synopsis

+ + +

Friends

- +
@@ -183,18 +136,19 @@

Friends

- + + + +|===
Name
struct U Friend struct U brief
UStruct U brief
- - - +
-

U

+

Z

-Friend struct U brief +Friend class Z brief
@@ -204,21 +158,6 @@

Synopsis

Declared in <friend-6.cpp>
 
-friend U;
-
-
- - -
-
-

Z

-
-
-

Synopsis

-
-Declared in <friend-6.cpp>
-
-
 class Z;
diff --git a/test-files/golden-tests/symbols/friend/friend-6.xml b/test-files/golden-tests/symbols/friend/friend-6.xml index 28f3a3be9..2c7ba9ee4 100644 --- a/test-files/golden-tests/symbols/friend/friend-6.xml +++ b/test-files/golden-tests/symbols/friend/friend-6.xml @@ -4,66 +4,44 @@ + + + Struct T brief - - - - - Friend class Z brief - - - - - - - - - Friend int brief - - - - + + + Struct U brief - - - - - Friend T brief - - - - + + + Struct V brief - - - - - Friend struct U brief - - - - + + + Friend class Z brief + + diff --git a/test-files/golden-tests/symbols/function/mem-fn.adoc b/test-files/golden-tests/symbols/function/mem-fn.adoc index 4ba33bebb..dde832035 100644 --- a/test-files/golden-tests/symbols/function/mem-fn.adoc +++ b/test-files/golden-tests/symbols/function/mem-fn.adoc @@ -450,7 +450,7 @@ struct T14; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -554,7 +554,7 @@ struct T17 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -615,7 +615,7 @@ struct U; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -681,7 +681,7 @@ struct V === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/function/noreturn.adoc b/test-files/golden-tests/symbols/function/noreturn.adoc index b2296746b..62fc80d3d 100644 --- a/test-files/golden-tests/symbols/function/noreturn.adoc +++ b/test-files/golden-tests/symbols/function/noreturn.adoc @@ -50,10 +50,12 @@ struct T; === Friends -[cols=1] +[cols=2] |=== | Name -| <> +| Description +| `<>` +| |=== [#T-f3] @@ -85,20 +87,6 @@ void f2(); ---- -[#T-08friend] -== f1 - -=== Synopsis - -Declared in `<noreturn.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -void -f1(); ----- - [#f1] == f1 diff --git a/test-files/golden-tests/symbols/function/noreturn.html b/test-files/golden-tests/symbols/function/noreturn.html index 70d90ead2..8ea7eef24 100644 --- a/test-files/golden-tests/symbols/function/noreturn.html +++ b/test-files/golden-tests/symbols/function/noreturn.html @@ -76,21 +76,26 @@

Static Member Functions

+ + +

Friends

- +
+ - + + + +|===
NameDescription
f1
f1
- - - +
@@ -129,23 +134,6 @@

Synopsis

-

f1

-
-
-

Synopsis

-
-Declared in <noreturn.cpp>
-
-
-friend
-void
-f1();
-
-
-
-
-
-

f1

diff --git a/test-files/golden-tests/symbols/function/noreturn.xml b/test-files/golden-tests/symbols/function/noreturn.xml index cd7b613bb..18536d121 100644 --- a/test-files/golden-tests/symbols/function/noreturn.xml +++ b/test-files/golden-tests/symbols/function/noreturn.xml @@ -4,6 +4,9 @@ + + + @@ -13,13 +16,10 @@ - - - - + diff --git a/test-files/golden-tests/symbols/function/sfinae.adoc b/test-files/golden-tests/symbols/function/sfinae.adoc index 30913e192..23f370edb 100644 --- a/test-files/golden-tests/symbols/function/sfinae.adoc +++ b/test-files/golden-tests/symbols/function/sfinae.adoc @@ -83,7 +83,7 @@ struct C; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc index 5bf1e1920..d2bcd9788 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc @@ -62,7 +62,7 @@ struct A; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description @@ -460,7 +460,7 @@ struct B; === Non-Member Functions -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc index 2024a3677..0234a6459 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc @@ -195,28 +195,14 @@ class B; === Friends -[cols=1] +[cols=2] |=== | Name -| <> +| Description +| `<>` +| Stream insertion operator |=== -[#ostream-B-08friend] -== <>::operator<< - -=== Synopsis - -Declared in `<overloads‐ostream.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -<>& -operator<<( - <>& os, - <> value); ----- - [#ostream-C] == <>::C diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.html b/test-files/golden-tests/symbols/overloads/overloads-ostream.html index 506f1a9aa..df15b86d8 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.html +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.html @@ -265,39 +265,25 @@

Synopsis

+ + +

Friends

- +
+ - + + + +|===
NameDescription
operator<<
operator<<Stream insertion operator
- - - -
-
-
-

ostream::operator<<

-
-
-

Synopsis

-
-Declared in <overloads-ostream.cpp>
-
-
-friend
-OStream&
-operator<<(
-    OStream& os,
-    B value);
-
-
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.xml b/test-files/golden-tests/symbols/overloads/overloads-ostream.xml index 179e8cc71..647cfab7b 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.xml +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.xml @@ -71,8 +71,7 @@ - - + diff --git a/test-files/golden-tests/symbols/overloads/overloads.adoc b/test-files/golden-tests/symbols/overloads/overloads.adoc index a7d444fa9..67e48efe2 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads.adoc @@ -59,11 +59,14 @@ struct A; === Friends -[cols=1] +[cols=2] |=== | Name -| <> -| <> +| Description +| `<>` +| Equality operator +| `<>` +| Equality operator |=== [#A-f-00] @@ -172,38 +175,6 @@ int g(int); ---- -[#A-08friend-0a] -== operator== - -=== Synopsis - -Declared in `<overloads.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -bool -operator==( - <> lhs, - <> rhs); ----- - -[#A-08friend-0e] -== operator== - -=== Synopsis - -Declared in `<overloads.cpp>` - -[source,cpp,subs="verbatim,replacements,macros,-callouts"] ----- -friend -bool -operator==( - <> lhs, - int rhs); ----- - [#B] == B @@ -282,12 +253,12 @@ Equality operator [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool -<>( +<>( <> lhs, - <> rhs); + int rhs); ---- -[.small]#<># +[.small]#<># Equality operator @@ -295,12 +266,12 @@ Equality operator [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool -<>( +<>( <> lhs, - int rhs); + <> rhs); ---- -[.small]#<># +[.small]#<># Equality operator @@ -328,7 +299,7 @@ bool [.small]#<># -[#operator_eq-0a] +[#operator_eq-0e] == operator== Equality operator @@ -342,7 +313,7 @@ Declared in `<overloads.cpp>` bool operator==( <> lhs, - <> rhs); + int rhs); ---- === Return Value @@ -361,7 +332,7 @@ operator==( | The right operand |=== -[#operator_eq-0e] +[#operator_eq-0a] == operator== Equality operator @@ -375,7 +346,7 @@ Declared in `<overloads.cpp>` bool operator==( <> lhs, - int rhs); + <> rhs); ---- === Return Value diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html index 06aa6cc6d..037b790b0 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.html +++ b/test-files/golden-tests/symbols/overloads/overloads.html @@ -81,22 +81,30 @@

Static Member Functions

+ + +

Friends

- +
+ - - + + + + + + + +|===
NameDescription
operator==
operator==
operator==Equality operator
operator==Equality operator
- - - +
@@ -222,44 +230,6 @@

Synopsis

-

operator==

-
-
-

Synopsis

-
-Declared in <overloads.cpp>
-
-
-friend
-bool
-operator==(
-    A lhs,
-    A rhs);
-
-
-
-
-
-
-

operator==

-
-
-

Synopsis

-
-Declared in <overloads.cpp>
-
-
-friend
-bool
-operator==(
-    A lhs,
-    int rhs);
-
-
-
-
-
-

B

@@ -350,21 +320,21 @@

Synopses

 
 bool
-operator==(
+operator==(
     A lhs,
-    A rhs);
+    int rhs);
 
-
» more... +» more... Equality operator 
 
 bool
-operator==(
+operator==(
     A lhs,
-    int rhs);
+    A rhs);
 
-
» more... +» more... Equality operator 
@@ -391,7 +361,7 @@ 
Synopses
-

operator==

+

operator==

Equality operator @@ -406,7 +376,7 @@

Synopsis

bool operator==( A lhs, - A rhs); + int rhs);
@@ -438,7 +408,7 @@

Parameters

-

operator==

+

operator==

Equality operator @@ -453,7 +423,7 @@

Synopsis

bool operator==( A lhs, - int rhs); + A rhs);
diff --git a/test-files/golden-tests/symbols/overloads/overloads.xml b/test-files/golden-tests/symbols/overloads/overloads.xml index 8f3a3a531..702365ced 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.xml +++ b/test-files/golden-tests/symbols/overloads/overloads.xml @@ -4,6 +4,12 @@ + + + + + + @@ -30,14 +36,6 @@ - - - - - - - - @@ -54,8 +52,8 @@ - - + + @@ -64,7 +62,7 @@ - + @@ -84,8 +82,8 @@ - - + + @@ -94,7 +92,7 @@ - + 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 a3372bbed..c66558d1d 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 @@ -117,7 +117,7 @@ struct R0 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -157,7 +157,7 @@ struct R1 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -180,7 +180,7 @@ struct R10 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -203,7 +203,7 @@ struct R11 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -226,7 +226,7 @@ struct R12 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -249,7 +249,7 @@ struct R13 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -272,7 +272,7 @@ struct R14 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -295,7 +295,7 @@ struct R15 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -318,7 +318,7 @@ struct R16 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -341,7 +341,7 @@ struct R17 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -364,7 +364,7 @@ struct R18 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -387,7 +387,7 @@ struct R19 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -410,7 +410,7 @@ struct R2 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -450,7 +450,7 @@ struct R20 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -473,7 +473,7 @@ struct R21 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -496,7 +496,7 @@ struct R22 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -519,7 +519,7 @@ struct R23 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -542,7 +542,7 @@ struct R24 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -565,7 +565,7 @@ struct R25 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -588,7 +588,7 @@ struct R26 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -611,7 +611,7 @@ struct R27 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -634,7 +634,7 @@ struct R28 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -674,7 +674,7 @@ struct R29 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -714,7 +714,7 @@ struct R3 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -737,7 +737,7 @@ struct R30 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -807,7 +807,7 @@ struct R31 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -830,7 +830,7 @@ struct R32 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -853,7 +853,7 @@ struct R33 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -876,7 +876,7 @@ struct R34 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -923,7 +923,7 @@ struct R35 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -946,7 +946,7 @@ struct R36 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -969,7 +969,7 @@ struct R37 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -995,7 +995,7 @@ struct R38 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1018,7 +1018,7 @@ struct R39 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1041,7 +1041,7 @@ struct R4 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1064,7 +1064,7 @@ struct R40 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1087,7 +1087,7 @@ struct R41 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1157,7 +1157,7 @@ struct R42 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1180,7 +1180,7 @@ struct R43 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1203,7 +1203,7 @@ struct R44 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1226,7 +1226,7 @@ struct R45 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1273,7 +1273,7 @@ struct R46 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1296,7 +1296,7 @@ struct R47 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1319,7 +1319,7 @@ struct R48 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1342,7 +1342,7 @@ struct R5 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1365,7 +1365,7 @@ struct R6 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1388,7 +1388,7 @@ struct R7 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1411,7 +1411,7 @@ struct R8 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1434,7 +1434,7 @@ struct R9 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1476,7 +1476,7 @@ struct S0; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -1872,7 +1872,7 @@ struct <><0>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2013,7 +2013,7 @@ struct S4; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2222,7 +2222,7 @@ struct <><14>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2419,7 +2419,7 @@ struct S4; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2442,7 +2442,7 @@ struct <><17, int*>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2576,7 +2576,7 @@ struct S5; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2670,7 +2670,7 @@ struct <><20>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2735,7 +2735,7 @@ struct S1; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2832,7 +2832,7 @@ struct S5; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2855,7 +2855,7 @@ struct <><22, int*>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -2990,7 +2990,7 @@ struct S6; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -3156,7 +3156,7 @@ struct S7; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -3337,7 +3337,7 @@ struct S7; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -3360,7 +3360,7 @@ struct <><29, int*>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -3495,7 +3495,7 @@ struct S2; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -3690,7 +3690,7 @@ struct <><32>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -3912,7 +3912,7 @@ struct S8; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -4177,7 +4177,7 @@ struct S9; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -4429,7 +4429,7 @@ struct S9; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -4452,7 +4452,7 @@ struct <><42, int*>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -4614,7 +4614,7 @@ struct <><5>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -4867,7 +4867,7 @@ struct <><46>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -5004,7 +5004,7 @@ struct S2; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -5027,7 +5027,7 @@ struct <><7, int*>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -5207,7 +5207,7 @@ struct S3; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -5299,7 +5299,7 @@ struct <><1, int*>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/record/local-class.adoc b/test-files/golden-tests/symbols/record/local-class.adoc index f40c17cad..41645d93b 100644 --- a/test-files/golden-tests/symbols/record/local-class.adoc +++ b/test-files/golden-tests/symbols/record/local-class.adoc @@ -35,7 +35,7 @@ struct B === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/record/record-inheritance.adoc b/test-files/golden-tests/symbols/record/record-inheritance.adoc index 83409bcd9..17b5d828c 100644 --- a/test-files/golden-tests/symbols/record/record-inheritance.adoc +++ b/test-files/golden-tests/symbols/record/record-inheritance.adoc @@ -41,7 +41,7 @@ class C0; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -77,7 +77,7 @@ class C2 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -126,7 +126,7 @@ class C5 === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -149,7 +149,7 @@ class C6 === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -173,7 +173,7 @@ class C7 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -197,7 +197,7 @@ struct S0; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -219,7 +219,7 @@ struct S1; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -242,7 +242,7 @@ struct S2 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -252,7 +252,7 @@ struct S2 === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -275,7 +275,7 @@ struct S3 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -285,7 +285,7 @@ struct S3 === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -309,7 +309,7 @@ struct S4 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -349,7 +349,7 @@ struct S6 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description 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 79a48205a..ba506616e 100644 --- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc +++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc @@ -73,7 +73,7 @@ struct R0 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -104,7 +104,7 @@ struct R1 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -127,7 +127,7 @@ struct R2 === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -160,7 +160,7 @@ struct S0; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -208,7 +208,7 @@ struct <><3>; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.adoc b/test-files/golden-tests/symbols/using/dependency-propagation.adoc index 3861f71ed..5fe08aebe 100644 --- a/test-files/golden-tests/symbols/using/dependency-propagation.adoc +++ b/test-files/golden-tests/symbols/using/dependency-propagation.adoc @@ -100,7 +100,7 @@ struct E === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description diff --git a/test-files/golden-tests/symbols/using/using-3.adoc b/test-files/golden-tests/symbols/using/using-3.adoc index 933541931..ce2e10584 100644 --- a/test-files/golden-tests/symbols/using/using-3.adoc +++ b/test-files/golden-tests/symbols/using/using-3.adoc @@ -36,7 +36,7 @@ struct A; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -79,7 +79,7 @@ struct B; === Derived Classes -[,cols=2] +[cols=2] |=== | Name | Description @@ -116,7 +116,7 @@ struct C === Base Classes -[,cols=2] +[cols=2] |=== | Name | Description