better xml typedefs

Author: vinniefalco

include/mrdox/Metadata/Type.hpp

@@ -21,6 +21,12 @@ namespace mrdox {
 // A base struct for TypeInfos
 struct TypeInfo
 {
+    /** The type being referenced.
+    */
+    Reference Type;
+
+    //--------------------------------------------
+
     TypeInfo() = default;
 
     explicit
@@ -44,8 +50,6 @@ struct TypeInfo
     {
         return Type == Other.Type;
     }
-
-    Reference Type; // Referenced type in this info.
 };
 
 } // mrdox

include/mrdox/Metadata/Typedef.hpp

@@ -22,6 +22,16 @@ namespace mrdox {
 // Info for typedef and using statements.
 struct TypedefInfo : SymbolInfo
 {
+    TypeInfo Underlying;
+
+    // Indicates if this is a new C++ "using"-style typedef:
+    //   using MyVector = std::vector<int>
+    // False means it's a C-style typedef:
+    //   typedef std::vector<int> MyVector;
+    bool IsUsing = false;
+
+    //--------------------------------------------
+
     static constexpr InfoType type_id = InfoType::IT_typedef;
 
     TypedefInfo(
@@ -31,14 +41,6 @@ struct TypedefInfo : SymbolInfo
     }
 
     void merge(TypedefInfo&& I);
-
-    TypeInfo Underlying;
-
-    // Inidicates if this is a new C++ "using"-style typedef:
-    //   using MyVector = std::vector<int>
-    // False means it's a C-style typedef:
-    //   typedef std::vector<int> MyVector;
-    bool IsUsing = false;
 };
 
 } // mrdox

source/api/_XML/XMLWriter.cpp

@@ -342,18 +342,24 @@ visit(
     if(fd_os_ && fd_os_->error())
         return false;
 
-    tags_.open("typedef", {
+    llvm::StringRef tag;
+    if(I.IsUsing)
+        tag = "using";
+    else
+        tag = "typedef";
+    tags_.open(tag, {
         { "name", I.Name },
         { I.id }
         });
 
     writeInfo(I);
     writeSymbol(I);
-    if(I.Underlying.Type.id != EmptySID)
-        tags_.write("qualusr", toBase64(I.Underlying.Type.id));
+    tags_.write("type", "", {
+        { "name", I.Underlying.Type.Name },
+        { I.Underlying.Type.id } });
     writeJavadoc(I.javadoc);
 
-    tags_.close("typedef");
+    tags_.close(tag);
 
     return true;
 }

test-files/old-tests/record-1.xml

@@ -61,11 +61,13 @@
         </para>
       </doc>
     </function>
-    <typedef name="U1" id="6UtddyCJy89K/bZpTmDb5jVXwAY=">
+    <using name="U1" id="6UtddyCJy89K/bZpTmDb5jVXwAY=">
       <file path="record-1.cpp" line="3" class="def"/>
-    </typedef>
+      <type name="int"/>
+    </using>
     <typedef name="U2" id="wwp4SQjMPktMmsnvq1thxjxFHFs=">
       <file path="record-1.cpp" line="4" class="def"/>
+      <type name="char"/>
     </typedef>
   </struct>
 </namespace>