chore: update tests

cppalliance · Dec 13, 2023 · 0244055 · 0244055
1 parent c19a4d4
commit 0244055
Show file tree

Hide file tree

Showing 19 changed files with 203 additions and 406 deletions.
diff --git a/test-files/old-tests/alias-template.xml b/test-files/old-tests/alias-template.xml
@@ -19,9 +19,7 @@
     <tparam name="T" class="type"/>
     <alias name="C" id="f75RIL8qKOwbyH6ffvrv59F0nCA=">
       <file path="alias-template.cpp" line="8" class="def"/>
-      <type class="specialization" id="5tUSuMtQqtYE49jBjSYSWp0DJAM=" name="A">
-        <targ class="type" type="T"/>
-      </type>
+      <type id="5tUSuMtQqtYE49jBjSYSWp0DJAM=" name="A&lt;T&gt;"/>
     </alias>
   </template>
   <template>
@@ -32,10 +30,7 @@
         <tparam name="U" class="type"/>
         <alias name="E" id="STM3CgeaOEakPrQJdlRWWM4MMFo=">
           <file path="alias-template.cpp" line="14" class="def"/>
-          <type class="specialization" id="swBEqeWAJoaWVKty+1lCoYUK04A=" name="B">
-            <targ class="type" type="T"/>
-            <targ class="type" type="U"/>
-          </type>
+          <type id="swBEqeWAJoaWVKty+1lCoYUK04A=" name="B&lt;T, U&gt;"/>
         </alias>
       </template>
     </struct>

diff --git a/test-files/old-tests/class-template-specializations-1.xml b/test-files/old-tests/class-template-specializations-1.xml
diff --git a/test-files/old-tests/class-template-specializations-3.xml b/test-files/old-tests/class-template-specializations-3.xml
@@ -102,83 +102,63 @@
     <file path="class-template-specializations-3.cpp" line="55" class="def"/>
     <field name="m0" id="oHfKrPnHC+B6Hx/yJYk5Fyxe+CI=">
       <file path="class-template-specializations-3.cpp" line="57" class="def"/>
-      <type class="specialization" id="Ax52oDYNHKdb/kayrTPXtP7EnLo=" parent="A&lt;float&gt;" name="B">
-        <targ class="type" type="double"/>
-      </type>
+      <type id="Ax52oDYNHKdb/kayrTPXtP7EnLo=" name="A&lt;float&gt;::B&lt;double&gt;"/>
     </field>
     <field name="m1" id="EvoFLEsY/zIQw+ATCcszcUXQX1U=">
       <file path="class-template-specializations-3.cpp" line="58" class="def"/>
-      <type class="specialization" id="Ax52oDYNHKdb/kayrTPXtP7EnLo=" parent="A&lt;long&gt;" name="B">
-        <targ class="type" type="double"/>
-      </type>
+      <type id="Ax52oDYNHKdb/kayrTPXtP7EnLo=" name="A&lt;long&gt;::B&lt;double&gt;"/>
     </field>
     <field name="m2" id="QerDxfhCX/VklfvPy6KMWR5/grA=">
       <file path="class-template-specializations-3.cpp" line="59" class="def"/>
-      <type class="specialization" id="sJKQ/XsqBeYlnpwi1s54+RRv5NA=" parent="A&lt;long&gt;" name="B">
-        <targ class="type" type="float"/>
-      </type>
+      <type id="sJKQ/XsqBeYlnpwi1s54+RRv5NA=" name="A&lt;long&gt;::B&lt;float&gt;"/>
     </field>
     <field name="m3" id="jkZFwdFnuuwOAnc9RU1Pi4xsuZQ=">
       <file path="class-template-specializations-3.cpp" line="60" class="def"/>
-      <type class="specialization" id="dKDSVrZun8skBV/NUCmJyCUOvJA=" parent="A&lt;unsigned int&gt;" name="B">
-        <targ class="type" type="float"/>
-      </type>
+      <type id="dKDSVrZun8skBV/NUCmJyCUOvJA=" name="A&lt;unsigned int&gt;::B&lt;float&gt;"/>
     </field>
     <field name="m4" id="Jz1/8DLujy3S44Nw3O0+j7/ib/E=">
       <file path="class-template-specializations-3.cpp" line="61" class="def"/>
-      <type class="specialization" id="AmrHzqMyGcAD714oirSEx/XCTwk=" parent="A&lt;short&gt;" name="B">
-        <targ class="type" type="void"/>
-      </type>
+      <type id="AmrHzqMyGcAD714oirSEx/XCTwk=" name="A&lt;short&gt;::B&lt;void&gt;"/>
     </field>
     <field name="m5" id="caJb3xi3hSrcOYpFTjaGGYy2Lwo=">
       <file path="class-template-specializations-3.cpp" line="63" class="def"/>
-      <type class="tag" id="AwZsTwyQp9xqkJ5YDcGgbnNSg3Q=" parent="B&lt;double&gt;" name="C"/>
+      <type id="AwZsTwyQp9xqkJ5YDcGgbnNSg3Q=" name="A::B&lt;double&gt;::C"/>
     </field>
     <field name="m6" id="I9XmCN/8GnrjYZlx8qXp383uWq0=">
       <file path="class-template-specializations-3.cpp" line="64" class="def"/>
-      <type class="tag" id="AwZsTwyQp9xqkJ5YDcGgbnNSg3Q=" parent="B&lt;double&gt;" name="C"/>
+      <type id="AwZsTwyQp9xqkJ5YDcGgbnNSg3Q=" name="A::B&lt;double&gt;::C"/>
     </field>
     <field name="m7" id="1q9S+RfN6FdeN1hVj4px4bBGHps=">
       <file path="class-template-specializations-3.cpp" line="65" class="def"/>
-      <type class="tag" id="Dpv+NzmwhV+wRSY65GFxl+38zQM=" parent="B&lt;float&gt;" name="C"/>
+      <type id="Dpv+NzmwhV+wRSY65GFxl+38zQM=" name="A::B&lt;float&gt;::C"/>
     </field>
     <field name="m8" id="lV8Cih1vnhktZoDmSG/54XfsVMY=">
       <file path="class-template-specializations-3.cpp" line="66" class="def"/>
-      <type class="tag" id="bmgK1R0ByNI2o0uDX/xUzqUPaB0=" parent="B&lt;float&gt;" name="C"/>
+      <type id="bmgK1R0ByNI2o0uDX/xUzqUPaB0=" name="A::B&lt;float&gt;::C"/>
     </field>
     <field name="m9" id="HXroC5e+xF7qrqN/j/TCTfZsqRM=">
       <file path="class-template-specializations-3.cpp" line="67" class="def"/>
-      <type class="tag" id="uGKF2n5ovA4i95uQxRmzyMq2uqY=" parent="B&lt;void&gt;" name="C"/>
+      <type id="uGKF2n5ovA4i95uQxRmzyMq2uqY=" name="A::B&lt;void&gt;::C"/>
     </field>
     <field name="m10" id="M37GfnOSLu7LdwyWNUKiLSwQU8E=">
       <file path="class-template-specializations-3.cpp" line="69" class="def"/>
-      <type class="specialization" id="2n2EC+ZzX4R61vVgqMqWD1h4Fqc=" parent="B&lt;double&gt;" name="D">
-        <targ class="type" type="bool"/>
-      </type>
+      <type id="2n2EC+ZzX4R61vVgqMqWD1h4Fqc=" name="A::B&lt;double&gt;::D&lt;bool&gt;"/>
     </field>
     <field name="m11" id="zs4yFWypzJvC9fBTuqRIWShHXDI=">
       <file path="class-template-specializations-3.cpp" line="70" class="def"/>
-      <type class="specialization" id="2n2EC+ZzX4R61vVgqMqWD1h4Fqc=" parent="B&lt;double&gt;" name="D">
-        <targ class="type" type="bool"/>
-      </type>
+      <type id="2n2EC+ZzX4R61vVgqMqWD1h4Fqc=" name="A::B&lt;double&gt;::D&lt;bool&gt;"/>
     </field>
     <field name="m12" id="npnYjIFI4UqRV4lM1m0vGdOXafw=">
       <file path="class-template-specializations-3.cpp" line="71" class="def"/>
-      <type class="specialization" id="vu+upAyFdAr9NpomAT9maDrr5VU=" parent="B&lt;float&gt;" name="D">
-        <targ class="type" type="bool"/>
-      </type>
+      <type id="vu+upAyFdAr9NpomAT9maDrr5VU=" name="A::B&lt;float&gt;::D&lt;bool&gt;"/>
     </field>
     <field name="m13" id="m3ZkUTvg5FF0YzKrQCCIMDL4Gjk=">
       <file path="class-template-specializations-3.cpp" line="72" class="def"/>
-      <type class="specialization" id="8gtdVs8Zc/2hE1ugmc5SJaowDrk=" parent="B&lt;float&gt;" name="D">
-        <targ class="type" type="bool"/>
-      </type>
+      <type id="8gtdVs8Zc/2hE1ugmc5SJaowDrk=" name="A::B&lt;float&gt;::D&lt;bool&gt;"/>
     </field>
     <field name="m14" id="lvoZQmyEhLRRqpEiNgzPQH1SOJ0=">
       <file path="class-template-specializations-3.cpp" line="73" class="def"/>
-      <type class="specialization" id="eYdoT3vlHlbkG+t3+ckhZAqrnlY=" parent="B&lt;void&gt;" name="D">
-        <targ class="type" type="bool"/>
-      </type>
+      <type id="eYdoT3vlHlbkG+t3+ckhZAqrnlY=" name="A::B&lt;void&gt;::D&lt;bool&gt;"/>
     </field>
   </struct>
 </namespace>

diff --git a/test-files/old-tests/class-template.xml b/test-files/old-tests/class-template.xml
@@ -15,7 +15,7 @@
       </field>
       <field name="x" id="81imwKxfuTfd7lfVGnF+fKx46lY=">
         <file path="class-template.cpp" line="7" class="def"/>
-        <type class="tag" id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
+        <type id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
       </field>
       <field name="y" id="UKBRhwzQ0PeL6ZwfxmreRBoDQSY=">
         <file path="class-template.cpp" line="8" class="def"/>
@@ -42,7 +42,7 @@
         <file path="class-template.cpp" line="21" class="def"/>
         <field name="x" id="bQCgblScrSKOxQMVJxT7vFw9W4I=">
           <file path="class-template.cpp" line="23" class="def"/>
-          <type class="tag" id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
+          <type id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
         </field>
         <field name="y" id="phg6+zMhjV0SJ7vav871OGqoPPQ=">
           <file path="class-template.cpp" line="24" class="def"/>
@@ -69,7 +69,7 @@
           <file path="class-template.cpp" line="35" class="def"/>
           <field name="w" id="bLX5mthqXMHAtLNEc87RKLQSUyU=">
             <file path="class-template.cpp" line="37" class="def"/>
-            <type class="tag" id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
+            <type id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
           </field>
           <field name="x" id="qSNOAAxaet7aBxvD7WvFqJOpm3A=">
             <file path="class-template.cpp" line="38" class="def"/>

diff --git a/test-files/old-tests/explicit-ctor.xml b/test-files/old-tests/explicit-ctor.xml
@@ -13,7 +13,7 @@
       <attr id="explicit-spec" name="explicit" value="1"/>
       <param>
         <type class="lvalue-reference">
-          <pointee-type class="tag" id="bonobNKGOblPVcRjxpiPan4nYnc=" name="Explicit" cv-qualifiers="const"/>
+          <pointee-type id="bonobNKGOblPVcRjxpiPan4nYnc=" name="Explicit" cv-qualifiers="const"/>
         </type>
       </param>
     </function>
@@ -22,7 +22,7 @@
       <attr id="explicit-spec" name="explicit" value="1"/>
       <param>
         <type class="rvalue-reference">
-          <pointee-type class="tag" id="bonobNKGOblPVcRjxpiPan4nYnc=" name="Explicit"/>
+          <pointee-type id="bonobNKGOblPVcRjxpiPan4nYnc=" name="Explicit"/>
         </type>
       </param>
     </function>
@@ -48,7 +48,7 @@
       <attr id="explicit-spec" name="explicit(true)" value="3"/>
       <param>
         <type class="lvalue-reference">
-          <pointee-type class="tag" id="htdCGapMsdazR1XkXoanrOCkvDE=" name="ExplicitTrue" cv-qualifiers="const"/>
+          <pointee-type id="htdCGapMsdazR1XkXoanrOCkvDE=" name="ExplicitTrue" cv-qualifiers="const"/>
         </type>
       </param>
     </function>
@@ -57,7 +57,7 @@
       <attr id="explicit-spec" name="explicit(true)" value="3"/>
       <param>
         <type class="rvalue-reference">
-          <pointee-type class="tag" id="htdCGapMsdazR1XkXoanrOCkvDE=" name="ExplicitTrue"/>
+          <pointee-type id="htdCGapMsdazR1XkXoanrOCkvDE=" name="ExplicitTrue"/>
         </type>
       </param>
     </function>
@@ -83,7 +83,7 @@
       <attr id="explicit-spec" name="explicit(false)" value="2"/>
       <param>
         <type class="lvalue-reference">
-          <pointee-type class="tag" id="Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=" name="ExplicitFalse" cv-qualifiers="const"/>
+          <pointee-type id="Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=" name="ExplicitFalse" cv-qualifiers="const"/>
         </type>
       </param>
     </function>
@@ -92,7 +92,7 @@
       <attr id="explicit-spec" name="explicit(false)" value="2"/>
       <param>
         <type class="rvalue-reference">
-          <pointee-type class="tag" id="Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=" name="ExplicitFalse"/>
+          <pointee-type id="Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=" name="ExplicitFalse"/>
         </type>
       </param>
     </function>
@@ -120,7 +120,7 @@
         <attr id="explicit-spec" name="explicit(expr)" value="4"/>
         <param>
           <type class="lvalue-reference">
-            <pointee-type class="tag" id="ztb0u1Q4SVBUQ0roTOM7MFlUt/o=" name="ExplicitExpression" cv-qualifiers="const"/>
+            <pointee-type id="ztb0u1Q4SVBUQ0roTOM7MFlUt/o=" name="ExplicitExpression" cv-qualifiers="const"/>
           </type>
         </param>
       </function>
@@ -129,7 +129,7 @@
         <attr id="explicit-spec" name="explicit(expr)" value="4"/>
         <param>
           <type class="rvalue-reference">
-            <pointee-type class="tag" id="ztb0u1Q4SVBUQ0roTOM7MFlUt/o=" name="ExplicitExpression"/>
+            <pointee-type id="ztb0u1Q4SVBUQ0roTOM7MFlUt/o=" name="ExplicitExpression"/>
           </type>
         </param>
       </function>

diff --git a/test-files/old-tests/explicit-deduct-guide.xml b/test-files/old-tests/explicit-deduct-guide.xml
@@ -11,9 +11,7 @@
   <guide name="X" explicit="1" id="2IF4pOfGcA57GQDlE3PJgs7yeUs=">
     <file path="explicit-deduct-guide.cpp" line="6" class="def"/>
     <deduced>
-      <type class="specialization" id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X">
-        <targ class="non-type" value="0"/>
-      </type>
+      <type id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X&lt;0&gt;"/>
     </deduced>
     <param>
       <type name="bool"/>
@@ -22,9 +20,7 @@
   <guide name="X" explicit="1" id="AtQyLakD3CjcM24GabAbHMNgVU4=">
     <file path="explicit-deduct-guide.cpp" line="8" class="def"/>
     <deduced>
-      <type class="specialization" id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X">
-        <targ class="non-type" value="0"/>
-      </type>
+      <type id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X&lt;0&gt;"/>
     </deduced>
     <param>
       <type name="char"/>
@@ -33,9 +29,7 @@
   <guide name="X" id="tkYkUU6H8cbFpCU7yBuvBLkT6dg=">
     <file path="explicit-deduct-guide.cpp" line="10" class="def"/>
     <deduced>
-      <type class="specialization" id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X">
-        <targ class="non-type" value="0"/>
-      </type>
+      <type id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X&lt;0&gt;"/>
     </deduced>
     <param>
       <type name="int"/>
@@ -46,9 +40,7 @@
     <guide name="X" explicit="1" id="YS/v8XQ/9ShQ2spNAh5EY33PN7s=">
       <file path="explicit-deduct-guide.cpp" line="13" class="def"/>
       <deduced>
-        <type class="specialization" id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X">
-          <targ class="non-type" value="0"/>
-        </type>
+        <type id="7wllQWhGGsbbeoZVa3gh4d7bcq8=" name="X&lt;0&gt;"/>
       </deduced>
       <param>
         <type name="long"/>

diff --git a/test-files/old-tests/function-parm-decay.xml b/test-files/old-tests/function-parm-decay.xml
@@ -48,7 +48,7 @@
     <file path="function-parm-decay.cpp" line="23"/>
     <file path="function-parm-decay.cpp" line="24"/>
     <param>
-      <type class="tag" id="PvNOREc+JWxdkVgvSz+jC45IbGQ=" name="T"/>
+      <type id="PvNOREc+JWxdkVgvSz+jC45IbGQ=" name="T"/>
     </param>
   </function>
 </namespace>

diff --git a/test-files/old-tests/implicit-instantiation-member-ref.xml b/test-files/old-tests/implicit-instantiation-member-ref.xml
@@ -17,9 +17,7 @@
         <tparam name="U" class="type"/>
         <alias name="M1" id="14SKPuw/wwAUmFZKoonB8Uu8gaY=">
           <file path="implicit-instantiation-member-ref.cpp" line="9" class="def"/>
-          <type class="specialization" id="P9+etXi0Ae+VNs1u8rYrHIbi6qE=" name="S0">
-            <targ class="type" type="U"/>
-          </type>
+          <type id="P9+etXi0Ae+VNs1u8rYrHIbi6qE=" name="S0&lt;U&gt;"/>
         </alias>
       </template>
       <template>
@@ -37,9 +35,7 @@
             <tparam name="V" class="type"/>
             <alias name="M3" id="TBl15ml95lYP4APzAuH1VpGgjgs=">
               <file path="implicit-instantiation-member-ref.cpp" line="19" class="def"/>
-              <type class="specialization" id="gxI8lOzHEX5mX3u/0hCHnvUY1OM=" name="S2">
-                <targ class="type" type="U"/>
-              </type>
+              <type id="gxI8lOzHEX5mX3u/0hCHnvUY1OM=" name="S0::S2&lt;U&gt;"/>
             </alias>
           </template>
           <template>
@@ -58,51 +54,47 @@
   </template>
   <alias name="A0" id="ApI0xrWYyA88AQ9a3mi+ochJbJc=">
     <file path="implicit-instantiation-member-ref.cpp" line="29" class="def"/>
-    <type class="specialization" id="P9+etXi0Ae+VNs1u8rYrHIbi6qE=" name="S0">
-      <targ class="type" type="int"/>
-    </type>
+    <type id="P9+etXi0Ae+VNs1u8rYrHIbi6qE=" name="S0&lt;int&gt;"/>
   </alias>
   <alias name="A1" id="zbm2FwMgaOYZ1PJI3zAcR9gD1DE=">
     <file path="implicit-instantiation-member-ref.cpp" line="30" class="def"/>
-    <type class="tag" id="aBQMz/OqX2QEHy4Cqfjgby4lSi4=" parent="A0" name="M0"/>
+    <type id="aBQMz/OqX2QEHy4Cqfjgby4lSi4=" name="A0::M0"/>
   </alias>
   <alias name="A2" id="3OXyXNWdB8izo3G750A0tnTvQWI=">
     <file path="implicit-instantiation-member-ref.cpp" line="31" class="def"/>
-    <type class="tag" id="ZDBtU18GeVxVwvEXVGYg+L3hBNw=" parent="A0" name="S1"/>
+    <type id="ZDBtU18GeVxVwvEXVGYg+L3hBNw=" name="A0::S1"/>
   </alias>
   <alias name="A3" id="iQWZK9m5g9ULZNf8pmkk4AQ6Fu0=">
     <file path="implicit-instantiation-member-ref.cpp" line="32" class="def"/>
-    <type class="tag" id="aBQMz/OqX2QEHy4Cqfjgby4lSi4=" parent="S0&lt;long&gt;" name="M0"/>
+    <type id="aBQMz/OqX2QEHy4Cqfjgby4lSi4=" name="S0&lt;long&gt;::M0"/>
   </alias>
   <alias name="A4" id="DMZ09ePoW0hqt5p5Hbb7r+CUQmE=">
     <file path="implicit-instantiation-member-ref.cpp" line="33" class="def"/>
-    <type class="tag" id="ZDBtU18GeVxVwvEXVGYg+L3hBNw=" parent="S0&lt;long long&gt;" name="S1"/>
+    <type id="ZDBtU18GeVxVwvEXVGYg+L3hBNw=" name="S0&lt;long long&gt;::S1"/>
   </alias>
   <alias name="A5" id="1Z8U4eFyt2XClP+7afzwsuyeXAI=">
     <file path="implicit-instantiation-member-ref.cpp" line="35" class="def"/>
-    <type class="specialization" id="P9+etXi0Ae+VNs1u8rYrHIbi6qE=" name="S0">
-      <targ class="type" type="void"/>
-    </type>
+    <type id="P9+etXi0Ae+VNs1u8rYrHIbi6qE=" name="S0&lt;void&gt;"/>
   </alias>
   <alias name="A6" id="JkIeD9nM+5+XWFXDHaK2rwRsuXA=">
     <file path="implicit-instantiation-member-ref.cpp" line="36" class="def"/>
-    <type class="tag" id="aBQMz/OqX2QEHy4Cqfjgby4lSi4=" parent="M1&lt;short&gt;" name="M0"/>
+    <type id="aBQMz/OqX2QEHy4Cqfjgby4lSi4=" name="S0::M1&lt;short&gt;::M0"/>
   </alias>
   <alias name="A7" id="9O5BsaAyDC9AuDDe/ftxNrckbjY=">
     <file path="implicit-instantiation-member-ref.cpp" line="37" class="def"/>
-    <type class="tag" id="NnkA706kKqg/azveB/lExZwRfFI=" parent="S2&lt;bool&gt;" name="M2"/>
+    <type id="NnkA706kKqg/azveB/lExZwRfFI=" name="S0::S2&lt;bool&gt;::M2"/>
   </alias>
   <alias name="A8" id="dWFupI7cyl8N8963fZrFrd+8ue4=">
     <file path="implicit-instantiation-member-ref.cpp" line="38" class="def"/>
-    <type class="tag" id="yTyWcP0E2V/EqE8I3ZdKao74yWQ=" parent="S2&lt;int&gt;" name="S3"/>
+    <type id="yTyWcP0E2V/EqE8I3ZdKao74yWQ=" name="S0::S2&lt;int&gt;::S3"/>
   </alias>
   <alias name="A9" id="r6hRllvikhxyJUBT7eKH8Z13wfw=">
     <file path="implicit-instantiation-member-ref.cpp" line="39" class="def"/>
-    <type class="tag" id="NnkA706kKqg/azveB/lExZwRfFI=" parent="M3&lt;unsigned int&gt;" name="M2"/>
+    <type id="NnkA706kKqg/azveB/lExZwRfFI=" name="S0::S2::M3&lt;unsigned int&gt;::M2"/>
   </alias>
   <alias name="A10" id="MR2bsp5xIs+Ga5MbTUu7kt4nT9E=">
     <file path="implicit-instantiation-member-ref.cpp" line="40" class="def"/>
-    <type class="tag" id="UQy9OWWe7a9N+jVLD+r6rjr4np8=" parent="S4&lt;void&gt;" name="M4"/>
+    <type id="UQy9OWWe7a9N+jVLD+r6rjr4np8=" name="S0::S2::S4&lt;void&gt;::M4"/>
   </alias>
 </namespace>
 </mrdocs>
diff --git a/test-files/old-tests/local-class.xml b/test-files/old-tests/local-class.xml
@@ -5,7 +5,7 @@
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
     <file path="local-class.cpp" line="1" class="def"/>
     <return>
-      <type class="tag" id="OhDTqBe4/sw3kfEe1/rfVoLg//I=" name="A"/>
+      <type id="OhDTqBe4/sw3kfEe1/rfVoLg//I=" name="A"/>
     </return>
   </function>
   <struct name="B" id="3JsK1DO0O+wZhv+0meptQrbs3fY=">

diff --git a/test-files/old-tests/mem-fn.xml b/test-files/old-tests/mem-fn.xml
@@ -111,7 +111,7 @@
   <struct name="T17" id="HL3/1NhKSels2G5ay7F0IYzlSLs=">
     <file path="mem-fn.cpp" line="20" class="def"/>
     <base>
-      <type class="tag" id="SLJhBKx+2u4KxSJ78Fg6wqlObPc=" name="T14"/>
+      <type id="SLJhBKx+2u4KxSJ78Fg6wqlObPc=" name="T14"/>
     </base>
     <function name="f" id="5+yfyWtDpz80IwKT3xugro18Ev0=">
       <file path="mem-fn.cpp" line="20"/>
@@ -151,7 +151,7 @@
   <struct name="V" id="9kzYwt0WPztMEDUaFxul1Jvqqs8=">
     <file path="mem-fn.cpp" line="29" class="def"/>
     <base>
-      <type class="tag" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=" name="U"/>
+      <type id="FLgkhM3m0U3Lo2o3XLPUizWPH00=" name="U"/>
     </base>
     <function name="f3" exception-spec="noexcept" id="/C2pxLlwRMKnr6YRbVnykUArzEI=">
       <file path="mem-fn.cpp" line="31"/>

diff --git a/test-files/old-tests/no_unique_address.xml b/test-files/old-tests/no_unique_address.xml
@@ -15,7 +15,7 @@
       <file path="no_unique_address.cpp" line="8" class="def"/>
       <attr id="maybe-unused"/>
       <attr id="deprecated"/>
-      <type class="tag" id="iczIHP1J59EwYw3xxL3w2C3Q43Q=" name="Empty"/>
+      <type id="iczIHP1J59EwYw3xxL3w2C3Q43Q=" name="Empty"/>
     </field>
   </struct>
 </namespace>