tidy up names and dtd

Author: vinniefalco

source/lib/BasicVisitor.cpp

@@ -125,15 +125,13 @@ bool
 BasicVisitor::
 VisitTypedefDecl(TypedefDecl const* D)
 {
-    //QualType qt = D->getASTContext().getTypedefType(D);
     return mapDecl(D);
 }
 
 bool
 BasicVisitor::
 VisitTypeAliasDecl(TypeAliasDecl const* D)
 {
-    //QualType qt = D->getASTContext().getTypedefType(D);
     return mapDecl(D);
 }
 

source/lib/Serialize.cpp

@@ -479,12 +479,6 @@ static void populateFunctionInfo(FunctionInfo& I, const FunctionDecl* D,
         IsInAnonymousNamespace);
 
     I.ReturnType = getTypeInfoForType(D->getReturnType());
-    {
-        // VFALCO generate the correct USR
-        SmallVector<char> buf;
-        index::generateUSRForType(D->getReturnType(), D->getASTContext(), buf);
-        I.ReturnType.Type.USR = hashUSR(llvm::StringRef(buf.data(), buf.size()));
-    }
     parseParameters(I, D);
 
     PopulateTemplateParameters(I.Template, D);

source/lib/XML.cpp

@@ -283,7 +283,7 @@ write(
     std::vector<TypedefInfo> const& v)
 {
     for(auto const& I : v)
-        writeInfo(I);
+        write(I);
 }
 
 //------------------------------------------------
@@ -293,9 +293,9 @@ XMLGenerator::
 write(
     NamespaceInfo const& I)
 {
-    openTag("scope", {
+    assert(I.IT == InfoType::IT_namespace);
+    openTag("namespace", {
         { "name", I.Name },
-        { "tag", toString(I.IT) },
         { "usr", toBase64(I.USR) }
         });
     writeInfo(I);
@@ -304,25 +304,33 @@ write(
     write(I.Children.functions);
     write(I.Children.Enums);
     write(I.Children.Typedefs);
-    closeTag("scope");
+    closeTag("namespace");
 }
 
 void
 XMLGenerator::
 write(
     RecordInfo const& I)
 {
-    openTag( "scope", {
+    llvm::StringRef tag;
+    switch(I.TagType)
+    {
+    case TagTypeKind::TTK_Struct: tag = "struct"; break;
+    case TagTypeKind::TTK_Class: tag = "class"; break;
+    case TagTypeKind::TTK_Union: tag = "union"; break;
+    default:
+        llvm_unreachable("unexpected TagType");
+    }
+    openTag(tag, {
         { "name", I.Name },
-        { "tag", getTagType(I.TagType) },
         { "usr", toBase64(I.USR) }
         });
     writeSymbolInfo(I);
     writeRecords(I.Children.Records);
     write(I.Children.functions);
     write(I.Children.Enums);
     write(I.Children.Typedefs);
-    closeTag("scope");
+    closeTag(tag);
 }
 
 void
@@ -336,11 +344,24 @@ write(
         { "usr", toBase64(I.USR) }
         });
     writeSymbolInfo(I);
-    writeTagLine("return",
-        //I.ReturnType.Type.Name, {
-        I.ReturnType.Type.QualName, {
-            { "usr", toString(I.ReturnType.Type.USR) }
+
+#if 1
+    
+    writeTag("return", {
+        { "name", I.ReturnType.Type.Name },
+        { "usr", toString(I.ReturnType.Type.USR) }
+        });
+#else
+    auto it = infos_->find(llvm::toHex(llvm::toStringRef(
+        I.ReturnType.Type.USR)));
+    assert(it != infos_->end());
+    Info const& inf = *it->second.get();
+    writeTag("return", {
+        { "name", inf.Name },
+        { "usr", toString(inf.USR) }
         });
+#endif
+
     write(I.Params);
 #if 0
     //writeRef(I.ReturnType.Type);