aboutsummaryrefslogtreecommitdiff
path: root/build2/diagnostics.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-04-26 15:00:52 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-04-26 15:00:52 +0200
commit0f26bc3b825a8711a4f8c60b5ab746cba9d93bd7 (patch)
tree4ec176df12071bd43633a95af145dde20aad2899 /build2/diagnostics.cxx
parentf98262e37f608330fcfce799dcacc6fbacac8f8a (diff)
Implement run buildfile directive
Now we can do: run echo 'foo = bar' print $foo
Diffstat (limited to 'build2/diagnostics.cxx')
-rw-r--r--build2/diagnostics.cxx23
1 files changed, 13 insertions, 10 deletions
diff --git a/build2/diagnostics.cxx b/build2/diagnostics.cxx
index f04751c..850c83f 100644
--- a/build2/diagnostics.cxx
+++ b/build2/diagnostics.cxx
@@ -65,21 +65,24 @@ namespace build2
{
stream_verb (r.os, sverb_);
- r << *loc_.file << ':';
-
- if (!ops.no_line ())
+ if (!loc_.empty ())
{
- if (loc_.line != 0)
- r << loc_.line << ':';
+ r << *loc_.file << ':';
- if (!ops.no_column ())
+ if (!ops.no_line ())
{
- if (loc_.column != 0)
- r << loc_.column << ':';
+ if (loc_.line != 0)
+ r << loc_.line << ':';
+
+ if (!ops.no_column ())
+ {
+ if (loc_.column != 0)
+ r << loc_.column << ':';
+ }
}
- }
- r << ' ';
+ r << ' ';
+ }
if (type_ != nullptr)
r << type_ << ": ";