diff --git a/include/mrdocs/Metadata/Info/Overloads.hpp b/include/mrdocs/Metadata/Info/Overloads.hpp index 7237b9bd1..7838463cd 100644 --- a/include/mrdocs/Metadata/Info/Overloads.hpp +++ b/include/mrdocs/Metadata/Info/Overloads.hpp @@ -12,7 +12,8 @@ #define MRDOCS_API_METADATA_OVERLOADS_HPP #include -#include +#include +#include namespace clang::mrdocs { @@ -41,7 +42,7 @@ struct OverloadsInfo final } explicit - OverloadsInfo(SymbolID const& Parent, std::string_view Name) noexcept; + OverloadsInfo(SymbolID const& Parent, std::string_view Name, AccessKind Access, bool isStatic) noexcept; }; MRDOCS_DECL diff --git a/include/mrdocs/Metadata/Javadoc.hpp b/include/mrdocs/Metadata/Javadoc.hpp index cf9b116bb..b00d249cb 100644 --- a/include/mrdocs/Metadata/Javadoc.hpp +++ b/include/mrdocs/Metadata/Javadoc.hpp @@ -891,6 +891,8 @@ struct Brief final : Paragraph operator=(text); } + Brief(Brief const& other) = default; + Brief& operator=(Brief const& other) = default; diff --git a/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp b/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp index 56a750734..c9cf05ebd 100644 --- a/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp +++ b/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp @@ -9,6 +9,7 @@ // #include "OverloadsFinalizer.hpp" +#include namespace clang::mrdocs { @@ -93,7 +94,7 @@ findBaseClassPermutation( void OverloadsFinalizer:: -foldOverloads(SymbolID const& contextId, std::vector& functionIds) +foldOverloads(SymbolID const& contextId, std::vector& functionIds, bool isStatic) { for (auto functionIdIt = functionIds.begin(); functionIdIt != functionIds.end(); @@ -153,7 +154,7 @@ foldOverloads(SymbolID const& contextId, std::vector& functionIds) // FunctionInfo is not unique and there's no equivalent // overload set in base classes, so we merge it with the // other FunctionInfos into a new OverloadsInfo - OverloadsInfo O(contextId, function->Name); + OverloadsInfo O(contextId, function->Name, function->Access, isStatic); addMember(O, *function); *functionIdIt = O.id; auto const itOffset = functionIdIt - functionIds.begin(); @@ -170,7 +171,7 @@ foldOverloads(SymbolID const& contextId, std::vector& functionIds) } } functionIdIt = functionIds.begin() + itOffset; - corpus_.info_.emplace(std::make_unique(std::move(O))); + MRDOCS_ASSERT(corpus_.info_.emplace(std::make_unique(std::move(O))).second); } } @@ -178,7 +179,7 @@ void OverloadsFinalizer:: operator()(NamespaceInfo& I) { - foldOverloads(I.id, I.Members.Functions); + foldOverloads(I.id, I.Members.Functions, true); foldRecordMembers(I.Members.Records); foldNamespaceMembers(I.Members.Namespaces); } @@ -203,12 +204,12 @@ operator()(RecordInfo& I) MRDOCS_CHECK_OR(baseRecord); operator()(*baseRecord); } - foldOverloads(I.id, I.Interface.Public.Functions); - foldOverloads(I.id, I.Interface.Protected.Functions); - foldOverloads(I.id, I.Interface.Private.Functions); - foldOverloads(I.id, I.Interface.Public.StaticFunctions); - foldOverloads(I.id, I.Interface.Protected.StaticFunctions); - foldOverloads(I.id, I.Interface.Private.StaticFunctions); + foldOverloads(I.id, I.Interface.Public.Functions, false); + foldOverloads(I.id, I.Interface.Protected.Functions, false); + foldOverloads(I.id, I.Interface.Private.Functions, false); + foldOverloads(I.id, I.Interface.Public.StaticFunctions, true); + foldOverloads(I.id, I.Interface.Protected.StaticFunctions, true); + foldOverloads(I.id, I.Interface.Private.StaticFunctions, true); foldRecordMembers(I.Interface.Public.Records); foldRecordMembers(I.Interface.Protected.Records); foldRecordMembers(I.Interface.Private.Records); diff --git a/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp b/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp index 98d5ae6fe..80f532dc0 100644 --- a/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp +++ b/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp @@ -38,7 +38,8 @@ class OverloadsFinalizer void foldOverloads( SymbolID const& contextId, - std::vector& functionIds); + std::vector& functionIds, + bool isStatic); public: OverloadsFinalizer(CorpusImpl& corpus) diff --git a/src/lib/Metadata/Info/Overloads.cpp b/src/lib/Metadata/Info/Overloads.cpp index ddebdd344..b76dfe695 100644 --- a/src/lib/Metadata/Info/Overloads.cpp +++ b/src/lib/Metadata/Info/Overloads.cpp @@ -21,10 +21,10 @@ namespace clang::mrdocs { OverloadsInfo:: -OverloadsInfo(SymbolID const& Parent, std::string_view Name) noexcept +OverloadsInfo(SymbolID const& Parent, std::string_view Name, AccessKind access, bool isStatic) noexcept : InfoCommonBase( SymbolID::createFromString( - fmt::format("{}-{}", toBase16(Parent), Name))) + fmt::format("{}-{}-{}-{}", toBase16(Parent), Name, toString(access), isStatic))) { this->Parent = Parent; } diff --git a/test-files/golden-tests/config/overloads/const-mutable.adoc b/test-files/golden-tests/config/overloads/const-mutable.adoc index ad248a2f1..28c5d65bd 100644 --- a/test-files/golden-tests/config/overloads/const-mutable.adoc +++ b/test-files/golden-tests/config/overloads/const-mutable.adoc @@ -30,11 +30,11 @@ class C; |=== | Name | Description -| <> +| <> | |=== -[#C-foo-01] +[#C-foo-0e] == <>::foo === Synopses diff --git a/test-files/golden-tests/config/overloads/const-mutable.html b/test-files/golden-tests/config/overloads/const-mutable.html index 08aa8ab4e..250a91c33 100644 --- a/test-files/golden-tests/config/overloads/const-mutable.html +++ b/test-files/golden-tests/config/overloads/const-mutable.html @@ -47,7 +47,7 @@

Member Functions

-foo +foo @@ -56,7 +56,7 @@

Member Functions

-

C::foo

+

C::foo

Synopses

diff --git a/test-files/golden-tests/config/overloads/visibility.adoc b/test-files/golden-tests/config/overloads/visibility.adoc new file mode 100644 index 000000000..aba2189fa --- /dev/null +++ b/test-files/golden-tests/config/overloads/visibility.adoc @@ -0,0 +1,308 @@ += Reference +:mrdocs: + +[#index] +== Global namespace + +=== Types + +[cols=1] +|=== +| Name +| <> +|=== + +[#C] +== C + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +class C; +---- + +=== Member Functions + +[cols=2] +|=== +| Name +| Description +| <> +| +|=== + +=== Static Member Functions + +[cols=2] +|=== +| Name +| Description +| <> +| +|=== + +=== Protected Member Functions + +[cols=2] +|=== +| Name +| Description +| <> +| +|=== + +=== Protected Static Member Functions + +[cols=2] +|=== +| Name +| Description +| <> +| +|=== + +[#C-foo-0e] +== <>::foo + +=== Synopses + +Declared in `<visibility.cpp>` + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +<>(); +---- + +[.small]#<># + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +<>(bool); +---- + +[.small]#<># + +[#C-foo-0b] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +foo(); +---- + +[#C-foo-06] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +foo(bool); +---- + +[#C-foo-03] +== <>::foo + +=== Synopses + +Declared in `<visibility.cpp>` + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +<>(int); +---- + +[.small]#<># + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +<>( + int, + bool); +---- + +[.small]#<># + +[#C-foo-0fc] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +foo(int); +---- + +[#C-foo-05] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +foo( + int, + bool); +---- + +[#C-foo-04c] +== <>::foo + +=== Synopses + +Declared in `<visibility.cpp>` + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +<>( + int, + int); +---- + +[.small]#<># + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +<>( + int, + int, + bool); +---- + +[.small]#<># + +[#C-foo-0a] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +foo( + int, + int); +---- + +[#C-foo-0c] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +int +foo( + int, + int, + bool); +---- + +[#C-foo-048] +== <>::foo + +=== Synopses + +Declared in `<visibility.cpp>` + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +<>( + int, + int, + int); +---- + +[.small]#<># + + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +<>( + int, + int, + int, + bool); +---- + +[.small]#<># + +[#C-foo-00] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +foo( + int, + int, + int); +---- + +[#C-foo-0f5] +== <>::foo + +=== Synopsis + +Declared in `<visibility.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +static +int +foo( + int, + int, + int, + bool); +---- + + +[.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/config/overloads/visibility.cpp b/test-files/golden-tests/config/overloads/visibility.cpp new file mode 100644 index 000000000..a0670026f --- /dev/null +++ b/test-files/golden-tests/config/overloads/visibility.cpp @@ -0,0 +1,17 @@ +class C { +public: + int foo(); + int foo(bool); + static int foo(int); + static int foo(int, bool); +protected: + int foo(int, int); + int foo(int, int, bool); + static int foo(int, int, int); + static int foo(int, int, int, bool); +private: + int foo(int, int, int, int); + int foo(int, int, int, int, bool); + static int foo(int, int, int, int, int); + static int foo(int, int, int, int, int, bool); +}; diff --git a/test-files/golden-tests/config/overloads/visibility.html b/test-files/golden-tests/config/overloads/visibility.html new file mode 100644 index 000000000..a185063a1 --- /dev/null +++ b/test-files/golden-tests/config/overloads/visibility.html @@ -0,0 +1,377 @@ + + +Reference + + +
+

Reference

+
+
+

Global namespace

+
+

Types

+ + + + + + + + + + +
Name
C
+ +
+
+
+

C

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+class C;
+
+
+
+

Member Functions

+ + + + + + + + + + + +
NameDescription
foo
+ +

Static Member Functions

+ + + + + + + + + + + +
NameDescription
foo
+ + +

Protected Member Functions

+ + + + + + + + + + + +
NameDescription
foo
+ +

Protected Static Member Functions

+ + + + + + + + + + + +
NameDescription
foo
+ + +
+
+
+

C::foo

+
+
+

Synopses

+
+Declared in <visibility.cpp>
+ +
+
+int
+foo();
+
+
» more... + + +
+
+int
+foo(bool);
+
+
» more... + + +
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+int
+foo();
+
+
+
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+int
+foo(bool);
+
+
+
+
+
+
+

C::foo

+
+
+

Synopses

+
+Declared in <visibility.cpp>
+ +
+
+static
+int
+foo(int);
+
+
» more... + + +
+
+static
+int
+foo(
+    int,
+    bool);
+
+
» more... + + +
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+static
+int
+foo(int);
+
+
+
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+static
+int
+foo(
+    int,
+    bool);
+
+
+
+
+
+
+

C::foo

+
+
+

Synopses

+
+Declared in <visibility.cpp>
+ +
+
+int
+foo(
+    int,
+    int);
+
+
» more... + + +
+
+int
+foo(
+    int,
+    int,
+    bool);
+
+
» more... + + +
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+int
+foo(
+    int,
+    int);
+
+
+
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+int
+foo(
+    int,
+    int,
+    bool);
+
+
+
+
+
+
+

C::foo

+
+
+

Synopses

+
+Declared in <visibility.cpp>
+ +
+
+static
+int
+foo(
+    int,
+    int,
+    int);
+
+
» more... + + +
+
+static
+int
+foo(
+    int,
+    int,
+    int,
+    bool);
+
+
» more... + + +
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+static
+int
+foo(
+    int,
+    int,
+    int);
+
+
+
+
+
+
+

C::foo

+
+
+

Synopsis

+
+Declared in <visibility.cpp>
+
+
+static
+int
+foo(
+    int,
+    int,
+    int,
+    bool);
+
+
+
+
+ +
+
+

Created with MrDocs

+
+ + \ No newline at end of file diff --git a/test-files/golden-tests/config/overloads/visibility.xml b/test-files/golden-tests/config/overloads/visibility.xml new file mode 100644 index 000000000..db361111e --- /dev/null +++ b/test-files/golden-tests/config/overloads/visibility.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test-files/golden-tests/config/sort/sort-members.adoc b/test-files/golden-tests/config/sort/sort-members.adoc index 6380cc0cf..e68aedcd9 100644 --- a/test-files/golden-tests/config/sort/sort-members.adoc +++ b/test-files/golden-tests/config/sort/sort-members.adoc @@ -28,7 +28,7 @@ | Description | <> | -| <> +| <> | | <> | @@ -413,7 +413,7 @@ void f(); ---- -[#g-0d] +[#g-0f] == g === Synopses diff --git a/test-files/golden-tests/config/sort/sort-members.html b/test-files/golden-tests/config/sort/sort-members.html index 7b0c89fc5..872608ad1 100644 --- a/test-files/golden-tests/config/sort/sort-members.html +++ b/test-files/golden-tests/config/sort/sort-members.html @@ -41,7 +41,7 @@

Functions

f -g +g h operator! Negation operator operator== Equality operator @@ -541,7 +541,7 @@

Synopsis

-

g

+

g

Synopses

diff --git a/test-files/golden-tests/config/sort/unordered.adoc b/test-files/golden-tests/config/sort/unordered.adoc index 19af77771..679a6ac0a 100644 --- a/test-files/golden-tests/config/sort/unordered.adoc +++ b/test-files/golden-tests/config/sort/unordered.adoc @@ -34,7 +34,7 @@ | Negation operator | <> | -| <> +| <> | | <> | @@ -508,7 +508,7 @@ void h(); ---- -[#g-0d] +[#g-0f] == g === Synopses diff --git a/test-files/golden-tests/config/sort/unordered.html b/test-files/golden-tests/config/sort/unordered.html index eff927bd9..63ffee98f 100644 --- a/test-files/golden-tests/config/sort/unordered.html +++ b/test-files/golden-tests/config/sort/unordered.html @@ -44,7 +44,7 @@

Functions

operator== Equality operator operator! Negation operator h -g +g f @@ -676,7 +676,7 @@

Synopsis

-

g

+

g

Synopses

diff --git a/test-files/golden-tests/javadoc/brief/brief-3.adoc b/test-files/golden-tests/javadoc/brief/brief-3.adoc index 4c2c6ebbc..7c8a14746 100644 --- a/test-files/golden-tests/javadoc/brief/brief-3.adoc +++ b/test-files/golden-tests/javadoc/brief/brief-3.adoc @@ -10,11 +10,11 @@ |=== | Name | Description -| <> +| <> | `f` overloads |=== -[#f-0e] +[#f-0c] == f `f` overloads diff --git a/test-files/golden-tests/javadoc/brief/brief-3.html b/test-files/golden-tests/javadoc/brief/brief-3.html index 8c830249a..e8bf1c3dc 100644 --- a/test-files/golden-tests/javadoc/brief/brief-3.html +++ b/test-files/golden-tests/javadoc/brief/brief-3.html @@ -19,14 +19,14 @@

Functions

-f f overloads +f f overloads
-

f

+

f

f overloads diff --git a/test-files/golden-tests/javadoc/copydoc/conversion.adoc b/test-files/golden-tests/javadoc/copydoc/conversion.adoc index d60ca0837..7ccebe57b 100644 --- a/test-files/golden-tests/javadoc/copydoc/conversion.adoc +++ b/test-files/golden-tests/javadoc/copydoc/conversion.adoc @@ -32,7 +32,7 @@ struct A; |=== | Name | Description -| <> +| <> | Convert a string to A | <> | Convert A to a string @@ -40,7 +40,7 @@ struct A; | Convert A to a string |=== -[#A-operator_assign-0d] +[#A-operator_assign-04] == <>::operator= Convert a string to A diff --git a/test-files/golden-tests/javadoc/copydoc/conversion.html b/test-files/golden-tests/javadoc/copydoc/conversion.html index 63baebec1..b7fa52399 100644 --- a/test-files/golden-tests/javadoc/copydoc/conversion.html +++ b/test-files/golden-tests/javadoc/copydoc/conversion.html @@ -49,7 +49,7 @@

Member Functions

-operator= Convert a string to A +operator= Convert a string to A operator string_type Convert A to a string operator string_view_type Convert A to a string @@ -60,7 +60,7 @@

Member Functions

-

A::operator=

+

A::operator=

Convert a string to A diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.adoc b/test-files/golden-tests/javadoc/copydoc/decay-params.adoc index 5f4304296..2fcd07260 100644 --- a/test-files/golden-tests/javadoc/copydoc/decay-params.adoc +++ b/test-files/golden-tests/javadoc/copydoc/decay-params.adoc @@ -12,7 +12,7 @@ | Description | <> | Brief from `foo()` -| <> +| <> | `foo` overloads |=== @@ -50,7 +50,7 @@ A boolean value. | An array of integers. |=== -[#foo-05] +[#foo-02] == foo `foo` overloads diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.html b/test-files/golden-tests/javadoc/copydoc/decay-params.html index b0a0104f1..aca5e0a3d 100644 --- a/test-files/golden-tests/javadoc/copydoc/decay-params.html +++ b/test-files/golden-tests/javadoc/copydoc/decay-params.html @@ -20,7 +20,7 @@

Functions

bar Brief from foo() -foo foo overloads +foo foo overloads @@ -73,7 +73,7 @@

Parameters

-

foo

+

foo

foo overloads diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.adoc b/test-files/golden-tests/javadoc/copydoc/fundamental.adoc index 415c03290..ad0d02bcc 100644 --- a/test-files/golden-tests/javadoc/copydoc/fundamental.adoc +++ b/test-files/golden-tests/javadoc/copydoc/fundamental.adoc @@ -10,7 +10,7 @@ |=== | Name | Description -| <> +| <> | `f` overloads | <> | Brief @@ -18,7 +18,7 @@ | Brief |=== -[#f-0e] +[#f-0c] == f `f` overloads diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.html b/test-files/golden-tests/javadoc/copydoc/fundamental.html index 03701bd76..eea42604f 100644 --- a/test-files/golden-tests/javadoc/copydoc/fundamental.html +++ b/test-files/golden-tests/javadoc/copydoc/fundamental.html @@ -19,7 +19,7 @@

Functions

-f f overloads +f f overloads g Brief h Brief @@ -28,7 +28,7 @@

Functions

-

f

+

f

f overloads diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.adoc b/test-files/golden-tests/javadoc/copydoc/no-param.adoc index 4932c35ef..d7070d62f 100644 --- a/test-files/golden-tests/javadoc/copydoc/no-param.adoc +++ b/test-files/golden-tests/javadoc/copydoc/no-param.adoc @@ -14,7 +14,7 @@ | Brief from `foo()` | <> | Brief from `foo()` -| <> +| <> | Brief from `foo()` |=== @@ -68,7 +68,7 @@ This documentation is copied from the page containing all overloads of foo&perio A boolean value. -[#foo-05] +[#foo-02] == foo Brief from `foo()` diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.html b/test-files/golden-tests/javadoc/copydoc/no-param.html index 6ee4e554c..3521a469e 100644 --- a/test-files/golden-tests/javadoc/copydoc/no-param.html +++ b/test-files/golden-tests/javadoc/copydoc/no-param.html @@ -21,7 +21,7 @@

Functions

copyFromNoParam Brief from foo() copyfromOverloads Brief from foo() -foo Brief from foo() +foo Brief from foo() @@ -87,7 +87,7 @@

Return Value

-

foo

+

foo

Brief from foo() diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.adoc b/test-files/golden-tests/javadoc/copydoc/operator-param.adoc index 431431229..85702c89e 100644 --- a/test-files/golden-tests/javadoc/copydoc/operator-param.adoc +++ b/test-files/golden-tests/javadoc/copydoc/operator-param.adoc @@ -30,11 +30,11 @@ struct A; |=== | Name | Description -| <> +| <> | Return true if ch is in the character set. |=== -[#A-operator_call-0d] +[#A-operator_call-08] == <>::operator() Return true if ch is in the character set. diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.html b/test-files/golden-tests/javadoc/copydoc/operator-param.html index 6cba679b3..0a4a08ff2 100644 --- a/test-files/golden-tests/javadoc/copydoc/operator-param.html +++ b/test-files/golden-tests/javadoc/copydoc/operator-param.html @@ -47,7 +47,7 @@

Member Functions

-operator() Return true if ch is in the character set. +operator() Return true if ch is in the character set. @@ -56,7 +56,7 @@

Member Functions

-

A::operator()

+

A::operator()

Return true if ch is in the character set. diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.adoc b/test-files/golden-tests/javadoc/copydoc/param-types.adoc index 373e69a31..2e4790f66 100644 --- a/test-files/golden-tests/javadoc/copydoc/param-types.adoc +++ b/test-files/golden-tests/javadoc/copydoc/param-types.adoc @@ -42,9 +42,9 @@ |=== | Name | Description -| <> +| <> | `f` overloads -| <> +| <> | `g` overloads |=== @@ -239,7 +239,7 @@ struct paramType; | Reference function. | <> | struct param function -| <> +| <> | Non‐variadic function |=== @@ -265,7 +265,7 @@ enum testEnum; | Enum param function |=== -[#f-0e] +[#f-0c7] == f `f` overloads @@ -324,10 +324,10 @@ Non‐variadic function [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -<>(<><3> a); +<>(<><3> a); ---- -[.small]#<># +[.small]#<># struct param function @@ -506,7 +506,7 @@ This reference uses the `...` keyword. | The first parameter of g |=== -[#f-0c] +[#f-0c1] == f Non‐variadic function @@ -692,7 +692,7 @@ This reference uses the qualified identifier `N::M::Q`&p | The first parameter of g |=== -[#g-0d] +[#g-0f] == g `g` overloads diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.html b/test-files/golden-tests/javadoc/copydoc/param-types.html index 6eaa6b2d8..79c8b93c9 100644 --- a/test-files/golden-tests/javadoc/copydoc/param-types.html +++ b/test-files/golden-tests/javadoc/copydoc/param-types.html @@ -62,8 +62,8 @@

Functions

-f f overloads -g g overloads +f f overloads +g g overloads @@ -327,7 +327,7 @@

Non-Member Functions

fQualified identifier param function fReference function. fstruct param function -fNon-variadic function +fNon-variadic function
@@ -376,7 +376,7 @@

Non-Member Functions

-

f

+

f

f overloads @@ -422,9 +422,9 @@

Synopses

 
 void
-f(paramType<3> a);
+f(paramType<3> a);
 
-
» more... +» more... struct param function 
@@ -638,7 +638,7 @@ 
Parameters
-

f

+

f

Non-variadic function @@ -890,7 +890,7 @@

Parameters

-

g

+

g

g overloads diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.adoc b/test-files/golden-tests/javadoc/copydoc/qualified.adoc index f79c798bf..630b6a353 100644 --- a/test-files/golden-tests/javadoc/copydoc/qualified.adoc +++ b/test-files/golden-tests/javadoc/copydoc/qualified.adoc @@ -61,9 +61,9 @@ struct A; | Description | <> | Reference function -| <> +| <> | `g` overloads -| <> +| <> | `h` overloads |=== @@ -418,7 +418,7 @@ Documentation for the reference function | Qualified param |=== -[#N-A-g-0d] +[#N-A-g-06e] == <>::<>::g `g` overloads @@ -444,10 +444,10 @@ Fail [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- void -<>(int a); +<>(int a); ---- -[.small]#<># +[.small]#<># === Parameters @@ -488,7 +488,7 @@ Documentation for the reference function | Qualified param |=== -[#N-A-g-06] +[#N-A-g-06c] == <>::<>::g Fail @@ -517,7 +517,7 @@ Function with same number of parameters but different types. This should | Fundamental type parameter |=== -[#N-A-h-0b] +[#N-A-h-05] == <>::<>::h `h` overloads diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.html b/test-files/golden-tests/javadoc/copydoc/qualified.html index e87d4d356..94962f04c 100644 --- a/test-files/golden-tests/javadoc/copydoc/qualified.html +++ b/test-files/golden-tests/javadoc/copydoc/qualified.html @@ -93,8 +93,8 @@

Member Functions

f Reference function -g g overloads -h h overloads +g g overloads +h h overloads @@ -544,7 +544,7 @@

Parameters

-

N::A::g

+

N::A::g

g overloads @@ -566,9 +566,9 @@

Synopses

 
 void
-g(int a);
+g(int a);
 
-
» more... +» more...
@@ -633,7 +633,7 @@

Parameters

-

N::A::g

+

N::A::g

Fail @@ -674,7 +674,7 @@

Parameters

-

N::A::h

+

N::A::h

h overloads diff --git a/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc b/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc index 4c72d0959..567ab5c9f 100644 --- a/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc +++ b/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc @@ -39,13 +39,13 @@ struct A; |=== | Name | Description -| <> +| <> | `begin` overloads | <> | Return a const iterator to the beginning | <> | An const rvalue reference to A -| <> +| <> | `ref` overloads | <> | An rvalue reference to A @@ -75,7 +75,7 @@ Declared in `<qualifiers.cpp>` class iterator; ---- -[#A-begin-05] +[#A-begin-03] == <>::begin `begin` overloads @@ -199,7 +199,7 @@ crvalue() const &&; A reference to A -[#A-ref-0f] +[#A-ref-05f] == <>::ref `ref` overloads @@ -214,10 +214,10 @@ An lvalue reference to A [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <>& -<>() &; +<>() &; ---- -[.small]#<># +[.small]#<># An rvalue reference to A @@ -256,7 +256,7 @@ An const rvalue reference to A A reference to A -[#A-ref-05] +[#A-ref-051] == <>::ref An lvalue reference to A diff --git a/test-files/golden-tests/javadoc/copydoc/qualifiers.html b/test-files/golden-tests/javadoc/copydoc/qualifiers.html index 423d4af62..d9cb10a8a 100644 --- a/test-files/golden-tests/javadoc/copydoc/qualifiers.html +++ b/test-files/golden-tests/javadoc/copydoc/qualifiers.html @@ -61,10 +61,10 @@

Member Functions

-begin begin overloads +begin begin overloads cbegin Return a const iterator to the beginning crvalue An const rvalue reference to A -ref ref overloads +ref ref overloads rvalue An rvalue reference to A @@ -108,7 +108,7 @@

Synopsis

-

A::begin

+

A::begin

begin overloads @@ -254,7 +254,7 @@

Return Value

-

A::ref

+

A::ref

ref overloads @@ -268,9 +268,9 @@

Synopses

 
 A&
-ref() &;
+ref() &;
 
-
» more... +» more... An rvalue reference to A 
@@ -305,7 +305,7 @@ 
Return Value
-

A::ref

+

A::ref

An lvalue reference to A diff --git a/test-files/golden-tests/symbols/concept/requires-clause.adoc b/test-files/golden-tests/symbols/concept/requires-clause.adoc index 1080b821c..47894da1b 100644 --- a/test-files/golden-tests/symbols/concept/requires-clause.adoc +++ b/test-files/golden-tests/symbols/concept/requires-clause.adoc @@ -21,7 +21,7 @@ | Description | <> | -| <> +| <> | |=== @@ -68,7 +68,7 @@ f() requires (sizeof(U) == 2); ---- -[#g-0d] +[#g-0f] == g === Synopses diff --git a/test-files/golden-tests/symbols/concept/requires-clause.html b/test-files/golden-tests/symbols/concept/requires-clause.html index 8524db85b..37edf9263 100644 --- a/test-files/golden-tests/symbols/concept/requires-clause.html +++ b/test-files/golden-tests/symbols/concept/requires-clause.html @@ -34,7 +34,7 @@

Functions

f -g +g @@ -97,7 +97,7 @@

Synopsis

-

g

+

g

Synopses

diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.adoc b/test-files/golden-tests/symbols/function/explicit-ctor.adoc index 9e7a5bbd9..e17fa4404 100644 --- a/test-files/golden-tests/symbols/function/explicit-ctor.adoc +++ b/test-files/golden-tests/symbols/function/explicit-ctor.adoc @@ -33,11 +33,11 @@ struct Explicit; |=== | Name | Description -| <> [.small]#[constructor]# +| <> [.small]#[constructor]# | Constructors |=== -[#Explicit-2constructor-08] +[#Explicit-2constructor-04] == <>::Explicit Constructors @@ -193,11 +193,11 @@ struct ExplicitExpression; |=== | Name | Description -| <> [.small]#[constructor]# +| <> [.small]#[constructor]# | Constructors |=== -[#ExplicitExpression-2constructor-026] +[#ExplicitExpression-2constructor-07] == <>::ExplicitExpression Constructors @@ -245,12 +245,12 @@ Constructor [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit(B) -<>( +<>( int, int); ---- -[.small]#<># +[.small]#<># [#ExplicitExpression-2constructor-0b] == <>::ExplicitExpression @@ -317,7 +317,7 @@ ExplicitExpression(<>&& other) noexcept; | The object to move construct from |=== -[#ExplicitExpression-2constructor-027] +[#ExplicitExpression-2constructor-02] == <>::ExplicitExpression Constructor @@ -352,11 +352,11 @@ struct ExplicitFalse; |=== | Name | Description -| <> [.small]#[constructor]# +| <> [.small]#[constructor]# | Constructors |=== -[#ExplicitFalse-2constructor-04c] +[#ExplicitFalse-2constructor-07] == <>::ExplicitFalse Constructors @@ -404,12 +404,12 @@ Constructor [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- explicit(false) -<>( +<>( int, int); ---- -[.small]#<># +[.small]#<># [#ExplicitFalse-2constructor-01] == <>::ExplicitFalse @@ -476,7 +476,7 @@ ExplicitFalse(<>&& other) noexcept; | The object to move construct from |=== -[#ExplicitFalse-2constructor-04f] +[#ExplicitFalse-2constructor-04] == <>::ExplicitFalse Constructor @@ -511,11 +511,11 @@ struct ExplicitTrue; |=== | Name | Description -| <> [.small]#[constructor]# +| <> [.small]#[constructor]# | Constructors |=== -[#ExplicitTrue-2constructor-0f] +[#ExplicitTrue-2constructor-01] == <>::ExplicitTrue Constructors diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.html b/test-files/golden-tests/symbols/function/explicit-ctor.html index ff2e4841f..9ca9c4295 100644 --- a/test-files/golden-tests/symbols/function/explicit-ctor.html +++ b/test-files/golden-tests/symbols/function/explicit-ctor.html @@ -50,7 +50,7 @@

Member Functions

-Explicit [constructor]Constructors +Explicit [constructor]Constructors @@ -59,7 +59,7 @@

Member Functions

-

Explicit::Explicit

+

Explicit::Explicit

Constructors @@ -247,7 +247,7 @@

Member Functions

-ExplicitExpression [constructor]Constructors +ExplicitExpression [constructor]Constructors @@ -256,7 +256,7 @@

Member Functions

-

ExplicitExpression::ExplicitExpression

+

ExplicitExpression::ExplicitExpression

Constructors @@ -294,11 +294,11 @@

Synopses

 
 explicit(B)
-ExplicitExpression(
+ExplicitExpression(
     int,
     int);
 
-
» more... +» more...
@@ -399,7 +399,7 @@

Parameters

-

ExplicitExpression::ExplicitExpression

+

ExplicitExpression::ExplicitExpression

Constructor @@ -443,7 +443,7 @@

Member Functions

-ExplicitFalse [constructor]Constructors +ExplicitFalse [constructor]Constructors @@ -452,7 +452,7 @@

Member Functions

-

ExplicitFalse::ExplicitFalse

+

ExplicitFalse::ExplicitFalse

Constructors @@ -490,11 +490,11 @@

Synopses

 
 explicit(false)
-ExplicitFalse(
+ExplicitFalse(
     int,
     int);
 
-
» more... +» more...
@@ -595,7 +595,7 @@

Parameters

-

ExplicitFalse::ExplicitFalse

+

ExplicitFalse::ExplicitFalse

Constructor @@ -639,7 +639,7 @@

Member Functions

-ExplicitTrue [constructor]Constructors +ExplicitTrue [constructor]Constructors @@ -648,7 +648,7 @@

Member Functions

-

ExplicitTrue::ExplicitTrue

+

ExplicitTrue::ExplicitTrue

Constructors diff --git a/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc b/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc index 2cc2e1b7d..39f29fd94 100644 --- a/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc +++ b/test-files/golden-tests/symbols/function/explicit-object-parameter.adoc @@ -30,11 +30,11 @@ struct Optional; |=== | Name | Description -| <> +| <> | |=== -[#Optional-value-01] +[#Optional-value-0c] == <>::value === Synopses diff --git a/test-files/golden-tests/symbols/function/explicit-object-parameter.html b/test-files/golden-tests/symbols/function/explicit-object-parameter.html index 8251983e2..f07612c49 100644 --- a/test-files/golden-tests/symbols/function/explicit-object-parameter.html +++ b/test-files/golden-tests/symbols/function/explicit-object-parameter.html @@ -47,7 +47,7 @@

Member Functions

-value +value @@ -56,7 +56,7 @@

Member Functions

-

Optional::value

+

Optional::value

Synopses

diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc index d2bcd9788..f18f3fbd4 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc @@ -22,11 +22,11 @@ |=== | Name | Description -| <> +| <> | `no_way_to_infer_this_brief` overloads -| <> +| <> | Unary plus operators -| <> +| <> | Function with same brief |=== @@ -50,13 +50,13 @@ struct A; |=== | Name | Description -| <> [.small]#[constructor]# +| <> [.small]#[constructor]# | Constructors -| <> +| <> | Assignment operators -| <> +| <> | Addition operators -| <> +| <> | Unary minus operators |=== @@ -66,11 +66,11 @@ struct A; |=== | Name | Description -| <> +| <> | Unary operator for A |=== -[#A-2constructor-08] +[#A-2constructor-0f] == <>::A Constructors @@ -147,7 +147,7 @@ A(int a); | Describe a |=== -[#A-operator_assign-0d] +[#A-operator_assign-04c] == <>::operator= Assignment operators @@ -162,10 +162,10 @@ Assign from A [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- <>& -<>(<> const& a); +<>(<> const& a); ---- -[.small]#<># +[.small]#<># Assign from int @@ -192,7 +192,7 @@ Assign from int | Describe a |=== -[#A-operator_assign-04] +[#A-operator_assign-045] == <>::operator= Assign from A @@ -250,7 +250,7 @@ operator=(int a); | Describe b |=== -[#A-operator_plus-07] +[#A-operator_plus-00] == <>::operator+ Addition operators @@ -353,7 +353,7 @@ operator+(<> const& a); | Describe a |=== -[#A-operator_minus-0a] +[#A-operator_minus-09] == <>::operator‐ Unary minus operators @@ -468,7 +468,7 @@ struct B; | Unary operator for B |=== -[#no_way_to_infer_this_brief-0e] +[#no_way_to_infer_this_brief-04] == no_way_to_infer_this_brief `no_way_to_infer_this_brief` overloads @@ -549,7 +549,7 @@ no_way_to_infer_this_brief(int a); | Describe a |=== -[#operator_plus-0dd] +[#operator_plus-09] == operator+ Unary plus operators @@ -564,10 +564,10 @@ Unary operator for A [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- int -<>(<> const& value); +<>(<> const& value); ---- -[.small]#<># +[.small]#<># Unary operator for B @@ -584,7 +584,7 @@ int Result -[#operator_plus-0d7] +[#operator_plus-0d] == operator+ Unary operator for A @@ -642,7 +642,7 @@ Result | The operand |=== -[#sameBrief-08] +[#sameBrief-07] == sameBrief Function with same brief diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.html b/test-files/golden-tests/symbols/overloads/overloads-brief.html index 7ab23146b..d9e187f80 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-brief.html +++ b/test-files/golden-tests/symbols/overloads/overloads-brief.html @@ -34,9 +34,9 @@

Functions

-no_way_to_infer_this_brief no_way_to_infer_this_brief overloads -operator+ Unary plus operators -sameBrief Function with same brief +no_way_to_infer_this_brief no_way_to_infer_this_brief overloads +operator+ Unary plus operators +sameBrief Function with same brief @@ -69,10 +69,10 @@

Member Functions

-A [constructor]Constructors -operator= Assignment operators -operator+ Addition operators -operator- Unary minus operators +A [constructor]Constructors +operator= Assignment operators +operator+ Addition operators +operator- Unary minus operators @@ -88,14 +88,14 @@

Non-Member Functions

-operator+Unary operator for A +operator+Unary operator for A
-

A::A

+

A::A

Constructors @@ -196,7 +196,7 @@

Parameters

-

A::operator=

+

A::operator=

Assignment operators @@ -210,9 +210,9 @@

Synopses

 
 A&
-operator=(A const& a);
+operator=(A const& a);
 
-
» more... +» more... Assign from int 
@@ -248,7 +248,7 @@ 
Parameters
-

A::operator=

+

A::operator=

Assign from A @@ -330,7 +330,7 @@

Parameters

-

A::operator+

+

A::operator+

Addition operators @@ -464,7 +464,7 @@

Parameters

-

A::operator-

+

A::operator-

Unary minus operators @@ -607,7 +607,7 @@

Non-Member Functions

-

no_way_to_infer_this_brief

+

no_way_to_infer_this_brief

no_way_to_infer_this_brief overloads @@ -712,7 +712,7 @@

Parameters

-

operator+

+

operator+

Unary plus operators @@ -726,9 +726,9 @@

Synopses

 
 int
-operator+(A const& value);
+operator+(A const& value);
 
-
» more... +» more... Unary operator for B 
@@ -747,7 +747,7 @@ 
Return Value
-

operator+

+

operator+

Unary operator for A @@ -829,7 +829,7 @@

Parameters

-

sameBrief

+

sameBrief

Function with same brief diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc index 1a19930de..b2d8d36fc 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc @@ -10,11 +10,11 @@ |=== | Name | Description -| <> +| <> | Test function |=== -[#f-0e] +[#f-0c] == f Test function diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.html b/test-files/golden-tests/symbols/overloads/overloads-metadata.html index 207e3ce86..271f52469 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-metadata.html +++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.html @@ -19,14 +19,14 @@

Functions

-f Test function +f Test function
-

f

+

f

Test function diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc index 0234a6459..3c260703c 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc @@ -50,11 +50,11 @@ class A; |=== | Name | Description -| <> +| <> | Left shift operators |=== -[#left_shift-A-operator_lshift-06] +[#left_shift-A-operator_lshift-00] == <>::<>::operator<< Left shift operators diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.html b/test-files/golden-tests/symbols/overloads/overloads-ostream.html index df15b86d8..1e6eceda1 100644 --- a/test-files/golden-tests/symbols/overloads/overloads-ostream.html +++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.html @@ -79,7 +79,7 @@

Member Functions

-operator<< Left shift operators +operator<< Left shift operators @@ -88,7 +88,7 @@

Member Functions

-

left_shift::A::operator<<

+

left_shift::A::operator<<

Left shift operators diff --git a/test-files/golden-tests/symbols/overloads/overloads.adoc b/test-files/golden-tests/symbols/overloads/overloads.adoc index 67e48efe2..f853c2b90 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.adoc +++ b/test-files/golden-tests/symbols/overloads/overloads.adoc @@ -19,9 +19,9 @@ |=== | Name | Description -| <> +| <> | -| <> +| <> | Equality operators |=== @@ -43,7 +43,7 @@ struct A; |=== | Name | Description -| <> +| <> | |=== @@ -53,7 +53,7 @@ struct A; |=== | Name | Description -| <> +| <> | |=== @@ -69,7 +69,7 @@ struct A; | Equality operator |=== -[#A-f-00] +[#A-f-07] == <>::f === Synopses @@ -120,7 +120,7 @@ int f(int); ---- -[#A-g-0e] +[#A-g-0d] == <>::g === Synopses @@ -187,7 +187,7 @@ Declared in `<overloads.cpp>` struct B; ---- -[#f-0e] +[#f-0c] == f === Synopses @@ -238,7 +238,7 @@ int f(int); ---- -[#operator_eq-0d] +[#operator_eq-073] == operator== Equality operators @@ -292,12 +292,12 @@ Equality operator [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- bool -<>( +<>( <> lhs, int rhs); ---- -[.small]#<># +[.small]#<># [#operator_eq-0e] == operator== @@ -398,7 +398,7 @@ operator==( | The right operand |=== -[#operator_eq-07] +[#operator_eq-071] == operator== Equality operator diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html index 037b790b0..1581e845e 100644 --- a/test-files/golden-tests/symbols/overloads/overloads.html +++ b/test-files/golden-tests/symbols/overloads/overloads.html @@ -33,8 +33,8 @@

Functions

-f -operator== Equality operators +f +operator== Equality operators @@ -63,7 +63,7 @@

Member Functions

-f +f @@ -77,7 +77,7 @@

Static Member Functions

-g +g @@ -108,7 +108,7 @@

Friends

-

A::f

+

A::f

Synopses

@@ -167,7 +167,7 @@

Synopsis

-

A::g

+

A::g

Synopses

@@ -247,7 +247,7 @@

Synopsis

-

f

+

f

Synopses

@@ -306,7 +306,7 @@

Synopsis

-

operator==

+

operator==

Equality operators @@ -350,11 +350,11 @@

Synopses

 
 bool
-operator==(
+operator==(
     B lhs,
     int rhs);
 
-
» more... +» more...
@@ -502,7 +502,7 @@

Parameters

-

operator==

+

operator==

Equality operator diff --git a/test-files/golden-tests/symbols/using/using-3.adoc b/test-files/golden-tests/symbols/using/using-3.adoc index ce2e10584..db64e76a6 100644 --- a/test-files/golden-tests/symbols/using/using-3.adoc +++ b/test-files/golden-tests/symbols/using/using-3.adoc @@ -132,7 +132,7 @@ struct C |=== | Name | Description -| <> +| <> | |=== @@ -141,11 +141,11 @@ struct C [cols=1] |=== | Name -| <> +| <> | <> |=== -[#C-f-082] +[#C-f-0e] == <>::f === Synopses @@ -196,7 +196,7 @@ void f(int); ---- -[#C-f-081] +[#C-f-08] == <>::f === Synopsis diff --git a/test-files/golden-tests/symbols/using/using-3.html b/test-files/golden-tests/symbols/using/using-3.html index 64e13e8ef..a57328b96 100644 --- a/test-files/golden-tests/symbols/using/using-3.html +++ b/test-files/golden-tests/symbols/using/using-3.html @@ -188,7 +188,7 @@

Member Functions

-f +f @@ -201,7 +201,7 @@

Using Declarations

-f +f f @@ -211,7 +211,7 @@

Using Declarations

-

C::f

+

C::f

Synopses

@@ -270,7 +270,7 @@

Synopsis

-

C::f

+

C::f

Synopsis

diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.adoc b/test-files/golden-tests/templates/c_mft_expl_inline.adoc index 1d832424e..56dc51a8a 100644 --- a/test-files/golden-tests/templates/c_mft_expl_inline.adoc +++ b/test-files/golden-tests/templates/c_mft_expl_inline.adoc @@ -30,11 +30,11 @@ struct A; |=== | Name | Description -| <> +| <> | |=== -[#A-f-00] +[#A-f-07] == <>::f === Synopses diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.html b/test-files/golden-tests/templates/c_mft_expl_inline.html index 279503679..ae498d891 100644 --- a/test-files/golden-tests/templates/c_mft_expl_inline.html +++ b/test-files/golden-tests/templates/c_mft_expl_inline.html @@ -47,7 +47,7 @@

Member Functions

-f +f @@ -56,7 +56,7 @@

Member Functions

-

A::f

+

A::f

Synopses

diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.adoc b/test-files/golden-tests/templates/c_mft_expl_outside.adoc index cacb53ff5..823e60a0b 100644 --- a/test-files/golden-tests/templates/c_mft_expl_outside.adoc +++ b/test-files/golden-tests/templates/c_mft_expl_outside.adoc @@ -30,11 +30,11 @@ struct A; |=== | Name | Description -| <> +| <> | |=== -[#A-f-00] +[#A-f-07] == <>::f === Synopses diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.html b/test-files/golden-tests/templates/c_mft_expl_outside.html index 2b6f992b0..469b09e08 100644 --- a/test-files/golden-tests/templates/c_mft_expl_outside.html +++ b/test-files/golden-tests/templates/c_mft_expl_outside.html @@ -47,7 +47,7 @@

Member Functions

-f +f @@ -56,7 +56,7 @@

Member Functions

-

A::f

+

A::f

Synopses

diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.adoc b/test-files/golden-tests/templates/ct_mft_expl_inline.adoc index 38a2a2402..1bb577da2 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_inline.adoc +++ b/test-files/golden-tests/templates/ct_mft_expl_inline.adoc @@ -31,11 +31,11 @@ struct A; |=== | Name | Description -| <> +| <> | |=== -[#A-f-0a] +[#A-f-00] == <>::f === Synopses diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.html b/test-files/golden-tests/templates/ct_mft_expl_inline.html index a43d4b6c3..882cddaeb 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_inline.html +++ b/test-files/golden-tests/templates/ct_mft_expl_inline.html @@ -48,7 +48,7 @@

Member Functions

-f +f @@ -57,7 +57,7 @@

Member Functions

-

A::f

+

A::f

Synopses

diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.adoc b/test-files/golden-tests/templates/ct_mft_expl_outside.adoc index 0bf7af345..04370be72 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_outside.adoc +++ b/test-files/golden-tests/templates/ct_mft_expl_outside.adoc @@ -67,11 +67,11 @@ struct <><int>; |=== | Name | Description -| <> +| <> | |=== -[#A-00-f-030] +[#A-00-f-0a] == <><int>::f === Synopses @@ -83,10 +83,10 @@ Declared in `<ct_mft_expl_outside.cpp>` ---- template<typename U> void -<>(); +<>(); ---- -[.small]#<># +[.small]#<># [source,cpp,subs="verbatim,replacements,macros,-callouts"] @@ -98,7 +98,7 @@ void [.small]#<># -[#A-00-f-032] +[#A-00-f-03] == <><int>::f === Synopsis diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.html b/test-files/golden-tests/templates/ct_mft_expl_outside.html index 69ba0bc42..160f9265f 100644 --- a/test-files/golden-tests/templates/ct_mft_expl_outside.html +++ b/test-files/golden-tests/templates/ct_mft_expl_outside.html @@ -97,7 +97,7 @@

Member Functions

-f +f @@ -106,7 +106,7 @@

Member Functions

-

A<int>::f

+

A<int>::f

Synopses

@@ -117,9 +117,9 @@

Synopses

template<typename U> void -f(); +f(); -» more... +» more... 
@@ -135,7 +135,7 @@ 
Synopses
-

A<int>::f

+

A<int>::f

Synopsis

diff --git a/test-files/golden-tests/templates/ft_expl.adoc b/test-files/golden-tests/templates/ft_expl.adoc index a4987dcfe..1af1db9ad 100644 --- a/test-files/golden-tests/templates/ft_expl.adoc +++ b/test-files/golden-tests/templates/ft_expl.adoc @@ -10,11 +10,11 @@ |=== | Name | Description -| <> +| <> | |=== -[#f-0e] +[#f-0c7] == f === Synopses @@ -36,10 +36,10 @@ void ---- template<> void -<><int>(); +<><int>(); ---- -[.small]#<># +[.small]#<># [#f-03] == f @@ -55,7 +55,7 @@ void f(); ---- -[#f-0c] +[#f-0ca] == f<int> === Synopsis diff --git a/test-files/golden-tests/templates/ft_expl.html b/test-files/golden-tests/templates/ft_expl.html index 49b687511..f5aea1383 100644 --- a/test-files/golden-tests/templates/ft_expl.html +++ b/test-files/golden-tests/templates/ft_expl.html @@ -19,14 +19,14 @@

Functions

-f +f
-

f

+

f

Synopses

@@ -46,9 +46,9 @@

Synopses

template<> void -f<int>(); +f<int>(); -» more... +» more...
@@ -72,7 +72,7 @@

Synopsis

-

f<int>

+

f<int>

Synopsis