1 files changed, 35 insertions, 8 deletions

diff --git a/libbuild2/script/parser.hxx b/libbuild2/script/parser.hxx
index 3a4c46f..795ce4e 100644
--- a/libbuild2/script/parser.hxx
+++ b/libbuild2/script/parser.hxx
@@ -97,15 +97,34 @@ namespace build2
       };
       using here_docs = vector<here_doc>;
 
-      pair<command_expr, here_docs>
-      parse_command_expr (token&, token_type&, const redirect_aliases&);
+      struct parse_command_expr_result
+      {
+        command_expr expr; // Single pipe for the for-loop.
+        here_docs    docs;
+        bool         for_loop = false;
+
+        parse_command_expr_result () = default;
+
+        parse_command_expr_result (command_expr&& e,
+                                   here_docs&& h,
+                                   bool f)
+            : expr (move (e)), docs (move (h)), for_loop (f) {}
+      };
+
+      // Pass the first special command program name (token_type::word) if it
+      // is already pre-parsed.
+      //
+      parse_command_expr_result
+      parse_command_expr (token&, token_type&,
+                          const redirect_aliases&,
+                          optional<token>&& program = nullopt);
 
       command_exit
       parse_command_exit (token&, token_type&);
 
       void
       parse_here_documents (token&, token_type&,
-                            pair<command_expr, here_docs>&);
+                            parse_command_expr_result&);
 
       struct parsed_doc
       {
@@ -121,7 +140,7 @@ namespace build2
 
         parsed_doc (string, uint64_t line, uint64_t column);
         parsed_doc (regex_lines&&, uint64_t line, uint64_t column);
-        parsed_doc (parsed_doc&&); // Note: move constuctible-only type.
+        parsed_doc (parsed_doc&&) noexcept; // Note: move constuctible-only type.
         ~parsed_doc ();
       };
 
@@ -135,18 +154,24 @@ namespace build2
       // the first two tokens. Use the specified lexer mode to peek the second
       // token.
       //
+      // Always return the cmd_for_stream line type for the for-loop. Note
+      // that the for-loop form cannot be detected easily, based on the first
+      // two tokens. Also note that the detection can be specific for the
+      // script implementation (custom lexing mode, special variables, etc).
+      //
       line_type
       pre_parse_line_start (token&, token_type&, lexer_mode);
 
       // Parse the env pseudo-builtin arguments up to the program name. Return
-      // the program execution timeout, CWD, the list of the variables that
-      // should be unset ("name") and/or set ("name=value") in the command
-      // environment, and the token/type that starts the program name. Note
-      // that the variable unsets come first, if present.
+      // the program execution timeout and its success flag, CWD, the list of
+      // the variables that should be unset ("name") and/or set ("name=value")
+      // in the command environment, and the token/type that starts the
+      // program name. Note that the variable unsets come first, if present.
       //
       struct parsed_env
       {
         optional<duration> timeout;
+        bool               timeout_success = false;
         optional<dir_path> cwd;
         environment_vars   variables;
       };
@@ -169,6 +194,7 @@ namespace build2
       using exec_cmd_function = void (token&, token_type&,
                                       const iteration_index*, size_t li,
                                       bool single,
+                                      const function<command_function>&,
                                       const location&);
 
       using exec_cond_function  = bool (token&, token_type&,
@@ -177,6 +203,7 @@ namespace build2
 
       using exec_for_function = void (const variable&,
                                       value&&,
+                                      const attributes& value_attrs,
                                       const location&);
 
       // If a parser implementation doesn't pre-enter variables into a pool