From c526c578824c7ee829fb927f67e62d9ea89ca3c3 Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Thu, 12 Dec 2024 17:12:09 -0300 Subject: [PATCH] feat: asciidoc universal escaping Replace escaping based on passthroughs without universal escaping based on character substitutions: https://docs.asciidoctor.org/asciidoc/latest/subs/replacements/ fix #763 --- .../adoc/partials/markup/code-block.adoc.hbs | 2 +- .../generator/adoc/partials/markup/h.adoc.hbs | 2 +- .../generator/adoc/partials/symbol.adoc.hbs | 1 + .../generator/html/partials/symbol.html.hbs | 18 +- src/lib/Gen/adoc/AdocEscape.cpp | 93 +++ src/lib/Gen/adoc/AdocEscape.hpp | 34 + src/lib/Gen/adoc/AdocGenerator.cpp | 29 +- src/lib/Gen/adoc/DocVisitor.cpp | 177 +++-- src/lib/Gen/adoc/DocVisitor.hpp | 63 +- src/lib/Gen/html/DocVisitor.cpp | 92 ++- src/lib/Gen/html/DocVisitor.hpp | 63 +- src/test/TestRunner.cpp | 11 +- test-files/golden-tests/alias-template.adoc | 41 +- test-files/golden-tests/attributes_1.adoc | 5 +- test-files/golden-tests/brief-1.adoc | 28 +- test-files/golden-tests/brief-2.adoc | 70 +- test-files/golden-tests/canonical_1.adoc | 40 +- .../class-template-partial-spec.adoc | 42 +- .../golden-tests/class-template-spec.adoc | 158 +++-- .../class-template-specializations-1.adoc | 526 ++++++++------- .../class-template-specializations-2.adoc | 148 +++-- .../class-template-specializations-3.adoc | 191 +++--- test-files/golden-tests/class-template.adoc | 120 ++-- test-files/golden-tests/commands.adoc | 13 +- test-files/golden-tests/concept.adoc | 21 +- .../golden-tests/dependency-propagation.adoc | 32 +- test-files/golden-tests/duplicate-jdoc.adoc | 106 +-- test-files/golden-tests/duplicate-jdoc.html | 44 +- test-files/golden-tests/enum.adoc | 116 ++-- .../golden-tests/explicit-conv-operator.adoc | 48 +- test-files/golden-tests/explicit-ctor.adoc | 194 +++--- .../golden-tests/explicit-deduct-guide.adoc | 53 +- .../explicit-object-parameter.adoc | 30 +- .../golden-tests/filters/blacklist_0.adoc | 20 +- .../golden-tests/filters/blacklist_test.adoc | 15 +- test-files/golden-tests/filters/filters.adoc | 100 +-- .../golden-tests/filters/whitelist_0.adoc | 72 +- .../golden-tests/filters/whitelist_test.adoc | 26 +- test-files/golden-tests/friend-1.adoc | 27 +- test-files/golden-tests/friend-2.adoc | 27 +- test-files/golden-tests/friend-3.adoc | 37 +- test-files/golden-tests/friend-4.adoc | 37 +- test-files/golden-tests/friend-5.adoc | 31 +- test-files/golden-tests/friend-6.adoc | 77 ++- .../golden-tests/function-parm-decay.adoc | 30 +- .../golden-tests/function-template.adoc | 98 +-- .../golden-tests/function-tparm-decay.adoc | 38 +- .../implicit-instantiation-member-ref.adoc | 137 ++-- test-files/golden-tests/local-class.adoc | 12 +- test-files/golden-tests/mem-fn.adoc | 194 +++--- .../golden-tests/namespace-alias-1.adoc | 5 +- .../golden-tests/namespace-alias-2.adoc | 10 +- .../golden-tests/namespace-alias-3.adoc | 10 +- test-files/golden-tests/namespace.adoc | 60 +- .../golden-tests/nested-private-template.adoc | 29 +- .../golden-tests/no_unique_address.adoc | 22 +- test-files/golden-tests/noreturn.adoc | 25 +- test-files/golden-tests/ns-variables.adoc | 52 +- .../golden-tests/out-of-line-record-def.adoc | 5 +- test-files/golden-tests/overloaded-op-1.adoc | 16 +- test-files/golden-tests/overloaded-op-2.adoc | 16 +- test-files/golden-tests/para-1.adoc | 28 +- test-files/golden-tests/para-2.adoc | 13 +- test-files/golden-tests/param-direction.adoc | 50 +- test-files/golden-tests/param-direction.html | 80 ++- test-files/golden-tests/param.adoc | 20 +- test-files/golden-tests/param.html | 40 +- test-files/golden-tests/pre-post.adoc | 9 +- test-files/golden-tests/pre-post.html | 6 +- test-files/golden-tests/record-1.adoc | 73 ++- test-files/golden-tests/record-1.html | 16 +- test-files/golden-tests/record-access.adoc | 60 +- test-files/golden-tests/record-data.adoc | 113 ++-- .../golden-tests/record-inheritance.adoc | 82 ++- test-files/golden-tests/ref.adoc | 618 ++++++++++-------- test-files/golden-tests/requires-clause.adoc | 98 +-- .../golden-tests/snippets/distance.adoc | 41 +- .../golden-tests/snippets/distance.html | 22 +- .../golden-tests/snippets/is_prime.adoc | 25 +- .../golden-tests/snippets/is_prime.html | 10 +- test-files/golden-tests/snippets/sqrt.adoc | 37 +- test-files/golden-tests/snippets/sqrt.html | 18 +- .../golden-tests/snippets/terminate.adoc | 15 +- .../spec-mem-implicit-instantiation.adoc | 53 +- .../static-data-def-constexpr.adoc | 22 +- test-files/golden-tests/static-data-def.adoc | 67 +- .../golden-tests/static-data-template.adoc | 42 +- .../golden-tests/temp/c_mct_expl_inline.adoc | 37 +- .../golden-tests/temp/c_mct_expl_outside.adoc | 37 +- .../golden-tests/temp/c_mft_expl_inline.adoc | 36 +- .../golden-tests/temp/c_mft_expl_outside.adoc | 36 +- test-files/golden-tests/temp/ct_expl.adoc | 32 +- test-files/golden-tests/temp/ct_mc.adoc | 17 +- .../golden-tests/temp/ct_mc_expl_outside.adoc | 17 +- test-files/golden-tests/temp/ct_mct.adoc | 19 +- .../golden-tests/temp/ct_mct_expl_inline.adoc | 39 +- .../temp/ct_mct_expl_outside.adoc | 19 +- test-files/golden-tests/temp/ct_mf.adoc | 12 +- .../golden-tests/temp/ct_mf_expl_outside.adoc | 12 +- test-files/golden-tests/temp/ct_mft.adoc | 14 +- .../golden-tests/temp/ct_mft_expl_inline.adoc | 38 +- .../temp/ct_mft_expl_outside.adoc | 14 +- test-files/golden-tests/temp/ft_expl.adoc | 31 +- test-files/golden-tests/type-resolution.adoc | 296 +++++---- test-files/golden-tests/union.adoc | 35 +- test-files/golden-tests/using-2.adoc | 20 +- test-files/golden-tests/using-3.adoc | 35 +- test-files/golden-tests/utf-8.adoc | 11 +- test-files/golden-tests/var-template.adoc | 73 ++- .../golden-tests/variadic-function.adoc | 29 +- 110 files changed, 3751 insertions(+), 2655 deletions(-) create mode 100644 src/lib/Gen/adoc/AdocEscape.cpp create mode 100644 src/lib/Gen/adoc/AdocEscape.hpp diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs index deaae574b5..6037d1a71a 100644 --- a/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs @@ -1,4 +1,4 @@ -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- {{> @partial-block }} diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs index 6134b881e0..3db75e008c 100644 --- a/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs @@ -1,3 +1,3 @@ {{#if id}}[#{{{id}}}] {{/if}} -={{select level (repeat "=" level) (select @root.config.multipage "==" "=")}} {{> @partial-block }} \ No newline at end of file +={{{select level (repeat "=" level) (select @root.config.multipage "==" "=")}}} {{> @partial-block }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs index 051251da81..30a35a7149 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs @@ -28,6 +28,7 @@ {{>location/source dcl=(primary_location symbol)}} + {{> symbol/signatures symbol }} {{/unless}} {{! Tranches }} diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs index 93e66ba10c..706b1c67d3 100644 --- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs @@ -133,7 +133,7 @@ {{#each symbol.doc.exceptions}} {{exception}} -{{description}} +{{{description}}} {{/each}} @@ -156,7 +156,7 @@ {{#each allExceptions as |exception|}} {{exception}} -{{description}} +{{{description}}} {{/each}} @@ -188,7 +188,7 @@ {{#each symbol.doc.tparams}} {{name}} -{{description}} +{{{description}}} {{/each}} @@ -211,7 +211,7 @@ {{#each allTParams as |param|}} {{param.name}} -{{param.description}} +{{{param.description}}} {{/each}} @@ -236,7 +236,7 @@ {{#each symbol.doc.params}} {{name}} -{{description}} +{{{description}}} {{/each}} @@ -259,7 +259,7 @@ {{#each allParams as |param|}} {{param.name}} -{{param.description}} +{{{param.description}}} {{/each}} @@ -273,7 +273,7 @@
{{#> markup/dynamic-level-h level=2 }}Preconditions{{/markup/dynamic-level-h}} {{#each symbol.doc.preconditions}} -

{{.}}

+

{{{.}}}

{{/each}}
{{/if}} @@ -282,7 +282,7 @@
{{#> markup/dynamic-level-h level=2 }}Postconditions{{/markup/dynamic-level-h}} {{#each symbol.doc.postconditions}} -

{{.}}

+

{{{.}}}

{{/each}}
{{/if}} @@ -291,7 +291,7 @@
{{#> markup/dynamic-level-h level=2 }}See Also{{/markup/dynamic-level-h}} {{#each symbol.doc.see}} -

{{.}}

+

{{{.}}}

{{/each}}
{{/if}} diff --git a/src/lib/Gen/adoc/AdocEscape.cpp b/src/lib/Gen/adoc/AdocEscape.cpp new file mode 100644 index 0000000000..c5793a8999 --- /dev/null +++ b/src/lib/Gen/adoc/AdocEscape.cpp @@ -0,0 +1,93 @@ +// +// This is a derivative work. originally part of the LLVM Project. +// 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) 2023 Vinnie Falco (vinnie.falco@gmail.com) +// +// Official repository: https://github.com/cppalliance/mrdocs +// + +#include "AdocEscape.hpp" +#include + +namespace clang::mrdocs::adoc { + +namespace { + +constexpr +std::optional +HTMLNamedEntity(char const c) +{ + // If c has a named entity, we use it + // Otherwise, we return std::nullopt + switch (c) + { + case '~': return "˜"; + case '^': return "ˆ"; + case '_': return "_"; + case '*': return "*"; + case '`': return "`"; + case '#': return "#"; + case '[': return "["; + case ']': return "]"; + case '{': return "{"; + case '}': return "}"; + case '<': return "<"; + case '>': return ">"; + case '\\': return "\"; + case '|': return "|"; + case '-': return "‐"; + case '=': return "="; + case '&': return "&"; + case ';': return ";"; + case '+': return "+"; + case ':': return ":"; + case '.': return "."; + case '"': return """; + case '\'': return "'"; + case '/': return "/"; + default: + break; + } + return {}; +} + +} // (anon) + +void +AdocEscape(OutputRef& os, std::string_view str) +{ + static constexpr char reserved[] = R"(~^_*`#[]{}<>\|-=&;+:."\'/)"; + for (char c: str) + { + if (std::ranges::find(reserved, c) != std::end(reserved)) + { + // https://docs.asciidoctor.org/asciidoc/latest/subs/replacements/ + if (auto e = HTMLNamedEntity(c)) + { + os << *e; + } + else + { + os << "&#" << static_cast(c) << ';'; + } + } + else + { + os << c; + } + } +} + +std::string +AdocEscape(std::string_view str) { + std::string res; + OutputRef os(res); + AdocEscape(os, str); + return res; +} + + +} // clang::mrdocs::adoc diff --git a/src/lib/Gen/adoc/AdocEscape.hpp b/src/lib/Gen/adoc/AdocEscape.hpp new file mode 100644 index 0000000000..514b94109f --- /dev/null +++ b/src/lib/Gen/adoc/AdocEscape.hpp @@ -0,0 +1,34 @@ +// +// This is a derivative work. originally part of the LLVM Project. +// 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) 2023 Vinnie Falco (vinnie.falco@gmail.com) +// Copyright (c) 2024 Alan de Freitas (alandefreitas@gmail.com) +// +// Official repository: https://github.com/cppalliance/mrdocs +// + +#ifndef MRDOCS_LIB_GEN_ADOC_ADOCESCAPE_HPP +#define MRDOCS_LIB_GEN_ADOC_ADOCESCAPE_HPP + +#include +#include +#include + +namespace clang::mrdocs::adoc { + +/** Escape a string for use in AsciiDoc + */ +MRDOCS_DECL +void +AdocEscape(OutputRef& os, std::string_view str); + +MRDOCS_DECL +std::string +AdocEscape(std::string_view str); + +} // clang::mrdocs::adoc + +#endif diff --git a/src/lib/Gen/adoc/AdocGenerator.cpp b/src/lib/Gen/adoc/AdocGenerator.cpp index ab312ef961..639d3ff724 100644 --- a/src/lib/Gen/adoc/AdocGenerator.cpp +++ b/src/lib/Gen/adoc/AdocGenerator.cpp @@ -10,11 +10,11 @@ // #include "AdocGenerator.hpp" +#include "AdocEscape.hpp" #include "DocVisitor.hpp" #include -namespace clang { -namespace mrdocs { +namespace clang::mrdocs { namespace adoc { AdocGenerator:: @@ -34,27 +34,9 @@ toString(hbs::HandlebarsCorpus const& c, doc::Node const& I) const void AdocGenerator:: -escape(OutputRef& os, std::string_view str) const +escape(OutputRef& os, std::string_view const str) const { - static constexpr std::string_view formattingChars = "\\`*_{}[]()#+-.!|"; - bool const needsEscape = str.find_first_of(formattingChars) != std::string_view::npos; - if (needsEscape) - { - os << "pass:["; - // Using passthroughs to pass content (without substitutions) can couple - // your content to a specific output format, such as HTML. - // In these cases, you should use conditional preprocessor directives - // to route passthrough content for different output formats based on - // the current backend. - // If we would like to couple passthrough content to an HTML format, - // then we'd use `HTMLEscape(os, str)` instead of `os << str`. - os << str; - os << "]"; - } - else - { - os << str; - } + AdocEscape(os, str); } } // adoc @@ -65,5 +47,4 @@ makeAdocGenerator() return std::make_unique(); } -} // mrdocs -} // clang +} // clang::mrdocs diff --git a/src/lib/Gen/adoc/DocVisitor.cpp b/src/lib/Gen/adoc/DocVisitor.cpp index 0191034b21..082edd30e6 100644 --- a/src/lib/Gen/adoc/DocVisitor.cpp +++ b/src/lib/Gen/adoc/DocVisitor.cpp @@ -11,6 +11,7 @@ // #include "DocVisitor.hpp" +#include "lib/Gen/adoc/AdocEscape.hpp" #include "lib/Support/Radix.hpp" #include #include @@ -18,56 +19,12 @@ #include #include -namespace clang { -namespace mrdocs { -namespace adoc { - -std::string -escapeAdoc( - std::string_view str) -{ - std::string result; - result.reserve(str.size()); - for(char ch : str) - { - switch(ch) - { - case '&': - result.append("&"); - break; - case '<': - result.append("<"); - break; - case '>': - result.append(">"); - break; - case '[': - result.append("["); - break; - case ']': - result.append("]"); - break; - case '|': - result.append("|"); - break; - case '=': - result.append("="); - break; - case '/': - result.append("/"); - break; - default: - result.push_back(ch); - break; - } - } - return result; -} +namespace clang::mrdocs::adoc { void DocVisitor:: operator()( - doc::Admonition const& I) + doc::Admonition const& I) const { std::string_view label; switch(I.admonish) @@ -97,7 +54,7 @@ operator()( void DocVisitor:: operator()( - doc::Code const& I) + doc::Code const& I) const { auto const leftMargin = measureLeftMargin(I.children); dest_ += @@ -130,47 +87,72 @@ operator()( void DocVisitor:: operator()( - doc::Heading const& I) + doc::Heading const& I) const { - fmt::format_to(ins_, "\n=== {}\n", escapeAdoc(I.string)); + fmt::format_to(ins_, "\n=== {}\n", AdocEscape(I.string)); } // Also handles doc::Brief void DocVisitor:: operator()( - doc::Paragraph const& I) + doc::Paragraph const& I) const { - std::span children = I.children; - if(children.empty()) + std::span const children = I.children; + if (children.empty()) + { return; - dest_.append("\n"); + } bool non_empty = write(*children.front(), *this); for(auto const& child : children.subspan(1)) { - if(non_empty) + if (non_empty) + { dest_.push_back('\n'); + } non_empty = write(*child, *this); } dest_.push_back('\n'); + dest_.push_back('\n'); } void DocVisitor:: operator()( - doc::Link const& I) + doc::Brief const& I) const +{ + std::span const children = I.children; + if (children.empty()) + { + return; + } + bool non_empty = write(*children.front(), *this); + for(auto const& child : children.subspan(1)) + { + if (non_empty) + { + dest_.push_back('\n'); + } + non_empty = write(*child, *this); + } +} + +void +DocVisitor:: +operator()( + doc::Link const& I) const { dest_.append("link:"); dest_.append(I.href); dest_.push_back('['); - dest_.append(escapeAdoc(I.string)); + dest_.append(AdocEscape(I.string)); dest_.push_back(']'); } void DocVisitor:: operator()( - doc::ListItem const& I) + doc::ListItem const& I) const { std::span children = I.children; if(children.empty()) @@ -179,8 +161,10 @@ operator()( bool non_empty = write(*children.front(), *this); for(auto const& child : children.subspan(1)) { - if(non_empty) + if (non_empty) + { dest_.push_back('\n'); + } non_empty = write(*child, *this); } dest_.push_back('\n'); @@ -188,48 +172,36 @@ operator()( void DocVisitor:: -operator()(doc::Param const& I) +operator()(doc::Param const& I) const { this->operator()(static_cast(I)); } void DocVisitor:: -operator()(doc::TParam const& I) -{ - this->operator()(static_cast(I)); -} - -void -DocVisitor:: -operator()(doc::Throws const& I) -{ - this->operator()(static_cast(I)); -} - -void -DocVisitor:: -operator()(doc::Returns const& I) +operator()(doc::Returns const& I) const { (*this)(static_cast(I)); } void DocVisitor:: -operator()(doc::Text const& I) +operator()(doc::Text const& I) const { // Asciidoc text must not have leading // else they can be rendered up as code. std::string_view s = trim(I.string); // Render empty lines as paragraph delimiters. - if(s.empty()) + if (s.empty()) + { s = "\n"; - dest_.append(escapeAdoc(s)); + } + dest_.append(AdocEscape(s)); } void DocVisitor:: -operator()(doc::Styled const& I) +operator()(doc::Styled const& I) const { // VFALCO We need to apply Asciidoc escaping // depending on the contents of the string. @@ -255,12 +227,35 @@ operator()(doc::Styled const& I) void DocVisitor:: -operator()(doc::Reference const& I) +operator()(doc::TParam const& I) const +{ + this->operator()(static_cast(I)); +} + +void +DocVisitor:: +operator()(doc::Reference const& I) const +{ + if (I.id == SymbolID::invalid) + { + return (*this)(static_cast(I)); + } + auto url = corpus_.getURL(corpus_->get(I.id)); + if (url.starts_with('/')) + { + url.erase(0, 1); + } + fmt::format_to( + std::back_inserter(dest_), + "xref:{}[{}]", + url, AdocEscape(I.string)); +} + +void +DocVisitor:: +operator()(doc::Throws const& I) const { - if(I.id == SymbolID::invalid) - return (*this)(static_cast(I)); - fmt::format_to(std::back_inserter(dest_), "xref:{}[{}]", - corpus_.getURL(corpus_->get(I.id)), escapeAdoc(I.string)); + this->operator()(static_cast(I)); } std::size_t @@ -269,20 +264,24 @@ measureLeftMargin( doc::List const& list) { if(list.empty()) + { return 0; - auto n = std::size_t(-1); + } + auto n = static_cast(-1); for(auto& text : list) { - if(trim(text->string).empty()) + if (trim(text->string).empty()) + { continue; + } auto const space = text->string.size() - ltrim(text->string).size(); - if( n > space) + if (n > space) + { n = space; + } } return n; } -} // adoc -} // mrdocs -} // clang +} // clang::mrdocs::adoc diff --git a/src/lib/Gen/adoc/DocVisitor.hpp b/src/lib/Gen/adoc/DocVisitor.hpp index ba59908b0b..c8acfc13e6 100644 --- a/src/lib/Gen/adoc/DocVisitor.hpp +++ b/src/lib/Gen/adoc/DocVisitor.hpp @@ -30,7 +30,7 @@ class DocVisitor bool write( const doc::Node& node, - Fn&& fn) + Fn&& fn) const { const auto n_before = dest_.size(); doc::visit(node, std::forward(fn)); @@ -47,22 +47,51 @@ class DocVisitor { } - void operator()(doc::Admonition const& I); - void operator()(doc::Code const& I); - void operator()(doc::Heading const& I); - void operator()(doc::Paragraph const& I); - void operator()(doc::Link const& I); - void operator()(doc::ListItem const& I); - void operator()(doc::Param const& I); - void operator()(doc::Returns const& I); - void operator()(doc::Text const& I); - void operator()(doc::Styled const& I); - void operator()(doc::TParam const& I); - void operator()(doc::Reference const& I); - void operator()(doc::Throws const& I); - - std::size_t measureLeftMargin( - doc::List const& list); + void + operator()(doc::Admonition const& I) const; + + void + operator()(doc::Code const& I) const; + + void + operator()(doc::Heading const& I) const; + + void + operator()(doc::Paragraph const& I) const; + + void + operator()(doc::Brief const& I) const; + + void + operator()(doc::Link const& I) const; + + void + operator()(doc::ListItem const& I) const; + + void + operator()(doc::Param const& I) const; + + void + operator()(doc::Returns const& I) const; + + void + operator()(doc::Text const& I) const; + + void + operator()(doc::Styled const& I) const; + + void + operator()(doc::TParam const& I) const; + + void + operator()(doc::Reference const& I) const; + + void + operator()(doc::Throws const& I) const; + + static + std::size_t + measureLeftMargin(doc::List const& list); }; } // hbs diff --git a/src/lib/Gen/html/DocVisitor.cpp b/src/lib/Gen/html/DocVisitor.cpp index 6297c8d272..fedce22901 100644 --- a/src/lib/Gen/html/DocVisitor.cpp +++ b/src/lib/Gen/html/DocVisitor.cpp @@ -25,7 +25,7 @@ namespace html { void DocVisitor:: operator()( - doc::Admonition const& I) + doc::Admonition const& I) const { std::string_view label; switch(I.admonish) @@ -57,7 +57,7 @@ operator()( void DocVisitor:: operator()( - doc::Code const& I) + doc::Code const& I) const { auto const leftMargin = measureLeftMargin(I.children); dest_.append("\n"); @@ -88,7 +88,7 @@ operator()( void DocVisitor:: operator()( - doc::Heading const& I) + doc::Heading const& I) const { fmt::format_to(ins_, "

{}

\n", I.string); } @@ -97,7 +97,7 @@ operator()( void DocVisitor:: operator()( - doc::Paragraph const& I) + doc::Paragraph const& I) const { dest_.append("

"); for(auto const& it : RangeFor(I.children)) @@ -108,10 +108,13 @@ operator()( if(! it.last && dest_.size() > n) { // wrap past 80 cols - if(dest_.size() < 80) + if (dest_.size() < 80) + { dest_.push_back(' '); - else + } else + { dest_.push_back('\n'); + } } } dest_.append("

\n\n"); @@ -120,7 +123,33 @@ operator()( void DocVisitor:: operator()( - doc::Link const& I) + doc::Brief const& I) const +{ + dest_.append(""); + for(auto const& it : RangeFor(I.children)) + { + auto const n = dest_.size(); + doc::visit(*it.value, *this); + // detect empty text blocks + if(! it.last && dest_.size() > n) + { + // wrap past 80 cols + if (dest_.size() < 80) + { + dest_.push_back(' '); + } else + { + dest_.push_back('\n'); + } + } + } + dest_.append(""); +} + +void +DocVisitor:: +operator()( + doc::Link const& I) const { dest_.append(""); for(auto const& it : RangeFor(I.children)) @@ -143,10 +172,13 @@ operator()( if(! it.last && dest_.size() > n) { // wrap past 80 cols - if(dest_.size() < 80) + if (dest_.size() < 80) + { dest_.push_back(' '); - else + } else + { dest_.append("\n"); + } } } dest_.append("\n"); @@ -154,21 +186,21 @@ operator()( void DocVisitor:: -operator()(doc::Param const& I) +operator()(doc::Param const& I) const { - //dest_ += I.string; + this->operator()(static_cast(I)); } void DocVisitor:: -operator()(doc::Returns const& I) +operator()(doc::Returns const& I) const { - //dest_ += I.string; + (*this)(static_cast(I)); } void DocVisitor:: -operator()(doc::Text const& I) +operator()(doc::Text const& I) const { std::string_view s = trim(I.string); fmt::format_to(std::back_inserter(dest_), "{}", s); @@ -176,7 +208,7 @@ operator()(doc::Text const& I) void DocVisitor:: -operator()(doc::Styled const& I) +operator()(doc::Styled const& I) const { std::string_view s = trim(I.string); switch(I.style) @@ -200,25 +232,29 @@ operator()(doc::Styled const& I) void DocVisitor:: -operator()(doc::TParam const& I) +operator()(doc::TParam const& I) const { - //dest_ += I.string; + this->operator()(static_cast(I)); } void DocVisitor:: -operator()(doc::Reference const& I) +operator()(doc::Reference const& I) const { - if(I.id == SymbolID::invalid) - return (*this)(static_cast(I)); + if (I.id == SymbolID::invalid) + { + return (*this)(static_cast(I)); + } + // AFREITAS: Unlike Adoc, we need relative URLs for HTML fmt::format_to(std::back_inserter(dest_), "{}", corpus_.getURL(corpus_->get(I.id)), I.string); } void DocVisitor:: -operator()(doc::Throws const& I) +operator()(doc::Throws const& I) const { + this->operator()(static_cast(I)); } std::size_t @@ -227,16 +263,22 @@ measureLeftMargin( doc::List const& list) { if(list.empty()) + { return 0; - std::size_t n = std::size_t(-1); + } + auto n = static_cast(-1); for(auto& text : list) { - if(trim(text->string).empty()) + if (trim(text->string).empty()) + { continue; + } auto const space = text->string.size() - ltrim(text->string).size(); - if( n > space) + if (n > space) + { n = space; + } } return n; } diff --git a/src/lib/Gen/html/DocVisitor.hpp b/src/lib/Gen/html/DocVisitor.hpp index 53f0038e3c..8f7548b468 100644 --- a/src/lib/Gen/html/DocVisitor.hpp +++ b/src/lib/Gen/html/DocVisitor.hpp @@ -30,7 +30,7 @@ class DocVisitor bool write( const doc::Node& node, - Fn&& fn) + Fn&& fn) const { const auto n_before = dest_.size(); doc::visit(node, std::forward(fn)); @@ -47,22 +47,51 @@ class DocVisitor { } - void operator()(doc::Admonition const& I); - void operator()(doc::Code const& I); - void operator()(doc::Heading const& I); - void operator()(doc::Paragraph const& I); - void operator()(doc::Link const& I); - void operator()(doc::ListItem const& I); - void operator()(doc::Param const& I); - void operator()(doc::Returns const& I); - void operator()(doc::Text const& I); - void operator()(doc::Styled const& I); - void operator()(doc::TParam const& I); - void operator()(doc::Reference const& I); - void operator()(doc::Throws const& I); - - std::size_t measureLeftMargin( - doc::List const& list); + void + operator()(doc::Admonition const& I) const; + + void + operator()(doc::Code const& I) const; + + void + operator()(doc::Heading const& I) const; + + void + operator()(doc::Paragraph const& I) const; + + void + operator()(doc::Brief const& I) const; + + void + operator()(doc::Link const& I) const; + + void + operator()(doc::ListItem const& I) const; + + void + operator()(doc::Param const& I) const; + + void + operator()(doc::Returns const& I) const; + + void + operator()(doc::Text const& I) const; + + void + operator()(doc::Styled const& I) const; + + void + operator()(doc::TParam const& I) const; + + void + operator()(doc::Reference const& I) const; + + void + operator()(doc::Throws const& I) const; + + static + std::size_t + measureLeftMargin(doc::List const& list); }; } // html diff --git a/src/test/TestRunner.cpp b/src/test/TestRunner.cpp index 70c2b3ccb5..de4d86c9c5 100644 --- a/src/test/TestRunner.cpp +++ b/src/test/TestRunner.cpp @@ -174,8 +174,17 @@ handleFile( testArgs.action == Action::test || testArgs.action == Action::create) { + std::string_view filePathSv = filePath; + if (filePathSv.starts_with(dirs_.cwd)) + { + filePathSv.remove_prefix(dirs_.cwd.size()); + if (filePathSv.starts_with("\\") || filePathSv.starts_with("/")) + { + filePathSv.remove_prefix(1); + } + } report::error("{}: \"{}\"", - Error("Incorrect results"), filePath); + Error("Incorrect results"), filePathSv); auto res = test_suite::diffStrings(expectedDocs, generatedDocs); report::error("{} lines added", res.added); report::error("{} lines removed", res.removed); diff --git a/test-files/golden-tests/alias-template.adoc b/test-files/golden-tests/alias-template.adoc index 2044cfb3ba..eabc400df1 100644 --- a/test-files/golden-tests/alias-template.adoc +++ b/test-files/golden-tests/alias-template.adoc @@ -28,10 +28,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<alias‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,12 +44,13 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<alias‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename T, - typename U> + typename U> struct B; ---- @@ -60,11 +62,12 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<alias‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using C = <<#A,A>>; +template<typename T> +using C = <<#A,A>><T>; ---- [#D] @@ -72,10 +75,11 @@ using C = <<#A,A>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<alias‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct D; ---- @@ -96,11 +100,12 @@ struct D; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<alias‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using E = <<#B,B>>; +template<typename U> +using E = <<#B,B>><T, U>; ---- diff --git a/test-files/golden-tests/attributes_1.adoc b/test-files/golden-tests/attributes_1.adoc index f426ba2472..cbde39dd0c 100644 --- a/test-files/golden-tests/attributes_1.adoc +++ b/test-files/golden-tests/attributes_1.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<attributes_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool f(); diff --git a/test-files/golden-tests/brief-1.adoc b/test-files/golden-tests/brief-1.adoc index 9f30b46300..fde4a53889 100644 --- a/test-files/golden-tests/brief-1.adoc +++ b/test-files/golden-tests/brief-1.adoc @@ -10,16 +10,16 @@ | Name | Description | <<#f5,`f5`>> -| -brief +| brief *bold* it -continues to the line. +continues to the line. + | <<#f6,`f6`>> -| -brief +| brief + |=== @@ -27,17 +27,18 @@ brief [#f5] == f5 - brief *bold* it -continues to the line. +continues to the line. + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f5(); @@ -46,14 +47,15 @@ f5(); [#f6] == f6 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -61,7 +63,6 @@ f6(); === Description - many lined *bold* what will @@ -70,4 +71,5 @@ happen? + [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/brief-2.adoc b/test-files/golden-tests/brief-2.adoc index de7c3c3f1a..d2ad5e1043 100644 --- a/test-files/golden-tests/brief-2.adoc +++ b/test-files/golden-tests/brief-2.adoc @@ -10,50 +10,51 @@ | Name | Description | <<#f1,`f1`>> -| -brief +| brief + | <<#f2,`f2`>> -| -brief +| brief + | <<#f3,`f3`>> -| -brief +| brief + | <<#f4,`f4`>> -| -brief x +| brief x + | <<#f5,`f5`>> -| -br +| br ief + | <<#f6,`f6`>> -| -br +| br ief + |=== [#f1] == f1 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -62,14 +63,15 @@ f1(); [#f2] == f2 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -78,14 +80,15 @@ f2(); [#f3] == f3 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(); @@ -94,14 +97,15 @@ f3(); [#f4] == f4 - brief x + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -109,23 +113,24 @@ f4(); === Description - br ief + [#f5] == f5 - br ief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f5(); @@ -134,15 +139,16 @@ f5(); [#f6] == f6 - br ief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<brief‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -150,10 +156,10 @@ f6(); === Description - desc + [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/canonical_1.adoc b/test-files/golden-tests/canonical_1.adoc index eb6066de2c..921ee291c3 100644 --- a/test-files/golden-tests/canonical_1.adoc +++ b/test-files/golden-tests/canonical_1.adoc @@ -40,8 +40,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -54,8 +55,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct b; ---- @@ -68,8 +70,9 @@ struct b; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -82,8 +85,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct a; ---- @@ -96,8 +100,9 @@ struct a; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Ba; ---- @@ -110,8 +115,9 @@ struct Ba; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct bA; ---- @@ -124,8 +130,9 @@ struct bA; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Bx; ---- @@ -138,8 +145,9 @@ struct Bx; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<canonical_1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct ba; ---- diff --git a/test-files/golden-tests/class-template-partial-spec.adoc b/test-files/golden-tests/class-template-partial-spec.adoc index 84f90aaff4..f15821ea99 100644 --- a/test-files/golden-tests/class-template-partial-spec.adoc +++ b/test-files/golden-tests/class-template-partial-spec.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐partial‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -34,10 +35,10 @@ struct A; | <<#A-B-0a,`B`>> | -| <<#A-B-06,`B`>> +| <<#A-B-06,`B<U*, T>`>> | -| <<#A-B-04,`B`>> +| <<#A-B-04,`B<T, long>`>> | |=== @@ -49,12 +50,13 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐partial‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename U, - typename V> + typename V> struct B; ---- @@ -62,30 +64,32 @@ struct B; [#A-B-06] -== <<#A,A>>::B +== <<#A,A>>::B<U*, T> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐partial‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#A-B-0a,B>>; +template<typename U> +struct <<#A-B-0a,B>><U*, T>; ---- [#A-B-04] -== <<#A,A>>::B +== <<#A,A>>::B<T, long> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐partial‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-B-0a,B>>; +template<> +struct <<#A-B-0a,B>><T, long>; ---- diff --git a/test-files/golden-tests/class-template-spec.adoc b/test-files/golden-tests/class-template-spec.adoc index 1380937d28..95dbf7e86e 100644 --- a/test-files/golden-tests/class-template-spec.adoc +++ b/test-files/golden-tests/class-template-spec.adoc @@ -12,28 +12,28 @@ | <<#A-0e,`A`>> | -| <<#A-00,`A`>> +| <<#A-00,`A<int>`>> | -| <<#A-0c,`A`>> +| <<#A-0c,`A<long>`>> | | <<#B-00,`B`>> | -| <<#B-07,`B`>> +| <<#B-07,`B<T*>`>> | -| <<#B-06,`B`>> +| <<#B-06,`B<T&>`>> | | <<#C-0f,`C`>> | -| <<#C-0a,`C`>> +| <<#C-0a,`C<int, int>`>> | -| <<#C-0e,`C`>> +| <<#C-0e,`C<T*, int>`>> | |=== @@ -43,10 +43,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -67,23 +68,25 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#A-00] -== A +== A<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e,A>>; +template<> +struct <<#A-0e,A>><int>; ---- === Member Functions @@ -99,27 +102,29 @@ struct <<#A-0e,A>>; [#A-00-g] -== <<#A-00,A>>::g +== <<#A-00,A>><int>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); ---- [#A-0c] -== A +== A<long> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e,A>>; +template<> +struct <<#A-0e,A>><long>; ---- === Member Functions @@ -135,12 +140,13 @@ struct <<#A-0e,A>>; [#A-0c-h] -== <<#A-0c,A>>::h +== <<#A-0c,A>><long>::h === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h(); @@ -151,10 +157,11 @@ h(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct B; ---- @@ -175,23 +182,25 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#B-07] -== B +== B<T*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#B-00,B>>; +template<typename T> +struct <<#B-00,B>><T*>; ---- === Member Functions @@ -207,27 +216,29 @@ struct <<#B-00,B>>; [#B-07-g] -== <<#B-07,B>>::g +== <<#B-07,B>><T*>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); ---- [#B-06] -== B +== B<T&> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#B-00,B>>; +template<typename T> +struct <<#B-00,B>><T&>; ---- === Member Functions @@ -243,12 +254,13 @@ struct <<#B-00,B>>; [#B-06-h] -== <<#B-06,B>>::h +== <<#B-06,B>><T&>::h === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h(); @@ -259,12 +271,13 @@ h(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename T, - typename U> + typename U> struct C; ---- @@ -285,23 +298,25 @@ struct C; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#C-0a] -== C +== C<int, int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#C-0f,C>>; +template<> +struct <<#C-0f,C>><int, int>; ---- === Member Functions @@ -317,27 +332,29 @@ struct <<#C-0f,C>>; [#C-0a-g] -== <<#C-0a,C>>::g +== <<#C-0a,C>><int, int>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); ---- [#C-0e] -== C +== C<T*, int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#C-0f,C>>; +template<typename T> +struct <<#C-0f,C>><T*, int>; ---- === Member Functions @@ -353,12 +370,13 @@ struct <<#C-0f,C>>; [#C-0e-h] -== <<#C-0e,C>>::h +== <<#C-0e,C>><T*, int>::h === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐spec.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h(); diff --git a/test-files/golden-tests/class-template-specializations-1.adoc b/test-files/golden-tests/class-template-specializations-1.adoc index 9998e00da4..502e3afa86 100644 --- a/test-files/golden-tests/class-template-specializations-1.adoc +++ b/test-files/golden-tests/class-template-specializations-1.adoc @@ -156,13 +156,13 @@ | <<#R9,`R9`>> | -| <<#S0-02,`S0<1, int*>`>> +| <<#S0-02,`S0<1, int*>`>> | -| <<#S0-0c4,`S0<1, T*>`>> +| <<#S0-0c4,`S0<1, T*>`>> | -| <<#S0-0be,`S0<0>`>> +| <<#S0-0be,`S0<0>`>> | | <<#S0-0cf,`S0`>> @@ -175,12 +175,13 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int I, - typename T = void> + typename T = void> struct S0; ---- @@ -213,8 +214,9 @@ struct S0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -225,8 +227,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S1; ---- @@ -257,8 +260,9 @@ struct S1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -269,12 +273,13 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int J, - typename U = void> + typename U = void> struct S2; ---- @@ -307,8 +312,9 @@ struct S2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -319,8 +325,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S3; ---- @@ -342,8 +349,9 @@ struct S3; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(); @@ -354,12 +362,13 @@ f3(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int K, - typename V = void> + typename V = void> struct S4; ---- @@ -380,8 +389,9 @@ struct S4; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -392,12 +402,13 @@ f4(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int J, - typename U = void> + typename U = void> struct S5; ---- @@ -427,8 +438,9 @@ struct S5; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f5(); @@ -439,8 +451,9 @@ f5(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S6; ---- @@ -471,8 +484,9 @@ struct S6; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -483,12 +497,13 @@ f6(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int K, - typename V = void> + typename V = void> struct S7; ---- @@ -521,8 +536,9 @@ struct S7; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f7(); @@ -533,8 +549,9 @@ f7(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S8; ---- @@ -556,8 +573,9 @@ struct S8; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f8(); @@ -568,12 +586,13 @@ f8(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int L, - typename W = void> + typename W = void> struct S9; ---- @@ -594,53 +613,57 @@ struct S9; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f9(); ---- [#S0-0be] -== S0<0> +== S0<0> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#S0-0cf,S0>><0>; +template<> +struct <<#S0-0cf,S0>><0>; ---- [#S0-0c4] -== S0<1, T*> +== S0<1, T*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#S0-0cf,S0>><1, T*>; +template<typename T> +struct <<#S0-0cf,S0>><1, T*>; ---- [#S0-02] -== S0<1, int*> +== S0<1, int*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#S0-0cf,S0>><1, int*>; +template<> +struct <<#S0-0cf,S0>><1, int*>; ---- @@ -651,11 +674,12 @@ struct <<#S0-0cf,S0>><1, int*>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R0 - : <<#S0-0cf,S0>>; + : <<#S0-0cf,S0>><‐1>; ---- === Types @@ -687,11 +711,12 @@ struct R0 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R1 - : <<#S0-0be,S0>><0>; + : <<#S0-0be,S0>><0>; ---- @@ -702,11 +727,12 @@ struct R1 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R2 - : <<#S0-0c4,S0>><1, void*>; + : <<#S0-0c4,S0>><1, void*>; ---- @@ -717,11 +743,12 @@ struct R2 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R3 - : <<#S0-02,S0>><1, int*>; + : <<#S0-02,S0>><1, int*>; ---- @@ -732,11 +759,12 @@ struct R3 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R4 - : <<#S0-0cf,S0>><2>::<<#S0-09c-S1,S1>>; + : <<#S0-0cf,S0>><2>::<<#S0-09c-S1,S1>>; ---- @@ -747,11 +775,12 @@ struct R4 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R5 - : <<#S0-0cf,S0>><3>::<<#S0-0cf-S1,S1>>::<<#S0-073-S1-S2,S2>>; + : <<#S0-0cf,S0>><3>::<<#S0-0cf-S1,S1>>::<<#S0-073-S1-S2,S2>><‐1>; ---- @@ -762,11 +791,12 @@ struct R5 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R6 - : <<#S0-0cf,S0>><4>::<<#S0-0cf-S1,S1>>::<<#S0-0a1-S1-S2,S2>><5>; + : <<#S0-0cf,S0>><4>::<<#S0-0cf-S1,S1>>::<<#S0-0a1-S1-S2,S2>><5>; ---- @@ -777,11 +807,12 @@ struct R6 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R7 - : <<#S0-0cf,S0>><6>::<<#S0-0cf-S1,S1>>::<<#S0-07e-S1-S2-06,S2>><7, void*>; + : <<#S0-0cf,S0>><6>::<<#S0-0cf-S1,S1>>::<<#S0-07e-S1-S2-06,S2>><7, void*>; ---- @@ -792,11 +823,12 @@ struct R7 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R8 - : <<#S0-0cf,S0>><6>::<<#S0-0cf-S1,S1>>::<<#S0-07e-S1-S2-07,S2>><7, int*>; + : <<#S0-0cf,S0>><6>::<<#S0-0cf-S1,S1>>::<<#S0-07e-S1-S2-07,S2>><7, int*>; ---- @@ -807,11 +839,12 @@ struct R8 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R9 - : <<#S0-0cf,S0>><8>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><9>::<<#S0-0a3-S1-S2-S3,S3>>; + : <<#S0-0cf,S0>><8>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><9>::<<#S0-0a3-S1-S2-S3,S3>>; ---- @@ -822,11 +855,12 @@ struct R9 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R10 - : <<#S0-0cf,S0>><10>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><11>::<<#S0-08-S1-S2-S4,S4>>; + : <<#S0-0cf,S0>><10>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><11>::<<#S0-08-S1-S2-S4,S4>><‐1>; ---- @@ -837,11 +871,12 @@ struct R10 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R11 - : <<#S0-0cf,S0>><12>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><13>::<<#S0-0e-S1-S2-S4,S4>><14>; + : <<#S0-0cf,S0>><12>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><13>::<<#S0-0e-S1-S2-S4,S4>><14>; ---- @@ -852,11 +887,12 @@ struct R11 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R12 - : <<#S0-0cf,S0>><15>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16>::<<#S0-09e4-S1-S2-S4-07,S4>><17, void*>; + : <<#S0-0cf,S0>><15>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16>::<<#S0-09e4-S1-S2-S4-07,S4>><17, void*>; ---- @@ -867,11 +903,12 @@ struct R12 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R13 - : <<#S0-0cf,S0>><15>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16>::<<#S0-09e4-S1-S2-S4-02,S4>><17, int*>; + : <<#S0-0cf,S0>><15>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16>::<<#S0-09e4-S1-S2-S4-02,S4>><17, int*>; ---- @@ -882,11 +919,12 @@ struct R13 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R14 - : <<#S0-0cf,S0>><18>::<<#S0-07a-S5,S5>>; + : <<#S0-0cf,S0>><18>::<<#S0-07a-S5,S5>><‐1>; ---- @@ -897,11 +935,12 @@ struct R14 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R15 - : <<#S0-0cf,S0>><19>::<<#S0-0a7-S5,S5>><20>; + : <<#S0-0cf,S0>><19>::<<#S0-0a7-S5,S5>><20>; ---- @@ -912,11 +951,12 @@ struct R15 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R16 - : <<#S0-0cf,S0>><21>::<<#S0-031-S5-0b,S5>><22, void*>; + : <<#S0-0cf,S0>><21>::<<#S0-031-S5-0b,S5>><22, void*>; ---- @@ -927,11 +967,12 @@ struct R16 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R17 - : <<#S0-0cf,S0>><21>::<<#S0-031-S5-03,S5>><22, int*>; + : <<#S0-0cf,S0>><21>::<<#S0-031-S5-03,S5>><22, int*>; ---- @@ -942,11 +983,12 @@ struct R17 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R18 - : <<#S0-0cf,S0>><23>::<<#S0-0cf-S5,S5>><24>::<<#S0-05-S5-S6,S6>>; + : <<#S0-0cf,S0>><23>::<<#S0-0cf-S5,S5>><24>::<<#S0-05-S5-S6,S6>>; ---- @@ -957,11 +999,12 @@ struct R18 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R19 - : <<#S0-0cf,S0>><25>::<<#S0-0cf-S5,S5>><26>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0a2-S5-S6-S7,S7>>; + : <<#S0-0cf,S0>><25>::<<#S0-0cf-S5,S5>><26>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0a2-S5-S6-S7,S7>><‐1>; ---- @@ -972,11 +1015,12 @@ struct R19 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R20 - : <<#S0-0cf,S0>><27>::<<#S0-0cf-S5,S5>><28>::<<#S0-0cf-S5-S6,S6>>::<<#S0-09e2-S5-S6-S7-0a,S7>><29, void*>; + : <<#S0-0cf,S0>><27>::<<#S0-0cf-S5,S5>><28>::<<#S0-0cf-S5-S6,S6>>::<<#S0-09e2-S5-S6-S7-0a,S7>><29, void*>; ---- @@ -987,11 +1031,12 @@ struct R20 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R21 - : <<#S0-0cf,S0>><27>::<<#S0-0cf-S5,S5>><28>::<<#S0-0cf-S5-S6,S6>>::<<#S0-09e2-S5-S6-S7-0d,S7>><29, int*>; + : <<#S0-0cf,S0>><27>::<<#S0-0cf-S5,S5>><28>::<<#S0-0cf-S5-S6,S6>>::<<#S0-09e2-S5-S6-S7-0d,S7>><29, int*>; ---- @@ -1002,11 +1047,12 @@ struct R21 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R22 - : <<#S0-0cf,S0>><30>::<<#S0-0cf-S5,S5>><31>::<<#S0-0cf-S5-S6,S6>>::<<#S0-01-S5-S6-S7,S7>><32>; + : <<#S0-0cf,S0>><30>::<<#S0-0cf-S5,S5>><31>::<<#S0-0cf-S5-S6,S6>>::<<#S0-01-S5-S6-S7,S7>><32>; ---- @@ -1017,11 +1063,12 @@ struct R22 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R23 - : <<#S0-0cf,S0>><33>::<<#S0-0cf-S5,S5>><34>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><35>::<<#S0-09ee-S5-S6-S7-S8,S8>>; + : <<#S0-0cf,S0>><33>::<<#S0-0cf-S5,S5>><34>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><35>::<<#S0-09ee-S5-S6-S7-S8,S8>>; ---- @@ -1032,11 +1079,12 @@ struct R23 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R24 - : <<#S0-0cf,S0>><36>::<<#S0-0cf-S5,S5>><37>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><38>::<<#S0-033-S5-S6-S7-S9,S9>>; + : <<#S0-0cf,S0>><36>::<<#S0-0cf-S5,S5>><37>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><38>::<<#S0-033-S5-S6-S7-S9,S9>><‐1>; ---- @@ -1047,11 +1095,12 @@ struct R24 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R25 - : <<#S0-0cf,S0>><39>::<<#S0-0cf-S5,S5>><40>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41>::<<#S0-06-S5-S6-S7-S9-00,S9>><42, void*>; + : <<#S0-0cf,S0>><39>::<<#S0-0cf-S5,S5>><40>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41>::<<#S0-06-S5-S6-S7-S9-00,S9>><42, void*>; ---- @@ -1062,11 +1111,12 @@ struct R25 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R26 - : <<#S0-0cf,S0>><39>::<<#S0-0cf-S5,S5>><40>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41>::<<#S0-06-S5-S6-S7-S9-08,S9>><42, int*>; + : <<#S0-0cf,S0>><39>::<<#S0-0cf-S5,S5>><40>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41>::<<#S0-06-S5-S6-S7-S9-08,S9>><42, int*>; ---- @@ -1077,11 +1127,12 @@ struct R26 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R27 - : <<#S0-0cf,S0>><43>::<<#S0-0cf-S5,S5>><44>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><45>::<<#S0-0ba-S5-S6-S7-S9,S9>><46>; + : <<#S0-0cf,S0>><43>::<<#S0-0cf-S5,S5>><44>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><45>::<<#S0-0ba-S5-S6-S7-S9,S9>><46>; ---- @@ -1092,11 +1143,12 @@ struct R27 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R28 - : <<#S0-0cf,S0>><0, bool>; + : <<#S0-0cf,S0>><0, bool>; ---- === Types @@ -1128,11 +1180,12 @@ struct R28 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R29 - : <<#S0-0cf,S0>><1, int>; + : <<#S0-0cf,S0>><1, int>; ---- === Types @@ -1164,11 +1217,12 @@ struct R29 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R30 - : <<#S0-0cf,S0>><2, bool>::<<#S0-0cf-S1,S1>>; + : <<#S0-0cf,S0>><2, bool>::<<#S0-0cf-S1,S1>>; ---- === Types @@ -1197,14 +1251,15 @@ struct R30 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int I, - typename T> + typename T> struct R31 - : <<#S0-0cf,S0>><3, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>; + : <<#S0-0cf,S0>><3, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><I, T>; ---- === Types @@ -1236,11 +1291,12 @@ struct R31 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R32 - : <<#S0-0cf,S0>><4, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><5, bool>; + : <<#S0-0cf,S0>><4, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><5, bool>; ---- === Types @@ -1272,11 +1328,12 @@ struct R32 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R33 - : <<#S0-0cf,S0>><6, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><7, int>; + : <<#S0-0cf,S0>><6, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><7, int>; ---- === Types @@ -1308,11 +1365,12 @@ struct R33 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R34 - : <<#S0-0cf,S0>><8, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><9, bool>::<<#S0-0cf-S1-S2-S3,S3>>; + : <<#S0-0cf,S0>><8, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><9, bool>::<<#S0-0cf-S1-S2-S3,S3>>; ---- === Member Functions @@ -1332,14 +1390,15 @@ struct R34 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int I, - typename T> + typename T> struct R35 - : <<#S0-0cf,S0>><10, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><11, bool>::<<#S0-0cf-S1-S2-S4,S4>>; + : <<#S0-0cf,S0>><10, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><11, bool>::<<#S0-0cf-S1-S2-S4,S4>><I, T>; ---- === Member Functions @@ -1359,11 +1418,12 @@ struct R35 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R36 - : <<#S0-0cf,S0>><12, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><13, bool>::<<#S0-0cf-S1-S2-S4,S4>><14, bool>; + : <<#S0-0cf,S0>><12, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><13, bool>::<<#S0-0cf-S1-S2-S4,S4>><14, bool>; ---- === Member Functions @@ -1383,11 +1443,12 @@ struct R36 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R37 - : <<#S0-0cf,S0>><15, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16, bool>::<<#S0-0cf-S1-S2-S4,S4>><17, int>; + : <<#S0-0cf,S0>><15, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16, bool>::<<#S0-0cf-S1-S2-S4,S4>><17, int>; ---- === Member Functions @@ -1407,14 +1468,15 @@ struct R37 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int I, - typename T> + typename T> struct R38 - : <<#S0-0cf,S0>><18, bool>::<<#S0-0cf-S5,S5>>; + : <<#S0-0cf,S0>><18, bool>::<<#S0-0cf-S5,S5>><I, T>; ---- === Types @@ -1443,11 +1505,12 @@ struct R38 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R39 - : <<#S0-0cf,S0>><19, bool>::<<#S0-0cf-S5,S5>><20, bool>; + : <<#S0-0cf,S0>><19, bool>::<<#S0-0cf-S5,S5>><20, bool>; ---- === Types @@ -1476,11 +1539,12 @@ struct R39 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R40 - : <<#S0-0cf,S0>><21, bool>::<<#S0-0cf-S5,S5>><22, int>; + : <<#S0-0cf,S0>><21, bool>::<<#S0-0cf-S5,S5>><22, int>; ---- === Types @@ -1509,11 +1573,12 @@ struct R40 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R41 - : <<#S0-0cf,S0>><23, bool>::<<#S0-0cf-S5,S5>><24, bool>::<<#S0-0cf-S5-S6,S6>>; + : <<#S0-0cf,S0>><23, bool>::<<#S0-0cf-S5,S5>><24, bool>::<<#S0-0cf-S5-S6,S6>>; ---- === Types @@ -1542,14 +1607,15 @@ struct R41 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int I, - typename T> + typename T> struct R42 - : <<#S0-0cf,S0>><25, bool>::<<#S0-0cf-S5,S5>><26, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>; + : <<#S0-0cf,S0>><25, bool>::<<#S0-0cf-S5,S5>><26, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><I, T>; ---- === Types @@ -1581,11 +1647,12 @@ struct R42 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R43 - : <<#S0-0cf,S0>><27, bool>::<<#S0-0cf-S5,S5>><28, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><29, int>; + : <<#S0-0cf,S0>><27, bool>::<<#S0-0cf-S5,S5>><28, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><29, int>; ---- === Types @@ -1617,11 +1684,12 @@ struct R43 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R44 - : <<#S0-0cf,S0>><30, bool>::<<#S0-0cf-S5,S5>><31, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><32, bool>; + : <<#S0-0cf,S0>><30, bool>::<<#S0-0cf-S5,S5>><31, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><32, bool>; ---- === Types @@ -1653,11 +1721,12 @@ struct R44 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R45 - : <<#S0-0cf,S0>><33, bool>::<<#S0-0cf-S5,S5>><34, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><35, bool>::<<#S0-0cf-S5-S6-S7-S8,S8>>; + : <<#S0-0cf,S0>><33, bool>::<<#S0-0cf-S5,S5>><34, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><35, bool>::<<#S0-0cf-S5-S6-S7-S8,S8>>; ---- === Member Functions @@ -1677,14 +1746,15 @@ struct R45 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int I, - typename T> + typename T> struct R46 - : <<#S0-0cf,S0>><36, bool>::<<#S0-0cf-S5,S5>><37, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><38, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>>; + : <<#S0-0cf,S0>><36, bool>::<<#S0-0cf-S5,S5>><37, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><38, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><I, T>; ---- === Member Functions @@ -1704,11 +1774,12 @@ struct R46 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R47 - : <<#S0-0cf,S0>><39, bool>::<<#S0-0cf-S5,S5>><40, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><42, int>; + : <<#S0-0cf,S0>><39, bool>::<<#S0-0cf-S5,S5>><40, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><42, int>; ---- === Member Functions @@ -1728,11 +1799,12 @@ struct R47 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct R48 - : <<#S0-0cf,S0>><43, bool>::<<#S0-0cf-S5,S5>><44, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><45, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><46, bool>; + : <<#S0-0cf,S0>><43, bool>::<<#S0-0cf-S5,S5>><44, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><45, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><46, bool>; ---- === Member Functions diff --git a/test-files/golden-tests/class-template-specializations-2.adoc b/test-files/golden-tests/class-template-specializations-2.adoc index 6b4eeb6240..cb5d923428 100644 --- a/test-files/golden-tests/class-template-specializations-2.adoc +++ b/test-files/golden-tests/class-template-specializations-2.adoc @@ -12,10 +12,10 @@ | <<#A-0e,`A`>> | -| <<#A-03,`A`>> +| <<#A-03,`A<T*>`>> | -| <<#A-06,`A`>> +| <<#A-06,`A<double>`>> | |=== @@ -25,10 +25,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -36,15 +37,16 @@ struct A; [#A-03] -== A +== A<T*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#A-0e,A>>; +template<typename T> +struct <<#A-0e,A>><T*>; ---- === Types @@ -55,10 +57,10 @@ struct <<#A-0e,A>>; | <<#A-03-B-05,`B`>> | -| <<#A-03-B-01,`B`>> +| <<#A-03-B-01,`B<U*>`>> | -| <<#A-03-B-0b,`B`>> +| <<#A-03-B-0b,`B<int>`>> | |=== @@ -66,14 +68,15 @@ struct <<#A-0e,A>>; [#A-03-B-05] -== <<#A-03,A>>::B +== <<#A-03,A>><T*>::B === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct B; ---- @@ -81,15 +84,16 @@ struct B; [#A-03-B-01] -== <<#A-03,A>>::B +== <<#A-03,A>><T*>::B<U*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#A-03-B-05,B>>; +template<typename U> +struct <<#A-03-B-05,B>><U*>; ---- === Types @@ -105,12 +109,13 @@ struct <<#A-03-B-05,B>>; [#A-03-B-01-C] -== <<#A-03,A>>::<<#A-03-B-01,B>>::C +== <<#A-03,A>><T*>::<<#A-03-B-01,B>><U*>::C === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct C; ---- @@ -119,30 +124,32 @@ struct C; [#A-03-B-0b] -== <<#A-03,A>>::B +== <<#A-03,A>><T*>::B<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-03-B-05,B>>; +template<> +struct <<#A-03-B-05,B>><int>; ---- [#A-06] -== A +== A<double> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e,A>>; +template<> +struct <<#A-0e,A>><double>; ---- === Types @@ -153,7 +160,7 @@ struct <<#A-0e,A>>; | <<#A-06-D-0b,`D`>> | -| <<#A-06-D-04,`D`>> +| <<#A-06-D-04,`D<float>`>> | |=== @@ -161,14 +168,15 @@ struct <<#A-0e,A>>; [#A-06-D-0b] -== <<#A-06,A>>::D +== <<#A-06,A>><double>::D === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct D; ---- @@ -180,7 +188,7 @@ struct D; | <<#A-06-D-0b-E-01,`E`>> | -| <<#A-06-D-0b-E-04,`E`>> +| <<#A-06-D-0b-E-04,`E<T*>`>> | |=== @@ -188,14 +196,15 @@ struct D; [#A-06-D-0b-E-01] -== <<#A-06,A>>::<<#A-06-D-0b,D>>::E +== <<#A-06,A>><double>::<<#A-06-D-0b,D>>::E === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct E; ---- @@ -203,15 +212,16 @@ struct E; [#A-06-D-0b-E-04] -== <<#A-06,A>>::<<#A-06-D-0b,D>>::E +== <<#A-06,A>><double>::<<#A-06-D-0b,D>>::E<T*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#A-06-D-0b-E-01,E>>; +template<typename T> +struct <<#A-06-D-0b-E-01,E>><T*>; ---- === Types @@ -227,12 +237,13 @@ struct <<#A-06-D-0b-E-01,E>>; [#A-06-D-0b-E-04-F] -== <<#A-06,A>>::<<#A-06-D-0b,D>>::<<#A-06-D-0b-E-04,E>>::F +== <<#A-06,A>><double>::<<#A-06-D-0b,D>>::<<#A-06-D-0b-E-04,E>><T*>::F === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct F; ---- @@ -241,15 +252,16 @@ struct F; [#A-06-D-04] -== <<#A-06,A>>::D +== <<#A-06,A>><double>::D<float> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-06-D-0b,D>>; +template<> +struct <<#A-06-D-0b,D>><float>; ---- === Types @@ -260,7 +272,7 @@ struct <<#A-06-D-0b,D>>; | <<#A-06-D-04-G-06,`G`>> | -| <<#A-06-D-04-G-0c,`G`>> +| <<#A-06-D-04-G-0c,`G<T*>`>> | |=== @@ -268,14 +280,15 @@ struct <<#A-06-D-0b,D>>; [#A-06-D-04-G-06] -== <<#A-06,A>>::<<#A-06-D-04,D>>::G +== <<#A-06,A>><double>::<<#A-06-D-04,D>><float>::G === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct G; ---- @@ -283,15 +296,16 @@ struct G; [#A-06-D-04-G-0c] -== <<#A-06,A>>::<<#A-06-D-04,D>>::G +== <<#A-06,A>><double>::<<#A-06-D-04,D>><float>::G<T*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#A-06-D-04-G-06,G>>; +template<typename T> +struct <<#A-06-D-04-G-06,G>><T*>; ---- diff --git a/test-files/golden-tests/class-template-specializations-3.adoc b/test-files/golden-tests/class-template-specializations-3.adoc index e4e292fa67..68ece9f99c 100644 --- a/test-files/golden-tests/class-template-specializations-3.adoc +++ b/test-files/golden-tests/class-template-specializations-3.adoc @@ -22,10 +22,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -37,7 +38,7 @@ struct A; | <<#A-0e-B-07,`B`>> | -| <<#A-0e-B-00,`B`>> +| <<#A-0e-B-00,`B<double>`>> | |=== @@ -49,10 +50,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct B; ---- @@ -67,7 +69,7 @@ struct B; | <<#A-0e-B-07-D-09,`D`>> | -| <<#A-0e-B-07-D-0f,`D`>> +| <<#A-0e-B-07-D-0f,`D<bool>`>> | |=== @@ -79,8 +81,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct C; ---- @@ -93,10 +96,11 @@ struct C; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename V> struct D; ---- @@ -104,30 +108,32 @@ struct D; [#A-0e-B-07-D-0f] -== <<#A-0e,A>>::<<#A-0e-B-07,B>>::D +== <<#A-0e,A>>::<<#A-0e-B-07,B>>::D<bool> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e-B-07-D-09,D>>; +template<> +struct <<#A-0e-B-07-D-09,D>><bool>; ---- [#A-0e-B-00] -== <<#A-0e,A>>::B +== <<#A-0e,A>>::B<double> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e-B-07,B>>; +template<> +struct <<#A-0e-B-07,B>><double>; ---- === Types @@ -141,7 +147,7 @@ struct <<#A-0e-B-07,B>>; | <<#A-0e-B-00-D-09,`D`>> | -| <<#A-0e-B-00-D-0d,`D`>> +| <<#A-0e-B-00-D-0d,`D<bool>`>> | |=== @@ -149,12 +155,13 @@ struct <<#A-0e-B-07,B>>; [#A-0e-B-00-C] -== <<#A-0e,A>>::<<#A-0e-B-00,B>>::C +== <<#A-0e,A>>::<<#A-0e-B-00,B>><double>::C === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct C; ---- @@ -163,14 +170,15 @@ struct C; [#A-0e-B-00-D-09] -== <<#A-0e,A>>::<<#A-0e-B-00,B>>::D +== <<#A-0e,A>>::<<#A-0e-B-00,B>><double>::D === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename V> struct D; ---- @@ -178,15 +186,16 @@ struct D; [#A-0e-B-00-D-0d] -== <<#A-0e,A>>::<<#A-0e-B-00,B>>::D +== <<#A-0e,A>>::<<#A-0e-B-00,B>><double>::D<bool> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e-B-00-D-09,D>>; +template<> +struct <<#A-0e-B-00-D-09,D>><bool>; ---- @@ -197,8 +206,9 @@ struct <<#A-0e-B-00-D-09,D>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct E; ---- @@ -262,10 +272,11 @@ struct E; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-00,B>> m0; +<<#A-0e,A>><float>::<<#A-0e-B-00,B>><double> m0; ---- [#E-m1] @@ -273,10 +284,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-00,B>> m1; +<<#A-0e,A>><long>::<<#A-0e-B-00,B>><double> m1; ---- [#E-m2] @@ -284,10 +296,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0c-B,B>> m2; +<<#A-0e,A>><long>::<<#A-0c-B,B>><float> m2; ---- [#E-m3] @@ -295,10 +308,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-07,B>> m3; +<<#A-0e,A>><unsigned int>::<<#A-0e-B-07,B>><float> m3; ---- [#E-m4] @@ -306,10 +320,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-00-B,B>> m4; +<<#A-0e,A>><short>::<<#A-00-B,B>><void> m4; ---- [#E-m5] @@ -317,10 +332,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-C,C>> m5; +<<#A-0e,A>><float>::<<#A-0e-B-00,B>><double>::<<#A-0e-B-00-C,C>> m5; ---- [#E-m6] @@ -328,10 +344,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-C,C>> m6; +<<#A-0e,A>><long>::<<#A-0e-B-00,B>><double>::<<#A-0e-B-00-C,C>> m6; ---- [#E-m7] @@ -339,10 +356,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0c-B,B>>::<<#A-0c-B-C,C>> m7; +<<#A-0e,A>><long>::<<#A-0c-B,B>><float>::<<#A-0c-B-C,C>> m7; ---- [#E-m8] @@ -350,10 +368,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-07,B>>::<<#A-0e-B-07-C,C>> m8; +<<#A-0e,A>><unsigned int>::<<#A-0e-B-07,B>><float>::<<#A-0e-B-07-C,C>> m8; ---- [#E-m9] @@ -361,10 +380,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-00-B,B>>::<<#A-00-B-C,C>> m9; +<<#A-0e,A>><short>::<<#A-00-B,B>><void>::<<#A-00-B-C,C>> m9; ---- [#E-m10] @@ -372,10 +392,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-D-0d,D>> m10; +<<#A-0e,A>><float>::<<#A-0e-B-00,B>><double>::<<#A-0e-B-00-D-0d,D>><bool> m10; ---- [#E-m11] @@ -383,10 +404,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-D-0d,D>> m11; +<<#A-0e,A>><long>::<<#A-0e-B-00,B>><double>::<<#A-0e-B-00-D-0d,D>><bool> m11; ---- [#E-m12] @@ -394,10 +416,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0c-B,B>>::<<#A-0c-B-D-0b,D>> m12; +<<#A-0e,A>><long>::<<#A-0c-B,B>><float>::<<#A-0c-B-D-0b,D>><bool> m12; ---- [#E-m13] @@ -405,10 +428,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-0e-B-07,B>>::<<#A-0e-B-07-D-0f,D>> m13; +<<#A-0e,A>><unsigned int>::<<#A-0e-B-07,B>><float>::<<#A-0e-B-07-D-0f,D>><bool> m13; ---- [#E-m14] @@ -416,10 +440,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template‐specializations‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#A-0e,A>>::<<#A-00-B,B>>::<<#A-00-B-D-07,D>> m14; +<<#A-0e,A>><short>::<<#A-00-B,B>><void>::<<#A-00-B-D-07,D>><bool> m14; ---- diff --git a/test-files/golden-tests/class-template.adoc b/test-files/golden-tests/class-template.adoc index 8c97ec5517..0ef614300f 100644 --- a/test-files/golden-tests/class-template.adoc +++ b/test-files/golden-tests/class-template.adoc @@ -31,8 +31,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S; ---- @@ -45,10 +46,11 @@ struct S; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct C0; ---- @@ -84,8 +86,9 @@ struct C0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int w; ---- @@ -95,8 +98,9 @@ int w; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#S,S>> x; ---- @@ -106,8 +110,9 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- T y; ---- @@ -117,8 +122,9 @@ T y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct N0; ---- @@ -140,8 +146,9 @@ struct N0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int z; ---- @@ -151,8 +158,9 @@ int z; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct C1; ---- @@ -183,8 +191,9 @@ struct C1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int w; ---- @@ -194,10 +203,11 @@ int w; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct N1; ---- @@ -224,8 +234,9 @@ struct N1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#S,S>> x; ---- @@ -235,8 +246,9 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- T y; ---- @@ -246,8 +258,9 @@ T y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int z; ---- @@ -257,10 +270,11 @@ int z; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct C2; ---- @@ -290,8 +304,9 @@ struct C2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int v; ---- @@ -301,10 +316,11 @@ int v; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct N2; ---- @@ -334,8 +350,9 @@ struct N2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#S,S>> w; ---- @@ -345,8 +362,9 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- T x; ---- @@ -356,8 +374,9 @@ T x; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- U y; ---- @@ -367,8 +386,9 @@ U y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int z; ---- @@ -378,10 +398,11 @@ int z; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct C3; ---- @@ -402,8 +423,9 @@ struct C3; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<class‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int v; ---- diff --git a/test-files/golden-tests/commands.adoc b/test-files/golden-tests/commands.adoc index 23e75beb3a..0413b4c76e 100644 --- a/test-files/golden-tests/commands.adoc +++ b/test-files/golden-tests/commands.adoc @@ -10,8 +10,8 @@ | Name | Description | <<#f1,`f1`>> -| -brief +| brief + |=== @@ -19,14 +19,15 @@ brief [#f1] == f1 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<commands.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -34,10 +35,10 @@ f1(); === Description - mrdocs hello + [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/concept.adoc b/test-files/golden-tests/concept.adoc index b51c4b9bf2..c6a301c654 100644 --- a/test-files/golden-tests/concept.adoc +++ b/test-files/golden-tests/concept.adoc @@ -37,11 +37,12 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<concept.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -concept C = pass:[sizeof(T) == sizeof(int)]; +template<typename T> +concept C = sizeof(T) == sizeof(int); ---- [#f] @@ -49,10 +50,11 @@ concept C = pass:[sizeof(T) == sizeof(int)]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<concept.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<<<#C,C>> T> +template<<<#C,C>> T> void f(); ---- @@ -62,8 +64,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<concept.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#C,C>> auto x = 0; ---- diff --git a/test-files/golden-tests/dependency-propagation.adoc b/test-files/golden-tests/dependency-propagation.adoc index 623ae15df3..55ffacf5ba 100644 --- a/test-files/golden-tests/dependency-propagation.adoc +++ b/test-files/golden-tests/dependency-propagation.adoc @@ -28,11 +28,12 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<dependency‐propagation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct E - : <<#N,N>>::<<#N-C,C>>; + : <<#N,N>>::<<#N-C,C>><int>; ---- @@ -62,11 +63,12 @@ struct E === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<dependency‐propagation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using C = <<#N-B,B>>; +template<typename T> +using C = <<#N-B,B>><T>; ---- [#N-B] @@ -74,11 +76,12 @@ using C = <<#N-B,B>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<dependency‐propagation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using B = <<#N-A,A>>; +template<typename T> +using B = <<#N-A,A>><T>; ---- [#N-A] @@ -86,10 +89,11 @@ using B = <<#N-A,A>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<dependency‐propagation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- diff --git a/test-files/golden-tests/duplicate-jdoc.adoc b/test-files/golden-tests/duplicate-jdoc.adoc index 1aa24aae6a..51e925e87b 100644 --- a/test-files/golden-tests/duplicate-jdoc.adoc +++ b/test-files/golden-tests/duplicate-jdoc.adoc @@ -10,33 +10,33 @@ | Name | Description | <<#f0,`f0`>> -| -f0 brief +| f0 brief + | <<#f1,`f1`>> -| -f1 brief +| f1 brief + | <<#g0,`g0`>> -| -g0 brief +| g0 brief + | <<#g1,`g1`>> -| -g1 brief +| g1 brief + | <<#h0,`h0`>> -| -h0 brief +| h0 brief + | <<#h1,`h1`>> -| -h1 brief +| h1 brief + |=== @@ -44,14 +44,15 @@ h1 brief [#f0] == f0 - f0 brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<duplicate‐jdoc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int f0(); @@ -59,21 +60,22 @@ f0(); === Return Value - int + [#f1] == f1 - f1 brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<duplicate‐jdoc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int f1(); @@ -81,21 +83,22 @@ f1(); === Return Value - bool + [#g0] == g0 - g0 brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<duplicate‐jdoc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(int a); @@ -107,26 +110,27 @@ g0(int a); | Name | Description | *a* -| -one +| one + | *a* -| -one +| one + |=== [#g1] == g1 - g1 brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<duplicate‐jdoc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g1(int a); @@ -138,28 +142,29 @@ g1(int a); | Name | Description | *a* -| -one +| one + | *b* -| -two +| two + |=== [#h0] == h0 - h0 brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<duplicate‐jdoc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void h0(); ---- @@ -170,28 +175,29 @@ h0(); | Name | Description | *T* -| -one +| one + | *T* -| -one +| one + |=== [#h1] == h1 - h1 brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<duplicate‐jdoc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void h1(); ---- @@ -202,12 +208,12 @@ h1(); | Name | Description | *T* -| -one +| one + | *U* -| -two +| two + |=== diff --git a/test-files/golden-tests/duplicate-jdoc.html b/test-files/golden-tests/duplicate-jdoc.html index 83d771ffbd..e5fa901f4b 100644 --- a/test-files/golden-tests/duplicate-jdoc.html +++ b/test-files/golden-tests/duplicate-jdoc.html @@ -65,6 +65,12 @@

Synopsis

f0(); + +
+

Return Value

+

int

+ +
@@ -87,6 +93,12 @@

Synopsis

f1(); +
+
+

Return Value

+

bool

+ +
@@ -122,11 +134,15 @@

Parameters

a - +

one

+ + a - +

one

+ + @@ -165,11 +181,15 @@

Parameters

a - +

one

+ + b - +

two

+ + @@ -209,11 +229,15 @@

Template Parameters

T - +

one

+ + T - +

one

+ + @@ -253,11 +277,15 @@

Template Parameters

T - +

one

+ + U - +

two

+ + diff --git a/test-files/golden-tests/enum.adoc b/test-files/golden-tests/enum.adoc index ea6e3567bc..b75e2a4679 100644 --- a/test-files/golden-tests/enum.adoc +++ b/test-files/golden-tests/enum.adoc @@ -10,16 +10,16 @@ | Name | Description | <<#E0,`E0`>> -| -E0 brief. +| E0 brief. + | <<#E1,`E1`>> | | <<#E2,`E2`>> -| -E2 brief. +| E2 brief. + | <<#E3,`E3`>> @@ -30,14 +30,15 @@ E2 brief. [#E0] == E0 +E0 brief. -E0 brief. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- enum E0; ---- @@ -48,61 +49,63 @@ enum E0; |=== |Name |Description |`e0` -|pass:[ -e0 brief. -] +|e0 brief&period; + + |`e1` -|pass:[ -e1 brief. -] +|e1 brief&period; + + |=== === Description +E0 description. -E0 description. [#E0-e0] == <<#E0,E0>>::e0 +e0 brief. -e0 brief. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e0 = 1 ---- === Description +e0 description. -e0 description. [#E0-e1] == <<#E0,E0>>::e1 +e1 brief. -e1 brief. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e1 ---- === Description +e1 description. -e1 description. [#E1] @@ -110,8 +113,9 @@ e1 description. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- enum E1 : char; ---- @@ -132,8 +136,9 @@ enum E1 : char; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e2 ---- @@ -143,8 +148,9 @@ e2 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e3 ---- @@ -152,14 +158,15 @@ e3 [#E2] == E2 +E2 brief. -E2 brief. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- enum E2 : int; ---- @@ -170,61 +177,63 @@ enum E2 : int; |=== |Name |Description |`e4` -|pass:[ -e4 brief. -] +|e4 brief&period; + + |`e5` -|pass:[ -e5 brief. -] +|e5 brief&period; + + |=== === Description +E2 description. -E2 description. [#E2-e4] == <<#E2,E2>>::e4 +e4 brief. -e4 brief. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e4 ---- === Description +e4 description. -e4 description. [#E2-e5] == <<#E2,E2>>::e5 +e5 brief. -e5 brief. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e5 ---- === Description +e5 description. -e5 description. [#E3] @@ -232,8 +241,9 @@ e5 description. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- enum E3 : char; ---- @@ -254,8 +264,9 @@ enum E3 : char; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e6 ---- @@ -265,8 +276,9 @@ e6 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<enum.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- e7 ---- diff --git a/test-files/golden-tests/explicit-conv-operator.adoc b/test-files/golden-tests/explicit-conv-operator.adoc index 994cfca6e1..6d8f09f345 100644 --- a/test-files/golden-tests/explicit-conv-operator.adoc +++ b/test-files/golden-tests/explicit-conv-operator.adoc @@ -28,8 +28,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Explicit; ---- @@ -51,8 +52,9 @@ struct Explicit; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit operator bool(); @@ -63,8 +65,9 @@ operator bool(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct ExplicitFalse; ---- @@ -86,10 +89,11 @@ struct ExplicitFalse; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) operator bool(); ---- @@ -98,8 +102,9 @@ operator bool(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct ExplicitTrue; ---- @@ -121,10 +126,11 @@ struct ExplicitTrue; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) operator bool(); ---- @@ -133,10 +139,11 @@ operator bool(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<bool B> struct ExplicitExpression; ---- @@ -157,10 +164,11 @@ struct ExplicitExpression; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐conv‐operator.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) operator bool(); ---- diff --git a/test-files/golden-tests/explicit-ctor.adoc b/test-files/golden-tests/explicit-ctor.adoc index 570a94b6ce..93062dc5d1 100644 --- a/test-files/golden-tests/explicit-ctor.adoc +++ b/test-files/golden-tests/explicit-ctor.adoc @@ -28,8 +28,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Explicit; ---- @@ -50,8 +51,9 @@ struct Explicit; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit <<#Explicit-2constructor-02,Explicit>>(); @@ -59,7 +61,7 @@ explicit [.small]#<<#Explicit-2constructor-02,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit <<#Explicit-2constructor-00,Explicit>>(<<#Explicit,Explicit>> const&); @@ -67,7 +69,7 @@ explicit [.small]#<<#Explicit-2constructor-00,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit <<#Explicit-2constructor-0b,Explicit>>(<<#Explicit,Explicit>>&&) noexcept; @@ -75,7 +77,7 @@ explicit [.small]#<<#Explicit-2constructor-0b,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit <<#Explicit-2constructor-03,Explicit>>( @@ -90,8 +92,9 @@ explicit === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit Explicit(); @@ -102,8 +105,9 @@ Explicit(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit Explicit(<<#Explicit,Explicit>> const&); @@ -114,8 +118,9 @@ Explicit(<<#Explicit,Explicit>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit Explicit(<<#Explicit,Explicit>>&&) noexcept; @@ -126,8 +131,9 @@ Explicit(<<#Explicit,Explicit>>&&) noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit Explicit( @@ -140,8 +146,9 @@ Explicit( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct ExplicitTrue; ---- @@ -162,34 +169,35 @@ struct ExplicitTrue; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) <<#ExplicitTrue-2constructor-0d,ExplicitTrue>>(); ---- [.small]#<<#ExplicitTrue-2constructor-0d,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) <<#ExplicitTrue-2constructor-04,ExplicitTrue>>(<<#ExplicitTrue,ExplicitTrue>> const&); ---- [.small]#<<#ExplicitTrue-2constructor-04,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) <<#ExplicitTrue-2constructor-08,ExplicitTrue>>(<<#ExplicitTrue,ExplicitTrue>>&&) noexcept; ---- [.small]#<<#ExplicitTrue-2constructor-08,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) <<#ExplicitTrue-2constructor-05,ExplicitTrue>>( int, int); @@ -202,10 +210,11 @@ pass:[explicit(true)] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) ExplicitTrue(); ---- @@ -214,10 +223,11 @@ ExplicitTrue(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) ExplicitTrue(<<#ExplicitTrue,ExplicitTrue>> const&); ---- @@ -226,10 +236,11 @@ ExplicitTrue(<<#ExplicitTrue,ExplicitTrue>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) ExplicitTrue(<<#ExplicitTrue,ExplicitTrue>>&&) noexcept; ---- @@ -238,10 +249,11 @@ ExplicitTrue(<<#ExplicitTrue,ExplicitTrue>>&&) noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(true)] +explicit(true) ExplicitTrue( int, int); @@ -252,8 +264,9 @@ ExplicitTrue( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct ExplicitFalse; ---- @@ -274,34 +287,35 @@ struct ExplicitFalse; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) <<#ExplicitFalse-2constructor-01,ExplicitFalse>>(); ---- [.small]#<<#ExplicitFalse-2constructor-01,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) <<#ExplicitFalse-2constructor-08,ExplicitFalse>>(<<#ExplicitFalse,ExplicitFalse>> const&); ---- [.small]#<<#ExplicitFalse-2constructor-08,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) <<#ExplicitFalse-2constructor-0a,ExplicitFalse>>(<<#ExplicitFalse,ExplicitFalse>>&&) noexcept; ---- [.small]#<<#ExplicitFalse-2constructor-0a,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) <<#ExplicitFalse-2constructor-04,ExplicitFalse>>( int, int); @@ -314,10 +328,11 @@ pass:[explicit(false)] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) ExplicitFalse(); ---- @@ -326,10 +341,11 @@ ExplicitFalse(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) ExplicitFalse(<<#ExplicitFalse,ExplicitFalse>> const&); ---- @@ -338,10 +354,11 @@ ExplicitFalse(<<#ExplicitFalse,ExplicitFalse>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) ExplicitFalse(<<#ExplicitFalse,ExplicitFalse>>&&) noexcept; ---- @@ -350,10 +367,11 @@ ExplicitFalse(<<#ExplicitFalse,ExplicitFalse>>&&) noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(false)] +explicit(false) ExplicitFalse( int, int); @@ -364,10 +382,11 @@ ExplicitFalse( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<bool B> struct ExplicitExpression; ---- @@ -387,34 +406,35 @@ struct ExplicitExpression; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) <<#ExplicitExpression-2constructor-0b,ExplicitExpression>>(); ---- [.small]#<<#ExplicitExpression-2constructor-0b,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) <<#ExplicitExpression-2constructor-04,ExplicitExpression>>(<<#ExplicitExpression,ExplicitExpression>> const&); ---- [.small]#<<#ExplicitExpression-2constructor-04,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) <<#ExplicitExpression-2constructor-08,ExplicitExpression>>(<<#ExplicitExpression,ExplicitExpression>>&&) noexcept; ---- [.small]#<<#ExplicitExpression-2constructor-08,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) <<#ExplicitExpression-2constructor-02,ExplicitExpression>>( int, int); @@ -427,10 +447,11 @@ pass:[explicit(B)] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) ExplicitExpression(); ---- @@ -439,10 +460,11 @@ ExplicitExpression(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) ExplicitExpression(<<#ExplicitExpression,ExplicitExpression>> const&); ---- @@ -451,10 +473,11 @@ ExplicitExpression(<<#ExplicitExpression,ExplicitExpression>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) ExplicitExpression(<<#ExplicitExpression,ExplicitExpression>>&&) noexcept; ---- @@ -463,10 +486,11 @@ ExplicitExpression(<<#ExplicitExpression,ExplicitExpression>>&&) noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐ctor.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -pass:[explicit(B)] +explicit(B) ExplicitExpression( int, int); diff --git a/test-files/golden-tests/explicit-deduct-guide.adoc b/test-files/golden-tests/explicit-deduct-guide.adoc index b4d40d0e06..702b6269ea 100644 --- a/test-files/golden-tests/explicit-deduct-guide.adoc +++ b/test-files/golden-tests/explicit-deduct-guide.adoc @@ -18,16 +18,16 @@ |=== | Name | Description -| <<#X-0d,`X<0>`>> +| <<#X-0d,`X<0>`>> | -| <<#X-00,`X<0>`>> +| <<#X-00,`X<0>`>> | -| <<#X-0b,`X<0>`>> +| <<#X-0b,`X<0>`>> | -| <<#X-06,`X<0>`>> +| <<#X-06,`X<0>`>> | |=== @@ -37,10 +37,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐deduct‐guide.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int> struct X; ---- @@ -48,48 +49,52 @@ struct X; [#X-0d] -== <<#X-0e,X>><0> +== <<#X-0e,X>><0> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐deduct‐guide.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#X-0e,X>><0>(bool) -> <<#X-0e,X>><0>; +<<#X-0e,X>><0>(bool) -> <<#X-0e,X>><0>; ---- [#X-00] -== <<#X-0e,X>><0> +== <<#X-0e,X>><0> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐deduct‐guide.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#X-0e,X>><0>(char) -> <<#X-0e,X>><0>; +<<#X-0e,X>><0>(char) -> <<#X-0e,X>><0>; ---- [#X-0b] -== <<#X-0e,X>><0> +== <<#X-0e,X>><0> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐deduct‐guide.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#X-0e,X>><0>(int) -> <<#X-0e,X>><0>; +<<#X-0e,X>><0>(int) -> <<#X-0e,X>><0>; ---- [#X-06] -== <<#X-0e,X>><0> +== <<#X-0e,X>><0> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐deduct‐guide.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -<<#X-0e,X>><0>(long) -> <<#X-0e,X>><0>; +template<bool B = true> +<<#X-0e,X>><0>(long) -> <<#X-0e,X>><0>; ---- diff --git a/test-files/golden-tests/explicit-object-parameter.adoc b/test-files/golden-tests/explicit-object-parameter.adoc index 3575c49514..3d71f7e863 100644 --- a/test-files/golden-tests/explicit-object-parameter.adoc +++ b/test-files/golden-tests/explicit-object-parameter.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐object‐parameter.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Optional; ---- @@ -41,10 +42,11 @@ struct Optional; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐object‐parameter.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename Self> constexpr auto&& <<#Optional-value-05,value>>(this Self&& self); @@ -52,9 +54,9 @@ auto&& [.small]#<<#Optional-value-05,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename Self> constexpr auto&& <<#Optional-value-06,value>>(this @@ -69,10 +71,11 @@ auto&& === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐object‐parameter.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename Self> constexpr auto&& value(this Self&& self); @@ -83,10 +86,11 @@ value(this Self&& self); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<explicit‐object‐parameter.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename Self> constexpr auto&& value(this diff --git a/test-files/golden-tests/filters/blacklist_0.adoc b/test-files/golden-tests/filters/blacklist_0.adoc index 90f59b8772..0bb5d80ece 100644 --- a/test-files/golden-tests/filters/blacklist_0.adoc +++ b/test-files/golden-tests/filters/blacklist_0.adoc @@ -41,8 +41,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/blacklist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -86,8 +87,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/blacklist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -111,8 +113,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/blacklist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -156,8 +159,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/blacklist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(); diff --git a/test-files/golden-tests/filters/blacklist_test.adoc b/test-files/golden-tests/filters/blacklist_test.adoc index 99d1515eab..54311a311d 100644 --- a/test-files/golden-tests/filters/blacklist_test.adoc +++ b/test-files/golden-tests/filters/blacklist_test.adoc @@ -12,34 +12,35 @@ | <<#blacklisted,`blacklisted`>> | -| <<#to_be_documented,`pass:[to_be_documented]`>> +| <<#to_be_documented,`to_be_documented`>> | |=== [#to_be_documented] -== pass:[to_be_documented] +== to_be_documented === Functions [cols=2] |=== | Name | Description -| <<#to_be_documented-documented_function,`pass:[documented_function]`>> +| <<#to_be_documented-documented_function,`documented_function`>> | |=== [#to_be_documented-documented_function] -== <<#to_be_documented,pass:[to_be_documented]>>::pass:[documented_function] +== <<#to_be_documented,to_be_documented>>::documented_function === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/blacklist_test.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[documented_function](); +documented_function(); ---- [#blacklisted] diff --git a/test-files/golden-tests/filters/filters.adoc b/test-files/golden-tests/filters/filters.adoc index 002cf533da..bbf17fe08d 100644 --- a/test-files/golden-tests/filters/filters.adoc +++ b/test-files/golden-tests/filters/filters.adoc @@ -56,8 +56,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -81,8 +82,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(); @@ -115,8 +117,9 @@ g0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -127,8 +130,9 @@ f4(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Y; ---- @@ -159,8 +163,9 @@ struct Y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -171,8 +176,9 @@ f6(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Z; ---- @@ -194,8 +200,9 @@ struct Z; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f7(); @@ -228,8 +235,9 @@ f7(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -262,8 +270,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -274,8 +283,9 @@ f4(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Y; ---- @@ -306,8 +316,9 @@ struct Y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -318,8 +329,9 @@ f6(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Z; ---- @@ -341,8 +353,9 @@ struct Z; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f7(); @@ -366,8 +379,9 @@ f7(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(); @@ -416,8 +430,9 @@ g0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(); @@ -428,8 +443,9 @@ g0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -440,8 +456,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g1(); @@ -474,8 +491,9 @@ g1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(); @@ -502,8 +520,9 @@ g0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -514,8 +533,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/filters.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g1(); diff --git a/test-files/golden-tests/filters/whitelist_0.adoc b/test-files/golden-tests/filters/whitelist_0.adoc index 62caf6a447..afa6df0dbc 100644 --- a/test-files/golden-tests/filters/whitelist_0.adoc +++ b/test-files/golden-tests/filters/whitelist_0.adoc @@ -28,21 +28,22 @@ |=== | Name | Description -| <<#N0-f0_WL,`pass:[f0_WL]`>> +| <<#N0-f0_WL,`f0_WL`>> | |=== [#N0-f0_WL] -== <<#N0,N0>>::pass:[f0_WL] +== <<#N0,N0>>::f0_WL === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[f0_WL](); +f0_WL(); ---- [#N1] @@ -53,7 +54,7 @@ pass:[f0_WL](); |=== | Name | Description -| <<#N1-N3_WL,`pass:[N3_WL]`>> +| <<#N1-N3_WL,`N3_WL`>> | | <<#N1-N4,`N4`>> @@ -62,28 +63,29 @@ pass:[f0_WL](); |=== [#N1-N3_WL] -== <<#N1,N1>>::pass:[N3_WL] +== <<#N1,N1>>::N3_WL === Functions [cols=2] |=== | Name | Description -| <<#N1-N3_WL-f1_WL,`pass:[f1_WL]`>> +| <<#N1-N3_WL-f1_WL,`f1_WL`>> | |=== [#N1-N3_WL-f1_WL] -== <<#N1,N1>>::<<#N1-N3_WL,pass:[N3_WL]>>::pass:[f1_WL] +== <<#N1,N1>>::<<#N1-N3_WL,N3_WL>>::f1_WL === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[f1_WL](); +f1_WL(); ---- [#N1-N4] @@ -94,21 +96,22 @@ pass:[f1_WL](); |=== | Name | Description -| <<#N1-N4-f1_WL,`pass:[f1_WL]`>> +| <<#N1-N4-f1_WL,`f1_WL`>> | |=== [#N1-N4-f1_WL] -== <<#N1,N1>>::<<#N1-N4,N4>>::pass:[f1_WL] +== <<#N1,N1>>::<<#N1-N4,N4>>::f1_WL === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[f1_WL](); +f1_WL(); ---- [#N5] @@ -119,7 +122,7 @@ pass:[f1_WL](); |=== | Name | Description -| <<#N5-N6_BL,`pass:[N6_BL]`>> +| <<#N5-N6_BL,`N6_BL`>> | |=== @@ -138,15 +141,16 @@ pass:[f1_WL](); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); ---- [#N5-N6_BL] -== <<#N5,N5>>::pass:[N6_BL] +== <<#N5,N5>>::N6_BL === Namespaces [cols=2] @@ -162,53 +166,55 @@ f0(); |=== [#N5-N6_BL-N7] -== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::N7 +== <<#N5,N5>>::<<#N5-N6_BL,N6_BL>>::N7 === Functions [cols=2] |=== | Name | Description -| <<#N5-N6_BL-N7-f2_WL,`pass:[f2_WL]`>> +| <<#N5-N6_BL-N7-f2_WL,`f2_WL`>> | |=== [#N5-N6_BL-N7-f2_WL] -== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::<<#N5-N6_BL-N7,N7>>::pass:[f2_WL] +== <<#N5,N5>>::<<#N5-N6_BL,N6_BL>>::<<#N5-N6_BL-N7,N7>>::f2_WL === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[f2_WL](); +f2_WL(); ---- [#N5-N6_BL-M7] -== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::M7 +== <<#N5,N5>>::<<#N5-N6_BL,N6_BL>>::M7 === Functions [cols=2] |=== | Name | Description -| <<#N5-N6_BL-M7-f2_WL,`pass:[f2_WL]`>> +| <<#N5-N6_BL-M7-f2_WL,`f2_WL`>> | |=== [#N5-N6_BL-M7-f2_WL] -== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::<<#N5-N6_BL-M7,M7>>::pass:[f2_WL] +== <<#N5,N5>>::<<#N5-N6_BL,N6_BL>>::<<#N5-N6_BL-M7,M7>>::f2_WL === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_0.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[f2_WL](); +f2_WL(); ---- diff --git a/test-files/golden-tests/filters/whitelist_test.adoc b/test-files/golden-tests/filters/whitelist_test.adoc index c84bd29549..e03a6c7a7b 100644 --- a/test-files/golden-tests/filters/whitelist_test.adoc +++ b/test-files/golden-tests/filters/whitelist_test.adoc @@ -12,34 +12,35 @@ | <<#blacklisted,`blacklisted`>> | -| <<#to_be_documented,`pass:[to_be_documented]`>> +| <<#to_be_documented,`to_be_documented`>> | |=== [#to_be_documented] -== pass:[to_be_documented] +== to_be_documented === Functions [cols=2] |=== | Name | Description -| <<#to_be_documented-documented_function,`pass:[documented_function]`>> +| <<#to_be_documented-documented_function,`documented_function`>> | |=== [#to_be_documented-documented_function] -== <<#to_be_documented,pass:[to_be_documented]>>::pass:[documented_function] +== <<#to_be_documented,to_be_documented>>::documented_function === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_test.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[documented_function](); +documented_function(); ---- [#blacklisted] @@ -50,21 +51,22 @@ pass:[documented_function](); |=== | Name | Description -| <<#blacklisted-whitelisted_function,`pass:[whitelisted_function]`>> +| <<#blacklisted-whitelisted_function,`whitelisted_function`>> | |=== [#blacklisted-whitelisted_function] -== <<#blacklisted,blacklisted>>::pass:[whitelisted_function] +== <<#blacklisted,blacklisted>>::whitelisted_function === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<filters/whitelist_test.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[whitelisted_function](); +whitelisted_function(); ---- diff --git a/test-files/golden-tests/friend-1.adoc b/test-files/golden-tests/friend-1.adoc index a0ddc7c9a4..433e0d2efc 100644 --- a/test-files/golden-tests/friend-1.adoc +++ b/test-files/golden-tests/friend-1.adoc @@ -19,8 +19,8 @@ | Name | Description | <<#f,`f`>> -| -f +| f + |=== @@ -30,8 +30,9 @@ f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -42,8 +43,8 @@ struct T; | Name | Description | <<#T-08friend,`f`>> -| -f +| f + |=== @@ -53,14 +54,15 @@ f [#T-08friend] == f - f + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void @@ -70,14 +72,15 @@ f(); [#f] == f - f + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/friend-2.adoc b/test-files/golden-tests/friend-2.adoc index 44b95057fe..13d8e2fe8a 100644 --- a/test-files/golden-tests/friend-2.adoc +++ b/test-files/golden-tests/friend-2.adoc @@ -19,8 +19,8 @@ | Name | Description | <<#f,`f`>> -| -f +| f + |=== @@ -30,8 +30,9 @@ f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -42,8 +43,8 @@ struct T; | Name | Description | <<#T-08friend,`f`>> -| -f +| f + |=== @@ -53,14 +54,15 @@ f [#T-08friend] == f - f + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void @@ -70,14 +72,15 @@ f(); [#f] == f - f + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/friend-3.adoc b/test-files/golden-tests/friend-3.adoc index b38dfb963f..c050305ea8 100644 --- a/test-files/golden-tests/friend-3.adoc +++ b/test-files/golden-tests/friend-3.adoc @@ -22,8 +22,8 @@ | Name | Description | <<#f,`f`>> -| -T::f +| T::f + |=== @@ -33,8 +33,9 @@ T::f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -45,8 +46,8 @@ struct T; | Name | Description | <<#T-08friend,`f`>> -| -T::f +| T::f + |=== @@ -56,14 +57,15 @@ T::f [#T-08friend] == f +T::f -T::f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void @@ -73,14 +75,15 @@ f(); [#f] == f +T::f -T::f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -91,8 +94,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct U; ---- @@ -114,8 +118,9 @@ struct U; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void diff --git a/test-files/golden-tests/friend-4.adoc b/test-files/golden-tests/friend-4.adoc index b8d73c9c66..b5bd5d36c1 100644 --- a/test-files/golden-tests/friend-4.adoc +++ b/test-files/golden-tests/friend-4.adoc @@ -22,8 +22,8 @@ | Name | Description | <<#f,`f`>> -| -U::f +| U::f + |=== @@ -33,8 +33,9 @@ U::f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐4.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -56,8 +57,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐4.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void @@ -67,14 +69,15 @@ f(); [#f] == f +U::f -U::f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐4.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -85,8 +88,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐4.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct U; ---- @@ -97,8 +101,8 @@ struct U; | Name | Description | <<#U-08friend,`f`>> -| -U::f +| U::f + |=== @@ -108,14 +112,15 @@ U::f [#U-08friend] == f +U::f -U::f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐4.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void diff --git a/test-files/golden-tests/friend-5.adoc b/test-files/golden-tests/friend-5.adoc index 19e6bcc9dc..454d4497e3 100644 --- a/test-files/golden-tests/friend-5.adoc +++ b/test-files/golden-tests/friend-5.adoc @@ -22,8 +22,8 @@ | Name | Description | <<#f,`f`>> -| -f +| f + |=== @@ -33,8 +33,9 @@ f === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐5.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -56,8 +57,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐5.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void @@ -67,14 +69,15 @@ f(); [#f] == f - f + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐5.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -85,8 +88,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐5.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct U; ---- @@ -108,8 +112,9 @@ struct U; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐5.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void diff --git a/test-files/golden-tests/friend-6.adoc b/test-files/golden-tests/friend-6.adoc index 81577c4695..be10d5c7c1 100644 --- a/test-files/golden-tests/friend-6.adoc +++ b/test-files/golden-tests/friend-6.adoc @@ -10,18 +10,18 @@ | Name | Description | <<#T,`T`>> -| -Struct T brief +| Struct T brief + | <<#U,`U`>> -| -Struct U brief +| Struct U brief + | <<#V,`V`>> -| -Struct V brief +| Struct V brief + |=== @@ -29,14 +29,15 @@ Struct V brief [#T] == T - Struct T brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -47,13 +48,13 @@ struct T; | Name | Description | <<#T-08friend-04ce,`[object Object]`>> -| -Friend int brief +| Friend int brief + | <<#T-08friend-04cb,`[object Object]`>> -| -Friend class Z brief +| Friend class Z brief + |=== @@ -63,14 +64,15 @@ Friend class Z brief [#T-08friend-04ce] == [object Object] - Friend int brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend int; ---- @@ -78,14 +80,15 @@ friend int; [#T-08friend-04cb] == [object Object] - Friend class Z brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend Z; ---- @@ -93,14 +96,15 @@ friend Z; [#U] == U - Struct U brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct U; ---- @@ -111,8 +115,8 @@ struct U; | Name | Description | <<#U-08friend,`[object Object]`>> -| -Friend T brief +| Friend T brief + |=== @@ -122,14 +126,15 @@ Friend T brief [#U-08friend] == [object Object] - Friend T brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend <<#T,T>>; ---- @@ -137,14 +142,15 @@ friend <<#T,T>>; [#V] == V - Struct V brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct V; ---- @@ -155,8 +161,8 @@ struct V; | Name | Description | <<#V-08friend,`[object Object]`>> -| -Friend struct U brief +| Friend struct U brief + |=== @@ -166,14 +172,15 @@ Friend struct U brief [#V-08friend] == [object Object] - Friend struct U brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<friend‐6.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend <<#U,U>>; ---- diff --git a/test-files/golden-tests/function-parm-decay.adoc b/test-files/golden-tests/function-parm-decay.adoc index b0dc2d12ff..8f3ddde312 100644 --- a/test-files/golden-tests/function-parm-decay.adoc +++ b/test-files/golden-tests/function-parm-decay.adoc @@ -40,8 +40,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐parm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(int const x); @@ -52,8 +53,9 @@ f(int const x); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐parm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(int* x); @@ -64,8 +66,9 @@ g(int* x); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐parm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h(int x(bool)); @@ -76,8 +79,9 @@ h(int x(bool)); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐parm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using T = int; ---- @@ -87,8 +91,9 @@ using T = int; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐parm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using U = int const; ---- @@ -98,8 +103,9 @@ using U = int const; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐parm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i(<<#T,T>>); diff --git a/test-files/golden-tests/function-template.adoc b/test-files/golden-tests/function-template.adoc index 52d9cb8de3..161037077b 100644 --- a/test-files/golden-tests/function-template.adoc +++ b/test-files/golden-tests/function-template.adoc @@ -52,10 +52,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void f0(int x); ---- @@ -65,10 +66,11 @@ f0(int x); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void f1(T t); ---- @@ -78,10 +80,11 @@ f1(T t); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T = int> void f2(); ---- @@ -91,12 +94,13 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename T, - class U = int> + class U = int> void f3(); ---- @@ -106,10 +110,11 @@ f3(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int I> void g0(int x); ---- @@ -119,10 +124,11 @@ g0(int x); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int I = 1> void g1(); ---- @@ -132,12 +138,13 @@ g1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< int J, - int I = 1> + int I = 1> void g2(); ---- @@ -147,10 +154,11 @@ g2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<class x:auto> void h0(auto x); ---- @@ -160,12 +168,13 @@ h0(auto x); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< - class x:auto, - class auto:2> +template< + class x:auto, + class auto:2> void h1( auto x, @@ -177,12 +186,13 @@ h1( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename T = int, - int I = 1> + int I = 1> void i(); ---- @@ -192,10 +202,11 @@ i(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template typename T> +template<template<typename U> typename T> void j0(); ---- @@ -205,12 +216,13 @@ j0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< - template typename X, - template typename Z> +template< + template<typename W> typename X, + template<typename Y> typename Z> void j1(); ---- diff --git a/test-files/golden-tests/function-tparm-decay.adoc b/test-files/golden-tests/function-tparm-decay.adoc index d38fa4450d..7760de4a29 100644 --- a/test-files/golden-tests/function-tparm-decay.adoc +++ b/test-files/golden-tests/function-tparm-decay.adoc @@ -40,10 +40,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐tparm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int x> void f(); ---- @@ -53,10 +54,11 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐tparm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int x[4]> void g(); ---- @@ -66,10 +68,11 @@ g(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐tparm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int(* x)(bool const)> void h(); ---- @@ -79,8 +82,9 @@ h(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐tparm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using T = int; ---- @@ -90,8 +94,9 @@ using T = int; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐tparm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using U = int const; ---- @@ -101,10 +106,11 @@ using U = int const; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<function‐tparm‐decay.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<int> void i(); ---- diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/implicit-instantiation-member-ref.adoc index 85b6c07fe6..f0d4f5a466 100644 --- a/test-files/golden-tests/implicit-instantiation-member-ref.adoc +++ b/test-files/golden-tests/implicit-instantiation-member-ref.adoc @@ -52,10 +52,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct S0; ---- @@ -85,8 +86,9 @@ struct S0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using M0 = T; ---- @@ -96,8 +98,9 @@ using M0 = T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S1; ---- @@ -110,11 +113,12 @@ struct S1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using M1 = <<#S0,S0>>; +template<typename U> +using M1 = <<#S0,S0>><U>; ---- [#S0-S2] @@ -122,10 +126,11 @@ using M1 = <<#S0,S0>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct S2; ---- @@ -155,8 +160,9 @@ struct S2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using M2 = U; ---- @@ -166,8 +172,9 @@ using M2 = U; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S3; ---- @@ -180,11 +187,12 @@ struct S3; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using M3 = <<#S0-S2,S2>>; +template<typename V> +using M3 = <<#S0-S2,S2>><U>; ---- [#S0-S2-S4] @@ -192,10 +200,11 @@ using M3 = <<#S0-S2,S2>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename V> struct S4; ---- @@ -216,8 +225,9 @@ struct S4; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using M4 = V; ---- @@ -227,10 +237,11 @@ using M4 = V; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A0 = <<#S0,S0>>; +using A0 = <<#S0,S0>><int>; ---- [#A1] @@ -238,8 +249,9 @@ using A0 = <<#S0,S0>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using A1 = <<#A0,A0>>::<<#S0-M0,M0>>; ---- @@ -249,8 +261,9 @@ using A1 = <<#A0,A0>>::<<#S0-M0,M0>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using A2 = <<#A0,A0>>::<<#S0-S1,S1>>; ---- @@ -260,10 +273,11 @@ using A2 = <<#A0,A0>>::<<#S0-S1,S1>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A3 = <<#S0,S0>>::<<#S0-M0,M0>>; +using A3 = <<#S0,S0>><long>::<<#S0-M0,M0>>; ---- [#A4] @@ -271,10 +285,11 @@ using A3 = <<#S0,S0>>::<<#S0-M0,M0>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A4 = <<#S0,S0>>::<<#S0-S1,S1>>; +using A4 = <<#S0,S0>><long long>::<<#S0-S1,S1>>; ---- [#A5] @@ -282,10 +297,11 @@ using A4 = <<#S0,S0>>::<<#S0-S1,S1>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A5 = <<#S0,S0>>; +using A5 = <<#S0,S0>><void>; ---- [#A6] @@ -293,10 +309,11 @@ using A5 = <<#S0,S0>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A6 = <<#A5,A5>>::<<#S0-M1,M1>>::<<#S0-M0,M0>>; +using A6 = <<#A5,A5>>::<<#S0-M1,M1>><short>::<<#S0-M0,M0>>; ---- [#A7] @@ -304,10 +321,11 @@ using A6 = <<#A5,A5>>::<<#S0-M1,M1>>::<<#S0-M0,M0>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A7 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M2,M2>>; +using A7 = <<#A5,A5>>::<<#S0-S2,S2>><bool>::<<#S0-S2-M2,M2>>; ---- [#A8] @@ -315,10 +333,11 @@ using A7 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M2,M2>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A8 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-S3,S3>>; +using A8 = <<#A5,A5>>::<<#S0-S2,S2>><int>::<<#S0-S2-S3,S3>>; ---- [#A9] @@ -326,10 +345,11 @@ using A8 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-S3,S3>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A9 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M2,M2>>; +using A9 = <<#A5,A5>>::<<#S0-S2,S2>><char>::<<#S0-S2-M3,M3>><int>::<<#S0-S2-M3,M3>><unsigned int>::<<#S0-S2-M2,M2>>; ---- [#A10] @@ -337,10 +357,11 @@ using A9 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M3,M === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<implicit‐instantiation‐member‐ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using A10 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M3,M3>>::<<#S0-S2-S4,S4>>::<<#S0-S2-S4-M4,M4>>; +using A10 = <<#A5,A5>>::<<#S0-S2,S2>><float>::<<#S0-S2-M3,M3>><double>::<<#S0-S2-M3,M3>><long double>::<<#S0-S2-S4,S4>><void>::<<#S0-S2-S4-M4,M4>>; ---- diff --git a/test-files/golden-tests/local-class.adoc b/test-files/golden-tests/local-class.adoc index 5a416da754..7852f848d0 100644 --- a/test-files/golden-tests/local-class.adoc +++ b/test-files/golden-tests/local-class.adoc @@ -28,8 +28,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<local‐class.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- auto f(); @@ -40,11 +41,12 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<local‐class.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B - : decltype(pass:[f()]); + : decltype(f()); ---- diff --git a/test-files/golden-tests/mem-fn.adoc b/test-files/golden-tests/mem-fn.adoc index f5597a6463..0edf9a05de 100644 --- a/test-files/golden-tests/mem-fn.adoc +++ b/test-files/golden-tests/mem-fn.adoc @@ -70,8 +70,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T01; ---- @@ -93,8 +94,9 @@ struct T01; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -105,8 +107,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T02; ---- @@ -128,8 +131,9 @@ struct T02; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static void @@ -141,8 +145,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T03; ---- @@ -164,11 +169,12 @@ struct T03; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -f() &; +f() &; ---- [#T04] @@ -176,8 +182,9 @@ f() &; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T04; ---- @@ -199,11 +206,12 @@ struct T04; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -f() &&; +f() &&; ---- [#T05] @@ -211,8 +219,9 @@ f() &&; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T05; ---- @@ -234,8 +243,9 @@ struct T05; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f() const; @@ -246,8 +256,9 @@ f() const; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T06; ---- @@ -269,8 +280,9 @@ struct T06; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr void @@ -282,8 +294,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T08; ---- @@ -305,8 +318,9 @@ struct T08; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -317,8 +331,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T09; ---- @@ -340,8 +355,9 @@ struct T09; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f() noexcept; @@ -352,8 +368,9 @@ f() noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T10; ---- @@ -375,8 +392,9 @@ struct T10; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -387,8 +405,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T11; ---- @@ -410,8 +429,9 @@ struct T11; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int f(); @@ -422,8 +442,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T12; ---- @@ -445,8 +466,9 @@ struct T12; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(...); @@ -457,8 +479,9 @@ f(...); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T13; ---- @@ -480,8 +503,9 @@ struct T13; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- virtual void @@ -493,8 +517,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T14; ---- @@ -516,8 +541,9 @@ struct T14; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- virtual void @@ -529,8 +555,9 @@ f() = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T15; ---- @@ -552,8 +579,9 @@ struct T15; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f() volatile; @@ -564,8 +592,9 @@ f() volatile; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T16; ---- @@ -587,8 +616,9 @@ struct T16; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static void @@ -600,8 +630,9 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T17 : <<#T14,T14>>; @@ -623,8 +654,9 @@ struct T17 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- virtual void @@ -636,8 +668,9 @@ f() override; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct U; ---- @@ -671,8 +704,9 @@ struct U; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr void @@ -684,8 +718,9 @@ f1(...) const volatile noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static @@ -698,8 +733,9 @@ f2() noexcept; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- virtual int @@ -711,8 +747,9 @@ f3() const volatile noexcept = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct V : <<#U,U>>; @@ -746,8 +783,9 @@ struct V === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<mem‐fn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- virtual int diff --git a/test-files/golden-tests/namespace-alias-1.adoc b/test-files/golden-tests/namespace-alias-1.adoc index b88b213f02..8739e86d5b 100644 --- a/test-files/golden-tests/namespace-alias-1.adoc +++ b/test-files/golden-tests/namespace-alias-1.adoc @@ -23,8 +23,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace‐alias‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- namespace A = <<#LongName,LongName>>; ---- diff --git a/test-files/golden-tests/namespace-alias-2.adoc b/test-files/golden-tests/namespace-alias-2.adoc index 0c39ade555..f128ef941c 100644 --- a/test-files/golden-tests/namespace-alias-2.adoc +++ b/test-files/golden-tests/namespace-alias-2.adoc @@ -23,8 +23,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace‐alias‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- namespace A = <<#LongName,LongName>>; ---- @@ -34,8 +35,9 @@ namespace A = <<#LongName,LongName>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace‐alias‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- namespace B = <<#LongName,LongName>>; ---- diff --git a/test-files/golden-tests/namespace-alias-3.adoc b/test-files/golden-tests/namespace-alias-3.adoc index 0178c71bc4..86f4d33ff5 100644 --- a/test-files/golden-tests/namespace-alias-3.adoc +++ b/test-files/golden-tests/namespace-alias-3.adoc @@ -23,8 +23,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace‐alias‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- namespace A = <<#LongName,LongName>>; ---- @@ -34,8 +35,9 @@ namespace A = <<#LongName,LongName>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace‐alias‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- namespace B = <<#A,A>>; ---- diff --git a/test-files/golden-tests/namespace.adoc b/test-files/golden-tests/namespace.adoc index 52e6c5811a..6d0beb559c 100644 --- a/test-files/golden-tests/namespace.adoc +++ b/test-files/golden-tests/namespace.adoc @@ -56,8 +56,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -81,8 +82,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -106,8 +108,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -131,8 +134,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(); @@ -171,8 +175,9 @@ f3(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f5(); @@ -196,8 +201,9 @@ f5(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -221,8 +227,9 @@ f6(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f7(); @@ -246,8 +253,9 @@ f7(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f8(); @@ -283,8 +291,9 @@ f8(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f10(); @@ -308,8 +317,9 @@ f10(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f11(); @@ -333,8 +343,9 @@ f11(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f12(); @@ -371,8 +382,9 @@ f12(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<namespace.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f14(); diff --git a/test-files/golden-tests/nested-private-template.adoc b/test-files/golden-tests/nested-private-template.adoc index e3438d703a..90a891318f 100644 --- a/test-files/golden-tests/nested-private-template.adoc +++ b/test-files/golden-tests/nested-private-template.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<nested‐private‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<class T> class range; ---- @@ -36,7 +37,7 @@ class range; | <<#range-impl-0e,`impl`>> | -| <<#range-impl-00,`impl`>> +| <<#range-impl-00,`impl<R, false>`>> | |=== @@ -46,12 +47,13 @@ class range; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<nested‐private‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< class R, - bool> + bool> struct impl; ---- @@ -59,15 +61,16 @@ struct impl; [#range-impl-00] -== <<#range,range>>::impl +== <<#range,range>>::impl<R, false> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<nested‐private‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -struct <<#range-impl-0e,impl>>; +template<class R> +struct <<#range-impl-0e,impl>><R, false>; ---- diff --git a/test-files/golden-tests/no_unique_address.adoc b/test-files/golden-tests/no_unique_address.adoc index 917bca88a5..88f90dac51 100644 --- a/test-files/golden-tests/no_unique_address.adoc +++ b/test-files/golden-tests/no_unique_address.adoc @@ -22,8 +22,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<no_unique_address.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct Empty; ---- @@ -36,8 +37,9 @@ struct Empty; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<no_unique_address.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -62,8 +64,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<no_unique_address.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int i; ---- @@ -73,10 +76,11 @@ int i; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<no_unique_address.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -<<#Empty,Empty>> e = pass:[Empty{}]; +<<#Empty,Empty>> e = Empty{}; ---- diff --git a/test-files/golden-tests/noreturn.adoc b/test-files/golden-tests/noreturn.adoc index 56480a7b2d..4dab74a8c7 100644 --- a/test-files/golden-tests/noreturn.adoc +++ b/test-files/golden-tests/noreturn.adoc @@ -28,8 +28,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<noreturn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -40,8 +41,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<noreturn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -81,8 +83,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<noreturn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static void @@ -94,8 +97,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<noreturn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(); @@ -106,8 +110,9 @@ f3(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<noreturn.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- friend void diff --git a/test-files/golden-tests/ns-variables.adoc b/test-files/golden-tests/ns-variables.adoc index c52e339a15..3eb841805a 100644 --- a/test-files/golden-tests/ns-variables.adoc +++ b/test-files/golden-tests/ns-variables.adoc @@ -52,8 +52,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr int const i = 0; @@ -64,8 +65,9 @@ int const i = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int j = 0; ---- @@ -75,8 +77,9 @@ int j = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr extern @@ -88,8 +91,9 @@ int const k = 1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- extern int l = 1; @@ -100,10 +104,11 @@ int l = 1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -double pi = pass:[3.14]; +double pi = 3.14; ---- [#T] @@ -111,8 +116,9 @@ double pi = pass:[3.14]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -125,8 +131,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- extern <<#T,T>> t; @@ -137,8 +144,9 @@ extern === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- thread_local int x0 = 0; @@ -149,8 +157,9 @@ int x0 = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static thread_local @@ -162,8 +171,9 @@ int x1 = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ns‐variables.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static diff --git a/test-files/golden-tests/out-of-line-record-def.adoc b/test-files/golden-tests/out-of-line-record-def.adoc index c3d041adec..3ac94efbf7 100644 --- a/test-files/golden-tests/out-of-line-record-def.adoc +++ b/test-files/golden-tests/out-of-line-record-def.adoc @@ -32,8 +32,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<out‐of‐line‐record‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S; ---- diff --git a/test-files/golden-tests/overloaded-op-1.adoc b/test-files/golden-tests/overloaded-op-1.adoc index 4ce77d342f..11d5dbe0f5 100644 --- a/test-files/golden-tests/overloaded-op-1.adoc +++ b/test-files/golden-tests/overloaded-op-1.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<overloaded‐op‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -30,7 +31,7 @@ struct T; |=== | Name | Description -| <<#T-operator_plus,`pass:[operator+]`>> +| <<#T-operator_plus,`operator+`>> | |=== @@ -38,15 +39,16 @@ struct T; [#T-operator_plus] -== <<#T,T>>::pass:[operator+] +== <<#T,T>>::operator+ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<overloaded‐op‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#T,T>> -pass:[operator+](); +operator+(); ---- diff --git a/test-files/golden-tests/overloaded-op-2.adoc b/test-files/golden-tests/overloaded-op-2.adoc index 10b2eb2755..ee5b0bfb5d 100644 --- a/test-files/golden-tests/overloaded-op-2.adoc +++ b/test-files/golden-tests/overloaded-op-2.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<overloaded‐op‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -30,7 +31,7 @@ struct T; |=== | Name | Description -| <<#T-operator_plus,`pass:[operator+]`>> +| <<#T-operator_plus,`operator+`>> | |=== @@ -38,15 +39,16 @@ struct T; [#T-operator_plus] -== <<#T,T>>::pass:[operator+] +== <<#T,T>>::operator+ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<overloaded‐op‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#T,T>> -pass:[operator+](<<#T,T>>); +operator+(<<#T,T>>); ---- diff --git a/test-files/golden-tests/para-1.adoc b/test-files/golden-tests/para-1.adoc index 7427bcd522..cf711463c0 100644 --- a/test-files/golden-tests/para-1.adoc +++ b/test-files/golden-tests/para-1.adoc @@ -19,8 +19,8 @@ | | <<#f4,`f4`>> -| -brief +| brief + |=== @@ -30,8 +30,9 @@ brief === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<para‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -42,8 +43,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<para‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -54,8 +56,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<para‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(); @@ -64,14 +67,15 @@ f3(); [#f4] == f4 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<para‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -79,7 +83,6 @@ f4(); === Description - a b @@ -89,4 +92,5 @@ c + [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/para-2.adoc b/test-files/golden-tests/para-2.adoc index 8fd0db8de3..354e4aa4aa 100644 --- a/test-files/golden-tests/para-2.adoc +++ b/test-files/golden-tests/para-2.adoc @@ -10,8 +10,8 @@ | Name | Description | <<#f1,`f1`>> -| -brief +| brief + |=== @@ -19,14 +19,15 @@ brief [#f1] == f1 - brief + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<para‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -34,7 +35,6 @@ f1(); === Description - a b c @@ -43,4 +43,5 @@ d + [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/param-direction.adoc b/test-files/golden-tests/param-direction.adoc index 4c27c042ff..dbed5321ab 100644 --- a/test-files/golden-tests/param-direction.adoc +++ b/test-files/golden-tests/param-direction.adoc @@ -46,8 +46,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(int x0); @@ -67,8 +68,9 @@ f(int x0); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g( @@ -92,8 +94,9 @@ g( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h( @@ -117,8 +120,9 @@ h( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i( @@ -142,8 +146,9 @@ i( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void j( @@ -167,8 +172,9 @@ j( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void k( @@ -195,8 +201,9 @@ k( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void l( @@ -224,8 +231,9 @@ l( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void m( @@ -249,8 +257,9 @@ m( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void n(int x8); @@ -270,8 +279,9 @@ n(int x8); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param‐direction.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void o(int x9); diff --git a/test-files/golden-tests/param-direction.html b/test-files/golden-tests/param-direction.html index 8940b22876..f7ac62cde8 100644 --- a/test-files/golden-tests/param-direction.html +++ b/test-files/golden-tests/param-direction.html @@ -68,7 +68,9 @@

Parameters

x0 - +

+ + @@ -103,11 +105,15 @@

Parameters

x1 - +

+ + y1 - +

+ + @@ -142,11 +148,15 @@

Parameters

x2 - +

+ + y2 - +

+ + @@ -181,11 +191,15 @@

Parameters

x3 - +

+ + y3 - +

+ + @@ -220,11 +234,15 @@

Parameters

x4 - +

+ + y4 - +

+ + @@ -260,15 +278,21 @@

Parameters

x5 - +

+ + y5 - +

+ + z5 - +

+ + @@ -305,15 +329,21 @@

Parameters

x6 - +

+ + y6 - +

+ + z6 - +

+ + @@ -348,11 +378,15 @@

Parameters

x7 - +

+ + y7 - +

+ + @@ -385,7 +419,9 @@

Parameters

x8 - +

+ + @@ -418,11 +454,15 @@

Parameters

x9 - +

+ + x9 - +

+ + diff --git a/test-files/golden-tests/param.adoc b/test-files/golden-tests/param.adoc index 029da39683..5982872034 100644 --- a/test-files/golden-tests/param.adoc +++ b/test-files/golden-tests/param.adoc @@ -28,8 +28,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(int x); @@ -49,8 +50,9 @@ f(int x); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g( @@ -74,8 +76,9 @@ g( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h( @@ -102,8 +105,9 @@ h( === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<param.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i( diff --git a/test-files/golden-tests/param.html b/test-files/golden-tests/param.html index e8e3d0e0b2..c61b713119 100644 --- a/test-files/golden-tests/param.html +++ b/test-files/golden-tests/param.html @@ -56,7 +56,9 @@

Parameters

x - +

+ + @@ -91,11 +93,15 @@

Parameters

x - +

+ + y - +

+ + @@ -131,15 +137,21 @@

Parameters

x - +

+ + y - +

+ + z - +

+ + @@ -176,19 +188,27 @@

Parameters

w - +

+ + x - +

+ + y - +

+ + z - +

+ + diff --git a/test-files/golden-tests/pre-post.adoc b/test-files/golden-tests/pre-post.adoc index dcb1ec83de..cc3cdd4c09 100644 --- a/test-files/golden-tests/pre-post.adoc +++ b/test-files/golden-tests/pre-post.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<pre‐post.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -28,19 +29,19 @@ f(); === Preconditions - first precondition second precondition -=== Postconditions +=== Postconditions first postcondition + [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/pre-post.html b/test-files/golden-tests/pre-post.html index 62ee195a92..671b2ed095 100644 --- a/test-files/golden-tests/pre-post.html +++ b/test-files/golden-tests/pre-post.html @@ -40,16 +40,16 @@

Synopsis

Preconditions

-

<p><span>first precondition</span></p> +

first precondition

-

<p><span>second precondition</span></p> +

second precondition

Postconditions

-

<p><span>first postcondition</span></p> +

first postcondition

diff --git a/test-files/golden-tests/record-1.adoc b/test-files/golden-tests/record-1.adoc index a8107e5962..79b7f9306a 100644 --- a/test-files/golden-tests/record-1.adoc +++ b/test-files/golden-tests/record-1.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -59,18 +60,18 @@ struct T; | Name | Description | <<#T-g1,`g1`>> -| -brief-g1 +| brief‐g1 + | <<#T-g2,`g2`>> -| -brief-g2 +| brief‐g2 + | <<#T-g3,`g3`>> -| -brief-g3 +| brief‐g3 + |=== @@ -81,8 +82,9 @@ brief-g3 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using U1 = int; ---- @@ -92,8 +94,9 @@ using U1 = int; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- typedef char U2; ---- @@ -103,8 +106,9 @@ typedef char U2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -115,8 +119,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int f2(); @@ -127,8 +132,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- char f3(); @@ -137,14 +143,15 @@ f3(); [#T-g1] == <<#T,T>>::g1 +brief‐g1 -brief-g1 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g1(); @@ -152,21 +159,22 @@ g1(); === Description - desc + [#T-g2] == <<#T,T>>::g2 +brief‐g2 -brief-g2 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int g2(); @@ -174,21 +182,22 @@ g2(); === Return Value - the number 2 + [#T-g3] == <<#T,T>>::g3 +brief‐g3 -brief-g3 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐1.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- char g3(int x); @@ -196,18 +205,18 @@ g3(int x); === Return Value - the separator + === Parameters |=== | Name | Description | *x* -| -any old number +| any old number + |=== diff --git a/test-files/golden-tests/record-1.html b/test-files/golden-tests/record-1.html index fe194b411f..514c5079a6 100644 --- a/test-files/golden-tests/record-1.html +++ b/test-files/golden-tests/record-1.html @@ -222,6 +222,12 @@

Synopsis

g2(); + +
+

Return Value

+

the number 2

+ +
@@ -244,6 +250,12 @@

Synopsis

g3(int x); +
+
+

Return Value

+

the separator

+ +

Parameters

@@ -257,7 +269,9 @@

Parameters

x - +

any old number

+ + diff --git a/test-files/golden-tests/record-access.adoc b/test-files/golden-tests/record-access.adoc index 21f0c280ed..88f9248985 100644 --- a/test-files/golden-tests/record-access.adoc +++ b/test-files/golden-tests/record-access.adoc @@ -25,8 +25,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S0; ---- @@ -66,8 +67,9 @@ struct S0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -78,8 +80,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -90,8 +93,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -102,8 +106,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C0; ---- @@ -143,8 +148,9 @@ class C0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -155,8 +161,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -167,8 +174,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -179,8 +187,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- union U0; ---- @@ -220,8 +229,9 @@ union U0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -232,8 +242,9 @@ f0(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -244,8 +255,9 @@ f1(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐access.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); diff --git a/test-files/golden-tests/record-data.adoc b/test-files/golden-tests/record-data.adoc index ed603d30c9..8c6ad005d5 100644 --- a/test-files/golden-tests/record-data.adoc +++ b/test-files/golden-tests/record-data.adoc @@ -31,8 +31,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -66,8 +67,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int i; ---- @@ -77,8 +79,9 @@ int i; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- double j; ---- @@ -88,8 +91,9 @@ double j; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- mutable int k; @@ -100,8 +104,9 @@ int k; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int l : 8; ---- @@ -111,10 +116,11 @@ int l : 8; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -int m : pass:[4 + 4]; +int m : 4 + 4; ---- [#U] @@ -122,8 +128,9 @@ int m : pass:[4 + 4]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct U; ---- @@ -145,8 +152,9 @@ struct U; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#T,T>> t; ---- @@ -156,8 +164,9 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class V; ---- @@ -191,8 +200,9 @@ class V; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int i; ---- @@ -202,8 +212,9 @@ int i; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- unsigned long j; ---- @@ -213,8 +224,9 @@ unsigned long j; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- double k; ---- @@ -224,8 +236,9 @@ double k; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct W; ---- @@ -247,8 +260,9 @@ struct W; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- char buf[64]; ---- @@ -258,12 +272,13 @@ char buf[64]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename P, - int I> + int I> struct X; ---- @@ -305,8 +320,9 @@ struct X; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using Q = P; ---- @@ -316,8 +332,9 @@ using Q = P; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int x0 = 0; ---- @@ -327,8 +344,9 @@ int x0 = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- P x1; ---- @@ -338,8 +356,9 @@ P x1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- P const x2[32]; ---- @@ -349,8 +368,9 @@ P const x2[32]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <<#X-Q,Q>> x3; ---- @@ -360,10 +380,11 @@ Declared in `` === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐data.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -int x4 : pass:[I + 4]; +int x4 : I + 4; ---- diff --git a/test-files/golden-tests/record-inheritance.adoc b/test-files/golden-tests/record-inheritance.adoc index 699061b1dd..41d08225bf 100644 --- a/test-files/golden-tests/record-inheritance.adoc +++ b/test-files/golden-tests/record-inheritance.adoc @@ -64,8 +64,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S0; ---- @@ -78,8 +79,9 @@ struct S0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C0; ---- @@ -92,8 +94,9 @@ class C0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- union U0; ---- @@ -106,8 +109,9 @@ union U0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S1; ---- @@ -120,8 +124,9 @@ struct S1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S2 : <<#S0,S0>>; @@ -135,8 +140,9 @@ struct S2 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S3 : <<#S1,S1>>; @@ -150,8 +156,9 @@ struct S3 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S4 : <<#S2,S2>> @@ -166,8 +173,9 @@ struct S4 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C1 : <<#C0,C0>>; @@ -181,8 +189,9 @@ class C1 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C2 : public <<#C0,C0>>; @@ -196,8 +205,9 @@ class C2 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C3 : protected <<#C0,C0>>; @@ -211,8 +221,9 @@ class C3 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C4 : <<#C0,C0>>; @@ -226,8 +237,9 @@ class C4 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C5 : virtual <<#C0,C0>>; @@ -241,8 +253,9 @@ class C5 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C6 : virtual <<#C1,C1>>; @@ -256,8 +269,9 @@ class C6 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- class C7 : public <<#C5,C5>> @@ -272,8 +286,9 @@ class C7 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S5 : private <<#S0,S0>> @@ -288,10 +303,11 @@ struct S5 === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<record‐inheritance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename... Ts> struct S6 : Ts...; ---- diff --git a/test-files/golden-tests/ref.adoc b/test-files/golden-tests/ref.adoc index ad1b59f625..3a662af23c 100644 --- a/test-files/golden-tests/ref.adoc +++ b/test-files/golden-tests/ref.adoc @@ -31,15 +31,15 @@ | | <<#f5,`f5`>> -| -See -xref:#A-f1[A::f1] +| See +xref:#A-f1[A::f1] + | <<#f6,`f6`>> -| -See -xref:#F-operator_bitnot[F::operator~] +| See +xref:#F-operator_bitnot[F::operator˜] + |=== @@ -49,8 +49,9 @@ xref:#F-operator_bitnot[F::operator~] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(); @@ -65,11 +66,11 @@ f0(); | Name | Description | <<#A-B,`B`>> -| -See +| See xref:#A-f1[f1] + | <<#A-C,`C`>> | @@ -83,25 +84,26 @@ xref:#A-f1[f1] | Name | Description | <<#A-f1,`f1`>> -| -See +| See xref:#f0[f0] + |=== [#A-f1] == <<#A,A>>::f1 - See xref:#f0[f0] + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(); @@ -109,25 +111,26 @@ f1(); === Description - See -xref:#f0[::f0] +xref:#f0[::f0] + [#A-B] == <<#A,A>>::B - See xref:#A-f1[f1] + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename> struct B; ---- @@ -145,12 +148,12 @@ struct B; === Description - See -xref:#A-f1[A::f1] +xref:#A-f1[A::f1] See -xref:#A-f1[::A::f1] +xref:#A-f1[::A::f1] + [#A-B-f2] @@ -158,8 +161,9 @@ xref:#A-f1[::A::f1] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(); @@ -170,8 +174,9 @@ f2(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct C; ---- @@ -196,8 +201,9 @@ struct C; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(); @@ -208,8 +214,9 @@ f3(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -220,8 +227,9 @@ f4(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct D : <<#A-C,C>>; @@ -233,11 +241,11 @@ struct D | Name | Description | <<#A-D-E,`E`>> -| -See +| See xref:#A-C-f3[f3] + |=== === Member Functions [cols=2] @@ -258,8 +266,9 @@ xref:#A-C-f3[f3] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(); @@ -268,15 +277,16 @@ f4(); [#A-D-E] == <<#A,A>>::<<#A-D,D>>::E - See xref:#A-C-f3[f3] + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct E; ---- @@ -286,26 +296,27 @@ struct E; === Description - See xref:#A-D-f4[f4] See -xref:#A-C-f4[C::f4] +xref:#A-C-f4[C::f4] + [#f5] == f5 - See -xref:#A-f1[A::f1] +xref:#A-f1[A::f1] + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f5(); @@ -313,9 +324,9 @@ f5(); === Description - See -xref:#A-f1[::A::f1] +xref:#A-f1[::A::f1] + [#F] @@ -323,8 +334,9 @@ xref:#A-f1[::A::f1] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct F; ---- @@ -334,121 +346,121 @@ struct F; |=== | Name | Description -| <<#F-operator_not,`pass:[operator!]`>> +| <<#F-operator_not,`operator!`>> | -| <<#F-operator_not_eq,`pass:[operator!=]`>> +| <<#F-operator_not_eq,`operator!=`>> | | <<#F-operator_mod,`operator%`>> | -| <<#F-operator_mod_eq,`operator%=`>> +| <<#F-operator_mod_eq,`operator%=`>> | -| <<#F-operator_bitand,`operator&`>> +| <<#F-operator_bitand,`operator&`>> | -| <<#F-operator_and,`operator&&`>> +| <<#F-operator_and,`operator&&`>> | -| <<#F-operator_and_eq,`operator&=`>> +| <<#F-operator_and_eq,`operator&=`>> | -| <<#F-operator_call,`pass:[operator()]`>> +| <<#F-operator_call,`operator()`>> | -| <<#F-operator_star,`pass:[operator*]`>> +| <<#F-operator_star,`operator*`>> | -| <<#F-operator_star_eq,`pass:[operator*=]`>> +| <<#F-operator_star_eq,`operator*=`>> | -| <<#F-operator_plus,`pass:[operator+]`>> +| <<#F-operator_plus,`operator+`>> | -| <<#F-operator_inc,`pass:[operator++]`>> +| <<#F-operator_inc,`operator++`>> | -| <<#F-operator_plus_eq,`pass:[operator+=]`>> +| <<#F-operator_plus_eq,`operator+=`>> | | <<#F-operator_comma,`operator,`>> | -| <<#F-operator_minus,`pass:[operator-]`>> +| <<#F-operator_minus,`operator‐`>> | -| <<#F-operator_dec,`pass:[operator--]`>> +| <<#F-operator_dec,`operator‐‐`>> | -| <<#F-operator_minus_eq,`pass:[operator-=]`>> +| <<#F-operator_minus_eq,`operator‐=`>> | -| <<#F-operator_ptr,`pass:[operator->]`>> +| <<#F-operator_ptr,`operator‐>`>> | -| <<#F-operator_ptrmem,`pass:[operator->*]`>> +| <<#F-operator_ptrmem,`operator‐>*`>> | -| <<#F-operator_slash,`operator/`>> +| <<#F-operator_slash,`operator/`>> | -| <<#F-operator_slash_eq,`operator/=`>> +| <<#F-operator_slash_eq,`operator/=`>> | -| <<#F-operator_lt,`operator<`>> +| <<#F-operator_lt,`operator<`>> | -| <<#F-operator_lshift,`operator<<`>> +| <<#F-operator_lshift,`operator<<`>> | -| <<#F-operator_lshift_eq,`operator<<=`>> +| <<#F-operator_lshift_eq,`operator<<=`>> | -| <<#F-operator_le,`operator<=`>> +| <<#F-operator_le,`operator<=`>> | -| <<#F-operator_3way,`operator<=>`>> +| <<#F-operator_3way,`operator<=>`>> | -| <<#F-operator_assign,`operator=`>> +| <<#F-operator_assign,`operator=`>> | -| <<#F-operator_eq,`operator==`>> +| <<#F-operator_eq,`operator==`>> | -| <<#F-operator_gt,`operator>`>> +| <<#F-operator_gt,`operator>`>> | -| <<#F-operator_ge,`operator>=`>> +| <<#F-operator_ge,`operator>=`>> | -| <<#F-operator_rshift,`operator>>`>> +| <<#F-operator_rshift,`operator>>`>> | -| <<#F-operator_rshift_eq,`operator>>=`>> +| <<#F-operator_rshift_eq,`operator>>=`>> | -| <<#F-operator_subs,`pass:[operator[]]`>> +| <<#F-operator_subs,`operator[]`>> | -| <<#F-operator_xor,`operator^`>> +| <<#F-operator_xor,`operatorˆ`>> | -| <<#F-operator_xor_eq,`operator^=`>> +| <<#F-operator_xor_eq,`operatorˆ=`>> | -| <<#F-operator_bitor,`pass:[operator|]`>> +| <<#F-operator_bitor,`operator|`>> | -| <<#F-operator_or_eq,`pass:[operator|=]`>> +| <<#F-operator_or_eq,`operator|=`>> | -| <<#F-operator_or,`pass:[operator||]`>> +| <<#F-operator_or,`operator||`>> | -| <<#F-operator_bitnot,`operator~`>> +| <<#F-operator_bitnot,`operator˜`>> | |=== @@ -456,15 +468,16 @@ struct F; [#F-operator_bitnot] -== <<#F,F>>::operator~ +== <<#F,F>>::operator˜ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator~(); +operator˜(); ---- [#F-operator_comma] @@ -472,335 +485,363 @@ operator~(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void operator,(<<#F,F>>&); ---- [#F-operator_call] -== <<#F,F>>::pass:[operator()] +== <<#F,F>>::operator() === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator()](<<#F,F>>&); +operator()(<<#F,F>>&); ---- [#F-operator_subs] -== <<#F,F>>::pass:[operator[]] +== <<#F,F>>::operator[] === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator[]](<<#F,F>>&); +operator[](<<#F,F>>&); ---- [#F-operator_plus] -== <<#F,F>>::pass:[operator+] +== <<#F,F>>::operator+ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator+](<<#F,F>>&); +operator+(<<#F,F>>&); ---- [#F-operator_inc] -== <<#F,F>>::pass:[operator++] +== <<#F,F>>::operator++ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator++](); +operator++(); ---- [#F-operator_plus_eq] -== <<#F,F>>::pass:[operator+=] +== <<#F,F>>::operator+= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator+=](<<#F,F>>&); +operator+=(<<#F,F>>&); ---- [#F-operator_bitand] -== <<#F,F>>::operator& +== <<#F,F>>::operator& === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator&(<<#F,F>>&); +operator&(<<#F,F>>&); ---- [#F-operator_and] -== <<#F,F>>::operator&& +== <<#F,F>>::operator&& === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator&&(<<#F,F>>&); +operator&&(<<#F,F>>&); ---- [#F-operator_and_eq] -== <<#F,F>>::operator&= +== <<#F,F>>::operator&= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator&=(<<#F,F>>&); +operator&=(<<#F,F>>&); ---- [#F-operator_bitor] -== <<#F,F>>::pass:[operator|] +== <<#F,F>>::operator| === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator|](<<#F,F>>&); +operator|(<<#F,F>>&); ---- [#F-operator_or] -== <<#F,F>>::pass:[operator||] +== <<#F,F>>::operator|| === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator||](<<#F,F>>&); +operator||(<<#F,F>>&); ---- [#F-operator_or_eq] -== <<#F,F>>::pass:[operator|=] +== <<#F,F>>::operator|= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator|=](<<#F,F>>&); +operator|=(<<#F,F>>&); ---- [#F-operator_minus] -== <<#F,F>>::pass:[operator-] +== <<#F,F>>::operator‐ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator-](<<#F,F>>&); +operator‐(<<#F,F>>&); ---- [#F-operator_dec] -== <<#F,F>>::pass:[operator--] +== <<#F,F>>::operator‐‐ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator--](); +operator‐‐(); ---- [#F-operator_minus_eq] -== <<#F,F>>::pass:[operator-=] +== <<#F,F>>::operator‐= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator-=](<<#F,F>>&); +operator‐=(<<#F,F>>&); ---- [#F-operator_ptr] -== <<#F,F>>::pass:[operator->] +== <<#F,F>>::operator‐> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator->](); +operator‐>(); ---- [#F-operator_ptrmem] -== <<#F,F>>::pass:[operator->*] +== <<#F,F>>::operator‐>* === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator->*](<<#F,F>>&); +operator‐>*(<<#F,F>>&); ---- [#F-operator_lt] -== <<#F,F>>::operator< +== <<#F,F>>::operator< === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator<(<<#F,F>>&); +operator<(<<#F,F>>&); ---- [#F-operator_lshift] -== <<#F,F>>::operator<< +== <<#F,F>>::operator<< === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator<<(<<#F,F>>&); +operator<<(<<#F,F>>&); ---- [#F-operator_lshift_eq] -== <<#F,F>>::operator<<= +== <<#F,F>>::operator<<= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator<<=(<<#F,F>>&); +operator<<=(<<#F,F>>&); ---- [#F-operator_le] -== <<#F,F>>::operator<= +== <<#F,F>>::operator<= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator<=(<<#F,F>>&); +operator<=(<<#F,F>>&); ---- [#F-operator_3way] -== <<#F,F>>::operator<=> +== <<#F,F>>::operator<=> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator<=>(<<#F,F>>&); +operator<=>(<<#F,F>>&); ---- [#F-operator_gt] -== <<#F,F>>::operator> +== <<#F,F>>::operator> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator>(<<#F,F>>&); +operator>(<<#F,F>>&); ---- [#F-operator_rshift] -== <<#F,F>>::operator>> +== <<#F,F>>::operator>> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator>>(<<#F,F>>&); +operator>>(<<#F,F>>&); ---- [#F-operator_rshift_eq] -== <<#F,F>>::operator>>= +== <<#F,F>>::operator>>= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator>>=(<<#F,F>>&); +operator>>=(<<#F,F>>&); ---- [#F-operator_ge] -== <<#F,F>>::operator>= +== <<#F,F>>::operator>= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator>=(<<#F,F>>&); +operator>=(<<#F,F>>&); ---- [#F-operator_star] -== <<#F,F>>::pass:[operator*] +== <<#F,F>>::operator* === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator*](<<#F,F>>&); +operator*(<<#F,F>>&); ---- [#F-operator_star_eq] -== <<#F,F>>::pass:[operator*=] +== <<#F,F>>::operator*= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator*=](<<#F,F>>&); +operator*=(<<#F,F>>&); ---- [#F-operator_mod] @@ -808,133 +849,144 @@ pass:[operator*=](<<#F,F>>&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void operator%(<<#F,F>>&); ---- [#F-operator_mod_eq] -== <<#F,F>>::operator%= +== <<#F,F>>::operator%= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator%=(<<#F,F>>&); +operator%=(<<#F,F>>&); ---- [#F-operator_slash] -== <<#F,F>>::operator/ +== <<#F,F>>::operator/ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator/(<<#F,F>>&); +operator/(<<#F,F>>&); ---- [#F-operator_slash_eq] -== <<#F,F>>::operator/= +== <<#F,F>>::operator/= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator/=(<<#F,F>>&); +operator/=(<<#F,F>>&); ---- [#F-operator_xor] -== <<#F,F>>::operator^ +== <<#F,F>>::operatorˆ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator^(<<#F,F>>&); +operatorˆ(<<#F,F>>&); ---- [#F-operator_xor_eq] -== <<#F,F>>::operator^= +== <<#F,F>>::operatorˆ= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator^=(<<#F,F>>&); +operatorˆ=(<<#F,F>>&); ---- [#F-operator_assign] -== <<#F,F>>::operator= +== <<#F,F>>::operator= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator=(<<#F,F>>&); +operator=(<<#F,F>>&); ---- [#F-operator_eq] -== <<#F,F>>::operator== +== <<#F,F>>::operator== === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -operator==(<<#F,F>>&); +operator==(<<#F,F>>&); ---- [#F-operator_not] -== <<#F,F>>::pass:[operator!] +== <<#F,F>>::operator! === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator!](); +operator!(); ---- [#F-operator_not_eq] -== <<#F,F>>::pass:[operator!=] +== <<#F,F>>::operator!= === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -pass:[operator!=](<<#F,F>>&); +operator!=(<<#F,F>>&); ---- [#f6] == f6 - See -xref:#F-operator_bitnot[F::operator~] +xref:#F-operator_bitnot[F::operator˜] + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<ref.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(); @@ -942,120 +994,120 @@ f6(); === Description - See -xref:#F-operator_comma[F::operator,] +xref:#F-operator_comma[F::operator,] See -xref:#F-operator_call[F::operator()] +xref:#F-operator_call[F::operator()] See -xref:#F-operator_subs[F::operator[]] +xref:#F-operator_subs[F::operator[]] See -xref:#F-operator_plus[F::operator+] +xref:#F-operator_plus[F::operator+] See -xref:#F-operator_inc[F::operator++] +xref:#F-operator_inc[F::operator++] See -xref:#F-operator_plus_eq[F::operator+=] +xref:#F-operator_plus_eq[F::operator+=] See -xref:#F-operator_bitand[F::operator&] +xref:#F-operator_bitand[F::operator&] See -xref:#F-operator_and[F::operator&&] +xref:#F-operator_and[F::operator&&] See -xref:#F-operator_and_eq[F::operator&=] +xref:#F-operator_and_eq[F::operator&=] See -xref:#F-operator_bitor[F::operator|] +xref:#F-operator_bitor[F::operator|] See -xref:#F-operator_or[F::operator||] +xref:#F-operator_or[F::operator||] See -xref:#F-operator_or_eq[F::operator|=] +xref:#F-operator_or_eq[F::operator|=] See -xref:#F-operator_minus[F::operator-] +xref:#F-operator_minus[F::operator‐] See -xref:#F-operator_dec[F::operator--] +xref:#F-operator_dec[F::operator‐‐] See -xref:#F-operator_minus_eq[F::operator-=] +xref:#F-operator_minus_eq[F::operator‐=] See -xref:#F-operator_ptr[F::operator->] +xref:#F-operator_ptr[F::operator‐>] See -xref:#F-operator_ptrmem[F::operator->*] +xref:#F-operator_ptrmem[F::operator‐>*] See -xref:#F-operator_lt[F::operator<] +xref:#F-operator_lt[F::operator<] See -xref:#F-operator_lshift[F::operator<<] +xref:#F-operator_lshift[F::operator<<] See -xref:#F-operator_lshift_eq[F::operator<<=] +xref:#F-operator_lshift_eq[F::operator<<=] See -xref:#F-operator_le[F::operator<=] +xref:#F-operator_le[F::operator<=] See -xref:#F-operator_3way[F::operator<=>] +xref:#F-operator_3way[F::operator<=>] See -xref:#F-operator_gt[F::operator>] +xref:#F-operator_gt[F::operator>] See -xref:#F-operator_rshift[F::operator>>] +xref:#F-operator_rshift[F::operator>>] See -xref:#F-operator_rshift_eq[F::operator>>=] +xref:#F-operator_rshift_eq[F::operator>>=] See -xref:#F-operator_ge[F::operator>=] +xref:#F-operator_ge[F::operator>=] See -xref:#F-operator_star[F::operator*] +xref:#F-operator_star[F::operator*] See -xref:#F-operator_star_eq[F::operator*=] +xref:#F-operator_star_eq[F::operator*=] See -xref:#F-operator_mod[F::operator%] +xref:#F-operator_mod[F::operator%] See -xref:#F-operator_mod_eq[F::operator%=] +xref:#F-operator_mod_eq[F::operator%=] See -xref:#F-operator_slash[F::operator/] +xref:#F-operator_slash[F::operator/] See -xref:#F-operator_slash_eq[F::operator/=] +xref:#F-operator_slash_eq[F::operator/=] See -xref:#F-operator_xor[F::operator^] +xref:#F-operator_xor[F::operatorˆ] See -xref:#F-operator_xor_eq[F::operator^=] +xref:#F-operator_xor_eq[F::operatorˆ=] See -xref:#F-operator_assign[F::operator=] +xref:#F-operator_assign[F::operator=] See -xref:#F-operator_eq[F::operator==] +xref:#F-operator_eq[F::operator==] See -xref:#F-operator_not[F::operator!] +xref:#F-operator_not[F::operator!] See -xref:#F-operator_not_eq[F::operator!=] +xref:#F-operator_not_eq[F::operator!=] + diff --git a/test-files/golden-tests/requires-clause.adoc b/test-files/golden-tests/requires-clause.adoc index 09de61d573..dbc73ea58b 100644 --- a/test-files/golden-tests/requires-clause.adoc +++ b/test-files/golden-tests/requires-clause.adoc @@ -32,30 +32,31 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void -<<#f-04,f>>() requires pass:[(sizeof(T) == 4)]; +<<#f-04,f>>() requires (sizeof(T) == 4); ---- [.small]#<<#f-04,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void -<<#f-0b,f>>() requires pass:[(sizeof(T) == 2)]; +<<#f-0b,f>>() requires (sizeof(T) == 2); ---- [.small]#<<#f-0b,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> void -<<#f-02,f>>() requires pass:[(sizeof(U) == 2)]; +<<#f-02,f>>() requires (sizeof(U) == 2); ---- [.small]#<<#f-02,_» more..._>># @@ -65,12 +66,13 @@ void === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void -f() requires pass:[(sizeof(T) == 4)]; +f() requires (sizeof(T) == 4); ---- [#f-0b] @@ -78,12 +80,13 @@ f() requires pass:[(sizeof(T) == 4)]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void -f() requires pass:[(sizeof(T) == 2)]; +f() requires (sizeof(T) == 2); ---- [#f-02] @@ -91,12 +94,13 @@ f() requires pass:[(sizeof(T) == 2)]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> void -f() requires pass:[(sizeof(U) == 2)]; +f() requires (sizeof(U) == 2); ---- [#g] @@ -104,28 +108,29 @@ f() requires pass:[(sizeof(U) == 2)]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(T) == 4)] +template<typename T> requires (sizeof(T) == 4) void <<#g-00,g>>(); ---- [.small]#<<#g-00,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(T) == 2)] +template<typename T> requires (sizeof(T) == 2) void <<#g-04,g>>(); ---- [.small]#<<#g-04,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(U) == 2)] +template<typename U> requires (sizeof(U) == 2) void <<#g-03,g>>(); ---- @@ -137,10 +142,11 @@ void === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(T) == 4)] +template<typename T> requires (sizeof(T) == 4) void g(); ---- @@ -150,10 +156,11 @@ g(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(T) == 2)] +template<typename T> requires (sizeof(T) == 2) void g(); ---- @@ -163,10 +170,11 @@ g(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(U) == 2)] +template<typename U> requires (sizeof(U) == 2) void g(); ---- @@ -176,10 +184,11 @@ g(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(T) == 2)] +template<typename T> requires (sizeof(T) == 2) struct A; ---- @@ -191,10 +200,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<requires‐clause.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template requires pass:[(sizeof(U) == 2)] +template<typename U> requires (sizeof(U) == 2) struct A; ---- diff --git a/test-files/golden-tests/snippets/distance.adoc b/test-files/golden-tests/snippets/distance.adoc index ececb9beca..c05fc383d1 100644 --- a/test-files/golden-tests/snippets/distance.adoc +++ b/test-files/golden-tests/snippets/distance.adoc @@ -10,8 +10,8 @@ | Name | Description | <<#distance,`distance`>> -| -Return the distance between two points +| Return the distance between two points + |=== @@ -19,14 +19,15 @@ Return the distance between two points [#distance] == distance - Return the distance between two points + === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<distance.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- double distance( @@ -38,38 +39,38 @@ distance( === Description - This function returns the distance between two points -according to the Euclidean distance formula. +according to the Euclidean distance formula. -=== Return Value +=== Return Value The distance between the two points + === Parameters |=== | Name | Description | *x0* -| pass:[ -The x-coordinate of the first point -] +| The x&hyphen;coordinate of the first point + + | *y0* -| pass:[ -The y-coordinate of the first point -] +| The y&hyphen;coordinate of the first point + + | *x1* -| pass:[ -The x-coordinate of the second point -] +| The x&hyphen;coordinate of the second point + + | *y1* -| pass:[ -The y-coordinate of the second point -] +| The y&hyphen;coordinate of the second point + + |=== diff --git a/test-files/golden-tests/snippets/distance.html b/test-files/golden-tests/snippets/distance.html index ebca525307..49195fd99d 100644 --- a/test-files/golden-tests/snippets/distance.html +++ b/test-files/golden-tests/snippets/distance.html @@ -56,6 +56,12 @@

Description

+
+
+

Return Value

+

The distance between the two points

+ +

Parameters

@@ -69,19 +75,27 @@

Parameters

x0 - +

The x-coordinate of the first point

+ + y0 - +

The y-coordinate of the first point

+ + x1 - +

The x-coordinate of the second point

+ + y1 - +

The y-coordinate of the second point

+ + diff --git a/test-files/golden-tests/snippets/is_prime.adoc b/test-files/golden-tests/snippets/is_prime.adoc index 5cefb0ce2c..b0fbab64a7 100644 --- a/test-files/golden-tests/snippets/is_prime.adoc +++ b/test-files/golden-tests/snippets/is_prime.adoc @@ -9,39 +9,40 @@ |=== | Name | Description -| <<#is_prime,`pass:[is_prime]`>> -| -Return true if a number is prime. +| <<#is_prime,`is_prime`>> +| Return true if a number is prime. + |=== [#is_prime] -== pass:[is_prime] +== is_prime +Return true if a number is prime. -Return true if a number is prime. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<is_prime.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool -pass:[is_prime](unsigned long long n) noexcept; +is_prime(unsigned long long n) noexcept; ---- === Description +Linear in n. -Linear in n. === Return Value +Whether or not n is prime. -Whether or not n is prime. === Parameters @@ -50,8 +51,8 @@ Whether or not n is prime. | Name | Description | *n* -| -The number to test +| The number to test + |=== diff --git a/test-files/golden-tests/snippets/is_prime.html b/test-files/golden-tests/snippets/is_prime.html index d8987eb7b6..c9e4e4ec7f 100644 --- a/test-files/golden-tests/snippets/is_prime.html +++ b/test-files/golden-tests/snippets/is_prime.html @@ -52,6 +52,12 @@

Description

+
+
+

Return Value

+

Whether or not n is prime.

+ +

Parameters

@@ -65,7 +71,9 @@

Parameters

n - +

The number to test

+ + diff --git a/test-files/golden-tests/snippets/sqrt.adoc b/test-files/golden-tests/snippets/sqrt.adoc index cd832cdf05..4689672dea 100644 --- a/test-files/golden-tests/snippets/sqrt.adoc +++ b/test-files/golden-tests/snippets/sqrt.adoc @@ -10,8 +10,8 @@ | Name | Description | <<#sqrt,`sqrt`>> -| -Computes the square root of an integral value. +| Computes the square root of an integral value. + |=== @@ -19,25 +19,26 @@ Computes the square root of an integral value. [#sqrt] == sqrt +Computes the square root of an integral value. -Computes the square root of an integral value. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<sqrt.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> std::T sqrt(T value); ---- === Description - This function calculates the square root of a -given integral value using bit manipulation. +given integral value using bit manipulation. + === Exceptions @@ -46,15 +47,15 @@ given integral value using bit manipulation. | Name | Thrown on | `if` -| pass:[ -the input value is negative. -] +| the input value is negative&period; + + |=== === Return Value +The square root of the input value. -The square root of the input value. === Template Parameters @@ -63,9 +64,9 @@ The square root of the input value. | Name | Description | *T* -| pass:[ -The type of the input value. Must be an integral type. -] +| The type of the input value&period; Must be an integral type&period; + + |=== === Parameters @@ -74,9 +75,9 @@ The type of the input value. Must be an integral type. | Name | Description | *value* -| pass:[ -The integral value to compute the square root of. -] +| The integral value to compute the square root of&period; + + |=== diff --git a/test-files/golden-tests/snippets/sqrt.html b/test-files/golden-tests/snippets/sqrt.html index dd7658f668..4a57820e2e 100644 --- a/test-files/golden-tests/snippets/sqrt.html +++ b/test-files/golden-tests/snippets/sqrt.html @@ -66,10 +66,18 @@

Exceptions

if - +

the input value is negative.

+ + +
+
+

Return Value

+

The square root of the input value.

+ +

Template Parameters

@@ -83,7 +91,9 @@

Template Parameters

T - +

The type of the input value. Must be an integral type.

+ + @@ -100,7 +110,9 @@

Parameters

value - +

The integral value to compute the square root of.

+ + diff --git a/test-files/golden-tests/snippets/terminate.adoc b/test-files/golden-tests/snippets/terminate.adoc index 9883c427a7..35552920b1 100644 --- a/test-files/golden-tests/snippets/terminate.adoc +++ b/test-files/golden-tests/snippets/terminate.adoc @@ -10,8 +10,8 @@ | Name | Description | <<#terminate,`terminate`>> -| -Exit the program. +| Exit the program. + |=== @@ -19,14 +19,15 @@ Exit the program. [#terminate] == terminate +Exit the program. -Exit the program. === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<terminate.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void terminate() noexcept; @@ -34,11 +35,11 @@ terminate() noexcept; === Description +The program will end immediately. -The program will end immediately. [NOTE] +This function does not return. -This function does not return. diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc index 7845b84e62..8cb25959bd 100644 --- a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc +++ b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc @@ -22,10 +22,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -58,8 +59,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); @@ -70,10 +72,11 @@ f(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct B; ---- @@ -94,8 +97,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); @@ -106,10 +110,11 @@ g(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct C; ---- @@ -130,8 +135,9 @@ struct C; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void h(); @@ -142,8 +148,9 @@ h(); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct D; ---- @@ -165,10 +172,11 @@ struct D; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct E; ---- @@ -189,8 +197,9 @@ struct E; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<spec‐mem‐implicit‐instantiation.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void k(); diff --git a/test-files/golden-tests/static-data-def-constexpr.adoc b/test-files/golden-tests/static-data-def-constexpr.adoc index dd52d87f17..c2890406f0 100644 --- a/test-files/golden-tests/static-data-def-constexpr.adoc +++ b/test-files/golden-tests/static-data-def-constexpr.adoc @@ -22,8 +22,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def‐constexpr.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S; ---- @@ -45,12 +46,13 @@ struct S; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def‐constexpr.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static -<<#S,S>> const s = pass:[S{}]; +<<#S,S>> const s = S{}; ---- [#T] @@ -58,8 +60,9 @@ static === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def‐constexpr.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct T; ---- @@ -81,8 +84,9 @@ struct T; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def‐constexpr.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static diff --git a/test-files/golden-tests/static-data-def.adoc b/test-files/golden-tests/static-data-def.adoc index 55da5ba076..cff2690338 100644 --- a/test-files/golden-tests/static-data-def.adoc +++ b/test-files/golden-tests/static-data-def.adoc @@ -31,10 +31,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -76,8 +77,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static int v0 = 0; @@ -88,8 +90,9 @@ int v0 = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static int v1 = 1; @@ -100,8 +103,9 @@ int v1 = 1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static @@ -113,8 +117,9 @@ int const v2 = 2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static int const v3 = 3; @@ -125,8 +130,9 @@ int const v3 = 3; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static int const v4 = 4; @@ -137,8 +143,9 @@ int const v4 = 4; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static int v5 = 5; @@ -149,8 +156,9 @@ int v5 = 5; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static int const v6 = 6; @@ -161,8 +169,9 @@ int const v6 = 6; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static @@ -174,8 +183,9 @@ int const v7 = 7; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -200,8 +210,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- static thread_local @@ -213,8 +224,9 @@ int const x0 = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- constexpr static @@ -227,8 +239,9 @@ int const x1 = 0; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐def.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- auto f(); diff --git a/test-files/golden-tests/static-data-template.adoc b/test-files/golden-tests/static-data-template.adoc index bfda0e4f35..d39820c11c 100644 --- a/test-files/golden-tests/static-data-template.adoc +++ b/test-files/golden-tests/static-data-template.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -34,10 +35,10 @@ struct A; | <<#A-x-0e,`x`>> | -| <<#A-x-0a,`x`>> +| <<#A-x-0a,`x<U*, T>`>> | -| <<#A-x-07,`x`>> +| <<#A-x-07,`x<T, long>`>> | |=== @@ -49,43 +50,46 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename U, - typename V> + typename V> constexpr static T const x = 0; ---- [#A-x-0a] -== <<#A,A>>::x +== <<#A,A>>::x<U*, T> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> constexpr static -T const <<#A-x-0e,x>> = 1; +T const <<#A-x-0e,x>><U*, T> = 1; ---- [#A-x-07] -== <<#A,A>>::x +== <<#A,A>>::x<T, long> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<static‐data‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> constexpr static -bool const <<#A-x-0e,x>> = 2; +bool const <<#A-x-0e,x>><T, long> = 2; ---- diff --git a/test-files/golden-tests/temp/c_mct_expl_inline.adoc b/test-files/golden-tests/temp/c_mct_expl_inline.adoc index 69336a3530..c86960ae5c 100644 --- a/test-files/golden-tests/temp/c_mct_expl_inline.adoc +++ b/test-files/golden-tests/temp/c_mct_expl_inline.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -33,7 +34,7 @@ struct A; | <<#A-B-04,`B`>> | -| <<#A-B-01,`B`>> +| <<#A-B-01,`B<int>`>> | |=== @@ -45,10 +46,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct B; ---- @@ -69,23 +71,25 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#A-B-01] -== <<#A,A>>::B +== <<#A,A>>::B<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-B-04,B>>; +template<> +struct <<#A-B-04,B>><int>; ---- === Member Functions @@ -101,12 +105,13 @@ struct <<#A-B-04,B>>; [#A-B-01-g] -== <<#A,A>>::<<#A-B-01,B>>::g +== <<#A,A>>::<<#A-B-01,B>><int>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); diff --git a/test-files/golden-tests/temp/c_mct_expl_outside.adoc b/test-files/golden-tests/temp/c_mct_expl_outside.adoc index e00108c1ec..5272eb2c75 100644 --- a/test-files/golden-tests/temp/c_mct_expl_outside.adoc +++ b/test-files/golden-tests/temp/c_mct_expl_outside.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -33,7 +34,7 @@ struct A; | <<#A-B-04,`B`>> | -| <<#A-B-01,`B`>> +| <<#A-B-01,`B<int>`>> | |=== @@ -45,10 +46,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct B; ---- @@ -69,23 +71,25 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#A-B-01] -== <<#A,A>>::B +== <<#A,A>>::B<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-B-04,B>>; +template<> +struct <<#A-B-04,B>><int>; ---- === Member Functions @@ -101,12 +105,13 @@ struct <<#A-B-04,B>>; [#A-B-01-g] -== <<#A,A>>::<<#A-B-01,B>>::g +== <<#A,A>>::<<#A-B-01,B>><int>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.adoc b/test-files/golden-tests/temp/c_mft_expl_inline.adoc index c4eecc8ab2..d2014e6633 100644 --- a/test-files/golden-tests/temp/c_mft_expl_inline.adoc +++ b/test-files/golden-tests/temp/c_mft_expl_inline.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -41,21 +42,22 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void <<#A-f-0e,f>>(); ---- [.small]#<<#A-f-0e,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#A-f-0b,f>>(); +<<#A-f-0b,f>><int>(); ---- [.small]#<<#A-f-0b,_» more..._>># @@ -65,25 +67,27 @@ void === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void f(); ---- [#A-f-0b] -== <<#A,A>>::f +== <<#A,A>>::f<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#A-f-0e,f>>(); +<<#A-f-0e,f>><int>(); ---- diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.adoc b/test-files/golden-tests/temp/c_mft_expl_outside.adoc index a88d9c2501..16838cc38a 100644 --- a/test-files/golden-tests/temp/c_mft_expl_outside.adoc +++ b/test-files/golden-tests/temp/c_mft_expl_outside.adoc @@ -19,8 +19,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -41,21 +42,22 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void <<#A-f-0e,f>>(); ---- [.small]#<<#A-f-0e,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#A-f-0b,f>>(); +<<#A-f-0b,f>><int>(); ---- [.small]#<<#A-f-0b,_» more..._>># @@ -65,25 +67,27 @@ void === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void f(); ---- [#A-f-0b] -== <<#A,A>>::f +== <<#A,A>>::f<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/c_mft_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#A-f-0e,f>>(); +<<#A-f-0e,f>><int>(); ---- diff --git a/test-files/golden-tests/temp/ct_expl.adoc b/test-files/golden-tests/temp/ct_expl.adoc index 2f41abc0a0..4cd5f10f98 100644 --- a/test-files/golden-tests/temp/ct_expl.adoc +++ b/test-files/golden-tests/temp/ct_expl.adoc @@ -12,7 +12,7 @@ | <<#A-0e,`A`>> | -| <<#A-00,`A`>> +| <<#A-00,`A<int>`>> | |=== @@ -22,10 +22,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -46,23 +47,25 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#A-00] -== A +== A<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-0e,A>>; +template<> +struct <<#A-0e,A>><int>; ---- === Member Functions @@ -78,12 +81,13 @@ struct <<#A-0e,A>>; [#A-00-g] -== <<#A-00,A>>::g +== <<#A-00,A>><int>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); diff --git a/test-files/golden-tests/temp/ct_mc.adoc b/test-files/golden-tests/temp/ct_mc.adoc index 6a62d74307..ceeb2a718c 100644 --- a/test-files/golden-tests/temp/ct_mc.adoc +++ b/test-files/golden-tests/temp/ct_mc.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,8 +44,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -66,8 +68,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mc.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc index bfceba3937..c4c167c112 100644 --- a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mc_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,8 +44,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mc_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -66,8 +68,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mc_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/temp/ct_mct.adoc b/test-files/golden-tests/temp/ct_mct.adoc index f3b85148e7..ad17e5e538 100644 --- a/test-files/golden-tests/temp/ct_mct.adoc +++ b/test-files/golden-tests/temp/ct_mct.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,10 +44,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct B; ---- @@ -67,8 +69,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc index dfaa4852e6..d02753c7fc 100644 --- a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc +++ b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -34,7 +35,7 @@ struct A; | <<#A-B-07,`B`>> | -| <<#A-B-06,`B`>> +| <<#A-B-06,`B<int>`>> | |=== @@ -46,10 +47,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct B; ---- @@ -70,23 +72,25 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); ---- [#A-B-06] -== <<#A,A>>::B +== <<#A,A>>::B<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -struct <<#A-B-07,B>>; +template<> +struct <<#A-B-07,B>><int>; ---- === Member Functions @@ -102,12 +106,13 @@ struct <<#A-B-07,B>>; [#A-B-06-g] -== <<#A,A>>::<<#A-B-06,B>>::g +== <<#A,A>>::<<#A-B-06,B>><int>::g === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(); diff --git a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc index 5c2a16a9bc..7f45ca3c06 100644 --- a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,10 +44,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> struct B; ---- @@ -67,8 +69,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mct_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/temp/ct_mf.adoc b/test-files/golden-tests/temp/ct_mf.adoc index 8201cb9830..3be9a2b04d 100644 --- a/test-files/golden-tests/temp/ct_mf.adoc +++ b/test-files/golden-tests/temp/ct_mf.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mf.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,8 +44,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mf.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc index 834a77f48f..81f098de89 100644 --- a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mf_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,8 +44,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mf_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(); diff --git a/test-files/golden-tests/temp/ct_mft.adoc b/test-files/golden-tests/temp/ct_mft.adoc index 4ce25b3ddf..eb53658dd1 100644 --- a/test-files/golden-tests/temp/ct_mft.adoc +++ b/test-files/golden-tests/temp/ct_mft.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,10 +44,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> void f(); ---- diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc index 14d3f07f0d..d57898c036 100644 --- a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc +++ b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -42,21 +43,22 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> void <<#A-f-07,f>>(); ---- [.small]#<<#A-f-07,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#A-f-04,f>>(); +<<#A-f-04,f>><int>(); ---- [.small]#<<#A-f-04,_» more..._>># @@ -66,25 +68,27 @@ void === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> void f(); ---- [#A-f-04] -== <<#A,A>>::f +== <<#A,A>>::f<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft_expl_inline.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#A-f-07,f>>(); +<<#A-f-07,f>><int>(); ---- diff --git a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc index 699427d544..801a33689a 100644 --- a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc @@ -19,10 +19,11 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> struct A; ---- @@ -43,10 +44,11 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ct_mft_expl_outside.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename U> void f(); ---- diff --git a/test-files/golden-tests/temp/ft_expl.adoc b/test-files/golden-tests/temp/ft_expl.adoc index 1927801353..55daeb5c54 100644 --- a/test-files/golden-tests/temp/ft_expl.adoc +++ b/test-files/golden-tests/temp/ft_expl.adoc @@ -18,21 +18,22 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ft_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void <<#f-03,f>>(); ---- [.small]#<<#f-03,_» more..._>># -[source,cpp,subs="verbatim,macros,-callouts"] +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#f-0c,f>>(); +<<#f-0c,f>><int>(); ---- [.small]#<<#f-0c,_» more..._>># @@ -42,25 +43,27 @@ void === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ft_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> void f(); ---- [#f-0c] -== f +== f<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<temp/ft_expl.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> void -<<#f-03,f>>(); +<<#f-03,f>><int>(); ---- diff --git a/test-files/golden-tests/type-resolution.adoc b/test-files/golden-tests/type-resolution.adoc index 53d7c1bbdc..38d31dbcd7 100644 --- a/test-files/golden-tests/type-resolution.adoc +++ b/test-files/golden-tests/type-resolution.adoc @@ -172,8 +172,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -186,12 +187,13 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename T, - typename U> + typename U> struct B; ---- @@ -203,8 +205,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using C = <<#A,A>>; ---- @@ -214,10 +217,11 @@ using C = <<#A,A>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -using D = <<#B,B>>; +using D = <<#B,B>><short, long>; ---- [#E] @@ -225,11 +229,12 @@ using D = <<#B,B>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -using E = <<#B,B>>; +template<typename T> +using E = <<#B,B>><T, long>; ---- [#f0] @@ -237,8 +242,9 @@ using E = <<#B,B>>; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f0(<<#A,A>>); @@ -249,8 +255,9 @@ f0(<<#A,A>>); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f1(<<#A,A>> const); @@ -261,8 +268,9 @@ f1(<<#A,A>> const); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f2(<<#A,A>>&); @@ -273,8 +281,9 @@ f2(<<#A,A>>&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f3(<<#A,A>> const&); @@ -285,8 +294,9 @@ f3(<<#A,A>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f4(<<#A,A>>*); @@ -297,8 +307,9 @@ f4(<<#A,A>>*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f5(<<#A,A>> const*); @@ -309,8 +320,9 @@ f5(<<#A,A>> const*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f6(<<#A,A>>**); @@ -321,8 +333,9 @@ f6(<<#A,A>>**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f7(<<#A,A>> const**); @@ -333,8 +346,9 @@ f7(<<#A,A>> const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f8(<<#A,A>> const const**); @@ -345,8 +359,9 @@ f8(<<#A,A>> const const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g0(<<#C,C>>); @@ -357,8 +372,9 @@ g0(<<#C,C>>); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g1(<<#C,C>> const); @@ -369,8 +385,9 @@ g1(<<#C,C>> const); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g2(<<#C,C>>&); @@ -381,8 +398,9 @@ g2(<<#C,C>>&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g3(<<#C,C>> const&); @@ -393,8 +411,9 @@ g3(<<#C,C>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g4(<<#C,C>>*); @@ -405,8 +424,9 @@ g4(<<#C,C>>*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g5(<<#C,C>> const*); @@ -417,8 +437,9 @@ g5(<<#C,C>> const*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g6(<<#C,C>>**); @@ -429,8 +450,9 @@ g6(<<#C,C>>**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g7(<<#C,C>> const**); @@ -441,8 +463,9 @@ g7(<<#C,C>> const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g8(<<#C,C>> const const**); @@ -453,11 +476,12 @@ g8(<<#C,C>> const const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h0(<<#B,B>>); +h0(<<#B,B>><short, long>); ---- [#h1] @@ -465,11 +489,12 @@ h0(<<#B,B>>); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h1(<<#B,B>> const); +h1(<<#B,B>><short, long> const); ---- [#h2] @@ -477,11 +502,12 @@ h1(<<#B,B>> const); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h2(<<#B,B>>&); +h2(<<#B,B>><short, long>&); ---- [#h3] @@ -489,11 +515,12 @@ h2(<<#B,B>>&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h3(<<#B,B>> const&); +h3(<<#B,B>><short, long> const&); ---- [#h4] @@ -501,11 +528,12 @@ h3(<<#B,B>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h4(<<#B,B>>*); +h4(<<#B,B>><short, long>*); ---- [#h5] @@ -513,11 +541,12 @@ h4(<<#B,B>>*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h5(<<#B,B>> const*); +h5(<<#B,B>><short, long> const*); ---- [#h6] @@ -525,11 +554,12 @@ h5(<<#B,B>> const*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h6(<<#B,B>>**); +h6(<<#B,B>><short, long>**); ---- [#h7] @@ -537,11 +567,12 @@ h6(<<#B,B>>**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h7(<<#B,B>> const**); +h7(<<#B,B>><short, long> const**); ---- [#h8] @@ -549,11 +580,12 @@ h7(<<#B,B>> const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -h8(<<#B,B>> const const**); +h8(<<#B,B>><short, long> const const**); ---- [#i0] @@ -561,8 +593,9 @@ h8(<<#B,B>> const const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i0(<<#D,D>>); @@ -573,8 +606,9 @@ i0(<<#D,D>>); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i1(<<#D,D>> const); @@ -585,8 +619,9 @@ i1(<<#D,D>> const); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i2(<<#D,D>>&); @@ -597,8 +632,9 @@ i2(<<#D,D>>&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i3(<<#D,D>> const&); @@ -609,8 +645,9 @@ i3(<<#D,D>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i4(<<#D,D>>*); @@ -621,8 +658,9 @@ i4(<<#D,D>>*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i5(<<#D,D>> const*); @@ -633,8 +671,9 @@ i5(<<#D,D>> const*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i6(<<#D,D>>**); @@ -645,8 +684,9 @@ i6(<<#D,D>>**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i7(<<#D,D>> const**); @@ -657,8 +697,9 @@ i7(<<#D,D>> const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void i8(<<#D,D>> const const**); @@ -669,11 +710,12 @@ i8(<<#D,D>> const const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j0(<<#E,E>>); +j0(<<#E,E>><short>); ---- [#j1] @@ -681,11 +723,12 @@ j0(<<#E,E>>); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j1(<<#E,E>> const); +j1(<<#E,E>><short> const); ---- [#j2] @@ -693,11 +736,12 @@ j1(<<#E,E>> const); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j2(<<#E,E>>&); +j2(<<#E,E>><short>&); ---- [#j3] @@ -705,11 +749,12 @@ j2(<<#E,E>>&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j3(<<#E,E>> const&); +j3(<<#E,E>><short> const&); ---- [#j4] @@ -717,11 +762,12 @@ j3(<<#E,E>> const&); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j4(<<#E,E>>*); +j4(<<#E,E>><short>*); ---- [#j5] @@ -729,11 +775,12 @@ j4(<<#E,E>>*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j5(<<#E,E>> const*); +j5(<<#E,E>><short> const*); ---- [#j6] @@ -741,11 +788,12 @@ j5(<<#E,E>> const*); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j6(<<#E,E>>**); +j6(<<#E,E>><short>**); ---- [#j7] @@ -753,11 +801,12 @@ j6(<<#E,E>>**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j7(<<#E,E>> const**); +j7(<<#E,E>><short> const**); ---- [#j8] @@ -765,11 +814,12 @@ j7(<<#E,E>> const**); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<type‐resolution.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -j8(<<#E,E>> const const**); +j8(<<#E,E>><short> const const**); ---- diff --git a/test-files/golden-tests/union.adoc b/test-files/golden-tests/union.adoc index fd9dae78a7..237a583ad4 100644 --- a/test-files/golden-tests/union.adoc +++ b/test-files/golden-tests/union.adoc @@ -22,8 +22,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- union A; ---- @@ -48,8 +49,9 @@ union A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int x; ---- @@ -59,8 +61,9 @@ int x; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool y; ---- @@ -70,8 +73,9 @@ bool y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -99,8 +103,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int x; ---- @@ -110,8 +115,9 @@ int x; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool y; ---- @@ -121,8 +127,9 @@ bool y; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<union.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int z; ---- diff --git a/test-files/golden-tests/using-2.adoc b/test-files/golden-tests/using-2.adoc index 80e78c7e59..edd8ab6ed2 100644 --- a/test-files/golden-tests/using-2.adoc +++ b/test-files/golden-tests/using-2.adoc @@ -35,8 +35,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S1; ---- @@ -49,8 +50,9 @@ struct S1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct S2; ---- @@ -63,8 +65,9 @@ struct S2; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using <<#LongName,LongName>>::S1; ---- @@ -81,8 +84,9 @@ using <<#LongName,LongName>>::S1; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐2.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using <<#LongName,LongName>>::S2; ---- diff --git a/test-files/golden-tests/using-3.adoc b/test-files/golden-tests/using-3.adoc index 0bfddffe46..306517c9a6 100644 --- a/test-files/golden-tests/using-3.adoc +++ b/test-files/golden-tests/using-3.adoc @@ -25,8 +25,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct A; ---- @@ -48,8 +49,9 @@ struct A; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(int); @@ -60,8 +62,9 @@ f(int); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -83,8 +86,9 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(bool); @@ -95,8 +99,9 @@ f(bool); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct C : <<#A,A>> @@ -131,8 +136,9 @@ struct C === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using <<#A,A>>::f; ---- @@ -149,8 +155,9 @@ using <<#A,A>>::f; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<using‐3.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using <<#B,B>>::f; ---- diff --git a/test-files/golden-tests/utf-8.adoc b/test-files/golden-tests/utf-8.adoc index d6d28d2edf..c8f9e1561d 100644 --- a/test-files/golden-tests/utf-8.adoc +++ b/test-files/golden-tests/utf-8.adoc @@ -9,21 +9,22 @@ |=== | Name | Description -| <<#Христос_воскрес,`pass:[Христос_воскрес]`>> +| <<#Христос_воскрес,`Христос_воскрес`>> | |=== [#Христос_воскрес] -== pass:[Христос_воскрес] +== Христос_воскрес === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<utf‐8.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool -pass:[Христос_воскрес](); +Христос_воскрес(); ---- diff --git a/test-files/golden-tests/var-template.adoc b/test-files/golden-tests/var-template.adoc index 4aaace96ea..c6679fdd20 100644 --- a/test-files/golden-tests/var-template.adoc +++ b/test-files/golden-tests/var-template.adoc @@ -21,10 +21,10 @@ | <<#A-084,`A`>> | -| <<#A-08e,`A`>> +| <<#A-08e,`A<void>`>> | -| <<#A-01,`A`>> +| <<#A-01,`A<T&>`>> | |=== @@ -34,35 +34,38 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -unsigned int A = pass:[sizeof(T)]; +template<typename T> +unsigned int A = sizeof(T); ---- [#A-08e] -== A +== A<void> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> -unsigned int <<#A-084,A>> = 0; +template<> +unsigned int <<#A-084,A>><void> = 0; ---- [#A-01] -== A +== A<T&> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template -unsigned int <<#A-084,A>> = pass:[sizeof(T)]; +template<typename T> +unsigned int <<#A-084,A>><T&> = sizeof(T); ---- [#B] @@ -70,8 +73,9 @@ unsigned int <<#A-084,A>> = pass:[sizeof(T)]; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- struct B; ---- @@ -84,10 +88,10 @@ struct B; | <<#B-C-0e,`C`>> | -| <<#B-C-05,`C`>> +| <<#B-C-05,`C<int>`>> | -| <<#B-C-0c,`C`>> +| <<#B-C-0c,`C<T*>`>> | |=== @@ -99,38 +103,41 @@ struct B; === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> static unsigned int C = 0; ---- [#B-C-05] -== <<#B,B>>::C +== <<#B,B>>::C<int> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template<> +template<> static -unsigned int <<#B-C-0e,C>> = pass:[-1]; +unsigned int <<#B-C-0e,C>><int> = ‐1; ---- [#B-C-0c] -== <<#B,B>>::C +== <<#B,B>>::C<T*> === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<var‐template.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template +template<typename T> static -unsigned int <<#B-C-0e,C>> = pass:[sizeof(T)]; +unsigned int <<#B-C-0e,C>><T*> = sizeof(T); ---- diff --git a/test-files/golden-tests/variadic-function.adoc b/test-files/golden-tests/variadic-function.adoc index bffbdbb2e9..9147dd2a94 100644 --- a/test-files/golden-tests/variadic-function.adoc +++ b/test-files/golden-tests/variadic-function.adoc @@ -37,8 +37,9 @@ === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<variadic‐function.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using T = void(...); ---- @@ -48,8 +49,9 @@ using T = void(...); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<variadic‐function.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- using U = void(int, ...); ---- @@ -59,8 +61,9 @@ using U = void(int, ...); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<variadic‐function.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void f(...); @@ -71,8 +74,9 @@ f(...); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<variadic‐function.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void g(int, ...); @@ -83,12 +87,13 @@ g(int, ...); === Synopsis -Declared in `` -[source,cpp,subs="verbatim,macros,-callouts"] +Declared in `<variadic‐function.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- -template< +template< typename A = void(...), - typename B = void(int, ...)> + typename B = void(int, ...)> struct C; ----