fix: report handlebars errors from Builder

Author: sdkrystian

include/mrdocs/Support/Error.hpp

@@ -2809,7 +2809,7 @@ struct fmt::formatter<clang::mrdocs::Error>
         clang::mrdocs::Error const& err,
         fmt::format_context& ctx) const
     {
-        return fmt::formatter<std::string_view>::format(err.reason(), ctx);
+        return fmt::formatter<std::string_view>::format(err.message(), ctx);
     }
 };
 

src/lib/-adoc/MultiPageVisitor.cpp

@@ -50,8 +50,10 @@ operator()(T const& I)
 {
     ex_.async([this, &I](Builder& builder)
     {
-        writePage(builder(I).value(),
-            builder.domCorpus.getXref(I));
+        if(const auto r = builder(I))
+            writePage(*r, builder.domCorpus.getXref(I));
+        else
+            r.error().Throw();
         if constexpr(
                 T::isNamespace() ||
                 T::isRecord() ||
@@ -69,8 +71,10 @@ operator()(OverloadSet const& OS)
 {
     ex_.async([this, OS](Builder& builder)
     {
-        writePage(builder(OS).value(),
-            builder.domCorpus.getXref(OS));
+        if(const auto r = builder(OS))
+            writePage(*r, builder.domCorpus.getXref(OS));
+        else
+            r.error().Throw();
         corpus_.traverse(OS, *this);
     });
 }

src/lib/-adoc/SinglePageVisitor.cpp

@@ -20,11 +20,13 @@ void
 SinglePageVisitor::
 operator()(T const& I)
 {
-    ex_.async(
-       [this, &I, page = numPages_++](Builder& builder)
-       {
-           writePage(builder(I).value(), page);
-       });
+    ex_.async([this, &I, page = numPages_++](Builder& builder)
+    {
+        if(auto r = builder(I))
+            writePage(*r, page);
+        else
+            r.error().Throw();
+    });
     if constexpr(
             T::isNamespace() ||
             T::isRecord() ||
@@ -41,7 +43,10 @@ operator()(OverloadSet const& OS)
 {
     ex_.async([this, OS, page = numPages_++](Builder& builder)
     {
-        writePage(builder(OS).value(), page);
+        if(auto r = builder(OS))
+            writePage(*r, page);
+        else
+            r.error().Throw();
         corpus_.traverse(OS, *this);
     });
 }

src/lib/Support/Error.cpp

@@ -42,12 +42,18 @@ Error::
 formatWhere(
     source_location const& loc)
 {
+    return fmt::format("{}:{}",
+        ::SourceFileNames::getFileName(
+            loc.file_name()),
+        loc.line());
+#if 0
     return fmt::format(
         "{}@{}({})",
         loc.function_name(),
         ::SourceFileNames::getFileName(
             loc.file_name()),
         loc.line());
+#endif
 }
 
 std::string
@@ -58,8 +64,9 @@ formatMessage(
 {
     std::string result;
     result = reason;
-    result.append(": ");
+    result.append(" (");
     result.append(where);
+    result.append(")");
     return result;
 }
 

src/tool/ToolMain.cpp

@@ -75,7 +75,7 @@ int mrdocs_main(int argc, char const** argv)
 
     // Generate
     if(auto err = DoGenerateAction())
-        report::error("Generating reference failed: {}", err);
+        report::error("Generating reference failed: {}", err.message());
 
     if( report::results.errorCount > 0 ||
         report::results.fatalCount > 0)