Add support for 'while' loop in script

9 files changed, 517 insertions, 112 deletions

diff --git a/libbuild2/test/script/parser+command-if.test.testscript b/libbuild2/test/script/parser+command-if.test.testscript
index 0b72b4a..9e223dd 100644
--- a/libbuild2/test/script/parser+command-if.test.testscript
+++ b/libbuild2/test/script/parser+command-if.test.testscript
@@ -315,6 +315,7 @@
 }
 
 : end
+:
 {
   : without-if
   :
@@ -322,7 +323,7 @@
   cmd
   end
   EOI
-  testscript:2:1: error: 'end' without preceding 'if'
+  testscript:2:1: error: 'end' without preceding 'if', 'for', or 'while'
   EOE
 
   : without-if-semi
@@ -331,10 +332,11 @@
   cmd;
   end
   EOI
-  testscript:2:1: error: 'end' without preceding 'if'
+  testscript:2:1: error: 'end' without preceding 'if', 'for', or 'while'
   EOE
 
   : before
+  :
   {
     : semi
     :
diff --git a/libbuild2/test/script/parser+description.test.testscript b/libbuild2/test/script/parser+description.test.testscript
index cee540f..f656b7d 100644
--- a/libbuild2/test/script/parser+description.test.testscript
+++ b/libbuild2/test/script/parser+description.test.testscript
@@ -313,7 +313,7 @@
     x = y
   end
   EOI
-  testscript:2:1: error: description before/after setup/teardown variable-if
+  testscript:2:1: error: description before/after setup/teardown variable-only 'if'
   EOE
 
   : var-if-after
@@ -323,7 +323,7 @@
     x = y
   end : foo
   EOI
-  testscript:1:1: error: description before/after setup/teardown variable-if
+  testscript:1:1: error: description before/after setup/teardown variable-only 'if'
   EOE
 
   : test
diff --git a/libbuild2/test/script/parser+while.test.testscript b/libbuild2/test/script/parser+while.test.testscript
new file mode 100644
index 0000000..b1a2b44
--- /dev/null
+++ b/libbuild2/test/script/parser+while.test.testscript
@@ -0,0 +1,265 @@
+# file      : libbuild2/test/script/parser+while.test.testscript
+# license   : MIT; see accompanying LICENSE file
+
+: while
+:
+{
+  : true
+  :
+  $* <<EOI >>EOO
+  while ($v != "aa")
+    cmd "$v"
+    v = "$(v)a"
+  end
+  EOI
+  ? true
+  cmd ''
+  ? true
+  cmd a
+  ? false
+  EOO
+
+  : false
+  :
+  $* <<EOI >>EOO
+  while ($v == "aa")
+    cmd "$v"
+    v = "$(v)a"
+  end
+  EOI
+  ? false
+  EOO
+
+  : without-command
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    cmd
+  end
+  EOI
+  testscript:1:6: error: missing program
+  EOE
+
+  : after-semi
+  :
+  $* -s <<EOI >>EOO
+  cmd1;
+  while ($v != "aa")
+    cmd2 "$v"
+    v = "$(v)a"
+  end
+  EOI
+  {
+    {
+      cmd1
+      ? true
+      cmd2 ''
+      ? true
+      cmd2 a
+      ? false
+    }
+  }
+  EOO
+
+  : setup
+  :
+  $* -s <<EOI >>EOO
+  +while ($v != "aa")
+    cmd2 "$v"
+    v = "$(v)a"
+  end
+  EOI
+  {
+    ? true
+    +cmd2 ''
+    ? true
+    +cmd2 a
+    ? false
+  }
+  EOO
+
+  : tdown
+  :
+  $* -s <<EOI >>EOO
+  -while ($v != "aa")
+    cmd2 "$v"
+    v = "$(v)a"
+  end
+  EOI
+  {
+    ? true
+    -cmd2 ''
+    ? true
+    -cmd2 a
+    ? false
+  }
+  EOO
+}
+
+: end
+:
+{
+  : without-end
+  :
+  $* <<EOI 2>>EOE != 0
+  while true
+    cmd
+  EOI
+  testscript:3:1: error: expected closing 'end'
+  EOE
+}
+
+: elif
+:
+{
+  : without-if
+  :
+  $* <<EOI 2>>EOE != 0
+  while false
+    elif true
+      cmd
+    end
+  end
+  EOI
+  testscript:2:3: error: 'elif' without preceding 'if'
+  EOE
+}
+
+: nested
+:
+{
+  $* -l -r <<EOI >>EOO
+  while ($v != "aa")      # 1
+    cmd1 "$v"             # 2
+    if ($v == "a")        # 3
+      cmd2                # 4
+      while ($v2 != "$v") # 5
+        cmd3              # 6
+        v2=$v
+      end
+    else
+      cmd4                # 7
+    end
+    cmd5                  # 8
+    v = "$(v)a"
+  end;
+  cmd6
+  EOI
+  ? true # 1 i1
+  cmd1 '' # 2 i1
+  ? false # 3 i1
+  cmd4 # 7 i1
+  cmd5 # 8 i1
+  ? true # 1 i2
+  cmd1 a # 2 i2
+  ? true # 3 i2
+  cmd2 # 4 i2
+  ? true # 5 i2 i1
+  cmd3 # 6 i2 i1
+  ? false # 5 i2 i2
+  cmd5 # 8 i2
+  ? false # 1 i3
+  cmd6 # 9
+  EOO
+}
+
+: contained
+:
+{
+  : semi
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    cmd;
+    cmd
+  end
+  EOI
+  testscript:2:3: error: ';' inside 'while'
+  EOE
+
+  : colon-leading
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    : foo
+    cmd
+  end
+  EOI
+  testscript:2:3: error: description inside 'while'
+  EOE
+
+  : colon-trailing
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    cmd : foo
+  end
+  EOI
+  testscript:2:3: error: description inside 'while'
+  EOE
+
+  : eos
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+  EOI
+  testscript:2:1: error: expected closing 'end'
+  EOE
+
+  : scope
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    cmd
+    {
+    }
+  end
+  EOI
+  testscript:3:3: error: expected closing 'end'
+  EOE
+
+  : setup
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    +cmd
+  end
+  EOI
+  testscript:2:3: error: setup command inside 'while'
+  EOE
+
+  : tdown
+  :
+  $* <<EOI 2>>EOE != 0
+  while
+    -cmd
+  end
+  EOI
+  testscript:2:3: error: teardown command inside 'while'
+  EOE
+}
+
+: var
+:
+$* <<EOI >>EOO
+while ($v1 != "a")
+  v1 = "$(v1)a"
+  v2 = "$v1"
+end
+cmd $v1
+EOI
+? true
+? false
+cmd a
+EOO
+
+: leading-and-trailing-description
+:
+$* <<EOI 2>>EOE != 0
+: foo
+while false
+  cmd
+end : bar
+EOI
+testscript:4:1: error: both leading and trailing descriptions
+EOE
diff --git a/libbuild2/test/script/parser.cxx b/libbuild2/test/script/parser.cxx
index eb7b140..a99f80a 100644
--- a/libbuild2/test/script/parser.cxx
+++ b/libbuild2/test/script/parser.cxx
@@ -293,22 +293,28 @@ namespace build2
       }
 
       // Parse a logical line (as well as scope-if since the only way to
-      // recognize it is to parse the if line).
+      // recognize it is to parse the if line), handling the flow control
+      // constructs recursively.
       //
       // If one is true then only parse one line returning an indication of
-      // whether the line ended with a semicolon. If if_line is true then this
-      // line can be an if-else construct flow control line (else, end, etc).
+      // whether the line ended with a semicolon. If the flow control
+      // construct type is specified, then this line is assumed to belong to
+      // such construct.
       //
       bool parser::
       pre_parse_line (token& t, type& tt,
                       optional<description>& d,
                       lines* ls,
                       bool one,
-                      bool if_line)
+                      optional<line_type> fct)
       {
         // enter: next token is peeked at (type in tt)
         // leave: newline
 
+        assert (!fct                      ||
+                *fct == line_type::cmd_if ||
+                *fct == line_type::cmd_while);
+
         // Note: token is only peeked at.
         //
         const location ll (get_location (peeked ()));
@@ -364,8 +370,9 @@ namespace build2
             {
               const string& n (t.value);
 
-              if      (n == "if")  lt = line_type::cmd_if;
-              else if (n == "if!") lt = line_type::cmd_ifn;
+              if      (n == "if")    lt = line_type::cmd_if;
+              else if (n == "if!")   lt = line_type::cmd_ifn;
+              else if (n == "while") lt = line_type::cmd_while;
             }
 
             break;
@@ -420,16 +427,20 @@ namespace build2
         case line_type::cmd_elif:
         case line_type::cmd_elifn:
         case line_type::cmd_else:
-        case line_type::cmd_end:
           {
-            if (!if_line)
-            {
+            if (!fct || *fct != line_type::cmd_if)
               fail (t) << lt << " without preceding 'if'";
-            }
+          }
+          // Fall through.
+        case line_type::cmd_end:
+          {
+            if (!fct)
+              fail (t) << lt << " without preceding 'if', 'for', or 'while'";
           }
           // Fall through.
         case line_type::cmd_if:
         case line_type::cmd_ifn:
+        case line_type::cmd_while:
           next (t, tt); // Skip to start of command.
           // Fall through.
         case line_type::cmd:
@@ -440,8 +451,9 @@ namespace build2
               p = parse_command_expr (t, tt, lexer::redirect_aliases);
 
             // Colon and semicolon are only valid in test command lines and
-            // after 'end' in if-else. Note that we still recognize them
-            // lexically, they are just not valid tokens per the grammar.
+            // after 'end' in a flow control construct. Note that we still
+            // recognize them lexically, they are just not valid tokens per
+            // the grammar.
             //
             if (tt != type::newline)
             {
@@ -504,14 +516,17 @@ namespace build2
           if (ls->empty ())
             return semi;
         }
+        else if (lt == line_type::cmd_while)
+          semi = pre_parse_while (t, tt, d, *ls);
 
         // Unless we were told where to put it, decide where it actually goes.
         //
         if (ls == &ls_data)
         {
-          // First pre-check variable and variable-if: by themselves (i.e.,
-          // without a trailing semicolon) they are treated as either setup or
-          // teardown without plus/minus. Also handle illegal line types.
+          // First pre-check variables and variable-only flow control
+          // constructs: by themselves (i.e., without a trailing semicolon)
+          // they are treated as either setup or teardown without
+          // plus/minus. Also handle illegal line types.
           //
           switch (lt)
           {
@@ -524,8 +539,9 @@ namespace build2
             }
           case line_type::cmd_if:
           case line_type::cmd_ifn:
+          case line_type::cmd_while:
             {
-              // See if this is a variable-only command-if.
+              // See if this is a variable-only flow control construct.
               //
               if (find_if (ls_data.begin (), ls_data.end (),
                            [] (const line& l) {
@@ -549,7 +565,7 @@ namespace build2
                     fail (ll) << "description before setup/teardown variable";
                   else
                     fail (ll) << "description before/after setup/teardown "
-                              << "variable-if";
+                              << "variable-only " << lt;
                 }
 
                 // If we don't have any nested scopes or teardown commands,
@@ -793,7 +809,7 @@ namespace build2
                                      td,
                                      &ls,
                                      true /* one */,
-                                     true /* if_line */));
+                                     line_type::cmd_if));
 
           assert (ls.size () == 1 && ls.back ().type == lt);
           assert (tt == type::newline);
@@ -831,6 +847,97 @@ namespace build2
         return false; // We never end with a semi.
       }
 
+      // Pre-parse the flow control construct block line. Fail if the line is
+      // unexpectedly followed with a semicolon or test description.
+      //
+      bool parser::
+      pre_parse_block_line (token& t, type& tt,
+                            line_type bt,
+                            optional<description>& d,
+                            lines& ls)
+      {
+        // enter: peeked first token of the line (type in tt)
+        // leave: newline
+
+        const location ll (get_location (peeked ()));
+
+        switch (tt)
+        {
+        case type::colon:
+          fail (ll) << "description inside " << bt << endf;
+        case type::eos:
+        case type::rcbrace:
+        case type::lcbrace:
+          fail (ll) << "expected closing 'end'" << endf;
+        case type::plus:
+          fail (ll) << "setup command inside " << bt << endf;
+        case type::minus:
+          fail (ll) << "teardown command inside " << bt << endf;
+        }
+
+        // Parse one line. Note that this one line can still be multiple lines
+        // in case of a flow control construct. In this case we want to view
+        // it as, for example, cmd_if, not cmd_end. Thus remember the start
+        // position of the next logical line.
+        //
+        size_t i (ls.size ());
+
+        line_type fct; // Flow control type the block type relates to.
+
+        switch (bt)
+        {
+        case line_type::cmd_if:
+        case line_type::cmd_ifn:
+        case line_type::cmd_elif:
+        case line_type::cmd_elifn:
+        case line_type::cmd_else:
+          {
+            fct = line_type::cmd_if;
+            break;
+          }
+        case line_type::cmd_while:
+          {
+            fct = line_type::cmd_while;
+            break;
+          }
+        default: assert(false);
+        }
+
+        optional<description> td;
+        bool semi (pre_parse_line (t, tt, td, &ls, true /* one */, fct));
+
+        assert (tt == type::newline);
+
+        line_type lt (ls[i].type);
+
+        // First take care of 'end'.
+        //
+        if (lt == line_type::cmd_end)
+        {
+          if (td)
+          {
+            if (d)
+              fail (ll) << "both leading and trailing descriptions";
+
+            d = move (td);
+          }
+
+          return semi;
+        }
+
+        // For any other line trailing semi or description is illegal.
+        //
+        // @@ Not the exact location of semi/colon.
+        //
+        if (semi)
+          fail (ll) << "';' inside " << bt;
+
+        if (td)
+          fail (ll) << "description inside " << bt;
+
+        return false;
+      }
+
       bool parser::
       pre_parse_if_else_command (token& t, type& tt,
                                  optional<description>& d,
@@ -839,70 +946,23 @@ namespace build2
         // enter: peeked first token of next line (type in tt)
         // leave: newline
 
-        // Parse lines until we see closing 'end'. Nested if-else blocks are
-        // handled recursively.
+        // Parse lines until we see closing 'end'.
         //
         for (line_type bt (line_type::cmd_if); // Current block.
              ;
              tt = peek (lexer_mode::first_token))
         {
           const location ll (get_location (peeked ()));
-
-          switch (tt)
-          {
-          case type::colon:
-            fail (ll) << "description inside " << bt << endf;
-          case type::eos:
-          case type::rcbrace:
-          case type::lcbrace:
-            fail (ll) << "expected closing 'end'" << endf;
-          case type::plus:
-            fail (ll) << "setup command inside " << bt << endf;
-          case type::minus:
-            fail (ll) << "teardown command inside " << bt << endf;
-          }
-
-          // Parse one line. Note that this one line can still be multiple
-          // lines in case of if-else. In this case we want to view it as
-          // cmd_if, not cmd_end. Thus remember the start position of the
-          // next logical line.
-          //
           size_t i (ls.size ());
 
-          optional<description> td;
-          bool semi (pre_parse_line (t, tt,
-                                     td,
-                                     &ls,
-                                     true /* one */,
-                                     true /* if_line */));
-          assert (tt == type::newline);
+          bool semi (pre_parse_block_line (t, tt, bt, d, ls));
 
           line_type lt (ls[i].type);
 
           // First take care of 'end'.
           //
           if (lt == line_type::cmd_end)
-          {
-            if (td)
-            {
-              if (d)
-                fail (ll) << "both leading and trailing descriptions";
-
-              d = move (td);
-            }
-
             return semi;
-          }
-
-          // For any other line trailing semi or description is illegal.
-          //
-          // @@ Not the exact location of semi/colon.
-          //
-          if (semi)
-            fail (ll) << "';' inside " << bt;
-
-          if (td)
-            fail (ll) << "description inside " << bt;
 
           // Check if-else block sequencing.
           //
@@ -924,6 +984,36 @@ namespace build2
           default: break;
           }
         }
+
+        assert (false); // Can't be here.
+        return false;
+      }
+
+      bool parser::
+      pre_parse_while (token& t, type& tt,
+                       optional<description>& d,
+                       lines& ls)
+      {
+        // enter: <newline> (previous line)
+        // leave: <newline>
+
+        tt = peek (lexer_mode::first_token);
+
+        // Parse lines until we see closing 'end'.
+        //
+        for (;; tt = peek (lexer_mode::first_token))
+        {
+          size_t i (ls.size ());
+
+          bool semi (
+            pre_parse_block_line (t, tt, line_type::cmd_while, d, ls));
+
+          if (ls[i].type == line_type::cmd_end)
+            return semi;
+        }
+
+        assert (false); // Can't be here.
+        return false;
       }
 
       void parser::
@@ -1424,7 +1514,7 @@ namespace build2
         command_type ct;
 
         auto exec_cmd = [&ct, this] (token& t, build2::script::token_type& tt,
-                                     size_t li,
+                                     const iteration_index* ii, size_t li,
                                      bool single,
                                      const location& ll)
         {
@@ -1437,19 +1527,20 @@ namespace build2
           command_expr ce (
             parse_command_line (t, static_cast<token_type&> (tt)));
 
-          runner_->run (*scope_, ce, ct, li, ll);
+          runner_->run (*scope_, ce, ct, ii, li, ll);
         };
 
-        auto exec_if = [this] (token& t, build2::script::token_type& tt,
-                               size_t li,
-                               const location& ll)
+        auto exec_cond = [this] (token& t, build2::script::token_type& tt,
+                                 const iteration_index* ii, size_t li,
+                                 const location& ll)
         {
           command_expr ce (
             parse_command_line (t, static_cast<token_type&> (tt)));
 
-          // Assume if-else always involves multiple commands.
+          // Assume a flow control construct always involves multiple
+          // commands.
           //
-          return runner_->run_if (*scope_, ce, li, ll);
+          return runner_->run_cond (*scope_, ce, ii, li, ll);
         };
 
         size_t li (1);
@@ -1459,16 +1550,16 @@ namespace build2
           ct = command_type::test;
 
           exec_lines (t->tests_.begin (), t->tests_.end (),
-                      exec_set, exec_cmd, exec_if,
-                      li);
+                      exec_set, exec_cmd, exec_cond,
+                      nullptr /* iteration_index */, li);
         }
         else if (group* g = dynamic_cast<group*> (scope_))
         {
           ct = command_type::setup;
 
           bool exec_scope (exec_lines (g->setup_.begin (), g->setup_.end (),
-                                       exec_set, exec_cmd, exec_if,
-                                       li));
+                                       exec_set, exec_cmd, exec_cond,
+                                       nullptr /* iteration_index */, li));
 
           if (exec_scope)
           {
@@ -1526,7 +1617,8 @@ namespace build2
 
                   try
                   {
-                    take = runner_->run_if (*scope_, ce, li++, ll);
+                    take = runner_->run_cond (
+                      *scope_, ce, nullptr /* iteration_index */, li++, ll);
                   }
                   catch (const exit_scope& e)
                   {
@@ -1637,8 +1729,8 @@ namespace build2
           ct = command_type::teardown;
 
           exec_lines (g->tdown_.begin (), g->tdown_.end (),
-                      exec_set, exec_cmd, exec_if,
-                      li);
+                      exec_set, exec_cmd, exec_cond,
+                      nullptr /* iteration_index */, li);
         }
         else
           assert (false);
diff --git a/libbuild2/test/script/parser.hxx b/libbuild2/test/script/parser.hxx
index 0d15580..31dd41d 100644
--- a/libbuild2/test/script/parser.hxx
+++ b/libbuild2/test/script/parser.hxx
@@ -62,7 +62,13 @@ namespace build2
                         optional<description>&,
                         lines* = nullptr,
                         bool one = false,
-                        bool if_line = false);
+                        optional<line_type> flow_control_type = nullopt);
+
+        bool
+        pre_parse_block_line (token&, token_type&,
+                              line_type block_type,
+                              optional<description>&,
+                              lines&);
 
         bool
         pre_parse_if_else (token&, token_type&,
@@ -79,6 +85,11 @@ namespace build2
                                    optional<description>&,
                                    lines&);
 
+        bool
+        pre_parse_while (token&, token_type&,
+                         optional<description>&,
+                         lines&);
+
         void
         pre_parse_directive (token&, token_type&);
 
diff --git a/libbuild2/test/script/parser.test.cxx b/libbuild2/test/script/parser.test.cxx
index ccd4104..ab0aee9 100644
--- a/libbuild2/test/script/parser.test.cxx
+++ b/libbuild2/test/script/parser.test.cxx
@@ -33,8 +33,11 @@ namespace build2
       class print_runner: public runner
       {
       public:
-        print_runner (bool scope, bool id, bool line)
-            : scope_ (scope), id_ (id), line_ (line) {}
+        print_runner (bool scope, bool id, bool line, bool iterations)
+            : scope_ (scope),
+              id_ (id),
+              line_ (line),
+              iterations_ (iterations) {}
 
         virtual bool
         test (scope&) const override
@@ -99,7 +102,7 @@ namespace build2
         virtual void
         run (scope&,
              const command_expr& e, command_type t,
-             size_t i,
+             const iteration_index* ii, size_t i,
              const location&) override
         {
           const char* s (nullptr);
@@ -113,22 +116,22 @@ namespace build2
 
           cout << ind_ << s << e;
 
-          if (line_)
-            cout << " # " << i;
+          if (line_ || iterations_)
+            print_line_info (ii, i);
 
           cout << endl;
         }
 
         virtual bool
-        run_if (scope&,
-                const command_expr& e,
-                size_t i,
-                const location&) override
+        run_cond (scope&,
+                  const command_expr& e,
+                  const iteration_index* ii, size_t i,
+                  const location&) override
         {
           cout << ind_ << "? " << e;
 
-          if (line_)
-            cout << " # " << i;
+          if (line_ || iterations_)
+            print_line_info (ii, i);
 
           cout << endl;
 
@@ -146,13 +149,33 @@ namespace build2
         }
 
       private:
+        void
+        print_line_info (const iteration_index* ii, size_t i) const
+        {
+          cout << " #";
+
+          if (line_)
+            cout << ' ' << i;
+
+          if (iterations_ && ii != nullptr)
+          {
+            string s;
+            for (const iteration_index* i (ii); i != nullptr; i = i->prev)
+              s.insert (0, " i" + to_string (i->index));
+
+            cout << s;
+          }
+        }
+
+      private:
         bool scope_;
         bool id_;
         bool line_;
+        bool iterations_;
         string ind_;
       };
 
-      // Usage: argv[0] [-s] [-i] [-l] [<testscript-name>]
+      // Usage: argv[0] [-s] [-i] [-l] [-r] [<testscript-name>]
       //
       int
       main (int argc, char* argv[])
@@ -174,6 +197,7 @@ namespace build2
         bool scope (false);
         bool id (false);
         bool line (false);
+        bool iterations (false);
         path name;
 
         for (int i (1); i != argc; ++i)
@@ -186,6 +210,8 @@ namespace build2
             id = true;
           else if (a == "-l")
             line = true;
+          else if (a == "-r")
+            iterations = true;
           else
           {
             name = path (move (a));
@@ -236,7 +262,7 @@ namespace build2
           script s (tt, st, dir_path (work) /= "test-driver");
           p.pre_parse (cin, s);
 
-          print_runner r (scope, id, line);
+          print_runner r (scope, id, line, iterations);
           p.execute (s, r);
         }
         catch (const failed&)
diff --git a/libbuild2/test/script/runner.cxx b/libbuild2/test/script/runner.cxx
index 8054c61..42eef04 100644
--- a/libbuild2/test/script/runner.cxx
+++ b/libbuild2/test/script/runner.cxx
@@ -142,7 +142,8 @@ namespace build2
       void default_runner::
       run (scope& sp,
            const command_expr& expr, command_type ct,
-           size_t li, const location& ll)
+           const iteration_index* ii, size_t li,
+           const location& ll)
       {
         // Noop for teardown commands if keeping tests output is requested.
         //
@@ -175,13 +176,14 @@ namespace build2
             dr << info << "test id: " << sp.id_path.posix_string ();
           });
 
-        build2::script::run (sp, expr, li, ll);
+        build2::script::run (sp, expr, ii, li, ll);
       }
 
       bool default_runner::
-      run_if (scope& sp,
-              const command_expr& expr,
-              size_t li, const location& ll)
+      run_cond (scope& sp,
+                const command_expr& expr,
+                const iteration_index* ii, size_t li,
+                const location& ll)
       {
         if (verb >= 3)
           text << ": ?" << expr;
@@ -197,7 +199,7 @@ namespace build2
             dr << info << "test id: " << sp.id_path.posix_string ();
           });
 
-        return build2::script::run_if (sp, expr, li, ll);
+        return build2::script::run_cond (sp, expr, ii, li, ll);
       }
     }
   }
diff --git a/libbuild2/test/script/runner.hxx b/libbuild2/test/script/runner.hxx
index b6a038d..0309a35 100644
--- a/libbuild2/test/script/runner.hxx
+++ b/libbuild2/test/script/runner.hxx
@@ -51,11 +51,14 @@ namespace build2
         virtual void
         run (scope&,
              const command_expr&, command_type,
-             size_t index,
+             const iteration_index*, size_t index,
              const location&) = 0;
 
         virtual bool
-        run_if (scope&, const command_expr&, size_t, const location&) = 0;
+        run_cond (scope&,
+                  const command_expr&,
+                  const iteration_index*, size_t,
+                  const location&) = 0;
 
         // Location is the scope end location (for diagnostics, etc).
         //
@@ -84,11 +87,14 @@ namespace build2
         virtual void
         run (scope&,
              const command_expr&, command_type,
-             size_t,
+             const iteration_index*, size_t,
              const location&) override;
 
         virtual bool
-        run_if (scope&, const command_expr&, size_t, const location&) override;
+        run_cond (scope&,
+                  const command_expr&,
+                  const iteration_index*, size_t,
+                  const location&) override;
 
         virtual void
         leave (scope&, const location&) override;
diff --git a/libbuild2/test/script/script.hxx b/libbuild2/test/script/script.hxx
index 22f6725..b75f68e 100644
--- a/libbuild2/test/script/script.hxx
+++ b/libbuild2/test/script/script.hxx
@@ -21,13 +21,14 @@ namespace build2
     namespace script
     {
       using build2::script::line;
+      using build2::script::line_type;
       using build2::script::lines;
       using build2::script::redirect;
       using build2::script::redirect_type;
-      using build2::script::line_type;
-      using build2::script::command_expr;
-      using build2::script::expr_term;
       using build2::script::command;
+      using build2::script::expr_term;
+      using build2::script::command_expr;
+      using build2::script::iteration_index;
       using build2::script::environment_vars;
       using build2::script::deadline;
       using build2::script::timeout;