From 5cefca444f7062c61cc9d118ffea5901e05186fd Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 8 Feb 2017 07:42:41 +0200
Subject: Implement parallel operation execution

---
 build2/test/rule.cxx         | 13 ++++---------
 build2/test/script/regex.cxx |  6 +++---
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'build2/test')

diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index 35302e1..9dc24cd 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -291,7 +291,7 @@ namespace build2
           {
             build2::match (ml, a, *it);
 
-            if (it->state () == target_state::unchanged)
+            if (it->synchronized_state () == target_state::unchanged) //@@ TM?
             {
               unmatch (a, *it);
               it = nullptr;
@@ -304,7 +304,7 @@ namespace build2
             {
               build2::match (ml, a, *ot);
 
-              if (ot->state () == target_state::unchanged)
+              if (ot->synchronized_state () == target_state::unchanged) //@@ MT?
               {
                 unmatch (a, *ot);
                 ot = nullptr;
@@ -337,13 +337,8 @@ namespace build2
             //
             target_state r (execute_delegate (dr, a, t));
 
-            if (it != nullptr)
-              r |= execute (a, *it);
-
-            if (ot != nullptr)
-              r |= execute (a, *ot);
-
-            return r;
+            const target* ts[] = {it, ot};
+            return r |= straight_execute_members (a, t, ts);
           };
         }
         else
diff --git a/build2/test/script/regex.cxx b/build2/test/script/regex.cxx
index 48e1eeb..b77f8a5 100644
--- a/build2/test/script/regex.cxx
+++ b/build2/test/script/regex.cxx
@@ -17,13 +17,13 @@ namespace build2
       namespace regex
       {
         static_assert (alignof (char_string) % 4 == 0,
-                       "inappropriate allignment for char_string");
+                       "unexpected char_string alignment");
 
         static_assert (alignof (char_regex) % 4 == 0,
-                       "inappropriate allignment for char_regex");
+                       "unexpected char_regex alignment");
 
         static_assert (sizeof (uintptr_t) > sizeof (int16_t),
-                       "inappropriate uintptr_t size");
+                       "unexpected uintptr_t size");
 
         const line_char line_char::nul (0);
         const line_char line_char::eof (-1);
-- 
cgit v1.1