aboutsummaryrefslogtreecommitdiff
path: root/build2/b.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-12-17 10:50:57 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-12-17 10:50:57 +0200
commit78d21f22eb72a96d9e993e358743ed72349e4235 (patch)
tree7cbc4c200f23b0fba3d92f535f57463e0539ae63 /build2/b.cxx
parentf9d759160eef1ca870edcbb9b87caa23f0c93a43 (diff)
Fix few issues with structured result output
Diffstat (limited to 'build2/b.cxx')
-rw-r--r--build2/b.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 7bb9484..f6ee45a 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -1187,6 +1187,8 @@ main (int argc, char* argv[])
// Finally, match the rules and perform the operation.
//
+ bool sr ();
+
if (pre_oid != 0)
{
l5 ([&]{trace << "start pre-operation batch " << pre_oif->name
@@ -1203,7 +1205,7 @@ main (int argc, char* argv[])
result_printer p (tgs);
if (mif->match != nullptr)
- mif->match (mparams, a, tgs);
+ mif->match (mparams, a, tgs, true /* quiet */);
if (mif->execute != nullptr && !ops.match_only ())
mif->execute (mparams, a, tgs, true /* quiet */);
@@ -1226,7 +1228,7 @@ main (int argc, char* argv[])
result_printer p (tgs);
if (mif->match != nullptr)
- mif->match (mparams, a, tgs);
+ mif->match (mparams, a, tgs, ops.structured_result () /*quiet*/);
if (mif->execute != nullptr && !ops.match_only ())
mif->execute (mparams, a, tgs, ops.structured_result () /*quiet*/);
@@ -1250,7 +1252,7 @@ main (int argc, char* argv[])
result_printer p (tgs);
if (mif->match != nullptr)
- mif->match (mparams, a, tgs);
+ mif->match (mparams, a, tgs, true /* quiet */);
if (mif->execute != nullptr && !ops.match_only ())
mif->execute (mparams, a, tgs, true /* quiet */);