From 0f26bc3b825a8711a4f8c60b5ab746cba9d93bd7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 26 Apr 2018 15:00:52 +0200
Subject: Implement run buildfile directive

Now we can do:

run echo 'foo = bar'
print $foo
---
 build2/diagnostics.cxx | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'build2/diagnostics.cxx')

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_ << ": ";
-- 
cgit v1.1