Tidy up javadoc parsing files

Author: vinniefalco

source/-adoc/AdocWriter.cpp

@@ -862,6 +862,22 @@ tagToString(TagTypeKind k) noexcept
     }
 }
 
+//------------------------------------------------
+
+void
+AdocWriter::
+declareRecord(
+    RecordInfo const& I)
+{
+}
+
+void
+AdocWriter::
+declareFunction(
+    FunctionInfo const& I)
+{
+}
+
 } // adoc
 } // mrdox
 } // clang

source/-adoc/AdocWriter.hpp

@@ -144,6 +144,11 @@ class AdocWriter
     void endSection();
 
     static llvm::StringRef tagToString(TagTypeKind k) noexcept;
+
+    //--------------------------------------------
+
+    void declareRecord(RecordInfo const& I);
+    void declareFunction(FunctionInfo const& I);
 };
 
 } // adoc

source/AST/ASTVisitor.cpp

@@ -12,7 +12,6 @@
 
 #include "ASTVisitor.hpp"
 #include "Bitcode.hpp"
-#include "Commands.hpp"
 #include "ParseJavadoc.hpp"
 #include "ConfigImpl.hpp"
 #include "Metadata/FunctionKind.hpp"

source/AST/Commands.cpp

@@ -9,17 +9,25 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "clangASTComment.hpp"
 #include "ParseJavadoc.hpp"
 #include <mrdox/Metadata/Javadoc.hpp>
 #include <clang/AST/CommentCommandTraits.h>
 #include <clang/AST/ASTContext.h>
 #include <clang/AST/RawCommentList.h>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 5054) // C5054: operator '+': deprecated between enumerations of different types
+#endif
+#include <clang/AST/Comment.h>
+#include <clang/AST/CommentVisitor.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include <llvm/Support/JSON.h>
 #include <cassert>
 
-#include <llvm/Support/Mutex.h>
-
 /*
     Comment Types
 
@@ -542,6 +550,23 @@ dumpCommentCommands()
 
 //------------------------------------------------
 
+void
+initCustomCommentCommands(ASTContext& context)
+{
+    auto& traits = context.getCommentCommandTraits();
+
+    {
+        //auto cmd = traits.registerBlockCommand("mrdox");
+        //auto cmd = traits.registerBlockCommand("par");
+
+        //CommentOptions opt;
+        //opt.BlockCommandNames.push_back("par");
+        //traits.registerCommentOptions(opt);
+    }
+
+    (void)traits;
+}
+
 Javadoc
 parseJavadoc(
     RawComment const* RC,

source/AST/Commands.hpp

@@ -15,13 +15,24 @@
 #include <mrdox/Platform.hpp>
 #include <mrdox/Reporter.hpp>
 #include <mrdox/Metadata/Javadoc.hpp>
-#include <clang/AST/Decl.h>
-#include "clangASTComment.hpp"
-#include <clang/AST/ASTContext.h>
 
 namespace clang {
+
+class Decl;
+class ASTContext;
+class RawComment;
+
 namespace mrdox {
 
+/** Initialize clang to recognize our custom comments.
+
+    Safe to be called more than once, but
+    not concurrently.
+*/
+void
+initCustomCommentCommands(
+    ASTContext& ctx);
+
 /** Return a complete javadoc object for a raw comment.
 */
 Javadoc
@@ -31,6 +42,7 @@ parseJavadoc(
     Reporter& R);
 
 } // mrdox
+
 } // clang
 
 #endif

source/AST/ParseJavadoc.cpp

@@ -79,6 +79,10 @@ class Interface::Build
         for(auto const& B : From.Bases)
         {
             auto actualAccess = effectiveAccess(access, B.access);
+            // VFALCO temporary hack to avoid looking up IDs
+            //        which for metadata that is not emitted.
+            if(! corpus_.find(B.id))
+                continue;
             append(actualAccess, corpus_.get<RecordInfo>(B.id));
         }
 

source/AST/ParseJavadoc.hpp

@@ -9,7 +9,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "AST/Commands.hpp"
+#include "AST/ParseJavadoc.hpp"
 #include <mrdox/Error.hpp>
 #include <mrdox/Generator.hpp>
 #include <llvm/ADT/SmallString.h>