aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/operation.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-04-07 09:33:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-04-07 09:33:50 +0200
commitbee90675a701d7267caba40921b4606db5072247 (patch)
tree14c40930f9e19fde4a8e93e4ea8f2d68280a50a6 /libbuild2/operation.cxx
parent4576f80a09ca247ee89e99a8103cc0c87e20672e (diff)
Rename {match,execute}() to *_sync(), add *_complete()
In particular, the match() rename makes sure it doesn't clash with rule::match() which, after removal of the hint argument in simple_rule, has exactly the same signature, thus making it error-prone to calling recursively.
Diffstat (limited to 'libbuild2/operation.cxx')
-rw-r--r--libbuild2/operation.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/libbuild2/operation.cxx b/libbuild2/operation.cxx
index 72b73f9..b7f414e 100644
--- a/libbuild2/operation.cxx
+++ b/libbuild2/operation.cxx
@@ -320,7 +320,7 @@ namespace build2
const target& t (at.as<target> ());
target_state s (j < i
- ? match (a, t, false)
+ ? match_complete (a, t, false)
: target_state::postponed);
switch (s)
{
@@ -510,6 +510,9 @@ namespace build2
{
const target& t (at.as<target> ());
+ // Note that here we call executed_state() directly instead of
+ // execute_complete() since we know there is no need to wait.
+ //
switch ((at.state = t.executed_state (a, false)))
{
case target_state::unknown: