Adoc config options

Author: vinniefalco

include/mrdox/Config.hpp

@@ -41,15 +41,10 @@ class ConfigImpl;
 class MRDOX_VISIBLE
     Config
 {
-    Config(Config const&) = delete;
-    Config& operator=(Config const&) = delete;
-
 protected:
     Config() noexcept;
 
 public:
-    class Options; // private, but for clang-15 bug
-
     /** A resource for running submitted work, possibly concurrent.
     */
     class WorkGroup;

source/api/_XML/XMLWriter.cpp

@@ -59,8 +59,8 @@ template<>
 struct llvm::yaml::MappingTraits<
     clang::mrdox::xml::XMLWriter::XmlKey>
 {
-    static void mapping(
-        IO& io, clang::mrdox::xml::XMLWriter::XmlKey& opt_)
+    static void mapping(IO& io,
+        clang::mrdox::xml::XMLWriter::XmlKey& opt_)
     {
         auto& opt= opt_.opt;
         io.mapOptional("index",  opt.index);
@@ -72,8 +72,8 @@ template<>
 struct llvm::yaml::MappingTraits<
     clang::mrdox::xml::XMLWriter::GenKey>
 {
-    static void mapping(
-        IO& io, clang::mrdox::xml::XMLWriter::GenKey& opt)
+    static void mapping(IO& io,
+        clang::mrdox::xml::XMLWriter::GenKey& opt)
     {
         clang::mrdox::xml::XMLWriter::XmlKey k(opt.opt);
 

source/api/_adoc/AdocSinglePageWriter.cpp

@@ -30,6 +30,8 @@ llvm::Error
 AdocSinglePageWriter::
 build()
 {
+    if(auto Err = AdocWriter::init())
+        return Err;
     Assert(sect_.level == 0);
     sect_.level = 1;
     sect_.markup = "=";

source/api/_adoc/AdocWriter.cpp

@@ -10,10 +10,88 @@
 //
 
 #include "AdocWriter.hpp"
+#include "ConfigImpl.hpp"
 #include "Support/Validate.hpp"
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Metadata/Overloads.hpp>
 #include <clang/Basic/Specifiers.h>
+#include <llvm/Support/YAMLParser.h>
+#include <llvm/Support/YAMLTraits.h>
+
+//------------------------------------------------
+//
+// YAML
+//
+//------------------------------------------------
+
+namespace clang {
+namespace mrdox {
+namespace adoc {
+
+struct AdocWriter::Key
+{
+    Options& opt;
+
+    explicit
+    Key(
+        Options& opt_) noexcept
+        : opt(opt_)
+    {
+    }
+};
+
+struct AdocWriter::GenKey
+{
+    Options& opt;
+
+    explicit
+    GenKey(
+        Options& opt_)
+        : opt(opt_)
+    {
+    }
+};
+
+} // adoc
+} // mrdox
+} // clang
+
+template<>
+struct llvm::yaml::MappingTraits<
+    clang::mrdox::adoc::AdocWriter::Key>
+{
+    static void mapping(IO& io,
+        clang::mrdox::adoc::AdocWriter::Key& opt_)
+    {
+        auto& opt= opt_.opt;
+        io.mapOptional("safe-names",  opt.safe_names);
+    }
+};
+
+template<>
+struct llvm::yaml::MappingTraits<
+    clang::mrdox::adoc::AdocWriter::GenKey>
+{
+    static void mapping(IO& io,
+        clang::mrdox::adoc::AdocWriter::GenKey& opt)
+    {
+        clang::mrdox::adoc::AdocWriter::Key k(opt.opt);
+
+        io.mapOptional("adoc",  k);
+    }
+};
+
+template<>
+struct llvm::yaml::MappingTraits<
+    clang::mrdox::adoc::AdocWriter::Options>
+{
+    static void mapping(IO& io,
+        clang::mrdox::adoc::AdocWriter::Options& opt)
+    {
+        clang::mrdox::adoc::AdocWriter::GenKey k(opt);
+        io.mapOptional("generator",  k);
+    }
+};
 
 namespace clang {
 namespace mrdox {
@@ -97,6 +175,32 @@ AdocWriter(
 {
 }
 
+llvm::Error
+AdocWriter::
+init()
+{
+    {
+        llvm::yaml::Input yin(
+            corpus_.config()->configYaml().first,
+                this, ConfigImpl::yamlDiagnostic);
+        yin.setAllowUnknownKeys(true);
+        yin >> options_;
+        if(auto ec = yin.error())
+            return makeError(ec);
+    }
+    {
+        llvm::yaml::Input yin(
+            corpus_.config()->configYaml().second,
+                this, ConfigImpl::yamlDiagnostic);
+        yin.setAllowUnknownKeys(true);
+        yin >> options_;
+        if(auto ec = yin.error())
+            return makeError(ec);
+    }
+
+    return llvm::Error::success();
+}
+
 //------------------------------------------------
 
 /*  Write a namespace.

source/api/_adoc/AdocWriter.hpp

@@ -13,6 +13,7 @@
 #define MRDOX_API_ADOC_ADOCWRITER_HPP
 
 #include "Support/SafeNames.hpp"
+#include "Support/YamlFwd.hpp"
 #include <mrdox/Platform.hpp>
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Metadata.hpp>
@@ -24,9 +25,20 @@ namespace adoc {
 
 class AdocWriter
 {
-    SafeNames const& names_;
+    template<class T>
+    friend struct llvm::yaml::MappingTraits;
 
 protected:
+    struct Options
+    {
+        bool safe_names = false;
+    };
+
+    struct Key;
+    struct GenKey;
+    Options options_;
+    SafeNames const& names_;
+
     struct Section
     {
         int level = 0;
@@ -52,6 +64,8 @@ class AdocWriter
         Corpus const& corpus,
         Reporter& R) noexcept;
 
+    llvm::Error init();
+
     struct FormalParam;
     struct TypeName;