asciidoc generator refactor

addons/generator/asciidoc/layouts/function.adoc.hbs

@@ -0,0 +1,27 @@
+== {{page.name}}
+
+{{#if page.doc}}
+{{page.doc.brief}}
+{{/if}}
+
+=== Synopsis
+
+{{#if page.decl}}
+[,cpp]
+----
+{{page.decl}}
+----
+{{/if}}
+
+{{#if page.loc}}
+Declared in file <{{page.loc}}>
+{{/if}}
+
+{{page.synopsis}}
+
+{{#if page.doc.description}}
+=== Description
+
+{{page.doc.description}}
+
+{{/if}}

addons/generator/asciidoc/layouts/namespace.adoc.hbs

@@ -0,0 +1,13 @@
+== Namespace {{page.name}}
+
+{{#each page.members}}
+
+=== {{name}}
+
+{{doc.brief}}
+
+==== Description
+
+{{doc.description }}
+
+{{/each}}

addons/generator/asciidoc/layouts/record.adoc.hbs

@@ -0,0 +1,2 @@
+{{>record-detail}}
+

addons/generator/asciidoc/partials/namespace-detail.adoc.hbs

@@ -0,0 +1 @@
+|{{item.tag}} |{{item.name}} |{{item.id}}

addons/generator/asciidoc/partials/record-detail.adoc.hbs

@@ -0,0 +1,6 @@
+[,cpp]
+----
+struct {{page.name}}
+{
+};
+----

mrdox.cmake

@@ -55,8 +55,9 @@ function(mrdox)
             COMMAND
                 mrdox --config=${CMAKE_CURRENT_SOURCE_DIR}/${MRDOX_TARGET_CONFIG}
                         ${MRDOX_COMPILE_COMMANDS}
+                        --addons=../addons
                         --format=${MRDOX_TARGET_FORMAT}
-                        --output=${MRDOX_TARGET_OUTPUT}
+                        "--output=${MRDOX_TARGET_OUTPUT}"
             MAIN_DEPENDENCY ${MRDOX_TARGET_CONFIG} # scanner!
             DEPENDS ${MRDOX_EXECUTABLE_DEPENDENCY} ${MRDOX_TARGET_SOURCES}
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

source/-adoc/AdocGenerator.cpp

@@ -10,16 +10,43 @@
 //
 
 #include "AdocGenerator.hpp"
-#include "AdocMultiPageWriter.hpp"
-#include "AdocPagesBuilder.hpp"
-#include "AdocSinglePageWriter.hpp"
-#include "Support/RawOstream.hpp"
+#include "Builder.hpp"
+#include "SinglePageVisitor.hpp"
 #include "Support/SafeNames.hpp"
+#include <mrdox/Support/Thread.hpp>
+#include <mrdox/Support/Path.hpp>
+#include <optional>
+#include <vector>
 
 namespace clang {
 namespace mrdox {
 namespace adoc {
 
+Expected<ExecutorGroup<Builder>>
+createExecutors(
+    Corpus const& corpus)
+{
+    auto options = loadOptions(corpus);
+    if(! options)
+        return options.getError();
+
+    auto const& config = corpus.config;
+    auto& threadPool = config.threadPool();
+    ExecutorGroup<Builder> group(threadPool);
+    for(auto i = threadPool.getThreadCount(); i--;)
+    {
+        try
+        {
+           group.emplace(corpus, *options);
+        }
+        catch(Error const& e)
+        {
+            return e;
+        }
+    }
+    return group;
+}
+
 //------------------------------------------------
 //
 // AdocGenerator
@@ -34,8 +61,12 @@ build(
 {
     if(corpus.config.singlePage)
         return Generator::build(outputPath, corpus);
-    return AdocPagesBuilder(
-        llvm::StringRef(outputPath), corpus).build();
+
+    auto ex = createExecutors(corpus);
+    if(! ex)
+        return ex.getError();
+
+    return Error::success();
 }
 
 Error
@@ -44,8 +75,14 @@ buildOne(
     std::ostream& os,
     Corpus const& corpus) const
 {
-    RawOstream raw_os(os);
-    return AdocSinglePageWriter(raw_os, corpus).build();
+    auto ex = createExecutors(corpus);
+    if(! ex)
+        return ex.getError();
+
+    SinglePageVisitor visitor(*ex, corpus, os);
+    visitor(corpus.globalNamespace());
+    ex->wait();
+    return Error::success();
 }
 
 } // adoc

source/-adoc/AdocGenerator.hpp

@@ -13,7 +13,6 @@
 #define MRDOX_TOOL_ADOC_ADOCGENERATOR_HPP
 
 #include <mrdox/Platform.hpp>
-#include <mrdox/MetadataFwd.hpp>
 #include <mrdox/Generator.hpp>
 
 namespace clang {
@@ -23,9 +22,6 @@ namespace adoc {
 class AdocGenerator
     : public Generator
 {
-    struct MultiPageBuilder;
-    struct SinglePageBuilder;
-
 public:
     std::string_view
     id() const noexcept override