From 0a1f06d11edb1d48fd8c848348031bf08652a580 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 4 Oct 2023 12:43:06 +0200 Subject: Add match_direct_complete() to support async direct matches --- libbuild2/algorithm.ixx | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'libbuild2/algorithm.ixx') diff --git a/libbuild2/algorithm.ixx b/libbuild2/algorithm.ixx index 9f1b70f..6d83984 100644 --- a/libbuild2/algorithm.ixx +++ b/libbuild2/algorithm.ixx @@ -427,19 +427,6 @@ namespace build2 return r; } - inline target_state - match_direct_sync (action a, const target& t, bool fail) - { - assert (t.ctx.phase == run_phase::match); - - target_state r (match_impl (a, t, 0, nullptr).second); - - if (r == target_state::failed && fail) - throw failed (); - - return r; - } - inline pair try_match_sync (action a, const target& t, bool fail) { @@ -530,6 +517,25 @@ namespace build2 return match_sync (a, t, um); } + inline target_state + match_direct_sync (action a, const target& t, bool fail) + { + assert (t.ctx.phase == run_phase::match); + + target_state r (match_impl (a, t, 0, nullptr).second); + + if (r == target_state::failed && fail) + throw failed (); + + return r; + } + + inline target_state + match_direct_complete (action a, const target& t, bool fail) + { + return match_direct_sync (a, t, fail); + } + // Clear rule match-specific target data. // inline void -- cgit v1.1