Add search_prerequisite*() variants of match_prerequisite*() versions

3 files changed, 117 insertions, 15 deletions

diff --git a/libbuild2/algorithm.cxx b/libbuild2/algorithm.cxx
index 26fad23..36d45b2 100644
--- a/libbuild2/algorithm.cxx
+++ b/libbuild2/algorithm.cxx
@@ -1719,7 +1719,8 @@ namespace build2
   match_prerequisite_range (action a, target& t,
                             R&& r,
                             const S& ms,
-                            const scope* s)
+                            const scope* s,
+                            bool search_only)
   {
     auto& pts (t.prerequisite_targets[a]);
 
@@ -1740,7 +1741,10 @@ namespace build2
     // Start asynchronous matching of prerequisites. Wait with unlocked phase
     // to allow phase switching.
     //
-    wait_guard wg (t.ctx, t.ctx.count_busy (), t[a].task_count, true);
+    wait_guard wg (
+      search_only
+      ? wait_guard ()
+      : wait_guard (t.ctx, t.ctx.count_busy (), t[a].task_count, true));
 
     for (auto&& p: forward<R> (r))
     {
@@ -1760,10 +1764,15 @@ namespace build2
           (s != nullptr && !pt.target->in (*s)))
         continue;
 
-      match_async (a, *pt.target, t.ctx.count_busy (), t[a].task_count);
+      if (!search_only)
+        match_async (a, *pt.target, t.ctx.count_busy (), t[a].task_count);
+
       pts.push_back (move (pt));
     }
 
+    if (search_only)
+      return;
+
     wg.wait ();
 
     // Finish matching all the targets that we have started.
@@ -1778,17 +1787,27 @@ namespace build2
   void
   match_prerequisites (action a, target& t,
                        const match_search& ms,
-                       const scope* s)
+                       const scope* s,
+                       bool search_only)
   {
-    match_prerequisite_range (a, t, group_prerequisites (t), ms, s);
+    match_prerequisite_range (a, t,
+                              group_prerequisites (t),
+                              ms,
+                              s,
+                              search_only);
   }
 
   void
   match_prerequisite_members (action a, target& t,
                               const match_search_member& msm,
-                              const scope* s)
+                              const scope* s,
+                              bool search_only)
   {
-    match_prerequisite_range (a, t, group_prerequisite_members (a, t), msm, s);
+    match_prerequisite_range (a, t,
+                              group_prerequisite_members (a, t),
+                              msm,
+                              s,
+                              search_only);
   }
 
   void
diff --git a/libbuild2/algorithm.hxx b/libbuild2/algorithm.hxx
index 1c5b717..a4feaea 100644
--- a/libbuild2/algorithm.hxx
+++ b/libbuild2/algorithm.hxx
@@ -563,6 +563,19 @@ namespace build2
   void
   match_prerequisites (action, target&, const match_search& = nullptr);
 
+  // As above but only do search. The match part can be performed later, for
+  // example, with the match_members() function below. The typical call
+  // sequence would be:
+  //
+  // inject_fsdir (a, t, false /* match */);
+  // search_prerequisite_members (a, t);            // Potentially with filter.
+  // pattern->apply_prerequisites (a, t, bs, me);   // If ad hoc pattern.
+  // <dependency synthesis>                         // Optional.
+  // match_members (a, t, t.prerequisite_targets[a]);
+  //
+  void
+  search_prerequisites (action, target&, const match_search& = nullptr);
+
   // As above but go into group members.
   //
   // Note that if we are cleaning, this function doesn't go into group
@@ -578,14 +591,24 @@ namespace build2
   match_prerequisite_members (action, target&,
                               const match_search_member& = nullptr);
 
+  void
+  search_prerequisite_members (action, target&,
+                               const match_search_member& = nullptr);
+
   // As above but omit prerequisites that are not in the specified scope.
   //
   void
   match_prerequisites (action, target&, const scope&);
 
   void
+  search_prerequisites (action, target&, const scope&);
+
+  void
   match_prerequisite_members (action, target&, const scope&);
 
+  void
+  search_prerequisite_members (action, target&, const scope&);
+
   // Match (already searched) members of a group or similar prerequisite-like
   // dependencies. Similar in semantics to match_prerequisites(). Any marked
   // target pointers are skipped.
diff --git a/libbuild2/algorithm.ixx b/libbuild2/algorithm.ixx
index de175eb..836dbed 100644
--- a/libbuild2/algorithm.ixx
+++ b/libbuild2/algorithm.ixx
@@ -745,12 +745,16 @@ namespace build2
   }
 
   LIBBUILD2_SYMEXPORT void
-  match_prerequisites (action, target&, const match_search&, const scope*);
+  match_prerequisites (action, target&,
+                       const match_search&,
+                       const scope*,
+                       bool search_only);
 
   LIBBUILD2_SYMEXPORT void
   match_prerequisite_members (action, target&,
                               const match_search_member&,
-                              const scope*);
+                              const scope*,
+                              bool search_only);
 
   inline void
   match_prerequisites (action a, target& t, const match_search& ms)
@@ -761,7 +765,21 @@ namespace build2
       ms,
       (a.operation () != clean_id || t.is_a<alias> ()
        ? nullptr
-       : &t.root_scope ()));
+       : &t.root_scope ()),
+      false);
+  }
+
+  inline void
+  search_prerequisites (action a, target& t, const match_search& ms)
+  {
+    match_prerequisites (
+      a,
+      t,
+      ms,
+      (a.operation () != clean_id || t.is_a<alias> ()
+       ? nullptr
+       : &t.root_scope ()),
+      true);
   }
 
   inline void
@@ -769,7 +787,37 @@ namespace build2
                               const match_search_member& msm)
   {
     if (a.operation () != clean_id || t.is_a<alias> ())
-      match_prerequisite_members (a, t, msm, nullptr);
+      match_prerequisite_members (a, t, msm, nullptr, false);
+    else
+    {
+      // Note that here we don't iterate over members even for see-through
+      // groups since the group target should clean eveything up. A bit of an
+      // optimization.
+      //
+      // @@ TMP: I wonder if this still holds for the new group semantics
+      //         we have in Qt automoc? Also below.
+      //
+      match_search ms (
+        msm
+        ? [&msm] (action a,
+                  const target& t,
+                  const prerequisite& p,
+                  include_type i)
+        {
+          return msm (a, t, prerequisite_member {p, nullptr}, i);
+        }
+        : match_search ());
+
+      match_prerequisites (a, t, ms, &t.root_scope (), false);
+    }
+  }
+
+  inline void
+  search_prerequisite_members (action a, target& t,
+                              const match_search_member& msm)
+  {
+    if (a.operation () != clean_id || t.is_a<alias> ())
+      match_prerequisite_members (a, t, msm, nullptr, true);
     else
     {
       // Note that here we don't iterate over members even for see-through
@@ -777,7 +825,7 @@ namespace build2
       // optimization.
       //
       // @@ TMP: I wonder if this still holds for the new group semantics
-      //         we have in Qt automoc?
+      //         we have in Qt automoc? Also above.
       //
       match_search ms (
         msm
@@ -790,20 +838,32 @@ namespace build2
         }
         : match_search ());
 
-      match_prerequisites (a, t, ms, &t.root_scope ());
+      match_prerequisites (a, t, ms, &t.root_scope (), true);
     }
   }
 
   inline void
   match_prerequisites (action a, target& t, const scope& s)
   {
-    match_prerequisites (a, t, nullptr, &s);
+    match_prerequisites (a, t, nullptr, &s, false);
+  }
+
+  inline void
+  search_prerequisites (action a, target& t, const scope& s)
+  {
+    match_prerequisites (a, t, nullptr, &s, true);
   }
 
   inline void
   match_prerequisite_members (action a, target& t, const scope& s)
   {
-    match_prerequisite_members (a, t, nullptr, &s);
+    match_prerequisite_members (a, t, nullptr, &s, false);
+  }
+
+  inline void
+  search_prerequisite_members (action a, target& t, const scope& s)
+  {
+    match_prerequisite_members (a, t, nullptr, &s, true);
   }
 
   LIBBUILD2_SYMEXPORT target_state