Add separate type to represent directory paths

1 files changed, 12 insertions, 8 deletions

diff --git a/build/dump.cxx b/build/dump.cxx
index 05ec679..b41e489 100644
--- a/build/dump.cxx
+++ b/build/dump.cxx
@@ -25,7 +25,12 @@ namespace build
 
     for (const prerequisite& p: t.prerequisites)
     {
-      os << ' ' << p;
+      os << ' ';
+
+      if (p.target != nullptr)
+        os << *p.target;
+      else
+        os << p;
     }
   }
 
@@ -36,15 +41,14 @@ namespace build
               string& ind,
               set<const target*>& rts)
   {
-    string d (relative (p.path ()).string ());
-
-    if (d.back () != path::traits::directory_separator)
-      d += '/';
-
-    os << ind << d << ":" << endl
+    // We don't want the extra notations (e.g., ~/) provided by
+    // diag_relative() since we want the path to be relative to
+    // the outer scope.
+    //
+    os << ind << relative (p.path ()) << ":" << endl
        << ind << '{';
 
-    const path* orb (relative_base);
+    const dir_path* orb (relative_base);
     relative_base = &p.path ();
 
     ind += "  ";