refactor config paths

Author: vinniefalco

include/mrdox/Config.hpp

@@ -52,6 +52,9 @@ class Config
     std::vector<std::string> inputFileFilter_;
     bool verbose_ = true;
 
+    llvm::SmallString<0>
+    makeAbsolute(llvm::StringRef relPath);
+
     explicit Config(llvm::StringRef configDir);
 
 public:
@@ -137,6 +140,15 @@ class Config
         return sourceRoot_;
     }
 
+    /** Returns true if the translation unit should be visited.
+
+        @param filePath The posix-style full path
+        to the file being processed.
+    */
+    bool
+    shouldVisitTU(
+        llvm::StringRef filePath) const noexcept;
+
     /** Returns true if the file should be visited.
 
         If the file is visited, then prefix is
@@ -174,6 +186,12 @@ class Config
         Symbol documentation will not be emitted unless
         the corresponding source file is a child of this
         directory.
+
+        If the specified directory is relative, then
+        the full path will be computed relative to
+        @ref configDir().
+
+        @param dirPath The directory.
     */
     llvm::Error
     setSourceRoot(

source/lib/Config.cpp

@@ -65,6 +65,22 @@ struct llvm::yaml::MappingTraits<
 namespace clang {
 namespace mrdox {
 
+//------------------------------------------------
+
+llvm::SmallString<0>
+Config::
+makeAbsolute(llvm::StringRef relPath)
+{
+    namespace fs = llvm::sys::fs;
+    namespace path = llvm::sys::path;
+
+    if(path::is_absolute(relPath))
+        return relPath;
+    llvm::SmallString<0> result(configDir());
+    path::append(result, relPath);
+    return result;
+}
+
 Config::
 Config(
     llvm::StringRef configDir)
@@ -136,6 +152,14 @@ loadFromFile(
 //
 //------------------------------------------------
 
+bool
+Config::
+shouldVisitTU(
+    llvm::StringRef filePath) const noexcept
+{
+    return true;
+}
+
 bool
 Config::
 shouldVisitFile(
@@ -146,9 +170,8 @@ shouldVisitFile(
 
     llvm::SmallString<32> temp;
     temp = filePath;
-    if(! path::replace_path_prefix(temp, sourceRoot_, ""))
+    if(! path::replace_path_prefix(temp, sourceRoot_, "", path::Style::posix))
         return false;
-
     prefixPath.assign(sourceRoot_.begin(), sourceRoot_.end());
     makeDirsy(prefixPath);
     return true;
@@ -168,20 +191,11 @@ setSourceRoot(
     namespace fs = llvm::sys::fs;
     namespace path = llvm::sys::path;
 
-    llvm::SmallString<0> temp(dirPath);
-    if(! path::is_absolute(sourceRoot_, path::Style::posix))
-    {
-        std::error_code ec = fs::make_absolute(temp);
-        if(ec)
-            return makeError("fs::make_absolute got '", ec, "'");
-    }
-
+    auto temp = makeAbsolute(dirPath);
     path::remove_dots(temp, true, path::Style::posix);
-
-    // This is required for filterSourceFile to work
+    convert_to_slash(temp);
     makeDirsy(temp, path::Style::posix);
     sourceRoot_ = temp.str();
-
     return llvm::Error::success();
 }
 

source/lib/Visitor.cpp

@@ -35,16 +35,16 @@ Visitor::
 HandleTranslationUnit(
     ASTContext& Context)
 {
-#if 0
-    llvm::Optional<llvm::StringRef> path = 
+    llvm::Optional<llvm::StringRef> filePath = 
         Context.getSourceManager().getNonBuiltinFilenameForID(
             Context.getSourceManager().getMainFileID());
-    if(path)
+    if(filePath)
     {
-        llvm::StringRef s = *path;
+        llvm::SmallString<0> s(*filePath);
+        convert_to_slash(s);
+        if(config_.shouldVisitTU(s))
+            TraverseDecl(Context.getTranslationUnitDecl());
     }
-#endif
-    TraverseDecl(Context.getTranslationUnitDecl());
 }
 
 template<typename T>
@@ -80,7 +80,7 @@ mapDecl(T const* D)
         // cached filter entry already exists
         FileFilter const& ff = result.first->second;
         if(! ff.include)
-            return false;
+            return true;
         filePath = loc.getFilename(); // native
         convert_to_slash(filePath);
         // VFALCO we could assert that the prefix
@@ -96,7 +96,7 @@ mapDecl(T const* D)
         FileFilter& ff = result.first->second;
         ff.include = config_.shouldVisitFile(filePath, ff.prefix);
         if(! ff.include)
-            return false;
+            return true;
         // VFALCO we could assert that the prefix
         //        matches and just lop off the
         //        first ff.prefix.size() characters.

source/lib/utility.hpp

@@ -30,6 +30,8 @@ convert_to_slash(
         llvm::sys::path::Style::native);
 
 /** Append a separator if not already present.
+
+    This is required for llvm::sys::path::append to work.
 */
 void
 makeDirsy(