diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-11-02 22:22:09 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-11-09 21:45:02 +0300 |
| commit | fca95dafaaab44d3e06e10bc9f3b45d00c82301f (patch) | |
| tree | 69f59c57b0aa6100e01264a5d10e6a155ffff79e /libbuild2/build | |
| parent | f34dd20fb7578874925dacf21b32338af50e8c12 (diff) | |
Use diag_buffer in script
Diffstat (limited to 'libbuild2/build')
| -rw-r--r-- | libbuild2/build/script/parser.cxx | 17 | ||||
| -rw-r--r-- | libbuild2/build/script/parser.test.cxx | 4 | ||||
| -rw-r--r-- | libbuild2/build/script/script.hxx | 1 |
3 files changed, 13 insertions, 9 deletions
diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx index cb1fbef..b406f12 100644 --- a/libbuild2/build/script/parser.cxx +++ b/libbuild2/build/script/parser.cxx @@ -2514,16 +2514,19 @@ namespace build2 (build2::script::environment&, const strings&, auto_fd in, - bool pipe, + pipe_command* pipe, const optional<deadline>& dl, - const command& deadline_cmd, const location& ll) { - iss.str (stream_read (move (in), - pipe, - dl, - deadline_cmd, - ll)); + read (move (in), + false /* whitespace */, + false /* newline */, + true /* exact */, + [&iss] (string&& s) {iss.str (move (s));}, + pipe, + dl, + ll, + "depdb-dyndep"); }); build2::script::run (*environment_, diff --git a/libbuild2/build/script/parser.test.cxx b/libbuild2/build/script/parser.test.cxx index d69929c..e1ee3ef 100644 --- a/libbuild2/build/script/parser.test.cxx +++ b/libbuild2/build/script/parser.test.cxx @@ -58,8 +58,8 @@ namespace build2 assert (!c.out && !c.err && !c.exit); cf (env, c.arguments, - fdopen_null (), false /* pipe */, - nullopt /* deadline */, c, + fdopen_null (), nullptr /* pipe */, + nullopt /* deadline */, ll); } diff --git a/libbuild2/build/script/script.hxx b/libbuild2/build/script/script.hxx index b2b886c..57a893e 100644 --- a/libbuild2/build/script/script.hxx +++ b/libbuild2/build/script/script.hxx @@ -30,6 +30,7 @@ namespace build2 using build2::script::iteration_index; using build2::script::deadline; using build2::script::timeout; + using build2::script::pipe_command; using build2::script::command_function; // Forward declarations. |