diff --git a/docs/mrdocs.schema.json b/docs/mrdocs.schema.json index 05a8f64e33..6db2b66717 100644 --- a/docs/mrdocs.schema.json +++ b/docs/mrdocs.schema.json @@ -93,7 +93,7 @@ }, "extract-anonymous-namespaces": { "default": true, - "description": "Determine whether symbols in anonymous namespaces should be extracted. When set to `always`, symbols in anonymous namespaces are always extracted. When set to `dependency`, symbols in anonymous namespaces are extracted only if they are referenced by the source code. When set to `never`, symbols in anonymous namespaces are never extracted.", + "description": "Determine whether symbols in anonymous namespaces should be extracted.", "enum": [ true, false @@ -101,6 +101,16 @@ "title": "Extraction policy for anonymous namespaces", "type": "boolean" }, + "extract-empty-namespaces": { + "default": false, + "description": "Determine whether empty namespaces without documentation should be extracted.", + "enum": [ + true, + false + ], + "title": "Extraction policy for empty namespaces", + "type": "boolean" + }, "extract-local-classes": { "default": true, "description": "Determine whether records only defined locally in source files should be extracted.", diff --git a/include/mrdocs/Metadata/Info.hpp b/include/mrdocs/Metadata/Info.hpp index 5964d997c2..ecf56351be 100644 --- a/include/mrdocs/Metadata/Info.hpp +++ b/include/mrdocs/Metadata/Info.hpp @@ -273,12 +273,13 @@ tag_invoke( DomCorpus const* domCorpus) { MRDOCS_ASSERT(domCorpus); + io.map("class", std::string("symbol")); + io.map("kind", I.Kind); io.map("id", I.id); if (!I.Name.empty()) { io.map("name", I.Name); } - io.map("kind", I.Kind); io.map("access", I.Access); io.map("extraction", I.Extraction); io.map("isRegular", I.Extraction == ExtractionMode::Regular); diff --git a/include/mrdocs/Metadata/Info/Function.hpp b/include/mrdocs/Metadata/Info/Function.hpp index b448d29a20..1f252947ff 100644 --- a/include/mrdocs/Metadata/Info/Function.hpp +++ b/include/mrdocs/Metadata/Info/Function.hpp @@ -235,7 +235,7 @@ tag_invoke( { io.map("refQualifier", I.RefQualifier); } - io.map("class", I.Class); + io.map("functionClass", I.Class); io.map("params", dom::LazyArray(I.Params, domCorpus)); io.map("return", I.ReturnType); io.map("template", I.Template); diff --git a/include/mrdocs/Metadata/Info/Namespace.hpp b/include/mrdocs/Metadata/Info/Namespace.hpp index 6affbb0625..acb52ecef4 100644 --- a/include/mrdocs/Metadata/Info/Namespace.hpp +++ b/include/mrdocs/Metadata/Info/Namespace.hpp @@ -13,6 +13,7 @@ #define MRDOCS_API_METADATA_NAMESPACE_HPP #include +#include #include #include #include @@ -110,7 +111,7 @@ struct NamespaceInfo final /** Namespaces nominated by using-directives. */ - std::vector UsingDirectives; + std::vector UsingDirectives; /** The members of this namespace. */ @@ -121,7 +122,8 @@ struct NamespaceInfo final { } - auto operator<=>(NamespaceInfo const&) const = default; + std::strong_ordering + operator<=>(NamespaceInfo const&) const; }; MRDOCS_DECL diff --git a/include/mrdocs/Metadata/Info/Using.hpp b/include/mrdocs/Metadata/Info/Using.hpp index 4f45e27a1e..751780e36a 100644 --- a/include/mrdocs/Metadata/Info/Using.hpp +++ b/include/mrdocs/Metadata/Info/Using.hpp @@ -93,7 +93,7 @@ tag_invoke( DomCorpus const* domCorpus) { tag_invoke(t, io, dynamic_cast(I), domCorpus); - io.map("class", I.Class); + io.map("usingClass", I.Class); io.map("shadows", dom::LazyArray(I.UsingSymbols, domCorpus)); io.map("qualifier", I.Qualifier); } diff --git a/include/mrdocs/Metadata/Name.hpp b/include/mrdocs/Metadata/Name.hpp index d7fe9181fb..661249539d 100644 --- a/include/mrdocs/Metadata/Name.hpp +++ b/include/mrdocs/Metadata/Name.hpp @@ -13,10 +13,9 @@ #define MRDOCS_API_METADATA_NAME_HPP #include -#include #include #include -#include +#include namespace clang::mrdocs { @@ -100,6 +99,12 @@ struct NameInfo std::strong_ordering operator<=>(NameInfo const& other) const; + + bool + operator==(NameInfo const& other) const + { + return std::is_eq(*this <=> other); + } }; /** Represents a (possibly qualified) symbol name with template arguments. diff --git a/mrdocs.rnc b/mrdocs.rnc index c5f9323ab6..15a23e1c5a 100644 --- a/mrdocs.rnc +++ b/mrdocs.rnc @@ -228,7 +228,7 @@ grammar element aliased { attribute name { text }, - attribute id { text } + attribute id { text } ? } } diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs index 7dae77cc97..c8b6efea89 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs @@ -66,7 +66,7 @@ {{/if}} {{! Using directives }} {{#if symbol.usingDirectives}} -{{>symbol/members-table members=symbol.usingDirectives title="Using Directives"}} +{{>symbol/members-table members=symbol.usingDirectives title="Using Namespace Directives"}} {{/if}} {{! Related symbols }} diff --git a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs new file mode 100644 index 0000000000..83964543b7 --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs @@ -0,0 +1,21 @@ +{{#>markup/table cols=(select includeBrief 2 1)}} +{{#>markup/thead}} +{{#>markup/tr~}} +{{#>markup/th}}Name{{/markup/th}} +{{#if includeBrief}} +{{#>markup/th}}Description{{/markup/th}} +{{/if}} +{{/markup/tr}} +{{/markup/thead}} +{{#>markup/tbody}} +{{#if isName}} +{{#each members}} +{{> symbol/detail/members-table-row . includeBrief=false isName=true}} +{{/each}} +{{ else }} +{{#each (filter_by members "isRegular" "isSeeBelow")}} +{{> symbol/detail/members-table-row . includeBrief=../includeBrief isName=false}} +{{/each}} +{{/if}} +{{/markup/tbody}} +{{/markup/table}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs index 893ac1fd8a..a23840ab76 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs @@ -1,12 +1,20 @@ {{! Helper for "info-list": renders a symbol as a row in a table of members }} -{{#>markup/tr~}} -{{#>markup/td}} -{{! Member name, linked to its documentation }} -{{#>markup/a href=url}}{{#>markup/code}}{{>symbol/name . nolink=true}}{{/markup/code}}{{/markup/a}} {{>symbol/special-function-suffix .}} -{{~/markup/td}} -{{#if (eq includeBrief true)}} +{{#>markup/tr}} {{#>markup/td~}} -{{{~doc.brief}}} -{{/markup/td~}} +{{~#if isName~}} +{{~#if symbol.url~}} +{{~#>markup/a href=symbol.url}}{{#>markup/code}}{{> symbol/name-info . nolink=true}}{{/markup/code}}{{/markup/a~}} +{{~else~}} +{{~> symbol/name-info . nolink=true~}} +{{~/if~}} +{{~else~}} +{{~#>markup/a href=url}}{{#>markup/code}}{{>symbol/name . nolink=true}}{{/markup/code}}{{/markup/a}} {{>symbol/special-function-suffix .~}} +{{~/if~}} +{{~/markup/td}} +{{#if includeBrief~}} +{{~#>markup/td~}} +{{{~doc.brief~}}} +{{~/markup/td}} {{/if}} -{{~/markup/tr}} \ No newline at end of file + +{{/markup/tr}} diff --git a/share/mrdocs/addons/generator/common/partials/symbol/members-table.hbs b/share/mrdocs/addons/generator/common/partials/symbol/members-table.hbs index 2845944e29..46cd775048 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/members-table.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/members-table.hbs @@ -4,41 +4,19 @@ This partials renders each row with the symbol name and brief for each member. - Expected Context: {Symbol Object} + Expected Context: {Symbol|NameInfo}[] + + Parameters: + members: An array of symbols or nameinfo to render. Example: {{> symbol/members-table symbol }} See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference --}} -{{#if (any_of_by members "isRegular" "isSeeBelow")}} +{{#if members}} +{{#if (or (eq members[0].class "name") (any_of_by members "isRegular" "isSeeBelow"))}} {{#>markup/h level=(select @root.config.multipage 1 2)}}{{title}}{{/markup/h}} -{{#if (any_of_by members "doc")}} -{{#>markup/table cols=2}} -{{#>markup/thead}} -{{#>markup/tr~}} -{{#>markup/th}}Name{{/markup/th~}} -{{#>markup/th}}Description{{/markup/th}} -{{/markup/tr}} -{{/markup/thead}} -{{#>markup/tbody}} -{{#each (filter_by members "isRegular" "isSeeBelow")}} -{{> symbol/detail/members-table-row . includeBrief=true}} -{{/each}} -{{/markup/tbody}} -{{/markup/table}} -{{else}} -{{#>markup/table cols=1}} -{{#>markup/thead}} -{{#>markup/tr~}} -{{#>markup/th}}Name{{/markup/th}} -{{/markup/tr}} -{{/markup/thead}} -{{#>markup/tbody}} -{{#each (filter_by members "isRegular" "isSeeBelow")}} -{{> symbol/detail/members-table-row . includeBrief=false}} -{{/each}} -{{/markup/tbody}} -{{/markup/table}} -{{/if}} +{{>symbol/detail/members-table-impl members=members isName=(eq members[0].class "name") includeBrief=(select (any_of_by members "doc") true false) title=title}} {{/if}} +{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/symbol/name.hbs b/share/mrdocs/addons/generator/common/partials/symbol/name.hbs index afa0750b88..82b9cac1aa 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/name.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/name.hbs @@ -15,7 +15,7 @@ See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference --}} -{{#if (and (eq kind "function") (eq class "conversion"))~}} +{{#if (and (eq kind "function") (eq functionClass "conversion"))~}} {{! Conversion operator: "operator" and the type declarator ~}} operator {{>type/declarator return nolink=nolink~}} {{else if (eq kind "guide")~}} diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs index 7b2ab8d2ec..130a8b58df 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs @@ -12,7 +12,7 @@ {{/if~}} {{#if explicitSpec}}{{explicitSpec}} {{/if~}} -{{#if (eq class "normal")}}{{>type/declarator-prefix return}} +{{#if (eq functionClass "normal")}}{{>type/declarator-prefix return}} {{/if~}} {{>symbol/name symbol link=(select link link template.primary)}} ({{#if isExplicitObjectMemberFunction}}this {{/if}}{{#each params}}{{#unless (and @first @last)}} @@ -24,7 +24,7 @@ {{#if isVolatile}} volatile{{/if~}} {{#if refQualifier}} {{refQualifier}}{{/if~}} {{#if exceptionSpec}} {{exceptionSpec}}{{/if~}} -{{#if (eq class "normal")}}{{>type/declarator-suffix return}}{{/if~}} +{{#if (eq functionClass "normal")}}{{>type/declarator-suffix return}}{{/if~}} {{#if requires}} requires {{requires}}{{/if~}} diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/using.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/using.hbs index 323d8b9f17..d3e24e2b18 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/signature/using.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/using.hbs @@ -1,4 +1,4 @@ -using {{#if (contains (arr "typename" "enum") class)}} {{class}} +using {{#if (contains (arr "typename" "enum") usingClass)}} {{usingClass}} {{~/if~}} {{~#if qualifier~}} {{>symbol/name-info qualifier }}:: diff --git a/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs b/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs index f7e79deccb..6aff727240 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs @@ -15,9 +15,9 @@ {{#if (eq kind "overloads")~}} {{>symbol/special-function-suffix (front members)}} {{~else if (eq kind "function")~}} - {{#if (eq class "constructor")}} + {{#if (eq functionClass "constructor")}} {{#>markup/span class="small"}}[constructor]{{/markup/span}} - {{~else if (eq class "destructor")~}} + {{~else if (eq functionClass "destructor")~}} {{#>markup/span class="small"}}[destructor]{{/markup/span}} {{~/if~}} {{~#if isVirtual~}} diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs index db9b8defe8..028d595f97 100644 --- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs @@ -81,7 +81,7 @@ {{! Using directives }} {{#if symbol.usingDirectives}}
-{{>symbol/members-table members=symbol.usingDirectives title="Using Directives"}} +{{>symbol/members-table members=symbol.usingDirectives title="Using Namespace Directives"}}
diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp index 468dc1e065..2014ac685f 100644 --- a/src/lib/AST/ASTVisitor.cpp +++ b/src/lib/AST/ASTVisitor.cpp @@ -158,6 +158,8 @@ Info* ASTVisitor:: traverse(UsingDirectiveDecl const* D) { + MRDOCS_SYMBOL_TRACE(D, context_); + // Find the parent namespace ScopeExitRestore s1(mode_, TraversalMode::Dependency); Decl const* P = getParent(D); @@ -174,9 +176,13 @@ traverse(UsingDirectiveDecl const* D) Info* NDI = findOrTraverse(ND); MRDOCS_CHECK_OR(NDI, nullptr); - if (std::ranges::find(PNI->UsingDirectives, NDI->id) == PNI->UsingDirectives.end()) + auto res = toNameInfo(ND); + MRDOCS_ASSERT(res); + MRDOCS_ASSERT(res->isIdentifier()); + if (NameInfo NI = *res; + std::ranges::find(PNI->UsingDirectives, NI) == PNI->UsingDirectives.end()) { - PNI->UsingDirectives.emplace_back(NDI->id); + PNI->UsingDirectives.push_back(std::move(NI)); } return nullptr; } diff --git a/src/lib/AST/ParseRef.cpp b/src/lib/AST/ParseRef.cpp index 8fd4835144..8c8d76a50f 100644 --- a/src/lib/AST/ParseRef.cpp +++ b/src/lib/AST/ParseRef.cpp @@ -385,6 +385,11 @@ class RefParser bool parseFunctionParameters() { + // https://en.cppreference.com/w/cpp/language/function + // parameter-list: + // possibly empty, comma-separated list of the function parameters + // (see below for details) + char const* start = ptr_; if (!parseLiteral('(')) { @@ -549,6 +554,21 @@ class RefParser bool parseMemberFunctionQualifiers() { + // https://en.cppreference.com/w/cpp/language/function + + // Parse cv: + // const/volatile qualification, only allowed in non-static member + // function declarations + + // Parse ref: + // ref-qualification, only allowed in non-static member function + // declarations + + // Parse except: + // dynamic exception specification, dynamic exception specification + // or noexcept specification, noexcept specification + + // Parse potential qualifiers at the end of a function // to identify the qualifiers to set // ReferenceKind Kind = ReferenceKind::None; and diff --git a/src/lib/Gen/xml/XMLWriter.cpp b/src/lib/Gen/xml/XMLWriter.cpp index 7df92957c0..0750e11c36 100644 --- a/src/lib/Gen/xml/XMLWriter.cpp +++ b/src/lib/Gen/xml/XMLWriter.cpp @@ -214,9 +214,12 @@ writeNamespace( { "is-inline", "1", I.IsInline} }); writeJavadoc(I.javadoc); - for (SymbolID const& id: I.UsingDirectives) + for (NameInfo const& NI: I.UsingDirectives) { - tags_.write("using-directive", {}, { { id } }); + if (auto const& id = NI.id; id != SymbolID::invalid) + { + tags_.write("using-directive", {}, { { id } }); + } } corpus_.traverse(I, *this); tags_.close(namespaceTagName); diff --git a/src/lib/Lib/ConfigOptions.json b/src/lib/Lib/ConfigOptions.json index 49e44d30e0..fe3987245d 100644 --- a/src/lib/Lib/ConfigOptions.json +++ b/src/lib/Lib/ConfigOptions.json @@ -223,10 +223,17 @@ { "name": "extract-anonymous-namespaces", "brief": "Extraction policy for anonymous namespaces", - "details": "Determine whether symbols in anonymous namespaces should be extracted. When set to `always`, symbols in anonymous namespaces are always extracted. When set to `dependency`, symbols in anonymous namespaces are extracted only if they are referenced by the source code. When set to `never`, symbols in anonymous namespaces are never extracted.", + "details": "Determine whether symbols in anonymous namespaces should be extracted.", "type": "bool", "default": true }, + { + "name": "extract-empty-namespaces", + "brief": "Extraction policy for empty namespaces", + "details": "Determine whether empty namespaces without documentation should be extracted.", + "type": "bool", + "default": false + }, { "name": "inherit-base-members", "brief": "Determine how derived classes inherit base members", diff --git a/src/lib/Lib/CorpusImpl.cpp b/src/lib/Lib/CorpusImpl.cpp index 2d5c8abef5..c62943cc80 100644 --- a/src/lib/Lib/CorpusImpl.cpp +++ b/src/lib/Lib/CorpusImpl.cpp @@ -17,6 +17,7 @@ #include "lib/Metadata/Finalizers/OverloadsFinalizer.hpp" #include "lib/Metadata/Finalizers/SortMembersFinalizer.hpp" #include "lib/Metadata/Finalizers/JavadocFinalizer.hpp" +#include "lib/Metadata/Finalizers/NamespacesFinalizer.hpp" #include "lib/Support/Error.hpp" #include "lib/Support/Chrono.hpp" #include @@ -592,6 +593,12 @@ qualifiedName(Info const& I, std::string& result) const void CorpusImpl::finalize() { + { + report::debug("Finalizing namespaces"); + NamespacesFinalizer finalizer(*this); + finalizer.build(); + } + if (config->inheritBaseMembers != PublicSettings::BaseMemberInheritance::Never) { report::debug("Finalizing base members"); diff --git a/src/lib/Lib/CorpusImpl.hpp b/src/lib/Lib/CorpusImpl.hpp index 6206cd0232..d3a1b8a0ce 100644 --- a/src/lib/Lib/CorpusImpl.hpp +++ b/src/lib/Lib/CorpusImpl.hpp @@ -60,6 +60,7 @@ class CorpusImpl final : public Corpus friend class OverloadsFinalizer; friend class SortMembersFinalizer; friend class JavadocFinalizer; + friend class NamespacesFinalizer; public: /** Constructor. @@ -92,6 +93,30 @@ class CorpusImpl final : public Corpus Info const* find(SymbolID const& id) const noexcept override; + /** Return a range of Info objects for the specified Symbol IDs. + */ + template R> + auto + find(R&& range) + { + return + std::views::transform( + range, + [this](SymbolID const& id) -> Info* + { + return this->find(id); + }) | + std::views::filter([](Info const* info) + { + return info != nullptr; + }) | + std::views::transform([](Info* info) -> Info& + { + return *info; + }) | + std::views::common; + } + Expected> lookup(SymbolID const& context, std::string_view name) const override; diff --git a/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp b/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp new file mode 100644 index 0000000000..6ff0fee45f --- /dev/null +++ b/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp @@ -0,0 +1,109 @@ +// +// Licensed under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// Copyright (c) 2025 Alan de Freitas (alandefreitas@gmail.com) +// +// Official repository: https://github.com/cppalliance/mrdocs +// + +#include "NamespacesFinalizer.hpp" + +namespace clang::mrdocs { + +NamespacesFinalizer::FinalizerResult +NamespacesFinalizer:: +operator()(NamespaceInfo& I) +{ + report::trace( + "Finalizing namespace '{}'", + corpus_.Corpus::qualifiedName(I)); + + // 1) Finalize sub-namespaces + SmallVector removedNamespaces; + for (auto subNamespaces = corpus_.find(I.Members.Namespaces); + Info& info: subNamespaces) + { + MRDOCS_ASSERT(info.isNamespace()); + SymbolID memberID = info.id; + auto& member = dynamic_cast(info); + if (auto const res = (*this)(member); + res == FinalizerResult::Removed) + { + removedNamespaces.push_back(memberID); + } + } + for (SymbolID const& memberID : removedNamespaces) + { + auto it = std::ranges::find(I.Members.Namespaces, memberID); + MRDOCS_ASSERT(it != I.Members.Namespaces.end()); + I.Members.Namespaces.erase(it); + } + + // No more steps for the global namespace + MRDOCS_CHECK_OR(I.id != SymbolID::global, FinalizerResult::None); + + // No more steps for documented namespaces + MRDOCS_CHECK_OR(!I.javadoc, FinalizerResult::None); + + // 3) Remove empty undocumented namespaces + auto memberIds = allMembers(I); + if (std::ranges::empty(memberIds)) + { + if (!corpus_.config->extractEmptyNamespaces) + { + auto const it = corpus_.info_.find(I.id); + MRDOCS_CHECK_OR(it != corpus_.info_.end(), FinalizerResult::None); + corpus_.info_.erase(it); + return FinalizerResult::Removed; + } + return FinalizerResult::None; + } + + // 4) If the namespace is regular and undocumented, + // it's extraction mode is updated according to + // its members + MRDOCS_CHECK_OR(I.Extraction == ExtractionMode::Regular, FinalizerResult::None); + auto members = corpus_.find(memberIds); + bool allDependencies = true; + bool allImplementationDefined = true; + bool anySeeBelow = false; + for (Info const& member : members) + { + if (member.Extraction == ExtractionMode::Regular) + { + // It has a regular member, so it should remain + // regular + return FinalizerResult::None; + } + if (member.Extraction != ExtractionMode::Dependency) + { + allDependencies = false; + } + if (member.Extraction != ExtractionMode::ImplementationDefined) + { + allImplementationDefined = false; + } + if (member.Extraction == ExtractionMode::SeeBelow) + { + anySeeBelow = true; + } + } + + if (allDependencies) + { + I.Extraction = ExtractionMode::Dependency; + } + else if (allImplementationDefined) + { + I.Extraction = ExtractionMode::ImplementationDefined; + } + else if (anySeeBelow) + { + I.Extraction = ExtractionMode::SeeBelow; + } + return FinalizerResult::Changed; +} + +} // clang::mrdocs diff --git a/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp b/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp new file mode 100644 index 0000000000..5186e9a1e5 --- /dev/null +++ b/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp @@ -0,0 +1,58 @@ +// +// Licensed under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// Copyright (c) 2025 Alan de Freitas (alandefreitas@gmail.com) +// +// Official repository: https://github.com/cppalliance/mrdocs +// + +#ifndef MRDOCS_LIB_METADATA_FINALIZER_NAMESPACESFINALIZER_HPP +#define MRDOCS_LIB_METADATA_FINALIZER_NAMESPACESFINALIZER_HPP + +#include "lib/Lib/Info.hpp" +#include "lib/Lib/CorpusImpl.hpp" + +namespace clang::mrdocs { + +/** Finalizes a set of Info. + + This removes any references to SymbolIDs + which do not exist. + + References which should always be valid + are not checked. +*/ +class NamespacesFinalizer +{ + CorpusImpl& corpus_; + std::unordered_set finalized_; + +public: + NamespacesFinalizer( + CorpusImpl& corpus) + : corpus_(corpus) + {} + + void + build() + { + Info* info = corpus_.find(SymbolID::global); + MRDOCS_CHECK_OR(info); + operator()(*dynamic_cast(info)); + } + + enum class FinalizerResult { + None, + Removed, + Changed + }; + + FinalizerResult + operator()(NamespaceInfo& I); +}; + +} // clang::mrdocs + +#endif diff --git a/src/lib/Metadata/Info/Namespace.cpp b/src/lib/Metadata/Info/Namespace.cpp index b167c60ac8..ff4e074a72 100644 --- a/src/lib/Metadata/Info/Namespace.cpp +++ b/src/lib/Metadata/Info/Namespace.cpp @@ -15,6 +15,46 @@ namespace clang::mrdocs { +std::strong_ordering +NamespaceInfo:: +operator<=>(NamespaceInfo const& other) const +{ + if (auto const res = dynamic_cast(*this) <=> dynamic_cast(other); + std::is_neq(res)) + { + return res; + } + if (auto const res = IsInline <=> other.IsInline; + std::is_neq(res)) + { + return res; + } + if (auto const res = IsAnonymous <=> other.IsAnonymous; + std::is_neq(res)) + { + return res; + } + if (auto const res = UsingDirectives.size() <=> other.UsingDirectives.size(); + std::is_neq(res)) + { + return res; + } + for (auto const& [lhs, rhs] : llvm::zip(UsingDirectives, other.UsingDirectives)) + { + if (auto const res = lhs <=> rhs; + std::is_neq(res)) + { + return res; + } + } + if (auto const res = Members <=> other.Members; + std::is_neq(res)) + { + return res; + } + return std::strong_ordering::equal; +} + namespace { void reduceSymbolIDs( @@ -30,6 +70,21 @@ reduceSymbolIDs( list.push_back(id); } } + +void +reduceNames( + std::vector& list, + std::vector&& otherList) +{ + for(auto const& id : otherList) + { + if (auto it = llvm::find(list, id); it != list.end()) + { + continue; + } + list.push_back(id); + } +} } // (anon) void @@ -53,7 +108,7 @@ merge(NamespaceInfo& I, NamespaceInfo&& Other) MRDOCS_ASSERT(canMerge(I, Other)); merge(dynamic_cast(I), std::move(dynamic_cast(Other))); merge(I.Members, std::move(Other.Members)); - reduceSymbolIDs(I.UsingDirectives, std::move(Other.UsingDirectives)); + reduceNames(I.UsingDirectives, std::move(Other.UsingDirectives)); I.IsInline |= Other.IsInline; I.IsAnonymous |= Other.IsAnonymous; } diff --git a/src/lib/Metadata/Name.cpp b/src/lib/Metadata/Name.cpp index bb8b9e63ab..87f5cfa4c4 100644 --- a/src/lib/Metadata/Name.cpp +++ b/src/lib/Metadata/Name.cpp @@ -50,6 +50,10 @@ operator<=>(Polymorphic const& lhs, Polymorphic const& rhs) { if (lhs->Kind == rhs->Kind) { + if (lhs->isIdentifier()) + { + return *lhs <=> *rhs; + } return visit(*lhs, detail::VisitCompareFn(*rhs)); } return lhs->Kind <=> rhs->Kind; @@ -130,6 +134,7 @@ tag_invoke( NameInfo const& I, DomCorpus const* domCorpus) { + io.map("class", std::string("name")); io.map("kind", I.Kind); visit(I, [domCorpus, &io](T const& t) { diff --git a/src/lib/Metadata/Type.cpp b/src/lib/Metadata/Type.cpp index 04d02ed624..24b83315e1 100644 --- a/src/lib/Metadata/Type.cpp +++ b/src/lib/Metadata/Type.cpp @@ -397,6 +397,7 @@ tag_invoke( TypeInfo const& I, DomCorpus const* domCorpus) { + io.map("class", std::string("type")); io.map("kind", I.Kind); io.map("is-pack", I.IsPackExpansion); visit(I, [&io, domCorpus](T const& t) diff --git a/test-files/golden-tests/config/auto-brief/auto-brief.adoc b/test-files/golden-tests/config/auto-brief/auto-brief.adoc index d1fd505d31..f89bb9e497 100644 --- a/test-files/golden-tests/config/auto-brief/auto-brief.adoc +++ b/test-files/golden-tests/config/auto-brief/auto-brief.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | This is the explicit brief. diff --git a/test-files/golden-tests/config/auto-brief/auto-brief.html b/test-files/golden-tests/config/auto-brief/auto-brief.html index 2770c8c5e4..87c9d75e6e 100644 --- a/test-files/golden-tests/config/auto-brief/auto-brief.html +++ b/test-files/golden-tests/config/auto-brief/auto-brief.html @@ -13,94 +13,95 @@

Functions

- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - + + + + + + + + + +
NameDescriptionNameDescription
copyBriefFromCopyBrief This is the explicit brief. - -
copyBriefFromExplicitBrief This is the explicit brief. - -
copyBriefFromFirstSentenceAsBrief This is the brief. - -
copyBriefFromFirstValid This function has documentation but no brief. - -
copyDetailsFromCopyBrief Details will be copied copyDetailsFromExplicitBrief - -
copyDetailsFromDocNoBrief Custom brief docNoBriefFunction - -
copyDetailsFromExplicitBrief This will not be copied. - -
copyDetailsFromFirstSentenceAsBrief This is more documentation. - -
copyDetailsFromNoDoc Custom brief noDocFunction - -
copyDocFromCopyBrief This is the explicit brief. - -
copyDocFromExplicitBrief This is the explicit brief. - -
copyDocFromFirstSentenceAsBrief This is the brief. - -
docNoBriefFunction This function has documentation but no brief. - -
explicitBriefFunction This is the explicit brief. - -
explicitBriefFunction2 This is the explicit brief. - -
failCircularReferenceCopyFunction -
failCircularSourceFunctionA -
failCircularSourceFunctionB -
failCircularReferenceCopyFunction
failCircularSourceFunctionA
failCircularSourceFunctionB
failCopyBriefFromDocNoBrief This function has documentation but no brief. - -
failCopyBriefFromInvalidReference -
failCopyBriefFromNoDoc -
failCopyDetailsFromInvalidReference -
failCopyBriefFromInvalidReference
failCopyBriefFromNoDoc
failCopyDetailsFromInvalidReference
failCopyDocFromDocNoBrief This function has documentation but no brief. - -
failCopyDocFromInvalidReference -
failCopyDocFromNoDoc -
failInvalidReferenceCopyFunctions -
failCopyDocFromInvalidReference
failCopyDocFromNoDoc
failInvalidReferenceCopyFunctions
firstSentenceAsBriefFunction This is the brief. - -
noDocFunction -
noDocFunction
recursiveReferenceCopyFunction Final recursive brief - -
recursiveSourceFunctionA Final recursive brief - -
recursiveSourceFunctionB Final recursive brief - -
diff --git a/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc b/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc index 32990d065b..42ca7a0d40 100644 --- a/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc +++ b/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | This is the explicit brief. diff --git a/test-files/golden-tests/config/auto-brief/no-auto-brief.html b/test-files/golden-tests/config/auto-brief/no-auto-brief.html index 078d7c26b9..cd517bbfd8 100644 --- a/test-files/golden-tests/config/auto-brief/no-auto-brief.html +++ b/test-files/golden-tests/config/auto-brief/no-auto-brief.html @@ -13,85 +13,86 @@

Functions

- + + + + - - + + + + + + + + - - + + + + + + + + + + - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
copyBriefFromCopyBrief This is the explicit brief. - -
copyBriefFromExplicitBrief This is the explicit brief. - -
copyBriefFromFirstSentenceAsBrief -
copyBriefFromFirstValid -
copyBriefFromFirstSentenceAsBrief
copyBriefFromFirstValid
copyDetailsFromCopyBrief Details will be copied copyDetailsFromExplicitBrief - -
copyDetailsFromDocNoBrief Custom brief docNoBriefFunction - -
copyDetailsFromExplicitBrief -
copyDetailsFromFirstSentenceAsBrief -
copyDetailsFromExplicitBrief
copyDetailsFromFirstSentenceAsBrief
copyDetailsFromNoDoc Custom brief noDocFunction - -
copyDocFromCopyBrief This is the explicit brief. - -
copyDocFromExplicitBrief This is the explicit brief. - -
copyDocFromFirstSentenceAsBrief -
docNoBriefFunction -
copyDocFromFirstSentenceAsBrief
docNoBriefFunction
explicitBriefFunction This is the explicit brief. - -
explicitBriefFunction2 This is the explicit brief. - -
failCircularReferenceCopyFunction -
failCircularSourceFunctionA -
failCircularSourceFunctionB -
failCopyBriefFromDocNoBrief -
failCopyBriefFromInvalidReference -
failCopyBriefFromNoDoc -
failCopyDetailsFromInvalidReference -
failCopyDocFromDocNoBrief -
failCopyDocFromInvalidReference -
failCopyDocFromNoDoc -
failInvalidReferenceCopyFunctions -
firstSentenceAsBriefFunction -
noDocFunction -
failCircularReferenceCopyFunction
failCircularSourceFunctionA
failCircularSourceFunctionB
failCopyBriefFromDocNoBrief
failCopyBriefFromInvalidReference
failCopyBriefFromNoDoc
failCopyDetailsFromInvalidReference
failCopyDocFromDocNoBrief
failCopyDocFromInvalidReference
failCopyDocFromNoDoc
failInvalidReferenceCopyFunctions
firstSentenceAsBriefFunction
noDocFunction
recursiveReferenceCopyFunction Final recursive brief - -
recursiveSourceFunctionA Final recursive brief - -
recursiveSourceFunctionB Final recursive brief - -
diff --git a/test-files/golden-tests/config/extract-all/no-extract-all.adoc b/test-files/golden-tests/config/extract-all/no-extract-all.adoc index b63008a4d3..57986d63aa 100644 --- a/test-files/golden-tests/config/extract-all/no-extract-all.adoc +++ b/test-files/golden-tests/config/extract-all/no-extract-all.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Documented function diff --git a/test-files/golden-tests/config/extract-all/no-extract-all.html b/test-files/golden-tests/config/extract-all/no-extract-all.html index 8dc8d1cab9..292ea2e7d5 100644 --- a/test-files/golden-tests/config/extract-all/no-extract-all.html +++ b/test-files/golden-tests/config/extract-all/no-extract-all.html @@ -13,17 +13,18 @@

Functions

- + + + + + +
NameDescriptionNameDescription
docFunction Documented function - -
sometimesDocFunction Sometimes documented function - -
diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc new file mode 100644 index 0000000000..d67c6cee3c --- /dev/null +++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc @@ -0,0 +1,269 @@ += Reference +:mrdocs: + +[#index] +== Global namespace + + +=== Namespaces + +[cols=2] +|=== +| Name +| Description + +| <> +| Namespace documentation + +| <> +| Should decay to see‐below + +| <> +| Should decay to regular + +| <> +| Regular namespace + +| <> +| Should decay to see‐below + +|=== +=== Namespace Aliases + +[cols=2] +|=== +| Name +| Description + +| <> +| Should still work + +| <> +| Should work + +|=== + +=== Using Namespace Directives + +[cols=1] +|=== +| Name + +| <> + +| empty_ns + +|=== + +[#documented_ns] +== documented_ns + + +Namespace documentation + + +[#mixed_ns] +== mixed_ns + + +Should decay to see‐below + +=== Types + +[cols=1] +|=== +| Name + +| <> + +|=== + +[#mixed_ns-SeeBelowStructA] +== <>::SeeBelowStructA + + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct SeeBelowStructA { /* see-below */ }; +---- + + + + +[#mixed_regular_ns] +== mixed_regular_ns + + +Should decay to regular + +=== Types + +[cols=1] +|=== +| Name + +| <> + +| <> + +|=== + +[#mixed_regular_ns-RegularStructA] +== <>::RegularStructA + + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct RegularStructA; +---- + + + + +[#mixed_regular_ns-SeeBelowStructB] +== <>::SeeBelowStructB + + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct SeeBelowStructB { /* see-below */ }; +---- + + + + +[#regular_ns] +== regular_ns + + +Regular namespace + +=== Types + +[cols=1] +|=== +| Name + +| <> + +|=== + +[#regular_ns-A] +== <>::A + + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct A; +---- + + + + +[#see_below_ns] +== see_below_ns + + +Should decay to see‐below + +=== Types + +[cols=1] +|=== +| Name + +| <> + +| <> + +|=== + +[#see_below_ns-SeeBelowStructA] +== <>::SeeBelowStructA + + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct SeeBelowStructA { /* see-below */ }; +---- + + + + +[#see_below_ns-SeeBelowStructB] +== <>::SeeBelowStructB + + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct SeeBelowStructB { /* see-below */ }; +---- + + + + +[#empty_ns_alias] +== empty_ns_alias + + +Should still work + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +namespace empty_ns_alias = empty_ns; +---- + +[#regular_ns_alias] +== regular_ns_alias + + +Should work + +=== Synopsis + + +Declared in `<no‐extract‐empty‐namespaces.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +namespace regular_ns_alias = <>; +---- + + + +[.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.cpp b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.cpp new file mode 100644 index 0000000000..6ac3b2ac6b --- /dev/null +++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.cpp @@ -0,0 +1,53 @@ +namespace empty_ns {} + +// Symbols are excluded so the namespace should also be excluded +namespace excluded_members_ns { + struct ExcludedStructA {}; + struct ExcludedStructB {}; +} + +/// Regular namespace +namespace regular_ns { + struct A {}; +} + +/// Namespace documentation +namespace documented_ns {} + +/// Should decay to see-below +namespace see_below_ns { + struct SeeBelowStructA {}; + struct SeeBelowStructB {}; +} + +/// Should decay to implementation-defined +namespace implementation_defined_ns { + struct ImplementationDefinedStructA {}; + struct ImplementationDefinedStructB {}; +} + +/// Should decay to see-below +namespace mixed_ns { + struct SeeBelowStructA {}; + struct ImplementationDefinedStructB {}; +} + +/// Should decay to regular +namespace mixed_regular_ns { + struct RegularStructA {}; + struct SeeBelowStructB {}; + struct ImplementationDefinedStructC {}; +} + +/// Should work +using namespace regular_ns; + +/// Should work +namespace regular_ns_alias = regular_ns; + +/// Should work +using namespace empty_ns; + +/// Should still work +namespace empty_ns_alias = empty_ns; + diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html new file mode 100644 index 0000000000..21efc67a24 --- /dev/null +++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html @@ -0,0 +1,331 @@ + + +Reference + + +
+

Reference

+
+
+

Global namespace

+
+

Namespaces

+ + + + + + + + + + + + + + + + + + + + +
NameDescription
documented_ns Namespace documentation +
mixed_ns Should decay to see-below +
mixed_regular_ns Should decay to regular +
regular_ns Regular namespace +
see_below_ns Should decay to see-below +
+

Namespace Aliases

+ + + + + + + + + + + + + + +
NameDescription
empty_ns_alias Should still work +
regular_ns_alias Should work +
+
+

Using Namespace Directives

+ + + + + + + + + + + + + +
Name
regular_ns
empty_ns
+ +
+ +
+
+
+

documented_ns

+
+Namespace documentation + + +
+
+
+
+
+

mixed_ns

+
+Should decay to see-below + + +
+
+

Types

+ + + + + + + + + + + +
Name
SeeBelowStructA
+
+
+
+

mixed_ns::SeeBelowStructA

+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+struct SeeBelowStructA { /* see-below */ };
+
+
+
+ + +
+
+
+

mixed_regular_ns

+
+Should decay to regular + + +
+
+

Types

+ + + + + + + + + + + + + +
Name
RegularStructA
SeeBelowStructB
+
+
+
+

mixed_regular_ns::RegularStructA

+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+struct RegularStructA;
+
+
+
+ + +
+
+
+

mixed_regular_ns::SeeBelowStructB

+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+struct SeeBelowStructB { /* see-below */ };
+
+
+
+ + +
+
+
+

regular_ns

+
+Regular namespace + + +
+
+

Types

+ + + + + + + + + + + +
Name
A
+
+
+
+

regular_ns::A

+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+struct A;
+
+
+
+ + +
+
+
+

see_below_ns

+
+Should decay to see-below + + +
+
+

Types

+ + + + + + + + + + + + + +
Name
SeeBelowStructA
SeeBelowStructB
+
+
+
+

see_below_ns::SeeBelowStructA

+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+struct SeeBelowStructA { /* see-below */ };
+
+
+
+ + +
+
+
+

see_below_ns::SeeBelowStructB

+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+struct SeeBelowStructB { /* see-below */ };
+
+
+
+ + +
+
+
+

empty_ns_alias

+
+Should still work + + +
+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+namespace empty_ns_alias = empty_ns;
+
+
+
+
+
+
+

regular_ns_alias

+
+Should work + + +
+
+
+

Synopsis

+
+Declared in <no-extract-empty-namespaces.cpp>
+
+
+namespace regular_ns_alias = regular_ns;
+
+
+
+
+ +
+
+

Created with MrDocs

+
+ + \ No newline at end of file diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.xml b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.xml new file mode 100644 index 0000000000..cf3e3acc86 --- /dev/null +++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.xml @@ -0,0 +1,91 @@ + + + + + + + + Namespace documentation + + + + + + + Should decay to implementation-defined + + + + + + + Should decay to see-below + + + + + + + + + + + + + Should decay to regular + + + + + + + + + + + + + + + + Regular namespace + + + + + + + + + + Should decay to see-below + + + + + + + + + + + + + + Should still work + + + + + + + + + Should work + + + + + + diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.yml b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.yml new file mode 100644 index 0000000000..69b3022868 --- /dev/null +++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.yml @@ -0,0 +1,11 @@ +extract-empty-namespaces: false +exclude-symbols: + - excluded_members_ns::* +implementation-defined: + - implementation_defined_ns::* + - mixed_ns::ImplementationDefinedStructB + - mixed_regular_ns::ImplementationDefinedStructC +see-below: + - see_below_ns::* + - mixed_ns::SeeBelowStructA + - mixed_regular_ns::SeeBelowStructB \ No newline at end of file diff --git a/test-files/golden-tests/config/extract-local-classes/extract-local-classes.adoc b/test-files/golden-tests/config/extract-local-classes/extract-local-classes.adoc index 2f4d084656..0ccbf4ad58 100644 --- a/test-files/golden-tests/config/extract-local-classes/extract-local-classes.adoc +++ b/test-files/golden-tests/config/extract-local-classes/extract-local-classes.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== === Functions @@ -21,6 +23,7 @@ | Name | <> + |=== [#local_class] diff --git a/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html b/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html index 5715721057..d32225a109 100644 --- a/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html +++ b/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html @@ -18,8 +18,10 @@

Types

-local_class -local_struct +local_class + +local_struct +

Functions

@@ -31,7 +33,8 @@

Functions

-local_function +local_function + diff --git a/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.adoc b/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.adoc index bc926ce02b..dfd5079c98 100644 --- a/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.adoc +++ b/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#local_function] diff --git a/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html b/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html index 12d0dc10e0..4e668e48b1 100644 --- a/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html +++ b/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html @@ -18,7 +18,8 @@

Functions

-local_function +local_function + diff --git a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.adoc b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.adoc index c4cf1eb324..8aef39240c 100644 --- a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.adoc +++ b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -35,6 +36,7 @@ class A; | Name | <> [.small]#[virtual]# + |=== @@ -45,6 +47,7 @@ class A; | Name | <> [.small]#[virtual]# + |=== [#A-f] diff --git a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html index be17690bbd..d7368122b9 100644 --- a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html +++ b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -45,7 +46,8 @@

Member Functions

-f [virtual] +f [virtual] + @@ -59,7 +61,8 @@

Private Member Functions

-g [virtual] +g [virtual] + diff --git a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.adoc b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.adoc index a4c1d1c5b8..591f67a29f 100644 --- a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.adoc +++ b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -35,6 +36,7 @@ class A; | Name | <> [.small]#[virtual]# + |=== diff --git a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html index 53957c36d7..0ec8b97f6b 100644 --- a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html +++ b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -45,7 +46,8 @@

Member Functions

-f [virtual] +f [virtual] + 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 3873159502..61ec79b79c 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 @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -47,7 +48,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -70,7 +72,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -204,7 +207,8 @@ class base_base; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -270,7 +274,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -299,7 +304,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -424,7 +430,8 @@ class private_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -492,7 +499,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -506,7 +514,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html index 7020bc924d..a1cdd90e12 100644 --- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html +++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html @@ -13,22 +13,23 @@

Types

- + + - - - - + + + + + + + + + +
NameDescriptionNameDescription
base -
base_base -
derived -
private_derived -
base
base_base
derived
private_derived
protected_derived Should inherit functions as protected. - -
@@ -51,26 +52,27 @@

Member Functions

- + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -78,20 +80,21 @@

Protected Member Functions

- + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
@@ -240,17 +243,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -318,32 +322,33 @@

Member Functions

- + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should shadow the base class function. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
do_derived_shadowed This function should shadow the base class function. - -
excluded_inherited This function should be inherited by derived classes. - -
@@ -351,26 +356,27 @@

Protected Member Functions

- + + + + + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
do_excluded_inherited This function should be inherited by derived classes. - -
do_shadowed This function should be shadowed by derived classes. - -
@@ -500,17 +506,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -583,17 +590,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -601,44 +609,45 @@

Protected Member Functions

- + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
do_excluded_inherited This function should be inherited by derived classes. - -
do_shadowed This function should be shadowed by derived classes. - -
excluded_inherited This function should be inherited by derived classes. - -
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 70bb2bb3e3..147963ec5e 100644 --- a/test-files/golden-tests/config/inherit-base-members/copy.adoc +++ b/test-files/golden-tests/config/inherit-base-members/copy.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -47,7 +48,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -70,7 +72,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -238,7 +241,8 @@ class base_base; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -304,7 +308,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -333,7 +338,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -577,7 +583,8 @@ class private_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -645,7 +652,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -659,7 +667,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. diff --git a/test-files/golden-tests/config/inherit-base-members/copy.html b/test-files/golden-tests/config/inherit-base-members/copy.html index 771614b9bc..f1ab624604 100644 --- a/test-files/golden-tests/config/inherit-base-members/copy.html +++ b/test-files/golden-tests/config/inherit-base-members/copy.html @@ -13,22 +13,23 @@

Types

- + + - - - - + + + + + + + + + +
NameDescriptionNameDescription
base -
base_base -
derived -
private_derived -
base
base_base
derived
private_derived
protected_derived Should inherit functions as protected. - -
@@ -51,26 +52,27 @@

Member Functions

- + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -78,20 +80,21 @@

Protected Member Functions

- + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
@@ -282,17 +285,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -360,32 +364,33 @@

Member Functions

- + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should shadow the base class function. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
do_derived_shadowed This function should shadow the base class function. - -
excluded_inherited This function should be inherited by derived classes. - -
@@ -393,26 +398,27 @@

Protected Member Functions

- + + + + + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
do_excluded_inherited This function should be inherited by derived classes. - -
do_shadowed This function should be shadowed by derived classes. - -
@@ -689,17 +695,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -772,17 +779,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -790,44 +798,45 @@

Protected Member Functions

- + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
do_excluded_inherited This function should be inherited by derived classes. - -
do_shadowed This function should be shadowed by derived classes. - -
excluded_inherited This function should be inherited by derived classes. - -
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 4e6e3ec6ff..73377c197f 100644 --- a/test-files/golden-tests/config/inherit-base-members/never.adoc +++ b/test-files/golden-tests/config/inherit-base-members/never.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -47,7 +48,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -64,7 +66,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -198,7 +201,8 @@ class base_base; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -264,7 +268,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -330,7 +335,8 @@ class private_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -398,7 +404,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. diff --git a/test-files/golden-tests/config/inherit-base-members/never.html b/test-files/golden-tests/config/inherit-base-members/never.html index e5ec619975..a71731578e 100644 --- a/test-files/golden-tests/config/inherit-base-members/never.html +++ b/test-files/golden-tests/config/inherit-base-members/never.html @@ -13,22 +13,23 @@

Types

- + + - - - - + + + + + + + + + +
NameDescriptionNameDescription
base -
base_base -
derived -
private_derived -
base
base_base
derived
private_derived
protected_derived Should inherit functions as protected. - -
@@ -51,20 +52,21 @@

Member Functions

- + + + + + + + +
NameDescriptionNameDescription
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
@@ -72,20 +74,21 @@

Protected Member Functions

- + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
@@ -234,17 +237,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -312,17 +316,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -390,17 +395,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -473,17 +479,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
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 74a1b8dfe8..dfea9cb84d 100644 --- a/test-files/golden-tests/config/inherit-base-members/reference.adoc +++ b/test-files/golden-tests/config/inherit-base-members/reference.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -47,7 +48,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -70,7 +72,8 @@ class base [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -204,7 +207,8 @@ class base_base; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -270,7 +274,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. @@ -296,7 +301,8 @@ class derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be inherited by derived classes. @@ -364,7 +370,8 @@ class private_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -432,7 +439,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should shadow the base class function. @@ -446,7 +454,8 @@ class protected_derived [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be indirectly inherited by derived classes. diff --git a/test-files/golden-tests/config/inherit-base-members/reference.html b/test-files/golden-tests/config/inherit-base-members/reference.html index 4137675716..746bdd49bd 100644 --- a/test-files/golden-tests/config/inherit-base-members/reference.html +++ b/test-files/golden-tests/config/inherit-base-members/reference.html @@ -13,22 +13,23 @@

Types

- + + - - - - + + + + + + + + + +
NameDescriptionNameDescription
base -
base_base -
derived -
private_derived -
base
base_base
derived
private_derived
protected_derived Should inherit functions as protected. - -
@@ -51,26 +52,27 @@

Member Functions

- + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -78,20 +80,21 @@

Protected Member Functions

- + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
@@ -240,17 +243,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
@@ -318,29 +322,30 @@

Member Functions

- + + + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should shadow the base class function. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -348,20 +353,21 @@

Protected Member Functions

- + + + + + + + +
NameDescriptionNameDescription
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
@@ -428,17 +434,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -511,17 +518,18 @@

Member Functions

- + + + + + +
NameDescriptionNameDescription
derived_shadowed This function should shadow the base class function. - -
do_derived_shadowed This function should shadow the base class function. - -
@@ -529,35 +537,36 @@

Protected Member Functions

- + + + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
base_base_inherited This function should be indirectly inherited by derived classes. - -
base_inherited This function should be inherited by derived classes. - -
base_shadowed This function should shadow the excluded_base function. - -
derived_shadowed This function should be shadowed by derived classes. - -
do_base_base_inherited This function should be indirectly inherited by derived classes. - -
do_base_inherited This function should be inherited by derived classes. - -
do_base_shadowed This function should shadow the excluded_base function. - -
do_derived_shadowed This function should be shadowed by derived classes. - -
diff --git a/test-files/golden-tests/config/sfinae/redeclare.adoc b/test-files/golden-tests/config/sfinae/redeclare.adoc index cdd407980a..d74b6118a5 100644 --- a/test-files/golden-tests/config/sfinae/redeclare.adoc +++ b/test-files/golden-tests/config/sfinae/redeclare.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#f] diff --git a/test-files/golden-tests/config/sfinae/redeclare.html b/test-files/golden-tests/config/sfinae/redeclare.html index 8537db57f0..d0391302a3 100644 --- a/test-files/golden-tests/config/sfinae/redeclare.html +++ b/test-files/golden-tests/config/sfinae/redeclare.html @@ -18,7 +18,8 @@

Functions

-f +f + diff --git a/test-files/golden-tests/config/sfinae/return-based.adoc b/test-files/golden-tests/config/sfinae/return-based.adoc index c10b19c2ee..163ca08d61 100644 --- a/test-files/golden-tests/config/sfinae/return-based.adoc +++ b/test-files/golden-tests/config/sfinae/return-based.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#f] diff --git a/test-files/golden-tests/config/sfinae/return-based.html b/test-files/golden-tests/config/sfinae/return-based.html index d04fdbba5a..db1fadd79b 100644 --- a/test-files/golden-tests/config/sfinae/return-based.html +++ b/test-files/golden-tests/config/sfinae/return-based.html @@ -18,7 +18,8 @@

Functions

-f +f + diff --git a/test-files/golden-tests/config/sort/sort-members.adoc b/test-files/golden-tests/config/sort/sort-members.adoc index d3b529cb01..1043344a02 100644 --- a/test-files/golden-tests/config/sort/sort-members.adoc +++ b/test-files/golden-tests/config/sort/sort-members.adoc @@ -12,20 +12,30 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -211,7 +221,8 @@ struct Z; [cols=2] |=== -| Name | Description +| Name +| Description | <> [.small]#[constructor]# | diff --git a/test-files/golden-tests/config/sort/sort-members.html b/test-files/golden-tests/config/sort/sort-members.html index 1606ce84e8..bd3c8c8360 100644 --- a/test-files/golden-tests/config/sort/sort-members.html +++ b/test-files/golden-tests/config/sort/sort-members.html @@ -18,38 +18,48 @@

Types

-A -B -B<int, char> -B<int, U> -C -C<int> -C<int, char> -D -Z +A + +B + +B<int, char> + +B<int, U> + +C + +C<int> + +C<int, char> + +D + +Z +

Functions

- + + - - - - - - + + + + + + + + + + + +
NameDescriptionNameDescription
f -
g -
h -
operator! -
operator== -
operator!= -
f
g
h
operator!
operator==
operator!=
@@ -217,27 +227,28 @@

Member Functions

- + + - - - - - - - - + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
Z [constructor] -
~Z [destructor] -
foo -
operator bool -
operator! -
operator== -
operator!= -
operator<=> -
Z [constructor]
~Z [destructor]
foo
operator bool
operator!
operator==
operator!=
operator<=>
diff --git a/test-files/golden-tests/config/sort/unordered.adoc b/test-files/golden-tests/config/sort/unordered.adoc index cf5d1d2d35..548879fa97 100644 --- a/test-files/golden-tests/config/sort/unordered.adoc +++ b/test-files/golden-tests/config/sort/unordered.adoc @@ -12,20 +12,30 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -211,7 +221,8 @@ struct Z; [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/config/sort/unordered.html b/test-files/golden-tests/config/sort/unordered.html index 0c24bcce3c..6607955d77 100644 --- a/test-files/golden-tests/config/sort/unordered.html +++ b/test-files/golden-tests/config/sort/unordered.html @@ -18,38 +18,48 @@

Types

-D -C -C<int, char> -C<int> -B -B<int, char> -B<int, U> -A -Z +D + +C + +C<int, char> + +C<int> + +B + +B<int, char> + +B<int, U> + +A + +Z +

Functions

- + + - - - - - - + + + + + + + + + + + +
NameDescriptionNameDescription
operator!= -
operator== -
operator! -
h -
g -
f -
operator!=
operator==
operator!
h
g
f
@@ -217,27 +227,28 @@

Member Functions

- + + - - - - - - - - + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
operator<=> -
operator!= -
operator== -
operator! -
operator bool -
foo -
~Z [destructor] -
Z [constructor] -
operator<=>
operator!=
operator==
operator!
operator bool
foo
~Z [destructor]
Z [constructor]
diff --git a/test-files/golden-tests/core/libcxx.adoc b/test-files/golden-tests/core/libcxx.adoc index 214bb41cd1..84a9257a51 100644 --- a/test-files/golden-tests/core/libcxx.adoc +++ b/test-files/golden-tests/core/libcxx.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Computes the square root of an integral value. diff --git a/test-files/golden-tests/core/libcxx.html b/test-files/golden-tests/core/libcxx.html index e796448704..27207c9d08 100644 --- a/test-files/golden-tests/core/libcxx.html +++ b/test-files/golden-tests/core/libcxx.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
sqrt Computes the square root of an integral value. - -
diff --git a/test-files/golden-tests/core/utf-8.adoc b/test-files/golden-tests/core/utf-8.adoc index e50c8bea3c..f2244d54a9 100644 --- a/test-files/golden-tests/core/utf-8.adoc +++ b/test-files/golden-tests/core/utf-8.adoc @@ -12,6 +12,7 @@ | Name | <<Христос_воскрес,`Христос_воскрес`>> + |=== [#Христос_воскрес] diff --git a/test-files/golden-tests/core/utf-8.html b/test-files/golden-tests/core/utf-8.html index e4310be652..326bc6dc56 100644 --- a/test-files/golden-tests/core/utf-8.html +++ b/test-files/golden-tests/core/utf-8.html @@ -18,7 +18,8 @@

Functions

-Христос_воскрес +Христос_воскрес + diff --git a/test-files/golden-tests/filters/file/include-self.adoc b/test-files/golden-tests/filters/file/include-self.adoc index cf452de34c..ac18de7153 100644 --- a/test-files/golden-tests/filters/file/include-self.adoc +++ b/test-files/golden-tests/filters/file/include-self.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#TEST] @@ -25,6 +26,7 @@ | Name | <> + |=== [#TEST-SUCCESS] diff --git a/test-files/golden-tests/filters/file/include-self.html b/test-files/golden-tests/filters/file/include-self.html index 9b14ce6e66..5d8a99e0ab 100644 --- a/test-files/golden-tests/filters/file/include-self.html +++ b/test-files/golden-tests/filters/file/include-self.html @@ -18,7 +18,8 @@

Namespaces

-TEST +TEST + @@ -35,7 +36,8 @@

Types

-SUCCESS +SUCCESS + diff --git a/test-files/golden-tests/filters/symbol-name/blacklist_0.adoc b/test-files/golden-tests/filters/symbol-name/blacklist_0.adoc index 539d343b95..8d57df631c 100644 --- a/test-files/golden-tests/filters/symbol-name/blacklist_0.adoc +++ b/test-files/golden-tests/filters/symbol-name/blacklist_0.adoc @@ -12,9 +12,11 @@ | Name | <> -| <> + | <> + | <> + |=== [#N0] @@ -28,6 +30,7 @@ | Name | <> + |=== [#N0-f0] @@ -45,11 +48,6 @@ void f0(); ---- -[#N3] -== N3 - - - [#N4] == N4 @@ -61,7 +59,9 @@ f0(); | Name | <> + | <> + |=== [#N4-N5] @@ -75,6 +75,7 @@ f0(); | Name | <> + |=== [#N4-N5-f1] @@ -103,6 +104,7 @@ f1(); | Name | <> + |=== [#N4-N6-f1] @@ -130,14 +132,9 @@ f1(); |=== | Name -| <> | <> -|=== - -[#N7-N8] -== <>::N8 - +|=== [#N7-N9] == <>::N9 @@ -150,6 +147,7 @@ f1(); | Name | <> + |=== [#N7-N9-g0] diff --git a/test-files/golden-tests/filters/symbol-name/blacklist_0.html b/test-files/golden-tests/filters/symbol-name/blacklist_0.html index c612f1c659..f238969a9c 100644 --- a/test-files/golden-tests/filters/symbol-name/blacklist_0.html +++ b/test-files/golden-tests/filters/symbol-name/blacklist_0.html @@ -18,10 +18,12 @@

Namespaces

-N0 -N3 -N4 -N7 +N0 + +N4 + +N7 + @@ -38,7 +40,8 @@

Functions

-f0 +f0 + @@ -60,11 +63,6 @@

Synopsis

-

N3

-
-
-
-

N4

Namespaces

@@ -76,8 +74,10 @@

Namespaces

-N5 -N6 +N5 + +N6 +
@@ -94,7 +94,8 @@

Functions

-f1 +f1 + @@ -127,7 +128,8 @@

Functions

-f1 +f1 + @@ -160,18 +162,13 @@

Namespaces

-N8 -N9 +N9 +
-

N7::N8

-
-
-
-

N7::N9

Functions

@@ -183,7 +180,8 @@

Functions

-g0 +g0 +
diff --git a/test-files/golden-tests/filters/symbol-name/blacklist_0.xml b/test-files/golden-tests/filters/symbol-name/blacklist_0.xml index 71be7125df..2a6e8810f9 100644 --- a/test-files/golden-tests/filters/symbol-name/blacklist_0.xml +++ b/test-files/golden-tests/filters/symbol-name/blacklist_0.xml @@ -8,8 +8,6 @@ - - @@ -23,8 +21,6 @@ - - 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 f930bb882a..f48e3ac9d7 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 @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -25,7 +26,9 @@ | Name | <> + | <> + |=== [#A-D] @@ -50,9 +53,13 @@ class D | Name | <> + | <> [.small]#[virtual]# + | <> [.small]#[virtual]# + | <> + |=== @@ -141,9 +148,13 @@ class E | Name | <> + | <> [.small]#[virtual]# + | <> [.small]#[virtual]# + | <> + |=== diff --git a/test-files/golden-tests/filters/symbol-name/excluded-base-class.html b/test-files/golden-tests/filters/symbol-name/excluded-base-class.html index 6d1f30a401..f3263d5760 100644 --- a/test-files/golden-tests/filters/symbol-name/excluded-base-class.html +++ b/test-files/golden-tests/filters/symbol-name/excluded-base-class.html @@ -18,7 +18,8 @@

Namespaces

-A +A + @@ -35,8 +36,10 @@

Types

-D -E +D + +E + @@ -64,10 +67,14 @@

Member Functions

-f -g [virtual] -h [virtual] -i +f + +g [virtual] + +h [virtual] + +i + @@ -163,10 +170,14 @@

Member Functions

-f -g [virtual] -h [virtual] -i +f + +g [virtual] + +h [virtual] + +i + diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc index f26c7e04b2..e9e5c416ab 100644 --- a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#B] @@ -25,6 +26,7 @@ | Name | <> + |=== [#B-U] @@ -38,6 +40,7 @@ | Name | <> + |=== [#B-U-E] diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html index 15403bfba4..7c1d5b6124 100644 --- a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html @@ -18,7 +18,8 @@

Namespaces

-B +B + @@ -35,7 +36,8 @@

Namespaces

-U +U + @@ -52,7 +54,8 @@

Namespace Aliases

-E +E + diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml index d2a91d321c..e2af59001d 100644 --- a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml @@ -6,7 +6,7 @@ - + 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 5dea0914e7..797e3ce575 100644 --- a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc +++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A regular namespace with different filters for members @@ -22,7 +23,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Namespace alias to form the dependency on dependency_ns @@ -38,7 +40,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A regular symbol in the global namespace @@ -51,7 +54,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A function to get a dependency symbol on the global namespace @@ -77,7 +81,8 @@ A regular namespace with different filters for members [cols=2] |=== -| Name | Description +| Name +| Description | <> | A symbol that passes the filters @@ -90,7 +95,8 @@ A regular namespace with different filters for members [cols=2] |=== -| Name | Description +| Name +| Description | <> | A function to get an excluded symbol @@ -126,7 +132,8 @@ struct regular; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Child of a regular symbol extracted as regular @@ -162,7 +169,8 @@ struct also_regular; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Grandchild of a regular symbol extracted as regular @@ -324,7 +332,8 @@ A see‐below namespace [cols=2] |=== -| Name | Description +| Name +| Description | <> | Regular symbol in a see‐below namespace @@ -337,7 +346,8 @@ A see‐below namespace [cols=2] |=== -| Name | Description +| Name +| Description | <> | A function to get a dependency symbol in a see‐below namespace @@ -535,7 +545,8 @@ struct regular; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Child of a regular symbol: should be traversed as usual @@ -571,7 +582,8 @@ struct also_regular; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Grandchild of a regular symbol: should be traversed as usual diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.html b/test-files/golden-tests/filters/symbol-name/extraction-mode.html index bc80432482..1f9b1d4a2c 100644 --- a/test-files/golden-tests/filters/symbol-name/extraction-mode.html +++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.html @@ -13,77 +13,81 @@

Namespaces

- + + + + + +
NameDescriptionNameDescription
regular_ns A regular namespace with different filters for members - -
see_below_ns A see-below namespace - -

Namespace Aliases

- + + + + + + + +
NameDescriptionNameDescription
dependency_ns_alias Namespace alias to form the dependency on dependency_ns - -
implementation_defined_ns_alias Namespace alias to form a dependency on the implementation-defined namespace - -
see_below_ns_alias Namespace alias to form a dependency on the see-below namespace - -

Types

- + + + + + +
NameDescriptionNameDescription
regular A regular symbol in the global namespace - -
see_below A see-below symbol in the global namespace - -

Functions

- + + + + + + + + + +
NameDescriptionNameDescription
get_dependency A function to get a dependency symbol on the global namespace - -
get_implementation_defined A function to get an implementation-defined symbol in the global namespace - -
get_regular A function to get a regular symbol in the global namespace - -
get_see_below A function to get a see-below symbol in the global namespace - -
@@ -100,40 +104,42 @@

Types

- + + + + + +
NameDescriptionNameDescription
regular A symbol that passes the filters - -
see_below A symbol that passes the see-below filter - -

Functions

- + + + + + + + + + +
NameDescriptionNameDescription
get_dependency A function to get an excluded symbol - -
get_implementation_defined A function to get an implementation-defined symbol - -
get_regular A function to get a regular symbol - -
get_see_below A function to get a see-below symbol - -
@@ -160,14 +166,15 @@

Types

- + + + +
NameDescriptionNameDescription
also_regular Child of a regular symbol extracted as regular - -
@@ -202,14 +209,15 @@

Types

- + + + +
NameDescriptionNameDescription
regular_as_well Grandchild of a regular symbol extracted as regular - -
@@ -387,34 +395,36 @@

Types

- + + + + + +
NameDescriptionNameDescription
regular Regular symbol in a see-below namespace - -
see_below See-below symbol in a see-below namespace - -

Functions

- + + + + + +
NameDescriptionNameDescription
get_dependency A function to get a dependency symbol in a see-below namespace - -
get_implementation_defined A function to get an implementation-defined symbol in a see-below namespace - -
@@ -626,14 +636,15 @@

Types

- + + + +
NameDescriptionNameDescription
also_regular Child of a regular symbol: should be traversed as usual - -
@@ -668,14 +679,15 @@

Types

- + + + +
NameDescriptionNameDescription
regular_as_well Grandchild of a regular symbol: should be traversed as usual - -
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.xml b/test-files/golden-tests/filters/symbol-name/extraction-mode.xml index 95e2d974c9..569473cf78 100644 --- a/test-files/golden-tests/filters/symbol-name/extraction-mode.xml +++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.xml @@ -217,7 +217,7 @@ Namespace alias to form the dependency on dependency_ns - + diff --git a/test-files/golden-tests/filters/symbol-name/impl-defined-member.adoc b/test-files/golden-tests/filters/symbol-name/impl-defined-member.adoc index fb3438743c..898662aa8f 100644 --- a/test-files/golden-tests/filters/symbol-name/impl-defined-member.adoc +++ b/test-files/golden-tests/filters/symbol-name/impl-defined-member.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Variables @@ -20,7 +21,9 @@ | Name | <> + | <> + |=== [#regular] @@ -34,6 +37,7 @@ | Name | <> + |=== [#regular-absolute_uri_rule_t] diff --git a/test-files/golden-tests/filters/symbol-name/impl-defined-member.html b/test-files/golden-tests/filters/symbol-name/impl-defined-member.html index 1ed58284ea..1c34509c6c 100644 --- a/test-files/golden-tests/filters/symbol-name/impl-defined-member.html +++ b/test-files/golden-tests/filters/symbol-name/impl-defined-member.html @@ -18,7 +18,8 @@

Namespaces

-regular +regular +

Variables

@@ -30,8 +31,10 @@

Variables

-absolute_uri_rule -regular_absolute_uri_rule +absolute_uri_rule + +regular_absolute_uri_rule +
@@ -48,7 +51,8 @@

Types

-absolute_uri_rule_t +absolute_uri_rule_t + diff --git a/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc b/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc index cd941e9ab9..ad48fc0211 100644 --- a/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc +++ b/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | This namespace should extracted because it's implied by `N0::f0_WL` @@ -25,7 +26,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | This namespace should be included because it strictly matches `C` @@ -42,7 +44,8 @@ This namespace should extracted because it's implied by `N0::f0 [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be included because it matches `N0::f0_WL` @@ -76,7 +79,8 @@ This namespace should extracted because it's implied by `N1::N3 [cols=2] |=== -| Name | Description +| Name +| Description | <> | This namespace should extracted because it's explicitly included by `N1::N3_WL` @@ -96,7 +100,8 @@ This namespace should extracted because it's explicitly included by `N1&col [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should extracted because the namespace `N1::N3_WL` is included as a literal. @@ -130,7 +135,8 @@ This namespace should extracted because it's implied by `N1::N4 [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should extracted because it matches `N1::N4::f1_WL` @@ -164,7 +170,8 @@ This namespace should extracted because it's implied by `N5::N6 [cols=2] |=== -| Name | Description +| Name +| Description | <> | This namespace should extracted because it's implied by `N5::N6::*7` @@ -181,7 +188,8 @@ This namespace should extracted because it's implied by `N5::N6 [cols=2] |=== -| Name | Description +| Name +| Description | <> | This namespace should be included because it matches `N5::N6::*7` @@ -201,7 +209,8 @@ This namespace should be included because it matches `N5::N6:& [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be included because it's a member of `M7`, which matches `N5::N6::*7` @@ -235,7 +244,8 @@ This namespace should be included because it matches `N5::N6:& [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be included because it's a member of `N7`, which matches `N5::N6::*7` @@ -279,7 +289,8 @@ struct C; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This struct should be included because it's a member of `C` @@ -289,7 +300,8 @@ struct C; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be included because it's a member of `C` @@ -318,7 +330,8 @@ struct D; [cols=2] |=== -| Name | Description +| Name +| Description | <> | This function should be included because it's a member of `D` diff --git a/test-files/golden-tests/filters/symbol-name/whitelist_0.html b/test-files/golden-tests/filters/symbol-name/whitelist_0.html index b3c38f0aed..e826eb8ff0 100644 --- a/test-files/golden-tests/filters/symbol-name/whitelist_0.html +++ b/test-files/golden-tests/filters/symbol-name/whitelist_0.html @@ -13,34 +13,36 @@

Namespaces

- + + + + + + + +
NameDescriptionNameDescription
N0 This namespace should extracted because it's implied by N0::f0_WL - -
N1 This namespace should extracted because it's implied by N1::N3_WL and N1::N4::f1_WL - -
N5 This namespace should extracted because it's implied by N5::N6::*7 - -

Types

- + + + +
NameDescriptionNameDescription
C This namespace should be included because it strictly matches C - -
@@ -57,14 +59,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f0_WL This function should be included because it matches N0::f0_WL - -
@@ -102,17 +105,18 @@

Namespaces

- + + + + + +
NameDescriptionNameDescription
N3_WL This namespace should extracted because it's explicitly included by N1::N3_WL - -
N4 This namespace should extracted because it's implied by N1::N4::f1_WL - -
@@ -129,14 +133,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f1_WL This function should extracted because the namespace N1::N3_WL is included as a literal. - -
@@ -174,14 +179,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f1_WL This function should extracted because it matches N1::N4::f1_WL - -
@@ -219,14 +225,15 @@

Namespaces

- + + + +
NameDescriptionNameDescription
N6 This namespace should extracted because it's implied by N5::N6::*7 - -
@@ -243,17 +250,18 @@

Namespaces

- + + + + + +
NameDescriptionNameDescription
M7 This namespace should be included because it matches N5::N6::*7 - -
N7 This namespace should be included because it matches N5::N6::*7 - -
@@ -270,14 +278,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f2_WL This function should be included because it's a member of M7 , which matches N5::N6::*7 - -
@@ -315,14 +324,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f2_WL This function should be included because it's a member of N7 , which matches N5::N6::*7 - -
@@ -370,28 +380,30 @@

Types

- + + + +
NameDescriptionNameDescription
D This struct should be included because it's a member of C - -

Member Functions

- + + + +
NameDescriptionNameDescription
f0_WL This function should be included because it's a member of C - -
@@ -420,14 +432,15 @@

Member Functions

- + + + +
NameDescriptionNameDescription
f1_WL This function should be included because it's a member of D - -
diff --git a/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc b/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc index 150c418d4b..1f30271946 100644 --- a/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc +++ b/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#range] @@ -38,7 +39,9 @@ class range; | Name | <> + | <> + |=== [#range-impl-0e] diff --git a/test-files/golden-tests/filters/symbol-type/nested-private-template.html b/test-files/golden-tests/filters/symbol-type/nested-private-template.html index ea33cc8c30..8924fdc854 100644 --- a/test-files/golden-tests/filters/symbol-type/nested-private-template.html +++ b/test-files/golden-tests/filters/symbol-type/nested-private-template.html @@ -18,7 +18,8 @@

Types

-range +range + @@ -48,8 +49,10 @@

Private Types

-impl -impl<R, false> +impl + +impl<R, false> + diff --git a/test-files/golden-tests/javadoc/brief/brief-1.adoc b/test-files/golden-tests/javadoc/brief/brief-1.adoc index cce5a478af..733a6aab3a 100644 --- a/test-files/golden-tests/javadoc/brief/brief-1.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-1.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief *bold* it continues to the line. diff --git a/test-files/golden-tests/javadoc/brief/brief-1.html b/test-files/golden-tests/javadoc/brief/brief-1.html index 0d7d1251fa..a96e99552d 100644 --- a/test-files/golden-tests/javadoc/brief/brief-1.html +++ b/test-files/golden-tests/javadoc/brief/brief-1.html @@ -13,17 +13,18 @@

Functions

- + + + + + +
NameDescriptionNameDescription
f5 brief bold it continues to the line. - -
f6 brief - -
diff --git a/test-files/golden-tests/javadoc/brief/brief-2.adoc b/test-files/golden-tests/javadoc/brief/brief-2.adoc index 5604ded150..05dc279cb7 100644 --- a/test-files/golden-tests/javadoc/brief/brief-2.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-2.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief diff --git a/test-files/golden-tests/javadoc/brief/brief-2.html b/test-files/golden-tests/javadoc/brief/brief-2.html index edf98caf83..7d1241b5e1 100644 --- a/test-files/golden-tests/javadoc/brief/brief-2.html +++ b/test-files/golden-tests/javadoc/brief/brief-2.html @@ -13,29 +13,30 @@

Functions

- + + + + + + + + + + + + + +
NameDescriptionNameDescription
f1 brief - -
f2 brief - -
f3 brief - -
f4 brief x - -
f5 brief - -
f6 brief - -
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.adoc b/test-files/golden-tests/javadoc/brief/brief-3.adoc index 824005babd..28275dc6d0 100644 --- a/test-files/golden-tests/javadoc/brief/brief-3.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-3.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | `f` overloads diff --git a/test-files/golden-tests/javadoc/brief/brief-3.html b/test-files/golden-tests/javadoc/brief/brief-3.html index ed3fc502dd..e7f8a53291 100644 --- a/test-files/golden-tests/javadoc/brief/brief-3.html +++ b/test-files/golden-tests/javadoc/brief/brief-3.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f f overloads - -
diff --git a/test-files/golden-tests/javadoc/brief/brief-4.adoc b/test-files/golden-tests/javadoc/brief/brief-4.adoc index 48c79c0d86..940e359435 100644 --- a/test-files/golden-tests/javadoc/brief/brief-4.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-4.adoc @@ -12,9 +12,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#f0] diff --git a/test-files/golden-tests/javadoc/brief/brief-4.html b/test-files/golden-tests/javadoc/brief/brief-4.html index 165d1bee9d..1dd70ab0a2 100644 --- a/test-files/golden-tests/javadoc/brief/brief-4.html +++ b/test-files/golden-tests/javadoc/brief/brief-4.html @@ -18,10 +18,14 @@

Functions

-f0 -f1 -f2 -f3 +f0 + +f1 + +f2 + +f3 + diff --git a/test-files/golden-tests/javadoc/brief/brief-5.adoc b/test-files/golden-tests/javadoc/brief/brief-5.adoc index afc36fa370..14ffce03b4 100644 --- a/test-files/golden-tests/javadoc/brief/brief-5.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-5.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief diff --git a/test-files/golden-tests/javadoc/brief/brief-5.html b/test-files/golden-tests/javadoc/brief/brief-5.html index 5c92ec0432..81268ee495 100644 --- a/test-files/golden-tests/javadoc/brief/brief-5.html +++ b/test-files/golden-tests/javadoc/brief/brief-5.html @@ -13,27 +13,28 @@

Functions

- + + - - + + + + + + + + + + + +
NameDescriptionNameDescription
f0 brief - -
f1 -
f2 -
f1
f2
f3 brief - -
f4 brief - -
f5 brief - -
diff --git a/test-files/golden-tests/javadoc/brief/brief-6.adoc b/test-files/golden-tests/javadoc/brief/brief-6.adoc index e3680abb7e..bc85716f50 100644 --- a/test-files/golden-tests/javadoc/brief/brief-6.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-6.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief diff --git a/test-files/golden-tests/javadoc/brief/brief-6.html b/test-files/golden-tests/javadoc/brief/brief-6.html index 5676651ac2..a9e42ccd5e 100644 --- a/test-files/golden-tests/javadoc/brief/brief-6.html +++ b/test-files/golden-tests/javadoc/brief/brief-6.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f0 brief - -
diff --git a/test-files/golden-tests/javadoc/code/code.adoc b/test-files/golden-tests/javadoc/code/code.adoc index b5cdcbd2d9..e815d6d470 100644 --- a/test-files/golden-tests/javadoc/code/code.adoc +++ b/test-files/golden-tests/javadoc/code/code.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief diff --git a/test-files/golden-tests/javadoc/code/code.html b/test-files/golden-tests/javadoc/code/code.html index 6477bc029d..9848ad4a1b 100644 --- a/test-files/golden-tests/javadoc/code/code.html +++ b/test-files/golden-tests/javadoc/code/code.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f brief - -
diff --git a/test-files/golden-tests/javadoc/copybrief/copybrief.adoc b/test-files/golden-tests/javadoc/copybrief/copybrief.adoc index 3efb894daf..02ff5ef7c7 100644 --- a/test-files/golden-tests/javadoc/copybrief/copybrief.adoc +++ b/test-files/golden-tests/javadoc/copybrief/copybrief.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief1 diff --git a/test-files/golden-tests/javadoc/copybrief/copybrief.html b/test-files/golden-tests/javadoc/copybrief/copybrief.html index fb210df65d..023018ae5e 100644 --- a/test-files/golden-tests/javadoc/copybrief/copybrief.html +++ b/test-files/golden-tests/javadoc/copybrief/copybrief.html @@ -13,20 +13,21 @@

Functions

- + + + + + + + +
NameDescriptionNameDescription
f1 brief1 - -
f2 brief1 - -
f3 brief1 - -
diff --git a/test-files/golden-tests/javadoc/copydetails/copydetails.adoc b/test-files/golden-tests/javadoc/copydetails/copydetails.adoc index b8e710b6b7..70a49e8160 100644 --- a/test-files/golden-tests/javadoc/copydetails/copydetails.adoc +++ b/test-files/golden-tests/javadoc/copydetails/copydetails.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Destination doc function diff --git a/test-files/golden-tests/javadoc/copydetails/copydetails.html b/test-files/golden-tests/javadoc/copydetails/copydetails.html index bc8f3161db..dc1cdbfe44 100644 --- a/test-files/golden-tests/javadoc/copydetails/copydetails.html +++ b/test-files/golden-tests/javadoc/copydetails/copydetails.html @@ -13,20 +13,21 @@

Functions

- + + + + + + + +
NameDescriptionNameDescription
dest Destination doc function - -
destOverride Destination doc function - -
source Source doc function - -
diff --git a/test-files/golden-tests/javadoc/inline/styled.adoc b/test-files/golden-tests/javadoc/inline/styled.adoc index d87ef1eca9..9ed165fbb7 100644 --- a/test-files/golden-tests/javadoc/inline/styled.adoc +++ b/test-files/golden-tests/javadoc/inline/styled.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Brief for A @@ -36,7 +37,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Compare function diff --git a/test-files/golden-tests/javadoc/inline/styled.html b/test-files/golden-tests/javadoc/inline/styled.html index 9eb874a385..87c88e0610 100644 --- a/test-files/golden-tests/javadoc/inline/styled.html +++ b/test-files/golden-tests/javadoc/inline/styled.html @@ -13,14 +13,15 @@

Types

- + + + +
NameDescriptionNameDescription
A Brief for A - -
@@ -47,14 +48,15 @@

Member Functions

- + + + +
NameDescriptionNameDescription
compare Compare function - -
diff --git a/test-files/golden-tests/javadoc/lists/li.adoc b/test-files/golden-tests/javadoc/lists/li.adoc index ca9ebcc135..b8f55a4cdc 100644 --- a/test-files/golden-tests/javadoc/lists/li.adoc +++ b/test-files/golden-tests/javadoc/lists/li.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A function diff --git a/test-files/golden-tests/javadoc/lists/li.html b/test-files/golden-tests/javadoc/lists/li.html index 3f3b5689b9..6cc5d13b39 100644 --- a/test-files/golden-tests/javadoc/lists/li.html +++ b/test-files/golden-tests/javadoc/lists/li.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f A function - -
diff --git a/test-files/golden-tests/javadoc/lists/listitem.adoc b/test-files/golden-tests/javadoc/lists/listitem.adoc index 9d332c408b..987aa944e0 100644 --- a/test-files/golden-tests/javadoc/lists/listitem.adoc +++ b/test-files/golden-tests/javadoc/lists/listitem.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/lists/listitem.html b/test-files/golden-tests/javadoc/lists/listitem.html index 5286571e0e..4dba1d6b33 100644 --- a/test-files/golden-tests/javadoc/lists/listitem.html +++ b/test-files/golden-tests/javadoc/lists/listitem.html @@ -13,21 +13,22 @@

Functions

- + + - - + + + + + + + +
NameDescriptionNameDescription
f0 -
f1 -
f0
f1
f2 brief - -
f3 brief - -
diff --git a/test-files/golden-tests/javadoc/paragraph/par-1.adoc b/test-files/golden-tests/javadoc/paragraph/par-1.adoc index 773c5fe874..16836b6039 100644 --- a/test-files/golden-tests/javadoc/paragraph/par-1.adoc +++ b/test-files/golden-tests/javadoc/paragraph/par-1.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Brief diff --git a/test-files/golden-tests/javadoc/paragraph/par-1.html b/test-files/golden-tests/javadoc/paragraph/par-1.html index 372330ecb7..95dae7c08d 100644 --- a/test-files/golden-tests/javadoc/paragraph/par-1.html +++ b/test-files/golden-tests/javadoc/paragraph/par-1.html @@ -13,23 +13,24 @@

Functions

- + + + + + + + + + +
NameDescriptionNameDescription
f1 Brief - -
f2 Brief - -
f3 Brief - -
f4 Brief - -
diff --git a/test-files/golden-tests/javadoc/paragraph/para-1.adoc b/test-files/golden-tests/javadoc/paragraph/para-1.adoc index 3b73b53b0b..8cdfa230a7 100644 --- a/test-files/golden-tests/javadoc/paragraph/para-1.adoc +++ b/test-files/golden-tests/javadoc/paragraph/para-1.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/paragraph/para-1.html b/test-files/golden-tests/javadoc/paragraph/para-1.html index a10ac4c8d4..3d6b37328b 100644 --- a/test-files/golden-tests/javadoc/paragraph/para-1.html +++ b/test-files/golden-tests/javadoc/paragraph/para-1.html @@ -13,20 +13,21 @@

Functions

- + + - - - + + + + + + + +
NameDescriptionNameDescription
f1 -
f2 -
f3 -
f1
f2
f3
f4 brief - -
diff --git a/test-files/golden-tests/javadoc/paragraph/para-2.adoc b/test-files/golden-tests/javadoc/paragraph/para-2.adoc index 185dd7cf39..94f6757e94 100644 --- a/test-files/golden-tests/javadoc/paragraph/para-2.adoc +++ b/test-files/golden-tests/javadoc/paragraph/para-2.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief diff --git a/test-files/golden-tests/javadoc/paragraph/para-2.html b/test-files/golden-tests/javadoc/paragraph/para-2.html index c84f9ad203..7960567bbb 100644 --- a/test-files/golden-tests/javadoc/paragraph/para-2.html +++ b/test-files/golden-tests/javadoc/paragraph/para-2.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f1 brief - -
diff --git a/test-files/golden-tests/javadoc/paragraph/para-3.adoc b/test-files/golden-tests/javadoc/paragraph/para-3.adoc index 0b1e3fda62..d5bbaa4389 100644 --- a/test-files/golden-tests/javadoc/paragraph/para-3.adoc +++ b/test-files/golden-tests/javadoc/paragraph/para-3.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A function diff --git a/test-files/golden-tests/javadoc/paragraph/para-3.html b/test-files/golden-tests/javadoc/paragraph/para-3.html index 7de458d6a4..808f5dbaad 100644 --- a/test-files/golden-tests/javadoc/paragraph/para-3.html +++ b/test-files/golden-tests/javadoc/paragraph/para-3.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
my_function A function - -
diff --git a/test-files/golden-tests/javadoc/param/param-1.adoc b/test-files/golden-tests/javadoc/param/param-1.adoc index 60f546b8af..473e35df73 100644 --- a/test-files/golden-tests/javadoc/param/param-1.adoc +++ b/test-files/golden-tests/javadoc/param/param-1.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/param/param-1.html b/test-files/golden-tests/javadoc/param/param-1.html index cd69602d2d..28a58c4541 100644 --- a/test-files/golden-tests/javadoc/param/param-1.html +++ b/test-files/golden-tests/javadoc/param/param-1.html @@ -13,21 +13,22 @@

Functions

- + + - - - - - + + + + + + + + + +
NameDescriptionNameDescription
f0 -
f1 -
f2 -
f3 -
f4 -
f0
f1
f2
f3
f4
diff --git a/test-files/golden-tests/javadoc/param/param-direction.adoc b/test-files/golden-tests/javadoc/param/param-direction.adoc index f7ee78356c..02d0053025 100644 --- a/test-files/golden-tests/javadoc/param/param-direction.adoc +++ b/test-files/golden-tests/javadoc/param/param-direction.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/param/param-direction.html b/test-files/golden-tests/javadoc/param/param-direction.html index eb00372401..13351d1744 100644 --- a/test-files/golden-tests/javadoc/param/param-direction.html +++ b/test-files/golden-tests/javadoc/param/param-direction.html @@ -13,31 +13,32 @@

Functions

- + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
f -
g -
h -
i -
j -
k -
l -
m -
n -
o -
f
g
h
i
j
k
l
m
n
o
diff --git a/test-files/golden-tests/javadoc/param/param-duplicate.adoc b/test-files/golden-tests/javadoc/param/param-duplicate.adoc index bef632bdd1..b098651d10 100644 --- a/test-files/golden-tests/javadoc/param/param-duplicate.adoc +++ b/test-files/golden-tests/javadoc/param/param-duplicate.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | f0 brief diff --git a/test-files/golden-tests/javadoc/param/param-duplicate.html b/test-files/golden-tests/javadoc/param/param-duplicate.html index 741425fc61..b3e75f7c94 100644 --- a/test-files/golden-tests/javadoc/param/param-duplicate.html +++ b/test-files/golden-tests/javadoc/param/param-duplicate.html @@ -13,29 +13,30 @@

Functions

- + + + + + + + + + + + + + +
NameDescriptionNameDescription
f0 f0 brief - -
f1 f1 brief - -
g0 g0 brief - -
g1 g1 brief - -
h0 h0 brief - -
h1 h1 brief - -
diff --git a/test-files/golden-tests/javadoc/param/param.adoc b/test-files/golden-tests/javadoc/param/param.adoc index c03c7945bc..91ab607586 100644 --- a/test-files/golden-tests/javadoc/param/param.adoc +++ b/test-files/golden-tests/javadoc/param/param.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/param/param.html b/test-files/golden-tests/javadoc/param/param.html index e8e3d0e0b2..ed35659358 100644 --- a/test-files/golden-tests/javadoc/param/param.html +++ b/test-files/golden-tests/javadoc/param/param.html @@ -13,19 +13,20 @@

Functions

- + + - - - - + + + + + + + +
NameDescriptionNameDescription
f -
g -
h -
i -
f
g
h
i
diff --git a/test-files/golden-tests/javadoc/pre/pre-post.adoc b/test-files/golden-tests/javadoc/pre/pre-post.adoc index f90e6dfb1f..92bfe822b2 100644 --- a/test-files/golden-tests/javadoc/pre/pre-post.adoc +++ b/test-files/golden-tests/javadoc/pre/pre-post.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/pre/pre-post.html b/test-files/golden-tests/javadoc/pre/pre-post.html index 17ce2bc2b9..acf3041998 100644 --- a/test-files/golden-tests/javadoc/pre/pre-post.html +++ b/test-files/golden-tests/javadoc/pre/pre-post.html @@ -13,13 +13,14 @@

Functions

- + + - + +
NameDescriptionNameDescription
f -
f
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.adoc b/test-files/golden-tests/javadoc/ref/broken-ref.adoc index be25765095..4ccc283582 100644 --- a/test-files/golden-tests/javadoc/ref/broken-ref.adoc +++ b/test-files/golden-tests/javadoc/ref/broken-ref.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.html b/test-files/golden-tests/javadoc/ref/broken-ref.html index 5c63016f3d..e010d75e06 100644 --- a/test-files/golden-tests/javadoc/ref/broken-ref.html +++ b/test-files/golden-tests/javadoc/ref/broken-ref.html @@ -13,16 +13,17 @@

Functions

- + + - + + + +
NameDescriptionNameDescription
f0 -
f0
f1 See f0 - -
diff --git a/test-files/golden-tests/javadoc/ref/operator-param.adoc b/test-files/golden-tests/javadoc/ref/operator-param.adoc index fb47b9a373..d968773684 100644 --- a/test-files/golden-tests/javadoc/ref/operator-param.adoc +++ b/test-files/golden-tests/javadoc/ref/operator-param.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -32,7 +33,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Return true if ch is in the character set. diff --git a/test-files/golden-tests/javadoc/ref/operator-param.html b/test-files/golden-tests/javadoc/ref/operator-param.html index e1402e2795..1bb741a61c 100644 --- a/test-files/golden-tests/javadoc/ref/operator-param.html +++ b/test-files/golden-tests/javadoc/ref/operator-param.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -40,14 +41,15 @@

Member Functions

- + + + +
NameDescriptionNameDescription
operator() Return true if ch is in the character set. - -
diff --git a/test-files/golden-tests/javadoc/ref/ref.adoc b/test-files/golden-tests/javadoc/ref/ref.adoc index fcc4c079ae..2df0d98759 100644 --- a/test-files/golden-tests/javadoc/ref/ref.adoc +++ b/test-files/golden-tests/javadoc/ref/ref.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Types @@ -20,12 +21,14 @@ | Name | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -46,7 +49,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | See xref:#A-f1[f1] @@ -62,7 +66,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | See xref:#f0[f0] @@ -93,6 +98,7 @@ struct B; | Name | <> + |=== @@ -142,7 +148,9 @@ struct C; | Name | <> + | <> + |=== @@ -196,7 +204,8 @@ struct D [cols=2] |=== -| Name | Description +| Name +| Description | <> | See xref:#A-C-f3[f3] @@ -209,7 +218,9 @@ struct D | Name | <> + | <> + |=== @@ -302,44 +313,83 @@ struct F; | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== diff --git a/test-files/golden-tests/javadoc/ref/ref.html b/test-files/golden-tests/javadoc/ref/ref.html index 62a2465155..1d7337a57c 100644 --- a/test-files/golden-tests/javadoc/ref/ref.html +++ b/test-files/golden-tests/javadoc/ref/ref.html @@ -18,7 +18,8 @@

Namespaces

-A +A +

Types

@@ -30,26 +31,28 @@

Types

-F +F +

Functions

- + + - + + + + + +
NameDescriptionNameDescription
f0 -
f0
f5 See A::f1 - -
f6 See F::operator~ - -
@@ -61,32 +64,34 @@

Types

- + + - - + + + + + +
NameDescriptionNameDescription
B See f1 - -
C -
D -
C
D

Functions

- + + + +
NameDescriptionNameDescription
f1 See f0 - -
@@ -119,7 +124,8 @@

Member Functions

-f2 +f2 + @@ -171,8 +177,10 @@

Member Functions

-f3 -f4 +f3 + +f4 + @@ -229,14 +237,15 @@

Types

- + + + +
NameDescriptionNameDescription
E See f3 - -

Member Functions

@@ -248,8 +257,10 @@

Member Functions

-f3 -f4 +f3 + +f4 + @@ -350,45 +361,84 @@

Member Functions

-operator= -operator% -operator%= -operator& -operator&& -operator&= -operator() -operator* -operator*= -operator+ -operator++ -operator+= -operator, -operator- -operator-- -operator-= -operator-> -operator->* -operator/ -operator/= -operator<<= -operator>> -operator>>= -operator[] -operator^ -operator^= -operator| -operator|= -operator|| -operator~ -operator<< -operator! -operator== -operator!= -operator< -operator<= -operator> -operator>= -operator<=> +operator= + +operator% + +operator%= + +operator& + +operator&& + +operator&= + +operator() + +operator* + +operator*= + +operator+ + +operator++ + +operator+= + +operator, + +operator- + +operator-- + +operator-= + +operator-> + +operator->* + +operator/ + +operator/= + +operator<<= + +operator>> + +operator>>= + +operator[] + +operator^ + +operator^= + +operator| + +operator|= + +operator|| + +operator~ + +operator<< + +operator! + +operator== + +operator!= + +operator< + +operator<= + +operator> + +operator>= + +operator<=> + diff --git a/test-files/golden-tests/javadoc/relates/relates.adoc b/test-files/golden-tests/javadoc/relates/relates.adoc index 255ba707d4..c6cf07ef4e 100644 --- a/test-files/golden-tests/javadoc/relates/relates.adoc +++ b/test-files/golden-tests/javadoc/relates/relates.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A brief for A. @@ -22,7 +23,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | A brief for f. @@ -52,7 +54,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | A brief for f. diff --git a/test-files/golden-tests/javadoc/relates/relates.html b/test-files/golden-tests/javadoc/relates/relates.html index ad9de8d584..c5a3d3f188 100644 --- a/test-files/golden-tests/javadoc/relates/relates.html +++ b/test-files/golden-tests/javadoc/relates/relates.html @@ -13,31 +13,33 @@

Types

- + + + + + +
NameDescriptionNameDescription
A A brief for A. - -
B A brief for B - -

Functions

- + + + +
NameDescriptionNameDescription
f A brief for f. - -
diff --git a/test-files/golden-tests/javadoc/throw/throw.adoc b/test-files/golden-tests/javadoc/throw/throw.adoc index 2a3b104a31..884dba82ab 100644 --- a/test-files/golden-tests/javadoc/throw/throw.adoc +++ b/test-files/golden-tests/javadoc/throw/throw.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief diff --git a/test-files/golden-tests/javadoc/throw/throw.html b/test-files/golden-tests/javadoc/throw/throw.html index 3947f24f43..bb66b5c1dc 100644 --- a/test-files/golden-tests/javadoc/throw/throw.html +++ b/test-files/golden-tests/javadoc/throw/throw.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f brief - -
diff --git a/test-files/golden-tests/javadoc/tparam/tparam-1.adoc b/test-files/golden-tests/javadoc/tparam/tparam-1.adoc index 1125916159..0f6f354e5e 100644 --- a/test-files/golden-tests/javadoc/tparam/tparam-1.adoc +++ b/test-files/golden-tests/javadoc/tparam/tparam-1.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/javadoc/tparam/tparam-1.html b/test-files/golden-tests/javadoc/tparam/tparam-1.html index 5c63206235..3c469a21ff 100644 --- a/test-files/golden-tests/javadoc/tparam/tparam-1.html +++ b/test-files/golden-tests/javadoc/tparam/tparam-1.html @@ -13,16 +13,17 @@

Functions

- + + - + + + +
NameDescriptionNameDescription
f0 -
f0
f1 brief - -
diff --git a/test-files/golden-tests/output/canonical_1.adoc b/test-files/golden-tests/output/canonical_1.adoc index 5a93e14b43..8f12e1b41c 100644 --- a/test-files/golden-tests/output/canonical_1.adoc +++ b/test-files/golden-tests/output/canonical_1.adoc @@ -12,13 +12,21 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#A] diff --git a/test-files/golden-tests/output/canonical_1.html b/test-files/golden-tests/output/canonical_1.html index 2fc56bf9d3..bddefdeec8 100644 --- a/test-files/golden-tests/output/canonical_1.html +++ b/test-files/golden-tests/output/canonical_1.html @@ -18,14 +18,22 @@

Types

-A -B -Ba -Bx -a -b -bA -ba +A + +B + +Ba + +Bx + +a + +b + +bA + +ba + diff --git a/test-files/golden-tests/symbols/concept/concept.adoc b/test-files/golden-tests/symbols/concept/concept.adoc index f5828a6737..fdf3a9a995 100644 --- a/test-files/golden-tests/symbols/concept/concept.adoc +++ b/test-files/golden-tests/symbols/concept/concept.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Variables @@ -20,6 +21,7 @@ | Name | <> + |=== === Concepts @@ -28,6 +30,7 @@ | Name | <> + |=== [#f] diff --git a/test-files/golden-tests/symbols/concept/concept.html b/test-files/golden-tests/symbols/concept/concept.html index 6168e35fdd..0c00aadcdc 100644 --- a/test-files/golden-tests/symbols/concept/concept.html +++ b/test-files/golden-tests/symbols/concept/concept.html @@ -18,7 +18,8 @@

Functions

-f +f +

Variables

@@ -30,7 +31,8 @@

Variables

-x +x +

Concepts

@@ -42,7 +44,8 @@

Concepts

-C +C + diff --git a/test-files/golden-tests/symbols/concept/requires-clause.adoc b/test-files/golden-tests/symbols/concept/requires-clause.adoc index 8f400f0e12..4f2fbbdd53 100644 --- a/test-files/golden-tests/symbols/concept/requires-clause.adoc +++ b/test-files/golden-tests/symbols/concept/requires-clause.adoc @@ -12,13 +12,16 @@ | Name | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/symbols/concept/requires-clause.html b/test-files/golden-tests/symbols/concept/requires-clause.html index 32c38de660..6e5977fb66 100644 --- a/test-files/golden-tests/symbols/concept/requires-clause.html +++ b/test-files/golden-tests/symbols/concept/requires-clause.html @@ -18,23 +18,26 @@

Types

-A -A +A + +A +

Functions

- + + - - + + + +
NameDescriptionNameDescription
f -
g -
f
g
diff --git a/test-files/golden-tests/symbols/enum/enum.adoc b/test-files/golden-tests/symbols/enum/enum.adoc index 220f865366..ad03be25da 100644 --- a/test-files/golden-tests/symbols/enum/enum.adoc +++ b/test-files/golden-tests/symbols/enum/enum.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | E0 brief. diff --git a/test-files/golden-tests/symbols/enum/enum.html b/test-files/golden-tests/symbols/enum/enum.html index 6e96297bb8..3259b762f8 100644 --- a/test-files/golden-tests/symbols/enum/enum.html +++ b/test-files/golden-tests/symbols/enum/enum.html @@ -13,21 +13,22 @@

Enums

- + + - + + + + - + + + +
NameDescriptionNameDescription
E0 E0 brief. - -
E1 -
E1
E2 E2 brief. - -
E3 -
E3
diff --git a/test-files/golden-tests/symbols/friend/friend-1.adoc b/test-files/golden-tests/symbols/friend/friend-1.adoc index 376e8b9475..2255f099b9 100644 --- a/test-files/golden-tests/symbols/friend/friend-1.adoc +++ b/test-files/golden-tests/symbols/friend/friend-1.adoc @@ -12,12 +12,14 @@ | Name | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | f @@ -42,7 +44,8 @@ struct T; [cols=2] |=== -| Name | Description +| Name +| Description | <> | f diff --git a/test-files/golden-tests/symbols/friend/friend-1.html b/test-files/golden-tests/symbols/friend/friend-1.html index c95818b087..e724997c0a 100644 --- a/test-files/golden-tests/symbols/friend/friend-1.html +++ b/test-files/golden-tests/symbols/friend/friend-1.html @@ -18,21 +18,23 @@

Types

-T +T +

Functions

- + + + +
NameDescriptionNameDescription
f f - -
@@ -54,14 +56,15 @@

Friends

- + + + +
NameDescriptionNameDescription
f f - -
diff --git a/test-files/golden-tests/symbols/friend/friend-2.adoc b/test-files/golden-tests/symbols/friend/friend-2.adoc index c088532618..4cc32bc9fc 100644 --- a/test-files/golden-tests/symbols/friend/friend-2.adoc +++ b/test-files/golden-tests/symbols/friend/friend-2.adoc @@ -12,12 +12,14 @@ | Name | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | f @@ -42,7 +44,8 @@ struct T; [cols=2] |=== -| Name | Description +| Name +| Description | <> | f diff --git a/test-files/golden-tests/symbols/friend/friend-2.html b/test-files/golden-tests/symbols/friend/friend-2.html index 23e3e6b078..1cc2630c3f 100644 --- a/test-files/golden-tests/symbols/friend/friend-2.html +++ b/test-files/golden-tests/symbols/friend/friend-2.html @@ -18,21 +18,23 @@

Types

-T +T +

Functions

- + + + +
NameDescriptionNameDescription
f f - -
@@ -54,14 +56,15 @@

Friends

- + + + +
NameDescriptionNameDescription
f f - -
diff --git a/test-files/golden-tests/symbols/friend/friend-3.adoc b/test-files/golden-tests/symbols/friend/friend-3.adoc index 013a062d4a..dad11720ac 100644 --- a/test-files/golden-tests/symbols/friend/friend-3.adoc +++ b/test-files/golden-tests/symbols/friend/friend-3.adoc @@ -12,13 +12,16 @@ | Name | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | T::f @@ -43,7 +46,8 @@ struct T; [cols=2] |=== -| Name | Description +| Name +| Description | <> | T::f @@ -91,6 +95,7 @@ struct U; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/friend/friend-3.html b/test-files/golden-tests/symbols/friend/friend-3.html index 17b531d081..653c027813 100644 --- a/test-files/golden-tests/symbols/friend/friend-3.html +++ b/test-files/golden-tests/symbols/friend/friend-3.html @@ -18,22 +18,25 @@

Types

-T -U +T + +U +

Functions

- + + + +
NameDescriptionNameDescription
f T::f - -
@@ -55,14 +58,15 @@

Friends

- + + + +
NameDescriptionNameDescription
f T::f - -
@@ -113,7 +117,8 @@

Friends

-f +f + diff --git a/test-files/golden-tests/symbols/friend/friend-4.adoc b/test-files/golden-tests/symbols/friend/friend-4.adoc index d85ff73253..562da646ce 100644 --- a/test-files/golden-tests/symbols/friend/friend-4.adoc +++ b/test-files/golden-tests/symbols/friend/friend-4.adoc @@ -12,13 +12,16 @@ | Name | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | U::f @@ -46,6 +49,7 @@ struct T; | Name | <> + |=== @@ -84,7 +88,8 @@ struct U; [cols=2] |=== -| Name | Description +| Name +| Description | <> | U::f diff --git a/test-files/golden-tests/symbols/friend/friend-4.html b/test-files/golden-tests/symbols/friend/friend-4.html index 3c2f78992b..87582a6037 100644 --- a/test-files/golden-tests/symbols/friend/friend-4.html +++ b/test-files/golden-tests/symbols/friend/friend-4.html @@ -18,22 +18,25 @@

Types

-T -U +T + +U +

Functions

- + + + +
NameDescriptionNameDescription
f U::f - -
@@ -60,7 +63,8 @@

Friends

-f +f + @@ -101,14 +105,15 @@

Friends

- + + + +
NameDescriptionNameDescription
f 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 b7ccf9db44..11febfe523 100644 --- a/test-files/golden-tests/symbols/friend/friend-5.adoc +++ b/test-files/golden-tests/symbols/friend/friend-5.adoc @@ -12,13 +12,16 @@ | Name | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | f @@ -46,6 +49,7 @@ struct T; | Name | <> + |=== @@ -87,6 +91,7 @@ struct U; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/friend/friend-5.html b/test-files/golden-tests/symbols/friend/friend-5.html index cf15d440ea..afc49b6b89 100644 --- a/test-files/golden-tests/symbols/friend/friend-5.html +++ b/test-files/golden-tests/symbols/friend/friend-5.html @@ -18,22 +18,25 @@

Types

-T -U +T + +U +

Functions

- + + + +
NameDescriptionNameDescription
f f - -
@@ -60,7 +63,8 @@

Friends

-f +f + @@ -106,7 +110,8 @@

Friends

-f +f + diff --git a/test-files/golden-tests/symbols/friend/friend-6.adoc b/test-files/golden-tests/symbols/friend/friend-6.adoc index b21dc8686e..5a9c679048 100644 --- a/test-files/golden-tests/symbols/friend/friend-6.adoc +++ b/test-files/golden-tests/symbols/friend/friend-6.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Struct T brief @@ -45,7 +46,8 @@ struct T; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Friend class Z brief @@ -109,7 +111,8 @@ struct U; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Friend T brief @@ -154,7 +157,8 @@ struct V; [cols=2] |=== -| Name | Description +| Name +| Description | <> | Friend struct U brief diff --git a/test-files/golden-tests/symbols/friend/friend-6.html b/test-files/golden-tests/symbols/friend/friend-6.html index d758de94cf..364f2ccbde 100644 --- a/test-files/golden-tests/symbols/friend/friend-6.html +++ b/test-files/golden-tests/symbols/friend/friend-6.html @@ -13,22 +13,23 @@

Types

- + + + + + + - + + + +
NameDescriptionNameDescription
T Struct T brief - -
U Struct U brief - -
V Struct V brief - -
Z -
Z
@@ -55,17 +56,18 @@

Friends

- + + + + + +
NameDescriptionNameDescription
class Z Friend class Z brief - -
int Friend int brief - -
@@ -134,14 +136,15 @@

Friends

- + + + +
NameDescriptionNameDescription
T Friend T brief - -
@@ -190,14 +193,15 @@

Friends

- + + + +
NameDescriptionNameDescription
struct U Friend struct U brief - -
diff --git a/test-files/golden-tests/symbols/function/attributes-2.adoc b/test-files/golden-tests/symbols/function/attributes-2.adoc index 60b9ae8e74..411872739d 100644 --- a/test-files/golden-tests/symbols/function/attributes-2.adoc +++ b/test-files/golden-tests/symbols/function/attributes-2.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#f] diff --git a/test-files/golden-tests/symbols/function/attributes-2.html b/test-files/golden-tests/symbols/function/attributes-2.html index 18e4ad8ba0..38a5d181f3 100644 --- a/test-files/golden-tests/symbols/function/attributes-2.html +++ b/test-files/golden-tests/symbols/function/attributes-2.html @@ -18,7 +18,8 @@

Functions

-f +f + diff --git a/test-files/golden-tests/symbols/function/attributes_1.adoc b/test-files/golden-tests/symbols/function/attributes_1.adoc index 10791ed4f2..1bc5d53363 100644 --- a/test-files/golden-tests/symbols/function/attributes_1.adoc +++ b/test-files/golden-tests/symbols/function/attributes_1.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#f] diff --git a/test-files/golden-tests/symbols/function/attributes_1.html b/test-files/golden-tests/symbols/function/attributes_1.html index fcc47a1e8c..bfc32ff1c7 100644 --- a/test-files/golden-tests/symbols/function/attributes_1.html +++ b/test-files/golden-tests/symbols/function/attributes_1.html @@ -18,7 +18,8 @@

Functions

-f +f + diff --git a/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc b/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc index e56d2014f1..234192e815 100644 --- a/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc +++ b/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc @@ -12,9 +12,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#Explicit] @@ -38,6 +42,7 @@ struct Explicit; | Name | <> + |=== @@ -79,6 +84,7 @@ struct ExplicitExpression; | Name | <> + |=== @@ -119,6 +125,7 @@ struct ExplicitFalse; | Name | <> + |=== @@ -159,6 +166,7 @@ struct ExplicitTrue; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/explicit-conv-operator.html b/test-files/golden-tests/symbols/function/explicit-conv-operator.html index 19b7d4002c..18e21c9bd4 100644 --- a/test-files/golden-tests/symbols/function/explicit-conv-operator.html +++ b/test-files/golden-tests/symbols/function/explicit-conv-operator.html @@ -18,10 +18,14 @@

Types

-Explicit -ExplicitExpression -ExplicitFalse -ExplicitTrue +Explicit + +ExplicitExpression + +ExplicitFalse + +ExplicitTrue + @@ -48,7 +52,8 @@

Member Functions

-operator bool +operator bool + @@ -94,7 +99,8 @@

Member Functions

-operator bool +operator bool + @@ -139,7 +145,8 @@

Member Functions

-operator bool +operator bool + @@ -184,7 +191,8 @@

Member Functions

-operator bool +operator bool + diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.adoc b/test-files/golden-tests/symbols/function/explicit-ctor.adoc index 7d79203563..81b70c886a 100644 --- a/test-files/golden-tests/symbols/function/explicit-ctor.adoc +++ b/test-files/golden-tests/symbols/function/explicit-ctor.adoc @@ -12,9 +12,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#Explicit] @@ -35,7 +39,8 @@ struct Explicit; [cols=2] |=== -| Name | Description +| Name +| Description | <> [.small]#[constructor]# | @@ -176,7 +181,8 @@ struct ExplicitExpression; [cols=2] |=== -| Name | Description +| Name +| Description | <> [.small]#[constructor]# | @@ -316,7 +322,8 @@ struct ExplicitFalse; [cols=2] |=== -| Name | Description +| Name +| Description | <> [.small]#[constructor]# | @@ -456,7 +463,8 @@ struct ExplicitTrue; [cols=2] |=== -| Name | Description +| Name +| Description | <> [.small]#[constructor]# | diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.html b/test-files/golden-tests/symbols/function/explicit-ctor.html index 3b2775c00d..5e962d5452 100644 --- a/test-files/golden-tests/symbols/function/explicit-ctor.html +++ b/test-files/golden-tests/symbols/function/explicit-ctor.html @@ -18,10 +18,14 @@

Types

-Explicit -ExplicitExpression -ExplicitFalse -ExplicitTrue +Explicit + +ExplicitExpression + +ExplicitFalse + +ExplicitTrue + @@ -43,13 +47,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
Explicit [constructor] -
Explicit [constructor]
@@ -189,13 +194,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
ExplicitExpression [constructor] -
ExplicitExpression [constructor]
@@ -334,13 +340,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
ExplicitFalse [constructor] -
ExplicitFalse [constructor]
@@ -479,13 +486,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
ExplicitTrue [constructor] -
ExplicitTrue [constructor]
diff --git a/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc b/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc index fb8b687bde..b684e8a984 100644 --- a/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc +++ b/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#Optional] @@ -32,7 +33,8 @@ struct Optional; [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/symbols/function/explicit-object-parameter.html b/test-files/golden-tests/symbols/function/explicit-object-parameter.html index e87c1a8a64..25e9ce5531 100644 --- a/test-files/golden-tests/symbols/function/explicit-object-parameter.html +++ b/test-files/golden-tests/symbols/function/explicit-object-parameter.html @@ -18,7 +18,8 @@

Types

-Optional +Optional + @@ -40,13 +41,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
value -
value
diff --git a/test-files/golden-tests/symbols/function/function-parm-decay.adoc b/test-files/golden-tests/symbols/function/function-parm-decay.adoc index d3e679e1b8..e60fecbb11 100644 --- a/test-files/golden-tests/symbols/function/function-parm-decay.adoc +++ b/test-files/golden-tests/symbols/function/function-parm-decay.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== === Functions @@ -21,9 +23,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#T] diff --git a/test-files/golden-tests/symbols/function/function-parm-decay.html b/test-files/golden-tests/symbols/function/function-parm-decay.html index 8da372a26b..8628ee096e 100644 --- a/test-files/golden-tests/symbols/function/function-parm-decay.html +++ b/test-files/golden-tests/symbols/function/function-parm-decay.html @@ -18,8 +18,10 @@

Types

-T -U +T + +U +

Functions

@@ -31,10 +33,14 @@

Functions

-f -g -h -i +f + +g + +h + +i + diff --git a/test-files/golden-tests/symbols/function/function-template-template.adoc b/test-files/golden-tests/symbols/function/function-template-template.adoc index a54ff770fc..b2cb01c903 100644 --- a/test-files/golden-tests/symbols/function/function-template-template.adoc +++ b/test-files/golden-tests/symbols/function/function-template-template.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#f] diff --git a/test-files/golden-tests/symbols/function/function-template-template.html b/test-files/golden-tests/symbols/function/function-template-template.html index 58d1977168..96a528dfd7 100644 --- a/test-files/golden-tests/symbols/function/function-template-template.html +++ b/test-files/golden-tests/symbols/function/function-template-template.html @@ -18,7 +18,8 @@

Functions

-f +f + diff --git a/test-files/golden-tests/symbols/function/function-template.adoc b/test-files/golden-tests/symbols/function/function-template.adoc index 3ec17eb97c..c7b4d51d81 100644 --- a/test-files/golden-tests/symbols/function/function-template.adoc +++ b/test-files/golden-tests/symbols/function/function-template.adoc @@ -12,17 +12,29 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#f0] diff --git a/test-files/golden-tests/symbols/function/function-template.html b/test-files/golden-tests/symbols/function/function-template.html index 45bf6eca81..e79ae939d9 100644 --- a/test-files/golden-tests/symbols/function/function-template.html +++ b/test-files/golden-tests/symbols/function/function-template.html @@ -18,18 +18,30 @@

Functions

-f0 -f1 -f2 -f3 -g0 -g1 -g2 -h0 -h1 -i -j0 -j1 +f0 + +f1 + +f2 + +f3 + +g0 + +g1 + +g2 + +h0 + +h1 + +i + +j0 + +j1 + diff --git a/test-files/golden-tests/symbols/function/function-tparm-decay.adoc b/test-files/golden-tests/symbols/function/function-tparm-decay.adoc index 2b7c0b507b..9dc7fd8cc0 100644 --- a/test-files/golden-tests/symbols/function/function-tparm-decay.adoc +++ b/test-files/golden-tests/symbols/function/function-tparm-decay.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== === Functions @@ -21,9 +23,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#T] diff --git a/test-files/golden-tests/symbols/function/function-tparm-decay.html b/test-files/golden-tests/symbols/function/function-tparm-decay.html index 182e7535cc..8d6d21444c 100644 --- a/test-files/golden-tests/symbols/function/function-tparm-decay.html +++ b/test-files/golden-tests/symbols/function/function-tparm-decay.html @@ -18,8 +18,10 @@

Types

-T -U +T + +U +

Functions

@@ -31,10 +33,14 @@

Functions

-f -g -h -i +f + +g + +h + +i + diff --git a/test-files/golden-tests/symbols/function/mem-fn.adoc b/test-files/golden-tests/symbols/function/mem-fn.adoc index 62e4441b0e..00afa5dd7e 100644 --- a/test-files/golden-tests/symbols/function/mem-fn.adoc +++ b/test-files/golden-tests/symbols/function/mem-fn.adoc @@ -12,23 +12,41 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#T01] @@ -52,6 +70,7 @@ struct T01; | Name | <> + |=== @@ -92,6 +111,7 @@ struct T02; | Name | <> + |=== @@ -133,6 +153,7 @@ struct T03; | Name | <> + |=== @@ -173,6 +194,7 @@ struct T04; | Name | <> + |=== @@ -213,6 +235,7 @@ struct T05; | Name | <> + |=== @@ -253,6 +276,7 @@ struct T06; | Name | <> + |=== @@ -294,6 +318,7 @@ struct T08; | Name | <> + |=== @@ -334,6 +359,7 @@ struct T09; | Name | <> + |=== @@ -374,6 +400,7 @@ struct T10; | Name | <> + |=== @@ -414,6 +441,7 @@ struct T11; | Name | <> + |=== @@ -454,6 +482,7 @@ struct T12; | Name | <> + |=== @@ -494,6 +523,7 @@ struct T13; | Name | <> [.small]#[virtual]# + |=== @@ -535,6 +565,7 @@ struct T14; | Name | <> [.small]#[virtual]# + |=== @@ -576,6 +607,7 @@ struct T15; | Name | <> + |=== @@ -616,6 +648,7 @@ struct T16; | Name | <> + |=== @@ -658,6 +691,7 @@ struct T17 | Name | <> [.small]#[virtual]# + |=== @@ -699,7 +733,9 @@ struct U; | Name | <> + | <> [.small]#[virtual]# + |=== === Static Member Functions @@ -708,6 +744,7 @@ struct U; | Name | <> + |=== @@ -783,7 +820,9 @@ struct V | Name | <> + | <> [.small]#[virtual]# + |=== === Static Member Functions @@ -792,6 +831,7 @@ struct V | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/mem-fn.html b/test-files/golden-tests/symbols/function/mem-fn.html index c68cabbe77..6435921720 100644 --- a/test-files/golden-tests/symbols/function/mem-fn.html +++ b/test-files/golden-tests/symbols/function/mem-fn.html @@ -18,24 +18,42 @@

Types

-T01 -T02 -T03 -T04 -T05 -T06 -T08 -T09 -T10 -T11 -T12 -T13 -T14 -T15 -T16 -T17 -U -V +T01 + +T02 + +T03 + +T04 + +T05 + +T06 + +T08 + +T09 + +T10 + +T11 + +T12 + +T13 + +T14 + +T15 + +T16 + +T17 + +U + +V + @@ -62,7 +80,8 @@

Member Functions

-f +f + @@ -107,7 +126,8 @@

Static Member Functions

-f +f + @@ -153,7 +173,8 @@

Member Functions

-f +f + @@ -198,7 +219,8 @@

Member Functions

-f +f + @@ -243,7 +265,8 @@

Member Functions

-f +f + @@ -288,7 +311,8 @@

Member Functions

-f +f + @@ -334,7 +358,8 @@

Member Functions

-f +f + @@ -379,7 +404,8 @@

Member Functions

-f +f + @@ -424,7 +450,8 @@

Member Functions

-f +f + @@ -469,7 +496,8 @@

Member Functions

-f +f + @@ -514,7 +542,8 @@

Member Functions

-f +f + @@ -559,7 +588,8 @@

Member Functions

-f [virtual] +f [virtual] + @@ -605,7 +635,8 @@

Member Functions

-f [virtual] +f [virtual] + @@ -651,7 +682,8 @@

Member Functions

-f +f + @@ -696,7 +728,8 @@

Static Member Functions

-f +f + @@ -743,7 +776,8 @@

Member Functions

-f [virtual] +f [virtual] + @@ -789,8 +823,10 @@

Member Functions

-f1 -f3 [virtual] +f1 + +f3 [virtual] +

Static Member Functions

@@ -802,7 +838,8 @@

Static Member Functions

-f2 +f2 + @@ -884,8 +921,10 @@

Member Functions

-f1 -f3 [virtual] +f1 + +f3 [virtual] +

Static Member Functions

@@ -897,7 +936,8 @@

Static Member Functions

-f2 +f2 + diff --git a/test-files/golden-tests/symbols/function/noreturn.adoc b/test-files/golden-tests/symbols/function/noreturn.adoc index 5defcb4ea7..0d1691e289 100644 --- a/test-files/golden-tests/symbols/function/noreturn.adoc +++ b/test-files/golden-tests/symbols/function/noreturn.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Functions @@ -20,6 +21,7 @@ | Name | <> + |=== [#T] @@ -43,6 +45,7 @@ struct T; | Name | <> + |=== === Static Member Functions @@ -51,6 +54,7 @@ struct T; | Name | <> + |=== === Friends @@ -59,6 +63,7 @@ struct T; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/noreturn.html b/test-files/golden-tests/symbols/function/noreturn.html index 8c8a0f4a1a..4912b20d60 100644 --- a/test-files/golden-tests/symbols/function/noreturn.html +++ b/test-files/golden-tests/symbols/function/noreturn.html @@ -18,7 +18,8 @@

Types

-T +T +

Functions

@@ -30,7 +31,8 @@

Functions

-f1 +f1 + @@ -57,7 +59,8 @@

Member Functions

-f3 +f3 +

Static Member Functions

@@ -69,7 +72,8 @@

Static Member Functions

-f2 +f2 +

Friends

@@ -81,7 +85,8 @@

Friends

-f1 +f1 + diff --git a/test-files/golden-tests/symbols/function/overloaded-op-1.adoc b/test-files/golden-tests/symbols/function/overloaded-op-1.adoc index 3c3ba53d78..6ce3fd8959 100644 --- a/test-files/golden-tests/symbols/function/overloaded-op-1.adoc +++ b/test-files/golden-tests/symbols/function/overloaded-op-1.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#T] @@ -35,6 +36,7 @@ struct T; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/overloaded-op-1.html b/test-files/golden-tests/symbols/function/overloaded-op-1.html index 15ec8b4158..feb8d2624d 100644 --- a/test-files/golden-tests/symbols/function/overloaded-op-1.html +++ b/test-files/golden-tests/symbols/function/overloaded-op-1.html @@ -18,7 +18,8 @@

Types

-T +T + @@ -45,7 +46,8 @@

Member Functions

-operator+ +operator+ + diff --git a/test-files/golden-tests/symbols/function/overloaded-op-2.adoc b/test-files/golden-tests/symbols/function/overloaded-op-2.adoc index de6842d40f..ec2b7a13b4 100644 --- a/test-files/golden-tests/symbols/function/overloaded-op-2.adoc +++ b/test-files/golden-tests/symbols/function/overloaded-op-2.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#T] @@ -35,6 +36,7 @@ struct T; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/overloaded-op-2.html b/test-files/golden-tests/symbols/function/overloaded-op-2.html index 29bb8c0286..2d0565358b 100644 --- a/test-files/golden-tests/symbols/function/overloaded-op-2.html +++ b/test-files/golden-tests/symbols/function/overloaded-op-2.html @@ -18,7 +18,8 @@

Types

-T +T + @@ -45,7 +46,8 @@

Member Functions

-operator+ +operator+ + diff --git a/test-files/golden-tests/symbols/function/sfinae.adoc b/test-files/golden-tests/symbols/function/sfinae.adoc index eb09a0cdb4..43f72580ed 100644 --- a/test-files/golden-tests/symbols/function/sfinae.adoc +++ b/test-files/golden-tests/symbols/function/sfinae.adoc @@ -12,12 +12,14 @@ | Name | <> + |=== === Types [cols=2] |=== -| Name | Description +| Name +| Description | <> | The partial specialization of A is enabled via a template parameter @@ -36,7 +38,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Enabled via return type @@ -81,6 +84,7 @@ | Name | <> + |=== [#B-C] @@ -169,6 +173,7 @@ struct S; | Name | <> + |=== @@ -212,6 +217,7 @@ struct <><T, std::void_t<T::a::b>>; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/sfinae.html b/test-files/golden-tests/symbols/function/sfinae.html index df89b3e64d..ac9f540a09 100644 --- a/test-files/golden-tests/symbols/function/sfinae.html +++ b/test-files/golden-tests/symbols/function/sfinae.html @@ -18,71 +18,74 @@

Namespaces

-B +B +

Types

- + + + + + + + + + +
NameDescriptionNameDescription
A The partial specialization of A is enabled via a template parameter - -
A<T> Specialization for floating point types - -
S SFINAE with std::void_t - -
S<T, std::void_t<T::a::b>> SFINAE with std::void_t - -

Functions

- + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionNameDescription
f1 Enabled via return type - -
f10 Enabled via type template parameter - -
f2 Enabling a specified return type - -
f3 Enabling a specified return type in another namespace - -
f4 Enabled via return type with std::enable_if - -
f5 Enabled via a non-type template parameter with helper - -
f6 Enabled via a non-type template parameter without helper - -
f7 Enabled via a non-type template parameter using int instead of bool - -
f8 Enabled via parameter without helper - -
f9 Enabled via parameter with helper - -
@@ -99,7 +102,8 @@

Types

-C +C + @@ -200,7 +204,8 @@

Member Functions

-store +store + @@ -251,7 +256,8 @@

Member Functions

-store +store + diff --git a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc index afb0cf27bc..b142751084 100644 --- a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc +++ b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc @@ -12,10 +12,15 @@ | Name | <> + | <> + | <> + | <> + | <> + |=== [#A-0e] @@ -40,7 +45,9 @@ struct A; | Name | <> + | <> + |=== === Member Functions @@ -49,6 +56,7 @@ struct A; | Name | <> + |=== @@ -75,6 +83,7 @@ struct B; | Name | <> + |=== @@ -116,6 +125,7 @@ struct C; | Name | <> + |=== @@ -172,9 +182,13 @@ struct <><bool>; | Name | <> + | <> + | <> + | <> + |=== === Member Functions @@ -183,6 +197,7 @@ struct <><bool>; | Name | <> + |=== @@ -245,6 +260,7 @@ struct <><double*>; | Name | <> + |=== @@ -286,6 +302,7 @@ struct <><U*>; | Name | <> + |=== @@ -342,8 +359,11 @@ struct <><int>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -352,6 +372,7 @@ struct <><int>; | Name | <> + |=== @@ -396,6 +417,7 @@ struct <><long>; | Name | <> + |=== @@ -470,7 +492,9 @@ struct <><short>; | Name | <> + | <> + |=== === Member Functions @@ -479,6 +503,7 @@ struct <><short>; | Name | <> + |=== @@ -523,6 +548,7 @@ struct C; | Name | <> + |=== @@ -578,7 +604,9 @@ struct D; | Name | <> + | <> + |=== @@ -605,6 +633,7 @@ struct E; | Name | <> + |=== @@ -646,6 +675,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html index 11fc534496..36f68c9397 100644 --- a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html +++ b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html @@ -18,11 +18,16 @@

Types

-A -A<bool> -A<int> -A<short> -D +A + +A<bool> + +A<int> + +A<short> + +D + @@ -50,8 +55,10 @@

Types

-B -C +B + +C +

Member Functions

@@ -63,7 +70,8 @@

Member Functions

-f +f + @@ -93,7 +101,8 @@

Member Functions

-g +g + @@ -139,7 +148,8 @@

Member Functions

-h +h + @@ -201,10 +211,14 @@

Types

-B -C -C<double*> -C<U*> +B + +C + +C<double*> + +C<U*> +

Member Functions

@@ -216,7 +230,8 @@

Member Functions

-f +f + @@ -282,7 +297,8 @@

Member Functions

-j +j + @@ -328,7 +344,8 @@

Member Functions

-j +j + @@ -390,9 +407,12 @@

Types

-B -B<long> -C +B + +B<long> + +C +

Member Functions

@@ -404,7 +424,8 @@

Member Functions

-f +f + @@ -452,7 +473,8 @@

Member Functions

-g +g + @@ -532,8 +554,10 @@

Types

-B -C +B + +C +

Member Functions

@@ -545,7 +569,8 @@

Member Functions

-f +f + @@ -593,7 +618,8 @@

Member Functions

-i +i + @@ -654,8 +680,10 @@

Types

-E -E<int> +E + +E<int> + @@ -685,7 +713,8 @@

Member Functions

-k +k + @@ -731,7 +760,8 @@

Member Functions

-k +k + diff --git a/test-files/golden-tests/symbols/function/type-resolution.adoc b/test-files/golden-tests/symbols/function/type-resolution.adoc index 1875545d8f..a77f700c28 100644 --- a/test-files/golden-tests/symbols/function/type-resolution.adoc +++ b/test-files/golden-tests/symbols/function/type-resolution.adoc @@ -12,10 +12,15 @@ | Name | <> + | <> + | <> + | <> + | <> + |=== === Functions @@ -24,50 +29,95 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#C] diff --git a/test-files/golden-tests/symbols/function/type-resolution.html b/test-files/golden-tests/symbols/function/type-resolution.html index bb2b99c5b0..dad1d270e8 100644 --- a/test-files/golden-tests/symbols/function/type-resolution.html +++ b/test-files/golden-tests/symbols/function/type-resolution.html @@ -18,11 +18,16 @@

Types

-A -B -C -D -E +A + +B + +C + +D + +E +

Functions

@@ -34,51 +39,96 @@

Functions

-f0 -f1 -f2 -f3 -f4 -f5 -f6 -f7 -f8 -g0 -g1 -g2 -g3 -g4 -g5 -g6 -g7 -g8 -h0 -h1 -h2 -h3 -h4 -h5 -h6 -h7 -h8 -i0 -i1 -i2 -i3 -i4 -i5 -i6 -i7 -i8 -j0 -j1 -j2 -j3 -j4 -j5 -j6 -j7 -j8 +f0 + +f1 + +f2 + +f3 + +f4 + +f5 + +f6 + +f7 + +f8 + +g0 + +g1 + +g2 + +g3 + +g4 + +g5 + +g6 + +g7 + +g8 + +h0 + +h1 + +h2 + +h3 + +h4 + +h5 + +h6 + +h7 + +h8 + +i0 + +i1 + +i2 + +i3 + +i4 + +i5 + +i6 + +i7 + +i8 + +j0 + +j1 + +j2 + +j3 + +j4 + +j5 + +j6 + +j7 + +j8 + diff --git a/test-files/golden-tests/symbols/function/variadic-function.adoc b/test-files/golden-tests/symbols/function/variadic-function.adoc index 93ac0812b7..6af87c5255 100644 --- a/test-files/golden-tests/symbols/function/variadic-function.adoc +++ b/test-files/golden-tests/symbols/function/variadic-function.adoc @@ -12,8 +12,11 @@ | Name | <> + | <> + | <> + |=== === Functions @@ -22,7 +25,9 @@ | Name | <> + | <> + |=== [#T] diff --git a/test-files/golden-tests/symbols/function/variadic-function.html b/test-files/golden-tests/symbols/function/variadic-function.html index 2157605a52..c9e109333b 100644 --- a/test-files/golden-tests/symbols/function/variadic-function.html +++ b/test-files/golden-tests/symbols/function/variadic-function.html @@ -18,9 +18,12 @@

Types

-C -T -U +C + +T + +U +

Functions

@@ -32,8 +35,10 @@

Functions

-f -g +f + +g + diff --git a/test-files/golden-tests/symbols/guide/explicit-deduct-guide.adoc b/test-files/golden-tests/symbols/guide/explicit-deduct-guide.adoc index 151005c0bb..d1d8465597 100644 --- a/test-files/golden-tests/symbols/guide/explicit-deduct-guide.adoc +++ b/test-files/golden-tests/symbols/guide/explicit-deduct-guide.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Deduction Guides @@ -20,9 +21,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#X-0e] diff --git a/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html b/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html index 704463abd5..36a978cafd 100644 --- a/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html +++ b/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html @@ -18,7 +18,8 @@

Types

-X +X +

Deduction Guides

@@ -30,10 +31,14 @@

Deduction Guides

-X<0> -X<0> -X<0> -X<0> +X<0> + +X<0> + +X<0> + +X<0> + diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.adoc b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.adoc index a5114a01a5..208e59ac9f 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.adoc +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Namespace Aliases @@ -20,12 +21,39 @@ | Name | <> + |=== [#LongName] == LongName +=== Types + +[cols=1] +|=== +| Name + +| <> + +|=== + +[#LongName-A] +== <>::A + + +=== Synopsis + + +Declared in `<namespace‐alias‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct A; +---- + + + [#A] == A diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.cpp b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.cpp index 805bf1d15b..8e2cee393d 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.cpp +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.cpp @@ -1,3 +1,5 @@ -namespace LongName {} +namespace LongName { + struct A; +} namespace A = LongName; diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html index d7cd396c43..d06fe3517d 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html @@ -18,7 +18,8 @@

Namespaces

-LongName +LongName +

Namespace Aliases

@@ -30,7 +31,8 @@

Namespace Aliases

-A +A + @@ -38,6 +40,36 @@

Namespace Aliases

LongName

+

Types

+ + + + + + + + + + + +
Name
A
+ +
+
+

LongName::A

+
+
+

Synopsis

+
+Declared in <namespace-alias-1.cpp>
+
+
+struct A;
+
+
+
+ +
diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.xml b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.xml index d93f9246d6..8c32eb5498 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.xml +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.xml @@ -3,9 +3,12 @@ xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc"> + + + - + diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.adoc b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.adoc index 55d4bee6fd..746220d797 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.adoc +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Namespace Aliases @@ -20,13 +21,41 @@ | Name | <> + | <> + |=== [#LongName] == LongName +=== Types + +[cols=1] +|=== +| Name + +| <> + +|=== + +[#LongName-A] +== <>::A + + +=== Synopsis + + +Declared in `<namespace‐alias‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct A; +---- + + + [#A] == A diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.cpp b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.cpp index c5dfcd9abc..2b3af06622 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.cpp +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.cpp @@ -1,4 +1,6 @@ -namespace LongName {} +namespace LongName { + struct A; +} namespace A = LongName; namespace B = LongName; diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html index 0f95489acb..0c0d1b1154 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html @@ -18,7 +18,8 @@

Namespaces

-LongName +LongName +

Namespace Aliases

@@ -30,8 +31,10 @@

Namespace Aliases

-A -B +A + +B +
@@ -39,6 +42,36 @@

Namespace Aliases

LongName

+

Types

+ + + + + + + + + + + +
Name
A
+
+
+
+

LongName::A

+
+
+

Synopsis

+
+Declared in <namespace-alias-2.cpp>
+
+
+struct A;
+
+
+
+ +
diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.xml b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.xml index b532209fd8..970420ce59 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.xml +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.xml @@ -3,13 +3,16 @@ xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc"> + + + - + - + diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.adoc b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.adoc index 339b07b8c2..0464ffc896 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.adoc +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Namespace Aliases @@ -20,13 +21,41 @@ | Name | <> + | <> + |=== [#LongName] == LongName +=== Types + +[cols=1] +|=== +| Name + +| <> + +|=== + +[#LongName-A] +== <>::A + + +=== Synopsis + + +Declared in `<namespace‐alias‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct A; +---- + + + [#A] == A diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.cpp b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.cpp index 067ec3a08e..4d5e0d3d6f 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.cpp +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.cpp @@ -1,4 +1,6 @@ -namespace LongName {} +namespace LongName { + struct A; +} namespace A = LongName; namespace B = A; diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html index c821b46fef..11ecd9d67b 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html @@ -18,7 +18,8 @@

Namespaces

-LongName +LongName +

Namespace Aliases

@@ -30,8 +31,10 @@

Namespace Aliases

-A -B +A + +B +
@@ -39,6 +42,36 @@

Namespace Aliases

LongName

+

Types

+ + + + + + + + + + + +
Name
A
+
+
+
+

LongName::A

+
+
+

Synopsis

+
+Declared in <namespace-alias-3.cpp>
+
+
+struct A;
+
+
+
+ +
diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.xml b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.xml index 0a32bfcf76..7875e776e2 100644 --- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.xml +++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.xml @@ -3,13 +3,16 @@ xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc"> + + + - + - + diff --git a/test-files/golden-tests/symbols/namespace/namespace.adoc b/test-files/golden-tests/symbols/namespace/namespace.adoc index 3c4b0f4169..50abc8e536 100644 --- a/test-files/golden-tests/symbols/namespace/namespace.adoc +++ b/test-files/golden-tests/symbols/namespace/namespace.adoc @@ -12,9 +12,13 @@ | Name | <<00namespace,`<unnamed>`>> + | <> + | <> + | <> + |=== [#00namespace] @@ -28,7 +32,9 @@ | Name | <<00namespace-G,`G`>> + | <<00namespace-H,`H`>> + |=== === Functions @@ -37,6 +43,7 @@ | Name | <<00namespace-f10,`f10`>> + |=== [#00namespace-G] @@ -50,6 +57,7 @@ | Name | <<00namespace-G-f11,`f11`>> + |=== [#00namespace-G-f11] @@ -78,6 +86,7 @@ f11(); | Name | <<00namespace-H-f12,`f12`>> + |=== [#00namespace-H-f12] @@ -121,8 +130,11 @@ f10(); | Name | <> + | <> + | <> + |=== === Functions @@ -131,6 +143,7 @@ f10(); | Name | <> + |=== [#A-00namespace] @@ -144,6 +157,7 @@ f10(); | Name | <> + |=== [#A-00namespace-f3] @@ -172,6 +186,7 @@ f3(); | Name | <> + |=== [#A-B-f1] @@ -200,6 +215,7 @@ f1(); | Name | <> + |=== [#A-C-f2] @@ -243,8 +259,11 @@ f0(); | Name | <> + | <> + | <> + |=== === Functions @@ -253,6 +272,7 @@ f0(); | Name | <> + |=== [#D-00namespace] @@ -266,6 +286,7 @@ f0(); | Name | <> + |=== [#D-00namespace-f8] @@ -294,6 +315,7 @@ f8(); | Name | <> + |=== [#D-E-f6] @@ -322,6 +344,7 @@ f6(); | Name | <> + |=== [#D-F-f7] @@ -365,6 +388,7 @@ f5(); | Name | <> + |=== [#I-00namespace] @@ -378,6 +402,7 @@ f5(); | Name | <> + |=== [#I-00namespace-f14] diff --git a/test-files/golden-tests/symbols/namespace/namespace.html b/test-files/golden-tests/symbols/namespace/namespace.html index 2eb2648c85..73ca8a6db3 100644 --- a/test-files/golden-tests/symbols/namespace/namespace.html +++ b/test-files/golden-tests/symbols/namespace/namespace.html @@ -18,10 +18,14 @@

Namespaces

-<unnamed> -A -D -I +<unnamed> + +A + +D + +I +
@@ -38,8 +42,10 @@

Namespaces

-G -H +G + +H +

Functions

@@ -51,7 +57,8 @@

Functions

-f10 +f10 +
@@ -68,7 +75,8 @@

Functions

-f11 +f11 + @@ -101,7 +109,8 @@

Functions

-f12 +f12 + @@ -150,9 +159,12 @@

Namespaces

-<unnamed> -B -C +<unnamed> + +B + +C +

Functions

@@ -164,7 +176,8 @@

Functions

-f0 +f0 + @@ -181,7 +194,8 @@

Functions

-f3 +f3 + @@ -214,7 +228,8 @@

Functions

-f1 +f1 + @@ -247,7 +262,8 @@

Functions

-f2 +f2 + @@ -296,9 +312,12 @@

Namespaces

-<unnamed> -E -F +<unnamed> + +E + +F +

Functions

@@ -310,7 +329,8 @@

Functions

-f5 +f5 + @@ -327,7 +347,8 @@

Functions

-f8 +f8 + @@ -360,7 +381,8 @@

Functions

-f6 +f6 + @@ -393,7 +415,8 @@

Functions

-f7 +f7 + @@ -442,7 +465,8 @@

Namespaces

-<unnamed> +<unnamed> + @@ -459,7 +483,8 @@

Functions

-f14 +f14 + diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc index f66ff5e2fb..d8dc0070fe 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Overload briefs from function or operator classes @@ -22,7 +23,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | `no_way_to_infer_this_brief` overloads @@ -55,7 +57,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> [.small]#[constructor]# | Constructors diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.html b/test-files/golden-tests/symbols/overloads/overloads-brief.html index 45a6416cbf..6747120649 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-brief.html +++ b/test-files/golden-tests/symbols/overloads/overloads-brief.html @@ -13,37 +13,39 @@

Types

- + + + + + +
NameDescriptionNameDescription
A Overload briefs from function or operator classes - -
B Auxiliary class - -

Functions

- + + + + + + + +
NameDescriptionNameDescription
no_way_to_infer_this_brief no_way_to_infer_this_brief overloads - -
operator+ Unary plus operators - -
sameBrief Function with same brief - -
@@ -70,23 +72,24 @@

Member Functions

- + + + + + + + + + +
NameDescriptionNameDescription
A [constructor]Constructors - -
operator= Assignment operators - -
operator+ Addition operators - -
operator- operator- overloads - -
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc index 3d5a24b3f4..d2b1f86076 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | Test function diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.html b/test-files/golden-tests/symbols/overloads/overloads-metadata.html index ceb2ecf7b3..a6274848c9 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-metadata.html +++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.html @@ -13,14 +13,15 @@

Functions

- + + + +
NameDescriptionNameDescription
f Test function - -
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc index 521b1ad272..eba99582cf 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#left_shift] @@ -26,6 +28,7 @@ | Name | <> + |=== === Functions @@ -34,6 +37,7 @@ | Name | <> + |=== [#left_shift-A] @@ -54,7 +58,8 @@ class A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -150,14 +155,18 @@ operator<<( | Name | <> + | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -185,6 +194,7 @@ class B; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.html b/test-files/golden-tests/symbols/overloads/overloads-ostream.html index ad031d7eeb..beff507af1 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.html +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.html @@ -18,8 +18,10 @@

Namespaces

-left_shift -ostream +left_shift + +ostream + @@ -36,7 +38,8 @@

Types

-A +A +

Functions

@@ -48,7 +51,8 @@

Functions

-operator<< +operator<< + @@ -70,13 +74,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
operator<< -
operator<<
@@ -174,22 +179,26 @@

Types

-B -C -OStream +B + +C + +OStream +

Functions

- + + - + +
NameDescriptionNameDescription
operator<< -
operator<<
@@ -216,7 +225,8 @@

Friends

-operator<< +operator<< + diff --git a/test-files/golden-tests/symbols/overloads/overloads.adoc b/test-files/golden-tests/symbols/overloads/overloads.adoc index de53c49688..bf68d5fc0c 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads.adoc @@ -12,13 +12,16 @@ | Name | <> + | <> + |=== === Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -46,7 +49,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -56,7 +60,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -69,7 +74,9 @@ struct A; | Name | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html index 7b6a14877f..8be428f10e 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.html +++ b/test-files/golden-tests/symbols/overloads/overloads.html @@ -18,23 +18,26 @@

Types

-A -B +A + +B +

Functions

- + + - - + + + +
NameDescriptionNameDescription
f -
operator== -
f
operator==
@@ -56,26 +59,28 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
f -
f

Static Member Functions

- + + - + +
NameDescriptionNameDescription
g -
g

Friends

@@ -87,8 +92,10 @@

Friends

-operator== -operator== +operator== + +operator== + diff --git a/test-files/golden-tests/symbols/record/class-private-alias.adoc b/test-files/golden-tests/symbols/record/class-private-alias.adoc index ef76435439..24362dec12 100644 --- a/test-files/golden-tests/symbols/record/class-private-alias.adoc +++ b/test-files/golden-tests/symbols/record/class-private-alias.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#S] @@ -35,6 +36,7 @@ class S; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/record/class-private-alias.html b/test-files/golden-tests/symbols/record/class-private-alias.html index 4ec44238ee..12864daaed 100644 --- a/test-files/golden-tests/symbols/record/class-private-alias.html +++ b/test-files/golden-tests/symbols/record/class-private-alias.html @@ -18,7 +18,8 @@

Types

-S +S + @@ -45,7 +46,8 @@

Member Functions

-f +f + diff --git a/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc b/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc index b2c8d067e3..eb2884ae6d 100644 --- a/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc +++ b/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,8 +37,11 @@ struct A; | Name | <> + | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/record/class-template-partial-spec.html b/test-files/golden-tests/symbols/record/class-template-partial-spec.html index 3c5786a93d..e54fb82766 100644 --- a/test-files/golden-tests/symbols/record/class-template-partial-spec.html +++ b/test-files/golden-tests/symbols/record/class-template-partial-spec.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,9 +47,12 @@

Types

-B -B<T, long> -B<U*, T> +B + +B<T, long> + +B<U*, T> + diff --git a/test-files/golden-tests/symbols/record/class-template-spec.adoc b/test-files/golden-tests/symbols/record/class-template-spec.adoc index 748add1f4f..8e418f0bf7 100644 --- a/test-files/golden-tests/symbols/record/class-template-spec.adoc +++ b/test-files/golden-tests/symbols/record/class-template-spec.adoc @@ -12,14 +12,23 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#A-0e] @@ -44,6 +53,7 @@ struct A; | Name | <> + |=== @@ -85,6 +95,7 @@ struct <><int>; | Name | <> + |=== @@ -126,6 +137,7 @@ struct <><long>; | Name | <> + |=== @@ -167,6 +179,7 @@ struct B; | Name | <> + |=== @@ -208,6 +221,7 @@ struct <><T&>; | Name | <> + |=== @@ -249,6 +263,7 @@ struct <><T*>; | Name | <> + |=== @@ -292,6 +307,7 @@ struct C; | Name | <> + |=== @@ -333,6 +349,7 @@ struct <><int, int>; | Name | <> + |=== @@ -374,6 +391,7 @@ struct <><T*, int>; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/record/class-template-spec.html b/test-files/golden-tests/symbols/record/class-template-spec.html index d1be7000c3..994c538ef0 100644 --- a/test-files/golden-tests/symbols/record/class-template-spec.html +++ b/test-files/golden-tests/symbols/record/class-template-spec.html @@ -18,15 +18,24 @@

Types

-A -A<int> -A<long> -B -B<T&> -B<T*> -C -C<int, int> -C<T*, int> +A + +A<int> + +A<long> + +B + +B<T&> + +B<T*> + +C + +C<int, int> + +C<T*, int> + @@ -54,7 +63,8 @@

Member Functions

-f +f + @@ -100,7 +110,8 @@

Member Functions

-g +g + @@ -146,7 +157,8 @@

Member Functions

-h +h + @@ -192,7 +204,8 @@

Member Functions

-f +f + @@ -238,7 +251,8 @@

Member Functions

-h +h + @@ -284,7 +298,8 @@

Member Functions

-g +g + @@ -332,7 +347,8 @@

Member Functions

-f +f + @@ -378,7 +394,8 @@

Member Functions

-g +g + @@ -424,7 +441,8 @@

Member Functions

-h +h + 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 e5523e4399..3914a2aeac 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 @@ -12,96 +12,187 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#R0] @@ -126,7 +217,9 @@ struct R0 | Name | <> + | <> + |=== === Member Functions @@ -135,6 +228,7 @@ struct R0 | Name | <> + |=== @@ -359,7 +453,9 @@ struct R2 | Name | <> + | <> + |=== === Member Functions @@ -368,6 +464,7 @@ struct R2 | Name | <> + |=== @@ -538,7 +635,9 @@ struct R28 | Name | <> + | <> + |=== === Member Functions @@ -547,6 +646,7 @@ struct R28 | Name | <> + |=== @@ -573,7 +673,9 @@ struct R29 | Name | <> + | <> + |=== === Member Functions @@ -582,6 +684,7 @@ struct R29 | Name | <> + |=== @@ -626,6 +729,7 @@ struct R30 | Name | <> + |=== === Member Functions @@ -634,6 +738,7 @@ struct R30 | Name | <> + |=== @@ -717,6 +822,7 @@ struct R34 | Name | <> + |=== @@ -875,6 +981,7 @@ struct R41 | Name | <> + |=== === Member Functions @@ -883,6 +990,7 @@ struct R41 | Name | <> + |=== @@ -966,6 +1074,7 @@ struct R45 | Name | <> + |=== @@ -1141,7 +1250,9 @@ struct S0; | Name | <> + | <> + |=== === Member Functions @@ -1150,6 +1261,7 @@ struct S0; | Name | <> + |=== @@ -1175,6 +1287,7 @@ struct S1; | Name | <> + |=== === Member Functions @@ -1183,6 +1296,7 @@ struct S1; | Name | <> + |=== @@ -1211,7 +1325,9 @@ struct S2; | Name | <> + | <> + |=== === Member Functions @@ -1220,6 +1336,7 @@ struct S2; | Name | <> + |=== @@ -1245,6 +1362,7 @@ struct S3; | Name | <> + |=== @@ -1288,6 +1406,7 @@ struct S4; | Name | <> + |=== @@ -1361,6 +1480,7 @@ struct S5; | Name | <> + |=== === Member Functions @@ -1369,6 +1489,7 @@ struct S5; | Name | <> + |=== @@ -1394,6 +1515,7 @@ struct S6; | Name | <> + |=== === Member Functions @@ -1402,6 +1524,7 @@ struct S6; | Name | <> + |=== @@ -1430,7 +1553,9 @@ struct S7; | Name | <> + | <> + |=== === Member Functions @@ -1439,6 +1564,7 @@ struct S7; | Name | <> + |=== @@ -1464,6 +1590,7 @@ struct S8; | Name | <> + |=== @@ -1507,6 +1634,7 @@ struct S9; | Name | <> + |=== @@ -1626,7 +1754,9 @@ struct <><10>; | Name | <> + | <> + |=== === Member Functions @@ -1635,6 +1765,7 @@ struct <><10>; | Name | <> + |=== @@ -1660,7 +1791,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -1669,6 +1802,7 @@ struct S1; | Name | <> + |=== @@ -1715,7 +1849,9 @@ struct <><11>; | Name | <> + | <> + |=== === Member Functions @@ -1724,6 +1860,7 @@ struct <><11>; | Name | <> + |=== @@ -1852,7 +1989,9 @@ struct <><12>; | Name | <> + | <> + |=== === Member Functions @@ -1861,6 +2000,7 @@ struct <><12>; | Name | <> + |=== @@ -1886,7 +2026,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -1895,6 +2037,7 @@ struct S1; | Name | <> + |=== @@ -1941,8 +2084,11 @@ struct <><13>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -1951,6 +2097,7 @@ struct <><13>; | Name | <> + |=== @@ -2097,7 +2244,9 @@ struct <><15>; | Name | <> + | <> + |=== === Member Functions @@ -2106,6 +2255,7 @@ struct <><15>; | Name | <> + |=== @@ -2131,7 +2281,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -2140,6 +2292,7 @@ struct S1; | Name | <> + |=== @@ -2186,9 +2339,13 @@ struct <><16>; | Name | <> + | <> + | <> + | <> + |=== === Member Functions @@ -2197,6 +2354,7 @@ struct <><16>; | Name | <> + |=== @@ -2361,7 +2519,9 @@ struct <><18>; | Name | <> + | <> + |=== === Member Functions @@ -2370,6 +2530,7 @@ struct <><18>; | Name | <> + |=== @@ -2448,8 +2609,11 @@ struct <><19>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -2458,6 +2622,7 @@ struct <><19>; | Name | <> + |=== @@ -2554,7 +2719,9 @@ struct <><2>; | Name | <> + | <> + |=== === Member Functions @@ -2563,6 +2730,7 @@ struct <><2>; | Name | <> + |=== @@ -2641,9 +2809,13 @@ struct <><21>; | Name | <> + | <> + | <> + | <> + |=== === Member Functions @@ -2652,6 +2824,7 @@ struct <><21>; | Name | <> + |=== @@ -2766,8 +2939,11 @@ struct <><23>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -2776,6 +2952,7 @@ struct <><23>; | Name | <> + |=== @@ -2839,6 +3016,7 @@ struct <><24>; | Name | <> + |=== === Member Functions @@ -2847,6 +3025,7 @@ struct <><24>; | Name | <> + |=== @@ -2920,8 +3099,11 @@ struct <><25>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -2930,6 +3112,7 @@ struct <><25>; | Name | <> + |=== @@ -2993,6 +3176,7 @@ struct <><26>; | Name | <> + |=== === Member Functions @@ -3001,6 +3185,7 @@ struct <><26>; | Name | <> + |=== @@ -3026,6 +3211,7 @@ struct S6; | Name | <> + |=== === Member Functions @@ -3034,6 +3220,7 @@ struct S6; | Name | <> + |=== @@ -3125,8 +3312,11 @@ struct <><27>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -3135,6 +3325,7 @@ struct <><27>; | Name | <> + |=== @@ -3198,6 +3389,7 @@ struct <><28>; | Name | <> + |=== === Member Functions @@ -3206,6 +3398,7 @@ struct <><28>; | Name | <> + |=== @@ -3231,8 +3424,11 @@ struct S6; | Name | <> + | <> + | <> + |=== === Member Functions @@ -3241,6 +3437,7 @@ struct S6; | Name | <> + |=== @@ -3368,7 +3565,9 @@ struct <><3>; | Name | <> + | <> + |=== === Member Functions @@ -3377,6 +3576,7 @@ struct <><3>; | Name | <> + |=== @@ -3402,6 +3602,7 @@ struct S1; | Name | <> + |=== === Member Functions @@ -3410,6 +3611,7 @@ struct S1; | Name | <> + |=== @@ -3506,8 +3708,11 @@ struct <><30>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -3516,6 +3721,7 @@ struct <><30>; | Name | <> + |=== @@ -3579,6 +3785,7 @@ struct <><31>; | Name | <> + |=== === Member Functions @@ -3587,6 +3794,7 @@ struct <><31>; | Name | <> + |=== @@ -3612,7 +3820,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -3621,6 +3831,7 @@ struct S6; | Name | <> + |=== @@ -3730,8 +3941,11 @@ struct <><33>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -3740,6 +3954,7 @@ struct <><33>; | Name | <> + |=== @@ -3803,6 +4018,7 @@ struct <><34>; | Name | <> + |=== === Member Functions @@ -3811,6 +4027,7 @@ struct <><34>; | Name | <> + |=== @@ -3836,7 +4053,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -3845,6 +4064,7 @@ struct S6; | Name | <> + |=== @@ -3891,7 +4111,9 @@ struct <><35>; | Name | <> + | <> + |=== === Member Functions @@ -3900,6 +4122,7 @@ struct <><35>; | Name | <> + |=== @@ -4023,8 +4246,11 @@ struct <><36>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -4033,6 +4259,7 @@ struct <><36>; | Name | <> + |=== @@ -4096,6 +4323,7 @@ struct <><37>; | Name | <> + |=== === Member Functions @@ -4104,6 +4332,7 @@ struct <><37>; | Name | <> + |=== @@ -4129,7 +4358,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -4138,6 +4369,7 @@ struct S6; | Name | <> + |=== @@ -4184,7 +4416,9 @@ struct <><38>; | Name | <> + | <> + |=== === Member Functions @@ -4193,6 +4427,7 @@ struct <><38>; | Name | <> + |=== @@ -4316,8 +4551,11 @@ struct <><39>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -4326,6 +4564,7 @@ struct <><39>; | Name | <> + |=== @@ -4389,6 +4628,7 @@ struct <><40>; | Name | <> + |=== === Member Functions @@ -4397,6 +4637,7 @@ struct <><40>; | Name | <> + |=== @@ -4422,7 +4663,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -4431,6 +4674,7 @@ struct S6; | Name | <> + |=== @@ -4477,9 +4721,13 @@ struct <><41>; | Name | <> + | <> + | <> + | <> + |=== === Member Functions @@ -4488,6 +4736,7 @@ struct <><41>; | Name | <> + |=== @@ -4647,7 +4896,9 @@ struct <><4>; | Name | <> + | <> + |=== === Member Functions @@ -4656,6 +4907,7 @@ struct <><4>; | Name | <> + |=== @@ -4681,7 +4933,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -4690,6 +4944,7 @@ struct S1; | Name | <> + |=== @@ -4804,8 +5059,11 @@ struct <><43>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -4814,6 +5072,7 @@ struct <><43>; | Name | <> + |=== @@ -4877,6 +5136,7 @@ struct <><44>; | Name | <> + |=== === Member Functions @@ -4885,6 +5145,7 @@ struct <><44>; | Name | <> + |=== @@ -4910,7 +5171,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -4919,6 +5182,7 @@ struct S6; | Name | <> + |=== @@ -4965,8 +5229,11 @@ struct <><45>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -4975,6 +5242,7 @@ struct <><45>; | Name | <> + |=== @@ -5116,7 +5384,9 @@ struct <><6>; | Name | <> + | <> + |=== === Member Functions @@ -5125,6 +5395,7 @@ struct <><6>; | Name | <> + |=== @@ -5150,8 +5421,11 @@ struct S1; | Name | <> + | <> + | <> + |=== === Member Functions @@ -5160,6 +5434,7 @@ struct S1; | Name | <> + |=== @@ -5292,7 +5567,9 @@ struct <><8>; | Name | <> + | <> + |=== === Member Functions @@ -5301,6 +5578,7 @@ struct <><8>; | Name | <> + |=== @@ -5326,7 +5604,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -5335,6 +5615,7 @@ struct S1; | Name | <> + |=== @@ -5381,7 +5662,9 @@ struct <><9>; | Name | <> + | <> + |=== === Member Functions @@ -5390,6 +5673,7 @@ struct <><9>; | Name | <> + |=== @@ -5536,7 +5820,9 @@ struct <><10, bool>; | Name | <> + | <> + |=== === Member Functions @@ -5545,6 +5831,7 @@ struct <><10, bool>; | Name | <> + |=== @@ -5570,7 +5857,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -5579,6 +5868,7 @@ struct S1; | Name | <> + |=== @@ -5625,7 +5915,9 @@ struct <><11, bool>; | Name | <> + | <> + |=== === Member Functions @@ -5634,6 +5926,7 @@ struct <><11, bool>; | Name | <> + |=== @@ -5762,7 +6055,9 @@ struct <><12, bool>; | Name | <> + | <> + |=== === Member Functions @@ -5771,6 +6066,7 @@ struct <><12, bool>; | Name | <> + |=== @@ -5796,7 +6092,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -5805,6 +6103,7 @@ struct S1; | Name | <> + |=== @@ -5851,7 +6150,9 @@ struct <><13, bool>; | Name | <> + | <> + |=== === Member Functions @@ -5860,6 +6161,7 @@ struct <><13, bool>; | Name | <> + |=== @@ -5988,7 +6290,9 @@ struct <><15, bool>; | Name | <> + | <> + |=== === Member Functions @@ -5997,6 +6301,7 @@ struct <><15, bool>; | Name | <> + |=== @@ -6022,7 +6327,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -6031,6 +6338,7 @@ struct S1; | Name | <> + |=== @@ -6077,7 +6385,9 @@ struct <><16, bool>; | Name | <> + | <> + |=== === Member Functions @@ -6086,6 +6396,7 @@ struct <><16, bool>; | Name | <> + |=== @@ -6214,7 +6525,9 @@ struct <><18, bool>; | Name | <> + | <> + |=== === Member Functions @@ -6223,6 +6536,7 @@ struct <><18, bool>; | Name | <> + |=== @@ -6301,7 +6615,9 @@ struct <><19, bool>; | Name | <> + | <> + |=== === Member Functions @@ -6310,6 +6626,7 @@ struct <><19, bool>; | Name | <> + |=== @@ -6388,7 +6705,9 @@ struct <><2, bool>; | Name | <> + | <> + |=== === Member Functions @@ -6397,6 +6716,7 @@ struct <><2, bool>; | Name | <> + |=== @@ -6422,6 +6742,7 @@ struct S1; | Name | <> + |=== === Member Functions @@ -6430,6 +6751,7 @@ struct S1; | Name | <> + |=== @@ -6526,7 +6848,9 @@ struct <><21, bool>; | Name | <> + | <> + |=== === Member Functions @@ -6535,6 +6859,7 @@ struct <><21, bool>; | Name | <> + |=== @@ -6613,8 +6938,11 @@ struct <><23, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -6623,6 +6951,7 @@ struct <><23, bool>; | Name | <> + |=== @@ -6686,6 +7015,7 @@ struct <><24, bool>; | Name | <> + |=== === Member Functions @@ -6694,6 +7024,7 @@ struct <><24, bool>; | Name | <> + |=== @@ -6719,6 +7050,7 @@ struct S6; | Name | <> + |=== === Member Functions @@ -6727,6 +7059,7 @@ struct S6; | Name | <> + |=== @@ -6818,8 +7151,11 @@ struct <><25, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -6828,6 +7164,7 @@ struct <><25, bool>; | Name | <> + |=== @@ -6891,6 +7228,7 @@ struct <><26, bool>; | Name | <> + |=== === Member Functions @@ -6899,6 +7237,7 @@ struct <><26, bool>; | Name | <> + |=== @@ -6924,6 +7263,7 @@ struct S6; | Name | <> + |=== === Member Functions @@ -6932,6 +7272,7 @@ struct S6; | Name | <> + |=== @@ -7023,8 +7364,11 @@ struct <><27, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -7033,6 +7377,7 @@ struct <><27, bool>; | Name | <> + |=== @@ -7096,6 +7441,7 @@ struct <><28, bool>; | Name | <> + |=== === Member Functions @@ -7104,6 +7450,7 @@ struct <><28, bool>; | Name | <> + |=== @@ -7129,6 +7476,7 @@ struct S6; | Name | <> + |=== === Member Functions @@ -7137,6 +7485,7 @@ struct S6; | Name | <> + |=== @@ -7228,7 +7577,9 @@ struct <><3, bool>; | Name | <> + | <> + |=== === Member Functions @@ -7237,6 +7588,7 @@ struct <><3, bool>; | Name | <> + |=== @@ -7262,6 +7614,7 @@ struct S1; | Name | <> + |=== === Member Functions @@ -7270,6 +7623,7 @@ struct S1; | Name | <> + |=== @@ -7366,8 +7720,11 @@ struct <><30, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -7376,6 +7733,7 @@ struct <><30, bool>; | Name | <> + |=== @@ -7439,6 +7797,7 @@ struct <><31, bool>; | Name | <> + |=== === Member Functions @@ -7447,6 +7806,7 @@ struct <><31, bool>; | Name | <> + |=== @@ -7472,6 +7832,7 @@ struct S6; | Name | <> + |=== === Member Functions @@ -7480,6 +7841,7 @@ struct S6; | Name | <> + |=== @@ -7571,8 +7933,11 @@ struct <><33, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -7581,6 +7946,7 @@ struct <><33, bool>; | Name | <> + |=== @@ -7644,6 +8010,7 @@ struct <><34, bool>; | Name | <> + |=== === Member Functions @@ -7652,6 +8019,7 @@ struct <><34, bool>; | Name | <> + |=== @@ -7677,7 +8045,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -7686,6 +8056,7 @@ struct S6; | Name | <> + |=== @@ -7732,7 +8103,9 @@ struct <><35, bool>; | Name | <> + | <> + |=== === Member Functions @@ -7741,6 +8114,7 @@ struct <><35, bool>; | Name | <> + |=== @@ -7766,6 +8140,7 @@ struct S8; | Name | <> + |=== @@ -7887,8 +8262,11 @@ struct <><36, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -7897,6 +8275,7 @@ struct <><36, bool>; | Name | <> + |=== @@ -7960,6 +8339,7 @@ struct <><37, bool>; | Name | <> + |=== === Member Functions @@ -7968,6 +8348,7 @@ struct <><37, bool>; | Name | <> + |=== @@ -7993,7 +8374,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -8002,6 +8385,7 @@ struct S6; | Name | <> + |=== @@ -8048,7 +8432,9 @@ struct <><38, bool>; | Name | <> + | <> + |=== === Member Functions @@ -8057,6 +8443,7 @@ struct <><38, bool>; | Name | <> + |=== @@ -8180,8 +8567,11 @@ struct <><39, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -8190,6 +8580,7 @@ struct <><39, bool>; | Name | <> + |=== @@ -8253,6 +8644,7 @@ struct <><40, bool>; | Name | <> + |=== === Member Functions @@ -8261,6 +8653,7 @@ struct <><40, bool>; | Name | <> + |=== @@ -8286,7 +8679,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -8295,6 +8690,7 @@ struct S6; | Name | <> + |=== @@ -8341,7 +8737,9 @@ struct <><41, bool>; | Name | <> + | <> + |=== === Member Functions @@ -8350,6 +8748,7 @@ struct <><41, bool>; | Name | <> + |=== @@ -8473,7 +8872,9 @@ struct <><4, bool>; | Name | <> + | <> + |=== === Member Functions @@ -8482,6 +8883,7 @@ struct <><4, bool>; | Name | <> + |=== @@ -8507,6 +8909,7 @@ struct S1; | Name | <> + |=== === Member Functions @@ -8515,6 +8918,7 @@ struct S1; | Name | <> + |=== @@ -8611,8 +9015,11 @@ struct <><43, bool>; | Name | <> + | <> + | <> + |=== === Member Functions @@ -8621,6 +9028,7 @@ struct <><43, bool>; | Name | <> + |=== @@ -8684,6 +9092,7 @@ struct <><44, bool>; | Name | <> + |=== === Member Functions @@ -8692,6 +9101,7 @@ struct <><44, bool>; | Name | <> + |=== @@ -8717,7 +9127,9 @@ struct S6; | Name | <> + | <> + |=== === Member Functions @@ -8726,6 +9138,7 @@ struct S6; | Name | <> + |=== @@ -8772,7 +9185,9 @@ struct <><45, bool>; | Name | <> + | <> + |=== === Member Functions @@ -8781,6 +9196,7 @@ struct <><45, bool>; | Name | <> + |=== @@ -8904,7 +9320,9 @@ struct <><6, bool>; | Name | <> + | <> + |=== === Member Functions @@ -8913,6 +9331,7 @@ struct <><6, bool>; | Name | <> + |=== @@ -8938,6 +9357,7 @@ struct S1; | Name | <> + |=== === Member Functions @@ -8946,6 +9366,7 @@ struct S1; | Name | <> + |=== @@ -9042,7 +9463,9 @@ struct <><8, bool>; | Name | <> + | <> + |=== === Member Functions @@ -9051,6 +9474,7 @@ struct <><8, bool>; | Name | <> + |=== @@ -9076,7 +9500,9 @@ struct S1; | Name | <> + | <> + |=== === Member Functions @@ -9085,6 +9511,7 @@ struct S1; | Name | <> + |=== @@ -9131,7 +9558,9 @@ struct <><9, bool>; | Name | <> + | <> + |=== === Member Functions @@ -9140,6 +9569,7 @@ struct <><9, bool>; | Name | <> + |=== @@ -9165,6 +9595,7 @@ struct S3; | Name | <> + |=== 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 54cffeeaf0..d8a37ffd54 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 @@ -18,97 +18,188 @@

Types

-R0 -R1 -R10 -R11 -R12 -R13 -R14 -R15 -R16 -R17 -R18 -R19 -R2 -R20 -R21 -R22 -R23 -R24 -R25 -R26 -R27 -R28 -R29 -R3 -R30 -R31 -R32 -R33 -R34 -R35 -R36 -R37 -R38 -R39 -R4 -R40 -R41 -R42 -R43 -R44 -R45 -R46 -R47 -R48 -R5 -R6 -R7 -R8 -R9 -S0 -S0<0> -S0<10> -S0<12> -S0<15> -S0<18> -S0<19> -S0<2> -S0<21> -S0<23> -S0<25> -S0<27> -S0<3> -S0<30> -S0<33> -S0<36> -S0<39> -S0<4> -S0<43> -S0<6> -S0<8> -S0<1, int*> -S0<10, bool> -S0<12, bool> -S0<15, bool> -S0<18, bool> -S0<19, bool> -S0<2, bool> -S0<21, bool> -S0<23, bool> -S0<25, bool> -S0<27, bool> -S0<3, bool> -S0<30, bool> -S0<33, bool> -S0<36, bool> -S0<39, bool> -S0<4, bool> -S0<43, bool> -S0<6, bool> -S0<8, bool> -S0<1, T*> +R0 + +R1 + +R10 + +R11 + +R12 + +R13 + +R14 + +R15 + +R16 + +R17 + +R18 + +R19 + +R2 + +R20 + +R21 + +R22 + +R23 + +R24 + +R25 + +R26 + +R27 + +R28 + +R29 + +R3 + +R30 + +R31 + +R32 + +R33 + +R34 + +R35 + +R36 + +R37 + +R38 + +R39 + +R4 + +R40 + +R41 + +R42 + +R43 + +R44 + +R45 + +R46 + +R47 + +R48 + +R5 + +R6 + +R7 + +R8 + +R9 + +S0 + +S0<0> + +S0<10> + +S0<12> + +S0<15> + +S0<18> + +S0<19> + +S0<2> + +S0<21> + +S0<23> + +S0<25> + +S0<27> + +S0<3> + +S0<30> + +S0<33> + +S0<36> + +S0<39> + +S0<4> + +S0<43> + +S0<6> + +S0<8> + +S0<1, int*> + +S0<10, bool> + +S0<12, bool> + +S0<15, bool> + +S0<18, bool> + +S0<19, bool> + +S0<2, bool> + +S0<21, bool> + +S0<23, bool> + +S0<25, bool> + +S0<27, bool> + +S0<3, bool> + +S0<30, bool> + +S0<33, bool> + +S0<36, bool> + +S0<39, bool> + +S0<4, bool> + +S0<43, bool> + +S0<6, bool> + +S0<8, bool> + +S0<1, T*> + @@ -136,8 +227,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -149,7 +242,8 @@

Member Functions

-f0 +f0 + @@ -377,8 +471,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -390,7 +486,8 @@

Member Functions

-f0 +f0 + @@ -564,8 +661,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -577,7 +676,8 @@

Member Functions

-f0 +f0 + @@ -607,8 +707,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -620,7 +722,8 @@

Member Functions

-f0 +f0 + @@ -668,7 +771,8 @@

Types

-S2 +S2 +

Member Functions

@@ -680,7 +784,8 @@

Member Functions

-f1 +f1 + @@ -767,7 +872,8 @@

Member Functions

-f3 +f3 + @@ -929,7 +1035,8 @@

Types

-S7 +S7 +

Member Functions

@@ -941,7 +1048,8 @@

Member Functions

-f6 +f6 + @@ -1028,7 +1136,8 @@

Member Functions

-f8 +f8 + @@ -1207,8 +1316,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -1220,7 +1331,8 @@

Member Functions

-f0 +f0 + @@ -1249,7 +1361,8 @@

Types

-S2 +S2 +

Member Functions

@@ -1261,7 +1374,8 @@

Member Functions

-f1 +f1 + @@ -1293,8 +1407,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -1306,7 +1422,8 @@

Member Functions

-f2 +f2 + @@ -1335,7 +1452,8 @@

Member Functions

-f3 +f3 + @@ -1383,7 +1501,8 @@

Member Functions

-f4 +f4 + @@ -1463,7 +1582,8 @@

Types

-S6 +S6 +

Member Functions

@@ -1475,7 +1595,8 @@

Member Functions

-f5 +f5 + @@ -1504,7 +1625,8 @@

Types

-S7 +S7 +

Member Functions

@@ -1516,7 +1638,8 @@

Member Functions

-f6 +f6 + @@ -1548,8 +1671,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -1561,7 +1686,8 @@

Member Functions

-f7 +f7 + @@ -1590,7 +1716,8 @@

Member Functions

-f8 +f8 + @@ -1638,7 +1765,8 @@

Member Functions

-f9 +f9 + @@ -1766,8 +1894,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -1779,7 +1909,8 @@

Member Functions

-f0 +f0 + @@ -1808,8 +1939,10 @@

Types

-S2 -S2<11> +S2 + +S2<11> +

Member Functions

@@ -1821,7 +1954,8 @@

Member Functions

-f1 +f1 + @@ -1871,8 +2005,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -1884,7 +2020,8 @@

Member Functions

-f2 +f2 + @@ -2019,8 +2156,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -2032,7 +2171,8 @@

Member Functions

-f0 +f0 + @@ -2061,8 +2201,10 @@

Types

-S2 -S2<13> +S2 + +S2<13> +

Member Functions

@@ -2074,7 +2216,8 @@

Member Functions

-f1 +f1 + @@ -2124,9 +2267,12 @@

Types

-S3 -S4 -S4<14> +S3 + +S4 + +S4<14> +

Member Functions

@@ -2138,7 +2284,8 @@

Member Functions

-f2 +f2 + @@ -2291,8 +2438,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -2304,7 +2453,8 @@

Member Functions

-f0 +f0 + @@ -2333,8 +2483,10 @@

Types

-S2 -S2<16> +S2 + +S2<16> +

Member Functions

@@ -2346,7 +2498,8 @@

Member Functions

-f1 +f1 + @@ -2396,10 +2549,14 @@

Types

-S3 -S4 -S4<17, int*> -S4<17, T*> +S3 + +S4 + +S4<17, int*> + +S4<17, T*> +

Member Functions

@@ -2411,7 +2568,8 @@

Member Functions

-f2 +f2 + @@ -2582,8 +2740,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -2595,7 +2755,8 @@

Member Functions

-f0 +f0 + @@ -2678,9 +2839,12 @@

Types

-S1 -S5 -S5<20> +S1 + +S5 + +S5<20> +

Member Functions

@@ -2692,7 +2856,8 @@

Member Functions

-f0 +f0 + @@ -2793,8 +2958,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -2806,7 +2973,8 @@

Member Functions

-f0 +f0 + @@ -2889,10 +3057,14 @@

Types

-S1 -S5 -S5<22, int*> -S5<22, T*> +S1 + +S5 + +S5<22, int*> + +S5<22, T*> +

Member Functions

@@ -2904,7 +3076,8 @@

Member Functions

-f0 +f0 + @@ -3023,9 +3196,12 @@

Types

-S1 -S5 -S5<24> +S1 + +S5 + +S5<24> +

Member Functions

@@ -3037,7 +3213,8 @@

Member Functions

-f0 +f0 + @@ -3104,7 +3281,8 @@

Types

-S6 +S6 +

Member Functions

@@ -3116,7 +3294,8 @@

Member Functions

-f5 +f5 + @@ -3195,9 +3374,12 @@

Types

-S1 -S5 -S5<26> +S1 + +S5 + +S5<26> +

Member Functions

@@ -3209,7 +3391,8 @@

Member Functions

-f0 +f0 + @@ -3276,7 +3459,8 @@

Types

-S6 +S6 +

Member Functions

@@ -3288,7 +3472,8 @@

Member Functions

-f5 +f5 + @@ -3317,7 +3502,8 @@

Types

-S7 +S7 +

Member Functions

@@ -3329,7 +3515,8 @@

Member Functions

-f6 +f6 + @@ -3427,9 +3614,12 @@

Types

-S1 -S5 -S5<28> +S1 + +S5 + +S5<28> +

Member Functions

@@ -3441,7 +3631,8 @@

Member Functions

-f0 +f0 + @@ -3508,7 +3699,8 @@

Types

-S6 +S6 +

Member Functions

@@ -3520,7 +3712,8 @@

Member Functions

-f5 +f5 + @@ -3549,9 +3742,12 @@

Types

-S7 -S7<29, int*> -S7<29, T*> +S7 + +S7<29, int*> + +S7<29, T*> +

Member Functions

@@ -3563,7 +3759,8 @@

Member Functions

-f6 +f6 + @@ -3697,8 +3894,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -3710,7 +3909,8 @@

Member Functions

-f0 +f0 + @@ -3739,7 +3939,8 @@

Types

-S2 +S2 +

Member Functions

@@ -3751,7 +3952,8 @@

Member Functions

-f1 +f1 + @@ -3853,9 +4055,12 @@

Types

-S1 -S5 -S5<31> +S1 + +S5 + +S5<31> +

Member Functions

@@ -3867,7 +4072,8 @@

Member Functions

-f0 +f0 + @@ -3934,7 +4140,8 @@

Types

-S6 +S6 +

Member Functions

@@ -3946,7 +4153,8 @@

Member Functions

-f5 +f5 + @@ -3975,8 +4183,10 @@

Types

-S7 -S7<32> +S7 + +S7<32> +

Member Functions

@@ -3988,7 +4198,8 @@

Member Functions

-f6 +f6 + @@ -4104,9 +4315,12 @@

Types

-S1 -S5 -S5<34> +S1 + +S5 + +S5<34> +

Member Functions

@@ -4118,7 +4332,8 @@

Member Functions

-f0 +f0 + @@ -4185,7 +4400,8 @@

Types

-S6 +S6 +

Member Functions

@@ -4197,7 +4413,8 @@

Member Functions

-f5 +f5 + @@ -4226,8 +4443,10 @@

Types

-S7 -S7<35> +S7 + +S7<35> +

Member Functions

@@ -4239,7 +4458,8 @@

Member Functions

-f6 +f6 + @@ -4289,8 +4509,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -4302,7 +4524,8 @@

Member Functions

-f7 +f7 + @@ -4433,9 +4656,12 @@

Types

-S1 -S5 -S5<37> +S1 + +S5 + +S5<37> +

Member Functions

@@ -4447,7 +4673,8 @@

Member Functions

-f0 +f0 + @@ -4514,7 +4741,8 @@

Types

-S6 +S6 +

Member Functions

@@ -4526,7 +4754,8 @@

Member Functions

-f5 +f5 + @@ -4555,8 +4784,10 @@

Types

-S7 -S7<38> +S7 + +S7<38> +

Member Functions

@@ -4568,7 +4799,8 @@

Member Functions

-f6 +f6 + @@ -4618,8 +4850,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -4631,7 +4865,8 @@

Member Functions

-f7 +f7 + @@ -4762,9 +4997,12 @@

Types

-S1 -S5 -S5<40> +S1 + +S5 + +S5<40> +

Member Functions

@@ -4776,7 +5014,8 @@

Member Functions

-f0 +f0 + @@ -4843,7 +5082,8 @@

Types

-S6 +S6 +

Member Functions

@@ -4855,7 +5095,8 @@

Member Functions

-f5 +f5 + @@ -4884,8 +5125,10 @@

Types

-S7 -S7<41> +S7 + +S7<41> +

Member Functions

@@ -4897,7 +5140,8 @@

Member Functions

-f6 +f6 + @@ -4947,10 +5191,14 @@

Types

-S8 -S9 -S9<42, int*> -S9<42, T*> +S8 + +S9 + +S9<42, int*> + +S9<42, T*> +

Member Functions

@@ -4962,7 +5210,8 @@

Member Functions

-f7 +f7 + @@ -5129,8 +5378,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -5142,7 +5393,8 @@

Member Functions

-f0 +f0 + @@ -5171,8 +5423,10 @@

Types

-S2 -S2<5> +S2 + +S2<5> +

Member Functions

@@ -5184,7 +5438,8 @@

Member Functions

-f1 +f1 + @@ -5304,9 +5559,12 @@

Types

-S1 -S5 -S5<44> +S1 + +S5 + +S5<44> +

Member Functions

@@ -5318,7 +5576,8 @@

Member Functions

-f0 +f0 + @@ -5385,7 +5644,8 @@

Types

-S6 +S6 +

Member Functions

@@ -5397,7 +5657,8 @@

Member Functions

-f5 +f5 + @@ -5426,8 +5687,10 @@

Types

-S7 -S7<45> +S7 + +S7<45> +

Member Functions

@@ -5439,7 +5702,8 @@

Member Functions

-f6 +f6 + @@ -5489,9 +5753,12 @@

Types

-S8 -S9 -S9<46> +S8 + +S9 + +S9<46> +

Member Functions

@@ -5503,7 +5770,8 @@

Member Functions

-f7 +f7 + @@ -5652,8 +5920,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -5665,7 +5935,8 @@

Member Functions

-f0 +f0 + @@ -5694,9 +5965,12 @@

Types

-S2 -S2<7, int*> -S2<7, T*> +S2 + +S2<7, int*> + +S2<7, T*> +

Member Functions

@@ -5708,7 +5982,8 @@

Member Functions

-f1 +f1 + @@ -5846,8 +6121,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -5859,7 +6136,8 @@

Member Functions

-f0 +f0 + @@ -5888,8 +6166,10 @@

Types

-S2 -S2<9> +S2 + +S2<9> +

Member Functions

@@ -5901,7 +6181,8 @@

Member Functions

-f1 +f1 + @@ -5951,8 +6232,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -5964,7 +6247,8 @@

Member Functions

-f2 +f2 + @@ -6117,8 +6401,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -6130,7 +6416,8 @@

Member Functions

-f0 +f0 + @@ -6159,8 +6446,10 @@

Types

-S2 -S2<11, bool> +S2 + +S2<11, bool> +

Member Functions

@@ -6172,7 +6461,8 @@

Member Functions

-f1 +f1 + @@ -6222,8 +6512,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -6235,7 +6527,8 @@

Member Functions

-f2 +f2 + @@ -6370,8 +6663,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -6383,7 +6678,8 @@

Member Functions

-f0 +f0 + @@ -6412,8 +6708,10 @@

Types

-S2 -S2<13, bool> +S2 + +S2<13, bool> +

Member Functions

@@ -6425,7 +6723,8 @@

Member Functions

-f1 +f1 + @@ -6475,8 +6774,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -6488,7 +6789,8 @@

Member Functions

-f2 +f2 + @@ -6623,8 +6925,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -6636,7 +6940,8 @@

Member Functions

-f0 +f0 + @@ -6665,8 +6970,10 @@

Types

-S2 -S2<16, bool> +S2 + +S2<16, bool> +

Member Functions

@@ -6678,7 +6985,8 @@

Member Functions

-f1 +f1 + @@ -6728,8 +7036,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -6741,7 +7051,8 @@

Member Functions

-f2 +f2 + @@ -6876,8 +7187,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -6889,7 +7202,8 @@

Member Functions

-f0 +f0 + @@ -6972,8 +7286,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -6985,7 +7301,8 @@

Member Functions

-f0 +f0 + @@ -7068,8 +7385,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -7081,7 +7400,8 @@

Member Functions

-f0 +f0 + @@ -7110,7 +7430,8 @@

Types

-S2 +S2 +

Member Functions

@@ -7122,7 +7443,8 @@

Member Functions

-f1 +f1 + @@ -7224,8 +7546,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -7237,7 +7561,8 @@

Member Functions

-f0 +f0 + @@ -7320,9 +7645,12 @@

Types

-S1 -S5 -S5<24, bool> +S1 + +S5 + +S5<24, bool> +

Member Functions

@@ -7334,7 +7662,8 @@

Member Functions

-f0 +f0 + @@ -7401,7 +7730,8 @@

Types

-S6 +S6 +

Member Functions

@@ -7413,7 +7743,8 @@

Member Functions

-f5 +f5 + @@ -7442,7 +7773,8 @@

Types

-S7 +S7 +

Member Functions

@@ -7454,7 +7786,8 @@

Member Functions

-f6 +f6 + @@ -7552,9 +7885,12 @@

Types

-S1 -S5 -S5<26, bool> +S1 + +S5 + +S5<26, bool> +

Member Functions

@@ -7566,7 +7902,8 @@

Member Functions

-f0 +f0 + @@ -7633,7 +7970,8 @@

Types

-S6 +S6 +

Member Functions

@@ -7645,7 +7983,8 @@

Member Functions

-f5 +f5 + @@ -7674,7 +8013,8 @@

Types

-S7 +S7 +

Member Functions

@@ -7686,7 +8026,8 @@

Member Functions

-f6 +f6 + @@ -7784,9 +8125,12 @@

Types

-S1 -S5 -S5<28, bool> +S1 + +S5 + +S5<28, bool> +

Member Functions

@@ -7798,7 +8142,8 @@

Member Functions

-f0 +f0 + @@ -7865,7 +8210,8 @@

Types

-S6 +S6 +

Member Functions

@@ -7877,7 +8223,8 @@

Member Functions

-f5 +f5 + @@ -7906,7 +8253,8 @@

Types

-S7 +S7 +

Member Functions

@@ -7918,7 +8266,8 @@

Member Functions

-f6 +f6 + @@ -8016,8 +8365,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -8029,7 +8380,8 @@

Member Functions

-f0 +f0 + @@ -8058,7 +8410,8 @@

Types

-S2 +S2 +

Member Functions

@@ -8070,7 +8423,8 @@

Member Functions

-f1 +f1 + @@ -8172,9 +8526,12 @@

Types

-S1 -S5 -S5<31, bool> +S1 + +S5 + +S5<31, bool> +

Member Functions

@@ -8186,7 +8543,8 @@

Member Functions

-f0 +f0 + @@ -8253,7 +8611,8 @@

Types

-S6 +S6 +

Member Functions

@@ -8265,7 +8624,8 @@

Member Functions

-f5 +f5 + @@ -8294,7 +8654,8 @@

Types

-S7 +S7 +

Member Functions

@@ -8306,7 +8667,8 @@

Member Functions

-f6 +f6 + @@ -8404,9 +8766,12 @@

Types

-S1 -S5 -S5<34, bool> +S1 + +S5 + +S5<34, bool> +

Member Functions

@@ -8418,7 +8783,8 @@

Member Functions

-f0 +f0 + @@ -8485,7 +8851,8 @@

Types

-S6 +S6 +

Member Functions

@@ -8497,7 +8864,8 @@

Member Functions

-f5 +f5 + @@ -8526,8 +8894,10 @@

Types

-S7 -S7<35, bool> +S7 + +S7<35, bool> +

Member Functions

@@ -8539,7 +8909,8 @@

Member Functions

-f6 +f6 + @@ -8589,8 +8960,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -8602,7 +8975,8 @@

Member Functions

-f7 +f7 + @@ -8631,7 +9005,8 @@

Member Functions

-f8 +f8 + @@ -8761,9 +9136,12 @@

Types

-S1 -S5 -S5<37, bool> +S1 + +S5 + +S5<37, bool> +

Member Functions

@@ -8775,7 +9153,8 @@

Member Functions

-f0 +f0 + @@ -8842,7 +9221,8 @@

Types

-S6 +S6 +

Member Functions

@@ -8854,7 +9234,8 @@

Member Functions

-f5 +f5 + @@ -8883,8 +9264,10 @@

Types

-S7 -S7<38, bool> +S7 + +S7<38, bool> +

Member Functions

@@ -8896,7 +9279,8 @@

Member Functions

-f6 +f6 + @@ -8946,8 +9330,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -8959,7 +9345,8 @@

Member Functions

-f7 +f7 + @@ -9090,9 +9477,12 @@

Types

-S1 -S5 -S5<40, bool> +S1 + +S5 + +S5<40, bool> +

Member Functions

@@ -9104,7 +9494,8 @@

Member Functions

-f0 +f0 + @@ -9171,7 +9562,8 @@

Types

-S6 +S6 +

Member Functions

@@ -9183,7 +9575,8 @@

Member Functions

-f5 +f5 + @@ -9212,8 +9605,10 @@

Types

-S7 -S7<41, bool> +S7 + +S7<41, bool> +

Member Functions

@@ -9225,7 +9620,8 @@

Member Functions

-f6 +f6 + @@ -9275,8 +9671,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -9288,7 +9686,8 @@

Member Functions

-f7 +f7 + @@ -9419,8 +9818,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -9432,7 +9833,8 @@

Member Functions

-f0 +f0 + @@ -9461,7 +9863,8 @@

Types

-S2 +S2 +

Member Functions

@@ -9473,7 +9876,8 @@

Member Functions

-f1 +f1 + @@ -9575,9 +9979,12 @@

Types

-S1 -S5 -S5<44, bool> +S1 + +S5 + +S5<44, bool> +

Member Functions

@@ -9589,7 +9996,8 @@

Member Functions

-f0 +f0 + @@ -9656,7 +10064,8 @@

Types

-S6 +S6 +

Member Functions

@@ -9668,7 +10077,8 @@

Member Functions

-f5 +f5 + @@ -9697,8 +10107,10 @@

Types

-S7 -S7<45, bool> +S7 + +S7<45, bool> +

Member Functions

@@ -9710,7 +10122,8 @@

Member Functions

-f6 +f6 + @@ -9760,8 +10173,10 @@

Types

-S8 -S9 +S8 + +S9 +

Member Functions

@@ -9773,7 +10188,8 @@

Member Functions

-f7 +f7 + @@ -9904,8 +10320,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -9917,7 +10335,8 @@

Member Functions

-f0 +f0 + @@ -9946,7 +10365,8 @@

Types

-S2 +S2 +

Member Functions

@@ -9958,7 +10378,8 @@

Member Functions

-f1 +f1 + @@ -10060,8 +10481,10 @@

Types

-S1 -S5 +S1 + +S5 +

Member Functions

@@ -10073,7 +10496,8 @@

Member Functions

-f0 +f0 + @@ -10102,8 +10526,10 @@

Types

-S2 -S2<9, bool> +S2 + +S2<9, bool> +

Member Functions

@@ -10115,7 +10541,8 @@

Member Functions

-f1 +f1 + @@ -10165,8 +10592,10 @@

Types

-S3 -S4 +S3 + +S4 +

Member Functions

@@ -10178,7 +10607,8 @@

Member Functions

-f2 +f2 + @@ -10207,7 +10637,8 @@

Member Functions

-f3 +f3 + diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc index fb2d793bc5..9e2688f286 100644 --- a/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc +++ b/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc @@ -12,9 +12,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#A-0e] @@ -57,8 +61,11 @@ struct <><double>; | Name | <> + | <> + | <> + |=== @@ -85,7 +92,9 @@ struct D; | Name | <> + | <> + |=== @@ -130,6 +139,7 @@ struct <><T*>; | Name | <> + |=== @@ -173,7 +183,9 @@ struct <><float>; | Name | <> + | <> + |=== @@ -236,7 +248,9 @@ struct <><short>; | Name | <> + | <> + |=== @@ -281,6 +295,7 @@ struct <><int*>; | Name | <> + |=== @@ -324,8 +339,11 @@ struct <><long*>; | Name | <> + | <> + | <> + |=== @@ -388,6 +406,7 @@ struct <><int*>; | Name | <> + |=== @@ -431,8 +450,11 @@ struct <><T*>; | Name | <> + | <> + | <> + |=== @@ -495,6 +517,7 @@ struct <><U*>; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-2.html b/test-files/golden-tests/symbols/record/class-template-specializations-2.html index 29ee0f02a9..abea224f85 100644 --- a/test-files/golden-tests/symbols/record/class-template-specializations-2.html +++ b/test-files/golden-tests/symbols/record/class-template-specializations-2.html @@ -18,10 +18,14 @@

Types

-A -A<double> -A<long*> -A<T*> +A + +A<double> + +A<long*> + +A<T*> + @@ -67,9 +71,12 @@

Types

-D -D<float> -D<short> +D + +D<float> + +D<short> + @@ -99,8 +106,10 @@

Types

-E -E<T*> +E + +E<T*> + @@ -148,7 +157,8 @@

Types

-F +F + @@ -195,8 +205,10 @@

Types

-G -G<T*> +G + +G<T*> + @@ -262,8 +274,10 @@

Types

-E -E<int*> +E + +E<int*> + @@ -311,7 +325,8 @@

Types

-F +F + @@ -358,9 +373,12 @@

Types

-B -B<int> -B<int*> +B + +B<int> + +B<int*> + @@ -426,7 +444,8 @@

Types

-C +C + @@ -473,9 +492,12 @@

Types

-B -B<int> -B<U*> +B + +B<int> + +B<U*> + @@ -541,7 +563,8 @@

Types

-C +C + diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc index 2a5ec30536..344438681c 100644 --- a/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc +++ b/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc @@ -12,11 +12,17 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + |=== [#A-0e] @@ -41,7 +47,9 @@ struct A; | Name | <> + | <> + |=== @@ -68,8 +76,11 @@ struct B; | Name | <> + | <> + | <> + |=== @@ -149,8 +160,11 @@ struct <><double>; | Name | <> + | <> + | <> + |=== @@ -230,7 +244,9 @@ struct <><float>; | Name | <> + | <> + |=== @@ -275,8 +291,11 @@ struct <><double, double>; | Name | <> + | <> + | <> + |=== @@ -356,8 +375,11 @@ struct <><long>; | Name | <> + | <> + | <> + |=== @@ -384,8 +406,11 @@ struct B; | Name | <> + | <> + | <> + |=== @@ -465,8 +490,11 @@ struct <><double>; | Name | <> + | <> + | <> + |=== @@ -546,8 +574,11 @@ struct <><float>; | Name | <> + | <> + | <> + |=== @@ -627,8 +658,11 @@ struct <><short>; | Name | <> + | <> + | <> + |=== @@ -673,8 +707,11 @@ struct <><double>; | Name | <> + | <> + | <> + |=== @@ -754,8 +791,11 @@ struct <><void>; | Name | <> + | <> + | <> + |=== @@ -835,8 +875,11 @@ struct <><unsigned int>; | Name | <> + | <> + | <> + |=== @@ -881,8 +924,11 @@ struct <><double>; | Name | <> + | <> + | <> + |=== @@ -962,8 +1008,11 @@ struct <><float>; | Name | <> + | <> + | <> + |=== @@ -1042,20 +1091,35 @@ struct E; | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-3.html b/test-files/golden-tests/symbols/record/class-template-specializations-3.html index b4eb8f69c6..7892d2a190 100644 --- a/test-files/golden-tests/symbols/record/class-template-specializations-3.html +++ b/test-files/golden-tests/symbols/record/class-template-specializations-3.html @@ -18,12 +18,18 @@

Types

-A -A<float> -A<long> -A<short> -A<unsigned int> -E +A + +A<float> + +A<long> + +A<short> + +A<unsigned int> + +E + @@ -51,8 +57,10 @@

Types

-B -B<double> +B + +B<double> + @@ -82,9 +90,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -167,9 +178,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -252,8 +266,10 @@

Types

-B -B<double, double> +B + +B<double, double> + @@ -301,9 +317,12 @@

Types

-C -D -D<bool, bool> +C + +D + +D<bool, bool> + @@ -386,9 +405,12 @@

Types

-B -B<double> -B<float> +B + +B<double> + +B<float> + @@ -418,9 +440,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -503,9 +528,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -588,9 +616,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -673,9 +704,12 @@

Types

-B -B<double> -B<void> +B + +B<double> + +B<void> + @@ -723,9 +757,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -808,9 +845,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -893,9 +933,12 @@

Types

-B -B<double> -B<float> +B + +B<double> + +B<float> + @@ -943,9 +986,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -1028,9 +1074,12 @@

Types

-C -D -D<bool> +C + +D + +D<bool> + @@ -1112,21 +1161,36 @@

Data Members

-m0 -m1 -m10 -m11 -m12 -m13 -m14 -m2 -m3 -m4 -m5 -m6 -m7 -m8 -m9 +m0 + +m1 + +m10 + +m11 + +m12 + +m13 + +m14 + +m2 + +m3 + +m4 + +m5 + +m6 + +m7 + +m8 + +m9 + diff --git a/test-files/golden-tests/symbols/record/class-template.adoc b/test-files/golden-tests/symbols/record/class-template.adoc index 8ffefe5156..b0faca83f4 100644 --- a/test-files/golden-tests/symbols/record/class-template.adoc +++ b/test-files/golden-tests/symbols/record/class-template.adoc @@ -12,10 +12,15 @@ | Name | <> + | <> + | <> + | <> + | <> + |=== [#C0] @@ -40,6 +45,7 @@ struct C0; | Name | <> + |=== === Data Members @@ -48,8 +54,11 @@ struct C0; | Name | <> + | <> + | <> + |=== @@ -75,6 +84,7 @@ struct N0; | Name | <> + |=== @@ -156,6 +166,7 @@ struct C1; | Name | <> + |=== === Data Members @@ -164,6 +175,7 @@ struct C1; | Name | <> + |=== @@ -190,8 +202,11 @@ struct N1; | Name | <> + | <> + | <> + |=== @@ -274,6 +289,7 @@ struct C2; | Name | <> + |=== === Data Members @@ -282,6 +298,7 @@ struct C2; | Name | <> + |=== @@ -308,9 +325,13 @@ struct N2; | Name | <> + | <> + | <> + | <> + |=== @@ -407,6 +428,7 @@ struct C3; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/record/class-template.html b/test-files/golden-tests/symbols/record/class-template.html index 236acbdd50..426ef18a74 100644 --- a/test-files/golden-tests/symbols/record/class-template.html +++ b/test-files/golden-tests/symbols/record/class-template.html @@ -18,11 +18,16 @@

Types

-C0 -C1 -C2 -C3 -S +C0 + +C1 + +C2 + +C3 + +S + @@ -50,7 +55,8 @@

Types

-N0 +N0 +

Data Members

@@ -62,9 +68,12 @@

Data Members

-w -x -y +w + +x + +y + @@ -93,7 +102,8 @@

Data Members

-z +z + @@ -182,7 +192,8 @@

Types

-N1 +N1 +

Data Members

@@ -194,7 +205,8 @@

Data Members

-w +w + @@ -224,9 +236,12 @@

Data Members

-x -y -z +x + +y + +z + @@ -316,7 +331,8 @@

Types

-N2 +N2 +

Data Members

@@ -328,7 +344,8 @@

Data Members

-v +v + @@ -358,10 +375,14 @@

Data Members

-w -x -y -z +w + +x + +y + +z + @@ -466,7 +487,8 @@

Data Members

-v +v + diff --git a/test-files/golden-tests/symbols/record/local-class.adoc b/test-files/golden-tests/symbols/record/local-class.adoc index 87467bdf96..9269789fd0 100644 --- a/test-files/golden-tests/symbols/record/local-class.adoc +++ b/test-files/golden-tests/symbols/record/local-class.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Functions @@ -20,6 +21,7 @@ | Name | <> + |=== [#B] diff --git a/test-files/golden-tests/symbols/record/local-class.html b/test-files/golden-tests/symbols/record/local-class.html index a4cc3b6a58..3981601023 100644 --- a/test-files/golden-tests/symbols/record/local-class.html +++ b/test-files/golden-tests/symbols/record/local-class.html @@ -18,7 +18,8 @@

Types

-B +B +

Functions

@@ -30,7 +31,8 @@

Functions

-f +f + diff --git a/test-files/golden-tests/symbols/record/out-of-line-record-def.adoc b/test-files/golden-tests/symbols/record/out-of-line-record-def.adoc index 0e0bde38f2..862889a518 100644 --- a/test-files/golden-tests/symbols/record/out-of-line-record-def.adoc +++ b/test-files/golden-tests/symbols/record/out-of-line-record-def.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#N] @@ -25,6 +26,7 @@ | Name | <> + |=== [#N-S] diff --git a/test-files/golden-tests/symbols/record/out-of-line-record-def.html b/test-files/golden-tests/symbols/record/out-of-line-record-def.html index 72a45fd4da..4d9569bfb9 100644 --- a/test-files/golden-tests/symbols/record/out-of-line-record-def.html +++ b/test-files/golden-tests/symbols/record/out-of-line-record-def.html @@ -18,7 +18,8 @@

Namespaces

-N +N + @@ -35,7 +36,8 @@

Types

-S +S + diff --git a/test-files/golden-tests/symbols/record/record-1.adoc b/test-files/golden-tests/symbols/record/record-1.adoc index 56a4eef18e..9c3cd5c7c4 100644 --- a/test-files/golden-tests/symbols/record/record-1.adoc +++ b/test-files/golden-tests/symbols/record/record-1.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#T] @@ -35,7 +36,9 @@ struct T; | Name | <> + | <> + |=== === Member Functions @@ -44,15 +47,19 @@ struct T; | Name | <> + | <> + | <> + |=== === Protected Member Functions [cols=2] |=== -| Name | Description +| Name +| Description | <> | brief‐g1 diff --git a/test-files/golden-tests/symbols/record/record-1.html b/test-files/golden-tests/symbols/record/record-1.html index 8ff7690edd..1cac6acb30 100644 --- a/test-files/golden-tests/symbols/record/record-1.html +++ b/test-files/golden-tests/symbols/record/record-1.html @@ -18,7 +18,8 @@

Types

-T +T + @@ -45,8 +46,10 @@

Types

-U1 -U2 +U1 + +U2 +

Member Functions

@@ -58,9 +61,12 @@

Member Functions

-f1 -f2 -f3 +f1 + +f2 + +f3 + @@ -68,20 +74,21 @@

Protected Member Functions

- + + + + + + + +
NameDescriptionNameDescription
g1 brief-g1 - -
g2 brief-g2 - -
g3 brief-g3 - -
diff --git a/test-files/golden-tests/symbols/record/record-access.adoc b/test-files/golden-tests/symbols/record/record-access.adoc index 0d1d8e3cb8..9e7801b03c 100644 --- a/test-files/golden-tests/symbols/record/record-access.adoc +++ b/test-files/golden-tests/symbols/record/record-access.adoc @@ -12,8 +12,11 @@ | Name | <> + | <> + | <> + |=== [#C0] @@ -37,6 +40,7 @@ class C0; | Name | <> + |=== === Protected Member Functions @@ -46,6 +50,7 @@ class C0; | Name | <> + |=== === Private Member Functions @@ -55,6 +60,7 @@ class C0; | Name | <> + |=== [#C0-f2] @@ -123,6 +129,7 @@ struct S0; | Name | <> + |=== === Protected Member Functions @@ -132,6 +139,7 @@ struct S0; | Name | <> + |=== === Private Member Functions @@ -141,6 +149,7 @@ struct S0; | Name | <> + |=== [#S0-f0] @@ -209,6 +218,7 @@ union U0; | Name | <> + |=== === Protected Member Functions @@ -218,6 +228,7 @@ union U0; | Name | <> + |=== === Private Member Functions @@ -227,6 +238,7 @@ union U0; | Name | <> + |=== [#U0-f0] diff --git a/test-files/golden-tests/symbols/record/record-access.html b/test-files/golden-tests/symbols/record/record-access.html index 1118014038..8b511ec257 100644 --- a/test-files/golden-tests/symbols/record/record-access.html +++ b/test-files/golden-tests/symbols/record/record-access.html @@ -18,9 +18,12 @@

Types

-C0 -S0 -U0 +C0 + +S0 + +U0 + @@ -47,7 +50,8 @@

Member Functions

-f2 +f2 + @@ -60,7 +64,8 @@

Protected Member Functions

-f1 +f1 + @@ -73,7 +78,8 @@

Private Member Functions

-f0 +f0 + @@ -148,7 +154,8 @@

Member Functions

-f0 +f0 + @@ -161,7 +168,8 @@

Protected Member Functions

-f1 +f1 + @@ -174,7 +182,8 @@

Private Member Functions

-f2 +f2 + @@ -249,7 +258,8 @@

Member Functions

-f0 +f0 + @@ -262,7 +272,8 @@

Protected Member Functions

-f1 +f1 + @@ -275,7 +286,8 @@

Private Member Functions

-f2 +f2 + diff --git a/test-files/golden-tests/symbols/record/record-data.adoc b/test-files/golden-tests/symbols/record/record-data.adoc index a7828a595d..698a60a618 100644 --- a/test-files/golden-tests/symbols/record/record-data.adoc +++ b/test-files/golden-tests/symbols/record/record-data.adoc @@ -12,10 +12,15 @@ | Name | <> + | <> + | <> + | <> + | <> + |=== [#T] @@ -39,10 +44,15 @@ struct T; | Name | <> + | <> + | <> + | <> + | <> + |=== @@ -139,6 +149,7 @@ struct U; | Name | <> + |=== @@ -179,6 +190,7 @@ class V; | Name | <> + |=== === Private Data Members @@ -188,7 +200,9 @@ class V; | Name | <> + | <> + |=== [#V-j] @@ -254,6 +268,7 @@ struct W; | Name | <> + |=== @@ -296,6 +311,7 @@ struct X; | Name | <> + |=== === Data Members @@ -304,10 +320,15 @@ struct X; | Name | <> + | <> + | <> + | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/record/record-data.html b/test-files/golden-tests/symbols/record/record-data.html index 4de3560a47..460404b442 100644 --- a/test-files/golden-tests/symbols/record/record-data.html +++ b/test-files/golden-tests/symbols/record/record-data.html @@ -18,11 +18,16 @@

Types

-T -U -V -W -X +T + +U + +V + +W + +X + @@ -49,11 +54,16 @@

Data Members

-i -j -k -l -m +i + +j + +k + +l + +m + @@ -158,7 +168,8 @@

Data Members

-t +t + @@ -203,7 +214,8 @@

Protected Data Members

-j +j + @@ -216,8 +228,10 @@

Private Data Members

-i -k +i + +k + @@ -289,7 +303,8 @@

Data Members

-buf +buf + @@ -336,7 +351,8 @@

Types

-Q +Q +

Data Members

@@ -348,11 +364,16 @@

Data Members

-x0 -x1 -x2 -x3 -x4 +x0 + +x1 + +x2 + +x3 + +x4 + diff --git a/test-files/golden-tests/symbols/record/record-inheritance.adoc b/test-files/golden-tests/symbols/record/record-inheritance.adoc index ed4b5a927e..001d043dee 100644 --- a/test-files/golden-tests/symbols/record/record-inheritance.adoc +++ b/test-files/golden-tests/symbols/record/record-inheritance.adoc @@ -12,21 +12,37 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#C0] diff --git a/test-files/golden-tests/symbols/record/record-inheritance.html b/test-files/golden-tests/symbols/record/record-inheritance.html index 8cebae5137..70d7fbde99 100644 --- a/test-files/golden-tests/symbols/record/record-inheritance.html +++ b/test-files/golden-tests/symbols/record/record-inheritance.html @@ -18,22 +18,38 @@

Types

-C0 -C1 -C2 -C3 -C4 -C5 -C6 -C7 -S0 -S1 -S2 -S3 -S4 -S5 -S6 -U0 +C0 + +C1 + +C2 + +C3 + +C4 + +C5 + +C6 + +C7 + +S0 + +S1 + +S2 + +S3 + +S4 + +S5 + +S6 + +U0 + 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 7e2c597300..d928d76476 100644 --- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc +++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc @@ -12,16 +12,27 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#U1] @@ -88,6 +99,7 @@ struct R0 | Name | <> + |=== @@ -152,6 +164,7 @@ struct S0; | Name | <> + |=== @@ -195,6 +208,7 @@ struct <><2>; | Name | <> + |=== @@ -256,6 +270,7 @@ struct <><5>; | Name | <> + |=== 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 da363f5fb6..4071ef3ecf 100644 --- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.html +++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.html @@ -18,17 +18,28 @@

Types

-R0 -R1 -R2 -S0 -S0<2> -S0<3> -S0<5> -S0<6> -U1 -U2 -U3 +R0 + +R1 + +R2 + +S0 + +S0<2> + +S0<3> + +S0<5> + +S0<6> + +U1 + +U2 + +U3 + @@ -101,7 +112,8 @@

Types

-S1 +S1 + @@ -169,7 +181,8 @@

Types

-S1 +S1 + @@ -216,7 +229,8 @@

Types

-S1 +S1 + @@ -281,7 +295,8 @@

Types

-S1 +S1 + diff --git a/test-files/golden-tests/symbols/record/union.adoc b/test-files/golden-tests/symbols/record/union.adoc index c1faf9194b..afeb4e07e2 100644 --- a/test-files/golden-tests/symbols/record/union.adoc +++ b/test-files/golden-tests/symbols/record/union.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#A] @@ -36,7 +38,9 @@ union A; | Name | <> [.small]#[variant member]# + | <> [.small]#[variant member]# + |=== @@ -90,8 +94,11 @@ struct B; | Name | <> [.small]#[variant member]# + | <> [.small]#[variant member]# + | <> + |=== diff --git a/test-files/golden-tests/symbols/record/union.html b/test-files/golden-tests/symbols/record/union.html index 5d3536fd14..f1df199240 100644 --- a/test-files/golden-tests/symbols/record/union.html +++ b/test-files/golden-tests/symbols/record/union.html @@ -18,8 +18,10 @@

Types

-A -B +A + +B + @@ -46,8 +48,10 @@

Data Members

-x [variant member] -y [variant member] +x [variant member] + +y [variant member] + @@ -106,9 +110,12 @@

Data Members

-x [variant member] -y [variant member] -z +x [variant member] + +y [variant member] + +z + diff --git a/test-files/golden-tests/symbols/using/alias-template.adoc b/test-files/golden-tests/symbols/using/alias-template.adoc index 6420197682..7f563fc263 100644 --- a/test-files/golden-tests/symbols/using/alias-template.adoc +++ b/test-files/golden-tests/symbols/using/alias-template.adoc @@ -12,9 +12,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#C] @@ -92,6 +96,7 @@ struct D; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/using/alias-template.html b/test-files/golden-tests/symbols/using/alias-template.html index 19d2785d23..48d9b817e0 100644 --- a/test-files/golden-tests/symbols/using/alias-template.html +++ b/test-files/golden-tests/symbols/using/alias-template.html @@ -18,10 +18,14 @@

Types

-A -B -D -C +A + +B + +D + +C + @@ -103,7 +107,8 @@

Types

-E +E + diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.adoc b/test-files/golden-tests/symbols/using/decay-to-primary.adoc index 4e61cffe99..73663f0099 100644 --- a/test-files/golden-tests/symbols/using/decay-to-primary.adoc +++ b/test-files/golden-tests/symbols/using/decay-to-primary.adoc @@ -12,10 +12,15 @@ | Name | <> + | <> + | <> + | <> + | <> + |=== [#A0] @@ -68,7 +73,9 @@ struct S0; | Name | <> + | <> + |=== @@ -124,7 +131,9 @@ struct <><short>; | Name | <> + | <> + |=== @@ -180,7 +189,9 @@ struct <><void>; | Name | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.html b/test-files/golden-tests/symbols/using/decay-to-primary.html index f4bd9ff13f..d82e216c1f 100644 --- a/test-files/golden-tests/symbols/using/decay-to-primary.html +++ b/test-files/golden-tests/symbols/using/decay-to-primary.html @@ -18,11 +18,16 @@

Types

-S0 -S0<short> -S0<void> -A0 -A1 +S0 + +S0<short> + +S0<void> + +A0 + +A1 + @@ -80,8 +85,10 @@

Types

-M0 -M1 +M0 + +M1 + @@ -142,8 +149,10 @@

Types

-M0 -M1 +M0 + +M1 + @@ -204,8 +213,10 @@

Types

-M0 -M1 +M0 + +M1 + diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.adoc b/test-files/golden-tests/symbols/using/dependency-propagation.adoc index 711e4d3a23..cf3390b160 100644 --- a/test-files/golden-tests/symbols/using/dependency-propagation.adoc +++ b/test-files/golden-tests/symbols/using/dependency-propagation.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Types @@ -20,6 +21,7 @@ | Name | <> + |=== [#N] @@ -33,9 +35,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#N-B] diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.html b/test-files/golden-tests/symbols/using/dependency-propagation.html index 081ba63b98..fc0d8e5e7e 100644 --- a/test-files/golden-tests/symbols/using/dependency-propagation.html +++ b/test-files/golden-tests/symbols/using/dependency-propagation.html @@ -18,7 +18,8 @@

Namespaces

-N +N +

Types

@@ -30,7 +31,8 @@

Types

-E +E + @@ -47,10 +49,14 @@

Types

-A -D -B -C +A + +D + +B + +C + diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc index 5ff79a999c..f753ca71f0 100644 --- a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc +++ b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc @@ -12,9 +12,13 @@ | Name | <> + | <> + | <> + | <> + |=== [#A5] @@ -67,6 +71,7 @@ struct S0; | Name | <> + |=== @@ -93,7 +98,9 @@ struct S2; | Name | <> + | <> + |=== @@ -149,7 +156,9 @@ struct <><void>; | Name | <> + | <> + |=== @@ -194,7 +203,9 @@ struct <><char>; | Name | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html index 9791e5451d..dbdbf0aa47 100644 --- a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html +++ b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html @@ -18,10 +18,14 @@

Types

-S0 -S0<void> -A5 -A9 +S0 + +S0<void> + +A5 + +A9 + @@ -79,7 +83,8 @@

Types

-S2 +S2 + @@ -109,8 +114,10 @@

Types

-M2 -M3 +M2 + +M3 + @@ -171,8 +178,10 @@

Types

-S2 -S2<char> +S2 + +S2<char> + @@ -220,8 +229,10 @@

Types

-M2 -M3 +M2 + +M3 + diff --git a/test-files/golden-tests/symbols/using/using-1.adoc b/test-files/golden-tests/symbols/using/using-1.adoc index 141656cb7d..ea492226b3 100644 --- a/test-files/golden-tests/symbols/using/using-1.adoc +++ b/test-files/golden-tests/symbols/using/using-1.adoc @@ -12,21 +12,49 @@ | Name | <> + |=== -=== Using Directives +=== Using Namespace Directives [cols=1] |=== | Name -| <> +| <> + |=== [#LongName] == LongName +=== Types + +[cols=1] +|=== +| Name + +| <> + +|=== + +[#LongName-A] +== <>::A + + +=== Synopsis + + +Declared in `<using‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +struct A; +---- + + + diff --git a/test-files/golden-tests/symbols/using/using-1.cpp b/test-files/golden-tests/symbols/using/using-1.cpp index 1e4c23de54..7e22a6ccfb 100644 --- a/test-files/golden-tests/symbols/using/using-1.cpp +++ b/test-files/golden-tests/symbols/using/using-1.cpp @@ -1,3 +1,5 @@ -namespace LongName {} +namespace LongName { + struct A; +} using namespace LongName; diff --git a/test-files/golden-tests/symbols/using/using-1.html b/test-files/golden-tests/symbols/using/using-1.html index 7f8b78e98a..090385e232 100644 --- a/test-files/golden-tests/symbols/using/using-1.html +++ b/test-files/golden-tests/symbols/using/using-1.html @@ -18,11 +18,12 @@

Namespaces

-LongName +LongName +
-

Using Directives

+

Using Namespace Directives

@@ -31,7 +32,8 @@

Using Directives

- + +
LongName
LongName
@@ -42,6 +44,36 @@

Using Directives

LongName

+

Types

+ + + + + + + + + + + +
Name
A
+
+
+
+

LongName::A

+
+
+

Synopsis

+
+Declared in <using-1.cpp>
+
+
+struct A;
+
+
+
+ +
diff --git a/test-files/golden-tests/symbols/using/using-1.xml b/test-files/golden-tests/symbols/using/using-1.xml index f32be8009b..22fc989d91 100644 --- a/test-files/golden-tests/symbols/using/using-1.xml +++ b/test-files/golden-tests/symbols/using/using-1.xml @@ -4,6 +4,9 @@ + + + diff --git a/test-files/golden-tests/symbols/using/using-2.adoc b/test-files/golden-tests/symbols/using/using-2.adoc index 77bc5f5510..8d4722fe7f 100644 --- a/test-files/golden-tests/symbols/using/using-2.adoc +++ b/test-files/golden-tests/symbols/using/using-2.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#LongName] @@ -25,7 +26,9 @@ | Name | <> + | <> + |=== [#LongName-S1] diff --git a/test-files/golden-tests/symbols/using/using-2.html b/test-files/golden-tests/symbols/using/using-2.html index b3586df998..99cc834ff8 100644 --- a/test-files/golden-tests/symbols/using/using-2.html +++ b/test-files/golden-tests/symbols/using/using-2.html @@ -18,7 +18,8 @@

Namespaces

-LongName +LongName + @@ -35,8 +36,10 @@

Types

-S1 -S2 +S1 + +S2 + diff --git a/test-files/golden-tests/symbols/using/using-3.adoc b/test-files/golden-tests/symbols/using/using-3.adoc index 7428519650..301cf4c87f 100644 --- a/test-files/golden-tests/symbols/using/using-3.adoc +++ b/test-files/golden-tests/symbols/using/using-3.adoc @@ -12,8 +12,11 @@ | Name | <> + | <> + | <> + |=== [#A] @@ -37,6 +40,7 @@ struct A; | Name | <> + |=== @@ -77,6 +81,7 @@ struct B; | Name | <> + |=== @@ -116,7 +121,8 @@ struct C [cols=2] |=== -| Name | Description +| Name +| Description | <> | @@ -129,7 +135,9 @@ struct C | Name | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/using/using-3.html b/test-files/golden-tests/symbols/using/using-3.html index 965f2d39bd..a8e7e3ec3c 100644 --- a/test-files/golden-tests/symbols/using/using-3.html +++ b/test-files/golden-tests/symbols/using/using-3.html @@ -18,9 +18,12 @@

Types

-A -B -C +A + +B + +C + @@ -47,7 +50,8 @@

Member Functions

-f +f + @@ -92,7 +96,8 @@

Member Functions

-f +f + @@ -134,13 +139,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
f -
f

Using Declarations

@@ -152,8 +158,10 @@

Using Declarations

-f -f +f + +f + diff --git a/test-files/golden-tests/symbols/variable/no_unique_address.adoc b/test-files/golden-tests/symbols/variable/no_unique_address.adoc index e6be35b39e..0a9bd7eb6a 100644 --- a/test-files/golden-tests/symbols/variable/no_unique_address.adoc +++ b/test-files/golden-tests/symbols/variable/no_unique_address.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#Empty] @@ -53,7 +55,9 @@ struct T; | Name | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/variable/no_unique_address.html b/test-files/golden-tests/symbols/variable/no_unique_address.html index 4fb80d7bc6..9293bc18fe 100644 --- a/test-files/golden-tests/symbols/variable/no_unique_address.html +++ b/test-files/golden-tests/symbols/variable/no_unique_address.html @@ -18,8 +18,10 @@

Types

-Empty -T +Empty + +T + @@ -63,8 +65,10 @@

Data Members

-e -i +e + +i + diff --git a/test-files/golden-tests/symbols/variable/ns-variables.adoc b/test-files/golden-tests/symbols/variable/ns-variables.adoc index 3fb5c55f41..8b7927dcb8 100644 --- a/test-files/golden-tests/symbols/variable/ns-variables.adoc +++ b/test-files/golden-tests/symbols/variable/ns-variables.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Variables @@ -20,14 +21,23 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#T] diff --git a/test-files/golden-tests/symbols/variable/ns-variables.html b/test-files/golden-tests/symbols/variable/ns-variables.html index 5373a9c346..18f67bf713 100644 --- a/test-files/golden-tests/symbols/variable/ns-variables.html +++ b/test-files/golden-tests/symbols/variable/ns-variables.html @@ -18,7 +18,8 @@

Types

-T +T +

Variables

@@ -30,15 +31,24 @@

Variables

-i -j -k -l -pi -t -x0 -x1 -x2 +i + +j + +k + +l + +pi + +t + +x0 + +x1 + +x2 + diff --git a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.adoc b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.adoc index 7f2af620d3..e994aad3f3 100644 --- a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.adoc +++ b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#S] @@ -36,6 +38,7 @@ struct S; | Name | <> + |=== @@ -76,6 +79,7 @@ struct T; | Name | <> + |=== diff --git a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html index 339def123a..a1a76df1c6 100644 --- a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html +++ b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html @@ -18,8 +18,10 @@

Types

-S -T +S + +T + @@ -46,7 +48,8 @@

Static Data Members

-s +s + @@ -91,7 +94,8 @@

Static Data Members

-t +t + diff --git a/test-files/golden-tests/symbols/variable/static-data-def.adoc b/test-files/golden-tests/symbols/variable/static-data-def.adoc index 6c89c64c91..3aaabfdeab 100644 --- a/test-files/golden-tests/symbols/variable/static-data-def.adoc +++ b/test-files/golden-tests/symbols/variable/static-data-def.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== === Functions @@ -21,6 +23,7 @@ | Name | <> + |=== [#A] @@ -45,13 +48,21 @@ struct A; | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== @@ -197,7 +208,9 @@ struct B; | Name | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/variable/static-data-def.html b/test-files/golden-tests/symbols/variable/static-data-def.html index 86ff27203b..d85221baef 100644 --- a/test-files/golden-tests/symbols/variable/static-data-def.html +++ b/test-files/golden-tests/symbols/variable/static-data-def.html @@ -18,8 +18,10 @@

Types

-A -B +A + +B +

Functions

@@ -31,7 +33,8 @@

Functions

-f +f + @@ -59,14 +62,22 @@

Static Data Members

-v0 -v1 -v2 -v3 -v4 -v5 -v6 -v7 +v0 + +v1 + +v2 + +v3 + +v4 + +v5 + +v6 + +v7 + @@ -223,8 +234,10 @@

Static Data Members

-x0 -x1 +x0 + +x1 + diff --git a/test-files/golden-tests/symbols/variable/static-data-template.adoc b/test-files/golden-tests/symbols/variable/static-data-template.adoc index 552b39e396..545a74b515 100644 --- a/test-files/golden-tests/symbols/variable/static-data-template.adoc +++ b/test-files/golden-tests/symbols/variable/static-data-template.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,8 +37,11 @@ struct A; | Name | <> + | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/variable/static-data-template.html b/test-files/golden-tests/symbols/variable/static-data-template.html index e438e1a87c..99729f9cc0 100644 --- a/test-files/golden-tests/symbols/variable/static-data-template.html +++ b/test-files/golden-tests/symbols/variable/static-data-template.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,9 +47,12 @@

Static Data Members

-x -x<T, long> -x<U*, T> +x + +x<T, long> + +x<U*, T> + diff --git a/test-files/golden-tests/symbols/variable/var-inline-constexpr.adoc b/test-files/golden-tests/symbols/variable/var-inline-constexpr.adoc index 1349b4239c..d2bb260f80 100644 --- a/test-files/golden-tests/symbols/variable/var-inline-constexpr.adoc +++ b/test-files/golden-tests/symbols/variable/var-inline-constexpr.adoc @@ -12,15 +12,25 @@ | Name | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + | <> + |=== [#var] diff --git a/test-files/golden-tests/symbols/variable/var-inline-constexpr.html b/test-files/golden-tests/symbols/variable/var-inline-constexpr.html index 55fdbf0036..03878c0a1c 100644 --- a/test-files/golden-tests/symbols/variable/var-inline-constexpr.html +++ b/test-files/golden-tests/symbols/variable/var-inline-constexpr.html @@ -18,16 +18,26 @@

Variables

-var -var_const -var_const_t -var_constexpr -var_constexpr_t -var_inline_const -var_inline_const_t -var_inline_constexpr -var_inline_constexpr_t -var_t +var + +var_const + +var_const_t + +var_constexpr + +var_constexpr_t + +var_inline_const + +var_inline_const_t + +var_inline_constexpr + +var_inline_constexpr_t + +var_t + diff --git a/test-files/golden-tests/symbols/variable/var-template.adoc b/test-files/golden-tests/symbols/variable/var-template.adoc index bac7195a04..53be17f33b 100644 --- a/test-files/golden-tests/symbols/variable/var-template.adoc +++ b/test-files/golden-tests/symbols/variable/var-template.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== === Variables @@ -20,8 +21,11 @@ | Name | <> + | <> + | <> + |=== [#B] @@ -45,8 +49,11 @@ struct B; | Name | <> + | <> + | <> + |=== diff --git a/test-files/golden-tests/symbols/variable/var-template.html b/test-files/golden-tests/symbols/variable/var-template.html index 94ab5fa9c8..bc4b14d585 100644 --- a/test-files/golden-tests/symbols/variable/var-template.html +++ b/test-files/golden-tests/symbols/variable/var-template.html @@ -18,7 +18,8 @@

Types

-B +B +

Variables

@@ -30,9 +31,12 @@

Variables

-A -A<void> -A<T&> +A + +A<void> + +A<T&> + @@ -59,9 +63,12 @@

Static Data Members

-C -C<int> -C<T*> +C + +C<int> + +C<T*> + diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.adoc b/test-files/golden-tests/templates/c_mct_expl_inline.adoc index b8f5db6714..089b5ffeb0 100644 --- a/test-files/golden-tests/templates/c_mct_expl_inline.adoc +++ b/test-files/golden-tests/templates/c_mct_expl_inline.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -35,7 +36,9 @@ struct A; | Name | <> + | <> + |=== @@ -62,6 +65,7 @@ struct B; | Name | <> + |=== @@ -103,6 +107,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.html b/test-files/golden-tests/templates/c_mct_expl_inline.html index 448c8524f6..9966e17419 100644 --- a/test-files/golden-tests/templates/c_mct_expl_inline.html +++ b/test-files/golden-tests/templates/c_mct_expl_inline.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -45,8 +46,10 @@

Types

-B -B<int> +B + +B<int> + @@ -76,7 +79,8 @@

Member Functions

-f +f + @@ -122,7 +126,8 @@

Member Functions

-g +g + diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.adoc b/test-files/golden-tests/templates/c_mct_expl_outside.adoc index 2bb4fa8f8c..fedd9a3b05 100644 --- a/test-files/golden-tests/templates/c_mct_expl_outside.adoc +++ b/test-files/golden-tests/templates/c_mct_expl_outside.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -35,7 +36,9 @@ struct A; | Name | <> + | <> + |=== @@ -62,6 +65,7 @@ struct B; | Name | <> + |=== @@ -103,6 +107,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.html b/test-files/golden-tests/templates/c_mct_expl_outside.html index cc907925f0..9d93fabd26 100644 --- a/test-files/golden-tests/templates/c_mct_expl_outside.html +++ b/test-files/golden-tests/templates/c_mct_expl_outside.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -45,8 +46,10 @@

Types

-B -B<int> +B + +B<int> + @@ -76,7 +79,8 @@

Member Functions

-f +f + @@ -122,7 +126,8 @@

Member Functions

-g +g + diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.adoc b/test-files/golden-tests/templates/c_mft_expl_inline.adoc index f9db18ba79..edb74d942f 100644 --- a/test-files/golden-tests/templates/c_mft_expl_inline.adoc +++ b/test-files/golden-tests/templates/c_mft_expl_inline.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -32,7 +33,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.html b/test-files/golden-tests/templates/c_mft_expl_inline.html index 178dcba6d8..0b4a16e5af 100644 --- a/test-files/golden-tests/templates/c_mft_expl_inline.html +++ b/test-files/golden-tests/templates/c_mft_expl_inline.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -40,13 +41,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
f -
f
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.adoc b/test-files/golden-tests/templates/c_mft_expl_outside.adoc index 6ed98d1c39..03df5f4a94 100644 --- a/test-files/golden-tests/templates/c_mft_expl_outside.adoc +++ b/test-files/golden-tests/templates/c_mft_expl_outside.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -32,7 +33,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.html b/test-files/golden-tests/templates/c_mft_expl_outside.html index cfee7343b8..7cdd10205e 100644 --- a/test-files/golden-tests/templates/c_mft_expl_outside.html +++ b/test-files/golden-tests/templates/c_mft_expl_outside.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -40,13 +41,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
f -
f
diff --git a/test-files/golden-tests/templates/ct_expl.adoc b/test-files/golden-tests/templates/ct_expl.adoc index 3b1cf127c6..2ca433edcb 100644 --- a/test-files/golden-tests/templates/ct_expl.adoc +++ b/test-files/golden-tests/templates/ct_expl.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#A-0e] @@ -37,6 +39,7 @@ struct A; | Name | <> + |=== @@ -78,6 +81,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_expl.html b/test-files/golden-tests/templates/ct_expl.html index 17ae8bdd7b..2e63cd1251 100644 --- a/test-files/golden-tests/templates/ct_expl.html +++ b/test-files/golden-tests/templates/ct_expl.html @@ -18,8 +18,10 @@

Types

-A -A<int> +A + +A<int> + @@ -47,7 +49,8 @@

Member Functions

-f +f + @@ -93,7 +96,8 @@

Member Functions

-g +g + diff --git a/test-files/golden-tests/templates/ct_mc.adoc b/test-files/golden-tests/templates/ct_mc.adoc index c8260af2b6..b84d78e6c8 100644 --- a/test-files/golden-tests/templates/ct_mc.adoc +++ b/test-files/golden-tests/templates/ct_mc.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,6 +37,7 @@ struct A; | Name | <> + |=== @@ -61,6 +63,7 @@ struct B; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mc.html b/test-files/golden-tests/templates/ct_mc.html index 850897edc8..59a8d98ce9 100644 --- a/test-files/golden-tests/templates/ct_mc.html +++ b/test-files/golden-tests/templates/ct_mc.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,7 +47,8 @@

Types

-B +B + @@ -75,7 +77,8 @@

Member Functions

-f +f + diff --git a/test-files/golden-tests/templates/ct_mc_expl_outside.adoc b/test-files/golden-tests/templates/ct_mc_expl_outside.adoc index 0aabc6a651..43b0ffcd50 100644 --- a/test-files/golden-tests/templates/ct_mc_expl_outside.adoc +++ b/test-files/golden-tests/templates/ct_mc_expl_outside.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#A-0e] @@ -37,6 +39,7 @@ struct A; | Name | <> + |=== @@ -62,6 +65,7 @@ struct B; | Name | <> + |=== @@ -103,6 +107,7 @@ struct <><int>; | Name | <> + |=== @@ -128,6 +133,7 @@ struct B; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mc_expl_outside.html b/test-files/golden-tests/templates/ct_mc_expl_outside.html index 304aaf80fc..7c0fade4e0 100644 --- a/test-files/golden-tests/templates/ct_mc_expl_outside.html +++ b/test-files/golden-tests/templates/ct_mc_expl_outside.html @@ -18,8 +18,10 @@

Types

-A -A<int> +A + +A<int> + @@ -47,7 +49,8 @@

Types

-B +B + @@ -76,7 +79,8 @@

Member Functions

-f +f + @@ -122,7 +126,8 @@

Types

-B +B + @@ -151,7 +156,8 @@

Member Functions

-g +g + diff --git a/test-files/golden-tests/templates/ct_mct.adoc b/test-files/golden-tests/templates/ct_mct.adoc index 3dae091840..97728cf279 100644 --- a/test-files/golden-tests/templates/ct_mct.adoc +++ b/test-files/golden-tests/templates/ct_mct.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,6 +37,7 @@ struct A; | Name | <> + |=== @@ -62,6 +64,7 @@ struct B; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mct.html b/test-files/golden-tests/templates/ct_mct.html index 54e4589139..c70fdbcd72 100644 --- a/test-files/golden-tests/templates/ct_mct.html +++ b/test-files/golden-tests/templates/ct_mct.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,7 +47,8 @@

Types

-B +B + @@ -76,7 +78,8 @@

Member Functions

-f +f + diff --git a/test-files/golden-tests/templates/ct_mct_expl_inline.adoc b/test-files/golden-tests/templates/ct_mct_expl_inline.adoc index cafbc56efb..ccb6ca1df3 100644 --- a/test-files/golden-tests/templates/ct_mct_expl_inline.adoc +++ b/test-files/golden-tests/templates/ct_mct_expl_inline.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,7 +37,9 @@ struct A; | Name | <> + | <> + |=== @@ -63,6 +66,7 @@ struct B; | Name | <> + |=== @@ -104,6 +108,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mct_expl_inline.html b/test-files/golden-tests/templates/ct_mct_expl_inline.html index 0b93028899..4e6f0a87ed 100644 --- a/test-files/golden-tests/templates/ct_mct_expl_inline.html +++ b/test-files/golden-tests/templates/ct_mct_expl_inline.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,8 +47,10 @@

Types

-B -B<int> +B + +B<int> + @@ -77,7 +80,8 @@

Member Functions

-f +f + @@ -123,7 +127,8 @@

Member Functions

-g +g + diff --git a/test-files/golden-tests/templates/ct_mct_expl_outside.adoc b/test-files/golden-tests/templates/ct_mct_expl_outside.adoc index a81bd2b648..fed2b57a64 100644 --- a/test-files/golden-tests/templates/ct_mct_expl_outside.adoc +++ b/test-files/golden-tests/templates/ct_mct_expl_outside.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#A-0e] @@ -37,6 +39,7 @@ struct A; | Name | <> + |=== @@ -63,6 +66,7 @@ struct B; | Name | <> + |=== @@ -104,7 +108,9 @@ struct <><int>; | Name | <> + | <> + |=== @@ -149,6 +155,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mct_expl_outside.html b/test-files/golden-tests/templates/ct_mct_expl_outside.html index 5070db3a3d..f7826b4e92 100644 --- a/test-files/golden-tests/templates/ct_mct_expl_outside.html +++ b/test-files/golden-tests/templates/ct_mct_expl_outside.html @@ -18,8 +18,10 @@

Types

-A -A<int> +A + +A<int> + @@ -47,7 +49,8 @@

Types

-B +B + @@ -77,7 +80,8 @@

Member Functions

-f +f + @@ -123,8 +127,10 @@

Types

-B -B<int> +B + +B<int> + @@ -172,7 +178,8 @@

Member Functions

-g +g + diff --git a/test-files/golden-tests/templates/ct_mf.adoc b/test-files/golden-tests/templates/ct_mf.adoc index 9c45bd0f47..1bee2ed308 100644 --- a/test-files/golden-tests/templates/ct_mf.adoc +++ b/test-files/golden-tests/templates/ct_mf.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,6 +37,7 @@ struct A; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mf.html b/test-files/golden-tests/templates/ct_mf.html index 66c1e0bc3e..05ff53b5ba 100644 --- a/test-files/golden-tests/templates/ct_mf.html +++ b/test-files/golden-tests/templates/ct_mf.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,7 +47,8 @@

Member Functions

-f +f + diff --git a/test-files/golden-tests/templates/ct_mf_expl_outside.adoc b/test-files/golden-tests/templates/ct_mf_expl_outside.adoc index 7a2f934561..d0b18fb4c5 100644 --- a/test-files/golden-tests/templates/ct_mf_expl_outside.adoc +++ b/test-files/golden-tests/templates/ct_mf_expl_outside.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#A-0e] @@ -37,6 +39,7 @@ struct A; | Name | <> + |=== @@ -78,6 +81,7 @@ struct <><int>; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mf_expl_outside.html b/test-files/golden-tests/templates/ct_mf_expl_outside.html index c17c16c504..c697f9b243 100644 --- a/test-files/golden-tests/templates/ct_mf_expl_outside.html +++ b/test-files/golden-tests/templates/ct_mf_expl_outside.html @@ -18,8 +18,10 @@

Types

-A -A<int> +A + +A<int> + @@ -47,7 +49,8 @@

Member Functions

-f +f + @@ -93,7 +96,8 @@

Member Functions

-f +f + diff --git a/test-files/golden-tests/templates/ct_mft.adoc b/test-files/golden-tests/templates/ct_mft.adoc index 768360400a..c9991f9b23 100644 --- a/test-files/golden-tests/templates/ct_mft.adoc +++ b/test-files/golden-tests/templates/ct_mft.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -36,6 +37,7 @@ struct A; | Name | <> + |=== diff --git a/test-files/golden-tests/templates/ct_mft.html b/test-files/golden-tests/templates/ct_mft.html index 6933f0fbcd..f7f05facce 100644 --- a/test-files/golden-tests/templates/ct_mft.html +++ b/test-files/golden-tests/templates/ct_mft.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -46,7 +47,8 @@

Member Functions

-f +f + diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.adoc b/test-files/golden-tests/templates/ct_mft_expl_inline.adoc index c50f52c4ab..9ea353b057 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_inline.adoc +++ b/test-files/golden-tests/templates/ct_mft_expl_inline.adoc @@ -12,6 +12,7 @@ | Name | <> + |=== [#A] @@ -33,7 +34,8 @@ struct A; [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.html b/test-files/golden-tests/templates/ct_mft_expl_inline.html index b90f8b819a..ee57b6da90 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_inline.html +++ b/test-files/golden-tests/templates/ct_mft_expl_inline.html @@ -18,7 +18,8 @@

Types

-A +A + @@ -41,13 +42,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
f -
f
diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.adoc b/test-files/golden-tests/templates/ct_mft_expl_outside.adoc index 56a0a05631..e3b945d493 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_outside.adoc +++ b/test-files/golden-tests/templates/ct_mft_expl_outside.adoc @@ -12,7 +12,9 @@ | Name | <> + | <> + |=== [#A-0e] @@ -37,6 +39,7 @@ struct A; | Name | <> + |=== @@ -76,7 +79,8 @@ struct <><int>; [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.html b/test-files/golden-tests/templates/ct_mft_expl_outside.html index a6a1e1da5b..59ec88d2e4 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_outside.html +++ b/test-files/golden-tests/templates/ct_mft_expl_outside.html @@ -18,8 +18,10 @@

Types

-A -A<int> +A + +A<int> + @@ -47,7 +49,8 @@

Member Functions

-f +f + @@ -89,13 +92,14 @@

Member Functions

- + + - + +
NameDescriptionNameDescription
f -
f
diff --git a/test-files/golden-tests/templates/ft_expl.adoc b/test-files/golden-tests/templates/ft_expl.adoc index d8b6feb95a..d10687c2b5 100644 --- a/test-files/golden-tests/templates/ft_expl.adoc +++ b/test-files/golden-tests/templates/ft_expl.adoc @@ -9,7 +9,8 @@ [cols=2] |=== -| Name | Description +| Name +| Description | <> | diff --git a/test-files/golden-tests/templates/ft_expl.html b/test-files/golden-tests/templates/ft_expl.html index 5c0d60d93f..57828338e3 100644 --- a/test-files/golden-tests/templates/ft_expl.html +++ b/test-files/golden-tests/templates/ft_expl.html @@ -13,13 +13,14 @@

Functions

- + + - + +
NameDescriptionNameDescription
f -
f