chore: clean up catch sites

Author: vinniefalco

include/mrdox/Support/Error.hpp

@@ -169,11 +169,26 @@ class [[nodiscard]] MRDOX_DECL
 
         @pre this->failed()
     */
-    [[noreturn]] void Throw() const;
+    [[noreturn]] void Throw() const&;
+
+    /** Throw Exception(std::move(*this))
+
+        @pre this->failed()
+    */
+    [[noreturn]] void Throw() &&;
 
     /** Throw Exception(*this), or do nothing if no failure.
     */
-    void maybeThrow() const
+    void maybeThrow() const&
+    {
+        if(! failed())
+            return;
+        Throw();
+    }
+
+    /** Throw Exception(std::move(*this)), or do nothing if no failure.
+    */
+    void maybeThrow() &&
     {
         if(! failed())
             return;

source/-adoc/AdocGenerator.cpp

@@ -42,9 +42,9 @@ createExecutors(
         {
            group.emplace(domCorpus, *options);
         }
-        catch(Error const& e)
+        catch(Exception const& ex)
         {
-            return e;
+            return ex.error();
         }
     }
     return group;

source/Support/Error.cpp

@@ -84,15 +84,18 @@ Error(
     loc_ = loc;
 }
 
-void
-Error::
-Throw() const
+void Error::Throw() const&
 {
     MRDOX_ASSERT(failed());
-    // VFALCO should we use std::move?
     throw Exception(*this);
 }
 
+void Error::Throw() &&
+{
+    MRDOX_ASSERT(failed());
+    throw Exception(std::move(*this));
+}
+
 SourceLocation::
 SourceLocation(
     source_location const& loc) noexcept

source/Support/ExecutorGroup.cpp

@@ -117,15 +117,15 @@ run(std::unique_lock<std::mutex> lock)
                         work(scope.get());
                         lock.lock();
                     }
-                    catch(Error const& err)
+                    catch(Exception const& ex)
                     {
                         lock.lock();
-                        impl_->errors.emplace(err);
+                        impl_->errors.emplace(ex.error());
                     }
                     catch(std::exception const& ex)
                     {
                         // Any exception which is not
-                        // derived from Error should
+                        // derived from Exception should
                         // be reported and terminate
                         // the process immediately.
                         reportUnhandledException(ex);

source/Support/Generator.cpp

@@ -100,6 +100,10 @@ buildOneString(
         dest = ss.str();
         return {};
     }
+    catch(Exception const& ex)
+    {
+        return ex.error();
+    }
     catch(std::exception const& ex)
     {
         return formatError("buildOne threw \"{}\"", ex.what());

source/Support/ThreadPool.cpp

@@ -74,21 +74,21 @@ post(
     auto sp = std::make_shared<
         any_callable<void(void)>>(std::move(f));
     impl_->async(
-        [sp]
+    [sp]
+    {
+        try
+        {
+            (*sp)();
+        }
+        catch(std::exception const& ex)
         {
-            try
-            {
-                (*sp)();
-            }
-            catch(std::exception const& ex)
-            {
-                // Any exception which is not
-                // derived from Error should
-                // be reported and terminate
-                // the process immediately.
-                reportUnhandledException(ex);
-            }
-        });
+            // Any exception which is not
+            // derived from Error should
+            // be reported and terminate
+            // the process immediately.
+            reportUnhandledException(ex);
+        }
+    });
 }
 
 //------------------------------------------------
@@ -155,26 +155,26 @@ post(
     auto sp = std::make_shared<
         any_callable<void(void)>>(std::move(f));
     impl_->taskGroup.async(
-        [&, sp]
+    [&, sp]
+    {
+        try
+        {
+            (*sp)();
+        }
+        catch(Exception const& ex)
+        {
+            std::lock_guard<std::mutex> lock(impl_->mutex);
+            impl_->errors.emplace(ex.error());
+        }
+        catch(std::exception const& ex)
         {
-            try
-            {
-                (*sp)();
-            }
-            catch(Error const& err)
-            {
-                std::lock_guard<std::mutex> lock(impl_->mutex);
-                impl_->errors.emplace(std::move(err));
-            }
-            catch(std::exception const& ex)
-            {
-                // Any exception which is not
-                // derived from Error should
-                // be reported and terminate
-                // the process immediately.
-                reportUnhandledException(ex);
-            }
-        });
+            // Any exception which is not
+            // derived from Error should
+            // be reported and terminate
+            // the process immediately.
+            reportUnhandledException(ex);
+        }
+    });
 }
 
 } // mrdox

source/Tool/ConfigImpl.cpp

@@ -187,9 +187,9 @@ createConfigFromYAML(
             workingDir, addonsDir, configYaml, extraYaml);
         return config;
     }
-    catch(Error const& err)
+    catch(Exception const& ex)
     {
-        return err;
+        return ex.error();
     }
 }
 
@@ -222,9 +222,9 @@ loadConfigFile(
             workingDir, addonsDir, *text, extraYaml);
         return config;
     }
-    catch(Error const& err)
+    catch(Exception const& ex)
     {
-        return err;
+        return ex.error();
     }
 }
 

source/Tool/ToolMain.cpp

@@ -170,10 +170,17 @@ int main(int argc, char const** argv)
     {
         return clang::mrdox::mrdox_main(argc, argv);
     }
+    catch(clang::mrdox::Exception const& ex)
+    {
+        // Any exception derived from Exception should
+        // be caught and handled, and never make it here.
+        MRDOX_UNREACHABLE();
+    }
     catch(std::exception const& ex)
     {
-        // Any exception not derived from Error should be
-        // reported and terminate the process immediately.
+        // Any exception not derived from Exception which
+        // makes it here must be reported and terminate the
+        // process immediately.
         clang::mrdox::reportUnhandledException(ex);
         return EXIT_FAILURE;
     }