Merge.

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/ExecutionEngine/ExecutionEngine.cs b/Source/ExecutionEngine/ExecutionEngine.cs
index b8bdf894..2588c08f 100644
--- a/Source/ExecutionEngine/ExecutionEngine.cs
+++ b/Source/ExecutionEngine/ExecutionEngine.cs
@@ -157,7 +157,7 @@ namespace Microsoft.Boogie
       string s;

       if (tok != null)

       {

-        s = string.Format("{0}({1},{2}): {3}", tok.filename, tok.line, tok.col, message);

+        s = string.Format("{0}({1},{2}): {3}", ExecutionEngine.GetFileNameForConsole(tok.filename), tok.line, tok.col, message);

       }

       else

       {

@@ -632,9 +632,9 @@ namespace Microsoft.Boogie
       }

     }

 

-    private static string GetFileNameForConsole(string filename)

+    internal static string GetFileNameForConsole(string filename)

     {

-      return (CommandLineOptions.Clo.UseBaseNameForFileName) ? System.IO.Path.GetFileName(filename) : filename;

+      return (CommandLineOptions.Clo.UseBaseNameForFileName && !string.IsNullOrEmpty(filename) && filename != "<console>") ? System.IO.Path.GetFileName(filename) : filename;

     }