cppalliance · alandefreitas · Jan 2, 2025 · Jan 2, 2025 · Jan 2, 2025
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
@@ -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
@@ -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
@@ -0,0 +1,59 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Namespaces
+
+[cols=1]
+|===
+| Name 
+
+| <<B,`B`>> 
+|===
+
+[#B]
+== B
+
+
+=== Namespaces
+
+[cols=1]
+|===
+| Name 
+
+| <<B-U,`U`>> 
+|===
+
+[#B-U]
+== <<B,B>>::U
+
+
+=== Namespace Aliases
+
+[cols=1]
+|===
+| Name 
+
+| <<B-U-E,`E`>> 
+|===
+
+[#B-U-E]
+== <<B,B>>::<<B-U,U>>::E
+
+
+=== Synopsis
+
+
+Declared in `&lt;excluded&hyphen;namespace&hyphen;alias&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+namespace E = <<B,B>>::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
@@ -0,0 +1,9 @@
+namespace B {
+    namespace S {
+        namespace E {}
+    }
+
+    namespace U {
+        namespace E = B::S::E;
+    }
+}
diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html
@@ -0,0 +1,80 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index">Global namespace</h2>
+</div>
+<h2>Namespaces</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#B"><code>B</code></a> </td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="B">B</h2>
+</div>
+<h2>Namespaces</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#B-U"><code>U</code></a> </td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="B-U"><a href="#B">B</a>::U</h2>
+</div>
+<h2>Namespace Aliases</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#B-U-E"><code>E</code></a> </td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="B-U-E"><a href="#B">B</a>::<a href="#B-U">U</a>::E</h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;excluded-namespace-alias.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+namespace E = <a href="#B">B</a>::S::E;
+</code>
+</pre>
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
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
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <namespace name="B" id="kPgq2AM8TvyGDGm5jEWfqYlOPmY=">
+    <namespace name="S" id="Rj2Fd5N7JujyJxCEKO4hXgEbuZE=">
+      <namespace name="E" id="3Bv76oUtQq1hnBVVkwioGwKa0oU=">
+      </namespace>
+    </namespace>
+    <namespace name="U" id="X48ZrJbrwHITObLn6vxlcgApA20=">
+      <namespace-alias name="E" id="TDj0Rc30uD7P5e+F1gsHzHoaV2U=">
+        <file path="excluded-namespace-alias.cpp" line="7"/>
+        <aliased name="B::S::E" id="3Bv76oUtQq1hnBVVkwioGwKa0oU="/>
+      </namespace-alias>
+    </namespace>
+  </namespace>
+</namespace>
+</mrdocs>
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
@@ -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
@@ -493,7 +493,7 @@ struct T13;
 |===
 | Name 
 
-| <<T13-f,`f`>> 
+| <<T13-f,`f`>>  [.small]#[virtual]#
 |===
 
 
@@ -534,7 +534,7 @@ struct T14;
 |===
 | Name 
 
-| <<T14-f,`f`>> 
+| <<T14-f,`f`>>  [.small]#[virtual]#
 |===
 
 
@@ -657,7 +657,7 @@ struct T17
 |===
 | Name 
 
-| <<T14-f,`f`>> 
+| <<T14-f,`f`>>  [.small]#[virtual]#
 |===
 
 
@@ -699,7 +699,7 @@ struct U;
 | Name 
 
 | <<U-f1,`f1`>> 
-| <<U-f3,`f3`>> 
+| <<U-f3,`f3`>>  [.small]#[virtual]#
 |===
 === Static Member Functions
 
@@ -783,7 +783,7 @@ struct V
 | Name 
 
 | <<U-f1,`f1`>> 
-| <<U-f3,`f3`>> 
+| <<U-f3,`f3`>>  [.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
@@ -559,7 +559,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T13-f"><code>f</code></a> </td></tr>
+<td><a href="#T13-f"><code>f</code></a>  <span class="small">[virtual]</span></td></tr>
 </tbody>
 </table>
 
@@ -605,7 +605,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T14-f"><code>f</code></a> </td></tr>
+<td><a href="#T14-f"><code>f</code></a>  <span class="small">[virtual]</span></td></tr>
 </tbody>
 </table>
 
@@ -743,7 +743,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T14-f"><code>f</code></a> </td></tr>
+<td><a href="#T14-f"><code>f</code></a>  <span class="small">[virtual]</span></td></tr>
 </tbody>
 </table>
 
@@ -790,7 +790,7 @@ <h2>Member Functions</h2>
 <tbody>
 <tr>
 <td><a href="#U-f1"><code>f1</code></a> </td></tr><tr>
-<td><a href="#U-f3"><code>f3</code></a> </td></tr>
+<td><a href="#U-f3"><code>f3</code></a>  <span class="small">[virtual]</span></td></tr>
 </tbody>
 </table>
 <h2>Static Member Functions</h2>
@@ -885,7 +885,7 @@ <h2>Member Functions</h2>
 <tbody>
 <tr>
 <td><a href="#U-f1"><code>f1</code></a> </td></tr><tr>
-<td><a href="#U-f3"><code>f3</code></a> </td></tr>
+<td><a href="#U-f3"><code>f3</code></a>  <span class="small">[virtual]</span></td></tr>
 </tbody>
 </table>
 <h2>Static Member Functions</h2>