Fix: Unify column numbers in Dafny's errors

Dafny counts from 0, but Boogie counts from 1. Tokens are 1-based. Thus when we
print tokens, we need to decrement the column number. This was done for resolver
errors, but not for verification or parsing errors. In addition, parsing errors
were inconsistent with resolution errors case-wise.

Unfortunately, the fix affects the output of many tests.

1 files changed, 7 insertions, 1 deletions

diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs
index 9fdc9320..d22899ab 100644
--- a/Source/DafnyDriver/DafnyDriver.cs
+++ b/Source/DafnyDriver/DafnyDriver.cs
@@ -273,7 +273,13 @@ namespace Microsoft.Dafny
     {

       public override void ReportBplError(IToken tok, string message, bool error, TextWriter tw, string category = null)

       {

-        base.ReportBplError(tok, message, error, tw, category);

+        // Dafny has 0-indexed columns, but Boogie counts from 1

+        var realigned_tok = new Token(tok.line, tok.col - 1);

+        realigned_tok.kind = tok.kind;

+        realigned_tok.pos = tok.pos;

+        realigned_tok.val = tok.val;

+        realigned_tok.filename = tok.filename;

+        base.ReportBplError(realigned_tok, message, error, tw, category);

 

         if (tok is Dafny.NestedToken)

         {