From 7afc8fe90ea5b894c6ef63c62012988e07f8bf42 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 3 Jun 2019 15:52:14 +0300
Subject: Fix `print $subprojects` failure

This print directive was failing with the message like "error:
invalid project_name element key 'tests/'".
---
 build2/variable.hxx |  2 +-
 build2/variable.ixx | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'build2')

diff --git a/build2/variable.hxx b/build2/variable.hxx
index 01e7038..782cc2b 100644
--- a/build2/variable.hxx
+++ b/build2/variable.hxx
@@ -916,7 +916,7 @@ namespace build2
 
     static project_name convert (name&&, name*);
     static void assign (value&, project_name&&);
-    static name reverse (const project_name& x) {return name (x.string ());}
+    static name reverse (const project_name&);
     static int compare (const project_name& x, const project_name& y) {
       return x.compare (y);}
     static bool empty (const project_name& x) {return x.empty ();}
diff --git a/build2/variable.ixx b/build2/variable.ixx
index a92ef3c..559151b 100644
--- a/build2/variable.ixx
+++ b/build2/variable.ixx
@@ -641,6 +641,18 @@ namespace build2
       new (&v.data_) project_name (move (x));
   }
 
+  inline name value_traits<project_name>::
+  reverse (const project_name& x)
+  {
+    // Make work for the special unnamed subproject representation (see
+    // find_subprojects() in file.cxx for details).
+    //
+    const string& s (x.string ());
+    return name (s.empty () || path::traits_type::is_separator (s.back ())
+                 ? empty_string
+                 : s);
+  }
+
   // vector<T> value
   //
   template <typename T>
-- 
cgit v1.1