From 0ca011d1220207b3c1cba92791413f113ec66329 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 23 Aug 2019 12:45:22 +0200
Subject: keep_going

---
 libbuild2/algorithm.ixx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libbuild2/algorithm.ixx')

diff --git a/libbuild2/algorithm.ixx b/libbuild2/algorithm.ixx
index f865992..13a3323 100644
--- a/libbuild2/algorithm.ixx
+++ b/libbuild2/algorithm.ixx
@@ -356,10 +356,12 @@ namespace build2
                size_t sc, atomic_count& tc,
                bool fail)
   {
-    assert (t.ctx.phase == run_phase::match);
+    context& ctx (t.ctx);
+
+    assert (ctx.phase == run_phase::match);
     target_state r (match (a, t, sc, &tc).second);
 
-    if (fail && !keep_going && r == target_state::failed)
+    if (fail && !ctx.keep_going && r == target_state::failed)
       throw failed ();
 
     return r;
@@ -559,7 +561,7 @@ namespace build2
   {
     target_state r (execute (a, t, sc, &tc));
 
-    if (fail && !keep_going && r == target_state::failed)
+    if (fail && !t.ctx.keep_going && r == target_state::failed)
       throw failed ();
 
     return r;
-- 
cgit v1.1