From 53105890d75789c81adbb3d781eff9ebd7110222 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 1 Sep 2017 17:33:44 +0200
Subject: Add support for try_match(), use to handle deleted headers

---
 build2/target.ixx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'build2/target.ixx')

diff --git a/build2/target.ixx b/build2/target.ixx
index 459265b..9b4b9d8 100644
--- a/build2/target.ixx
+++ b/build2/target.ixx
@@ -92,9 +92,20 @@ namespace build2
   {
     // Note that the target could be being asynchronously re-matched.
     //
-    target_state r (state (a));
+    pair<bool, target_state> r (state (a));
 
-    if (fail && r == target_state::failed)
+    if (fail && (!r.first || r.second == target_state::failed))
+      throw failed ();
+
+    return r.second;
+  }
+
+  inline pair<bool, target_state> target::
+  try_matched_state (action_type a, bool fail) const
+  {
+    pair<bool, target_state> r (state (a));
+
+    if (fail && r.first && r.second == target_state::failed)
       throw failed ();
 
     return r;
-- 
cgit v1.1