diff --git a/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs b/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs index 16658c2182..f7e79deccb 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs @@ -20,6 +20,12 @@ {{~else if (eq class "destructor")~}} {{#>markup/span class="small"}}[destructor]{{/markup/span}} {{~/if~}} + {{~#if isVirtual~}} + {{str ' '}}{{#>markup/span class="small"}}[virtual]{{/markup/span}} + {{~/if~}} + {{~#if isDeleted~}} + {{str ' '}}{{#>markup/span class="small"}}[deleted]{{/markup/span}} + {{~/if~}} {{else if (eq kind "field")~}} {{~#if isVariant~}} {{#>markup/span class="small"}}[variant member]{{/markup/span}} diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp index 380b61c231..45e23cdf94 100644 --- a/src/lib/AST/ASTVisitor.cpp +++ b/src/lib/AST/ASTVisitor.cpp @@ -1334,9 +1334,11 @@ populate( NamespaceAliasDecl* D) { NamedDecl const* Aliased = D->getAliasedNamespace(); - I.AliasedSymbol = toNameInfo(Aliased); + NestedNameSpecifier const* NNS = D->getQualifier(); + I.AliasedSymbol = toNameInfo(Aliased, {}, NNS); } + void ASTVisitor:: populate( diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc new file mode 100644 index 0000000000..f26c7e04b2 --- /dev/null +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.adoc @@ -0,0 +1,59 @@ += Reference +:mrdocs: + +[#index] +== Global namespace + + +=== Namespaces + +[cols=1] +|=== +| Name + +| <> +|=== + +[#B] +== B + + +=== Namespaces + +[cols=1] +|=== +| Name + +| <> +|=== + +[#B-U] +== <>::U + + +=== Namespace Aliases + +[cols=1] +|=== +| Name + +| <> +|=== + +[#B-U-E] +== <>::<>::E + + +=== Synopsis + + +Declared in `<excluded‐namespace‐alias.cpp>` + +[source,cpp,subs="verbatim,replacements,macros,-callouts"] +---- +namespace E = <>::S::E; +---- + + + +[.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.cpp b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.cpp new file mode 100644 index 0000000000..55502563b3 --- /dev/null +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.cpp @@ -0,0 +1,9 @@ +namespace B { + namespace S { + namespace E {} + } + + namespace U { + namespace E = B::S::E; + } +} \ No newline at end of file diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html new file mode 100644 index 0000000000..15403bfba4 --- /dev/null +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html @@ -0,0 +1,80 @@ + + +Reference + + +
+

Reference

+
+
+

Global namespace

+
+

Namespaces

+ + + + + + + + + + +
Name
B
+
+
+
+

B

+
+

Namespaces

+ + + + + + + + + + +
Name
U
+
+
+
+

B::U

+
+

Namespace Aliases

+ + + + + + + + + + +
Name
E
+
+
+
+

B::U::E

+
+
+

Synopsis

+
+Declared in <excluded-namespace-alias.cpp>
+
+
+namespace E = B::S::E;
+
+
+
+
+ +
+
+

Created with MrDocs

+
+ + \ No newline at end of file diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml new file mode 100644 index 0000000000..e88559cfe9 --- /dev/null +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.yml b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.yml new file mode 100644 index 0000000000..3e51e752a1 --- /dev/null +++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.yml @@ -0,0 +1,6 @@ +include-symbols: + - 'B::U' + - 'B::U::**' +exclude-symbols: + - 'B::S' + - 'B::S::**' diff --git a/test-files/golden-tests/metadata/mem-fn.adoc b/test-files/golden-tests/metadata/mem-fn.adoc index 1b1a236a1a..31ecb76ffb 100644 --- a/test-files/golden-tests/metadata/mem-fn.adoc +++ b/test-files/golden-tests/metadata/mem-fn.adoc @@ -493,7 +493,7 @@ struct T13; |=== | Name -| <> +| <> [.small]#[virtual]# |=== @@ -534,7 +534,7 @@ struct T14; |=== | Name -| <> +| <> [.small]#[virtual]# |=== @@ -657,7 +657,7 @@ struct T17 |=== | Name -| <> +| <> [.small]#[virtual]# |=== @@ -699,7 +699,7 @@ struct U; | Name | <> -| <> +| <> [.small]#[virtual]# |=== === Static Member Functions @@ -783,7 +783,7 @@ struct V | Name | <> -| <> +| <> [.small]#[virtual]# |=== === Static Member Functions diff --git a/test-files/golden-tests/metadata/mem-fn.html b/test-files/golden-tests/metadata/mem-fn.html index 06f4fb5253..e030428e80 100644 --- a/test-files/golden-tests/metadata/mem-fn.html +++ b/test-files/golden-tests/metadata/mem-fn.html @@ -559,7 +559,7 @@

Member Functions

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

Member Functions

-f +f [virtual] @@ -743,7 +743,7 @@

Member Functions

-f +f [virtual] @@ -790,7 +790,7 @@

Member Functions

f1 -f3 +f3 [virtual]

Static Member Functions

@@ -885,7 +885,7 @@

Member Functions

f1 -f3 +f3 [virtual]

Static Member Functions