Dafny: Made sure that error locations refer to the Dafny program, even if the /print option is used.

2 files changed, 12 insertions, 2 deletions

diff --git a/Source/Core/Util.cs b/Source/Core/Util.cs
index d557bc55..6b4c570a 100644
--- a/Source/Core/Util.cs
+++ b/Source/Core/Util.cs
@@ -167,6 +167,16 @@ namespace Microsoft.Boogie {
       //base();

     }

 

+    public TokenTextWriter(string filename, bool setTokens)

+      : base() {//BASEMOVE DANGER

+      Contract.Requires(writer != null);

+      Contract.Requires(filename != null);

+      this.filename = filename;

+      this.writer = new StreamWriter(filename);

+      this.setTokens = setTokens;

+      //base();

+    }

+

     public TokenTextWriter(string filename, TextWriter writer, bool setTokens)

       : base() {//BASEMOVE DANGER

       Contract.Requires(writer != null);

diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs
index 2c2e64e6..c7a929b8 100644
--- a/Source/DafnyDriver/DafnyDriver.cs
+++ b/Source/DafnyDriver/DafnyDriver.cs
@@ -250,8 +250,8 @@ namespace Microsoft.Dafny
           CommandLineOptions.Clo.PrintDesugarings = false;

         }

         using (TokenTextWriter writer = filename == "-" ?

-                                        new TokenTextWriter("<console>", Console.Out) :

-                                        new TokenTextWriter(filename))

+                                        new TokenTextWriter("<console>", Console.Out, false) :

+                                        new TokenTextWriter(filename, false))

         {

             writer.WriteLine("// " + CommandLineOptions.Clo.Version);

             writer.WriteLine("// " + CommandLineOptions.Clo.Environment);