source file refactor

Author: vinniefalco

include/mrdox/Error.hpp

@@ -12,7 +12,6 @@
 #ifndef MRDOX_ERROR_HPP
 #define MRDOX_ERROR_HPP
 
-#include <mrdox/detail/nice.hpp>
 #include <llvm/Support/Error.h>
 #include <llvm/Support/raw_ostream.h>
 #include <source_location>
@@ -21,6 +20,47 @@
 namespace clang {
 namespace mrdox {
 
+//------------------------------------------------
+/*
+    nice output for variadic error functions
+
+    These are used to convert arguments to
+    strings in makeError and Reporter members.
+*/
+
+template<class T>
+T& nice(T& t)
+{
+    return t;
+}
+
+template<class T>
+T&& nice(T&& t)
+{
+    return std::forward<T>(t);
+}
+
+template<class T>
+auto nice(llvm::Expected<T>&& e)
+{
+    return nice(e.takeError());
+}
+
+inline auto nice(std::error_code ec)
+{
+    return ec.message();
+}
+
+template<class T>
+auto nice(llvm::ErrorOr<T>&& e)
+{
+    return nice(e.getError());
+}
+
+llvm::StringRef nice(std::source_location loc);
+
+//------------------------------------------------
+
 /** Return an Error with descriptive information.
 
     @param reason A phrase describing the cause of the failure.
@@ -45,7 +85,6 @@ struct makeError : llvm::Error
         : llvm::Error(
             [&]
             {
-                using detail::nice;
                 std::string temp;
                 llvm::raw_string_ostream os(temp);
                 os << nice(std::forward<Arg0>(arg0));

include/mrdox/Reporter.hpp

@@ -12,7 +12,7 @@
 #ifndef MRDOX_REPORTER_HPP
 #define MRDOX_REPORTER_HPP
 
-#include <mrdox/detail/nice.hpp>
+#include <mrdox/Error.hpp>
 #include <llvm/Support/Error.h>
 #include <llvm/Support/Mutex.h>
 #include <llvm/Support/raw_ostream.h>
@@ -164,7 +164,6 @@ print(
     Arg0&& arg,
     Args&&... args)
 {
-    using detail::nice;
     auto& temp = temp_string();
     temp.clear();
     {
@@ -184,7 +183,6 @@ failed(
     Arg0&& arg,
     Args&&... args)
 {
-    using detail::nice;
     auto& temp = temp_string();
     temp.clear();
     {
@@ -208,7 +206,6 @@ error(
     Arg0&& arg0,
     Args&&... args)
 {
-    using detail::nice;
     if(! isFailure(std::forward<E>(e)))
         return false;
     auto& temp = temp_string();

include/mrdox/detail/nice.hpp

@@ -11,11 +11,54 @@
 
 #include <mrdox/Error.hpp>
 #include <mrdox/Reporter.hpp>
+#include <llvm/Support/Path.h>
 #include <utility>
 
 namespace clang {
 namespace mrdox {
 
+llvm::StringRef
+nice(
+    std::source_location loc)
+{
+    namespace path = llvm::sys::path;
+
+    static thread_local llvm::SmallString<0> temp;
+
+    llvm::StringRef fileName(loc.file_name());
+    auto it = path::rbegin(fileName);
+    auto const end = path::rend(fileName);
+    if(it == end)
+    {
+        temp.clear();
+        return {};
+    }
+    for(;;)
+    {
+        // VFALCO This assumes the directory
+        //        layout of the source files.
+        if( *it == "source" ||
+            *it == "include")
+        {
+            temp.assign(
+                it->data(),
+                fileName.end());
+            break;
+        }
+        ++it;
+        if(it == end)
+        {
+            temp = fileName;
+            break;
+        }
+    }
+    path::remove_dots(temp, true);
+    temp.push_back('(');
+    temp.append(std::to_string(loc.line()));
+    temp.push_back(')');
+    return temp;
+}
+
 namespace {
 
 class ErrorInfoPlus
@@ -39,7 +82,7 @@ class ErrorInfoPlus
     log(
         llvm::raw_ostream &os) const override
     {
-        os << action_ << " at " << detail::nice(loc_);
+        os << action_ << " at " << nice(loc_);
     }
 
     std::error_code

source/lib/Error.cpp

@@ -9,7 +9,7 @@
 //
 
 #include "PagesBuilder.hpp"
-#include "format/radix.hpp"
+#include "radix.hpp"
 #include <mrdox/Metadata.hpp>
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/Support/FileSystem.h>