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.

7 files changed, 9 insertions, 9 deletions

diff --git a/Test/dafny0/snapshots/Snapshots0.run.dfy.expect b/Test/dafny0/snapshots/Snapshots0.run.dfy.expect
index 96c280d9..d32cd9bb 100644
--- a/Test/dafny0/snapshots/Snapshots0.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots0.run.dfy.expect
@@ -18,7 +18,7 @@ Processing command (at <unknown location>) a##cached##0 := a##cached##0 && ##ext
   >>> AssumeNegationOfAssumptionVariable

 Processing command (at Snapshots0.v1.dfy(4,10)) assert Lit(false);

   >>> MarkAsPartiallyVerified

-Snapshots0.v1.dfy(4,10): Error: assertion violation

+Snapshots0.v1.dfy(4,9): Error: assertion violation

 Execution trace:

     (0,0): anon0

 

diff --git a/Test/dafny0/snapshots/Snapshots1.run.dfy.expect b/Test/dafny0/snapshots/Snapshots1.run.dfy.expect
index 878f9905..6d5e43f8 100644
--- a/Test/dafny0/snapshots/Snapshots1.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots1.run.dfy.expect
@@ -14,7 +14,7 @@ Processing command (at Snapshots1.v1.dfy(3,4)) assert (forall<alpha> $o: ref, $f
   >>> MarkAsFullyVerified

 Processing command (at Snapshots1.v1.dfy(4,10)) assert Lit(false);

   >>> DoNothingToAssert

-Snapshots1.v1.dfy(4,10): Error: assertion violation

+Snapshots1.v1.dfy(4,9): Error: assertion violation

 Execution trace:

     (0,0): anon0

 

diff --git a/Test/dafny0/snapshots/Snapshots2.run.dfy.expect b/Test/dafny0/snapshots/Snapshots2.run.dfy.expect
index a6a9bc4c..ee2ceecd 100644
--- a/Test/dafny0/snapshots/Snapshots2.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots2.run.dfy.expect
@@ -26,7 +26,7 @@ Processing command (at Snapshots2.v1.dfy(3,4)) assert (forall<alpha> $o: ref, $f
   >>> MarkAsFullyVerified

 Processing command (at Snapshots2.v1.dfy(4,10)) assert Lit(false);

   >>> DoNothingToAssert

-Snapshots2.v1.dfy(4,10): Error: assertion violation

+Snapshots2.v1.dfy(4,9): Error: assertion violation

 Execution trace:

     (0,0): anon0

 Processing command (at Snapshots2.v1.dfy(11,11)) assert true;

diff --git a/Test/dafny0/snapshots/Snapshots3.run.dfy.expect b/Test/dafny0/snapshots/Snapshots3.run.dfy.expect
index 07e2d063..accacd90 100644
--- a/Test/dafny0/snapshots/Snapshots3.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots3.run.dfy.expect
@@ -1,6 +1,6 @@
 Processing command (at Snapshots3.v0.dfy(9,14)) assert Lit(0 != 0);

   >>> DoNothingToAssert

-Snapshots3.v0.dfy(9,14): Error: assertion violation

+Snapshots3.v0.dfy(9,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon3_Else

@@ -10,7 +10,7 @@ Processing command (at Snapshots3.v1.dfy(5,12)) assert Lit(true);
   >>> DoNothingToAssert

 Processing command (at Snapshots3.v1.dfy(9,14)) assert Lit(0 != 0);

   >>> RecycleError

-Snapshots3.v0.dfy(9,14): Error: assertion violation

+Snapshots3.v0.dfy(9,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon3_Else

diff --git a/Test/dafny0/snapshots/Snapshots4.run.dfy.expect b/Test/dafny0/snapshots/Snapshots4.run.dfy.expect
index fdc97775..d56eb9d0 100644
--- a/Test/dafny0/snapshots/Snapshots4.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots4.run.dfy.expect
@@ -8,11 +8,11 @@ Processing command (at Snapshots4.v1.dfy(9,14)) assert LitInt(0) == LitInt(0);
   >>> MarkAsFullyVerified

 Processing command (at Snapshots4.v1.dfy(10,14)) assert Lit(2 != 2);

   >>> DoNothingToAssert

-Snapshots4.v1.dfy(5,14): Error: assertion violation

+Snapshots4.v1.dfy(5,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon3_Then

-Snapshots4.v1.dfy(10,14): Error: assertion violation

+Snapshots4.v1.dfy(10,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon3_Else

diff --git a/Test/dafny0/snapshots/Snapshots6.run.dfy.expect b/Test/dafny0/snapshots/Snapshots6.run.dfy.expect
index af440327..bef5a87d 100644
--- a/Test/dafny0/snapshots/Snapshots6.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots6.run.dfy.expect
@@ -4,7 +4,7 @@ Processing command (at Snapshots6.v0.dfy(20,14)) assert Lit(false);
 Dafny program verifier finished with 4 verified, 0 errors

 Processing command (at Snapshots6.v1.dfy(20,14)) assert Lit(false);

   >>> DoNothingToAssert

-Snapshots6.v1.dfy(20,14): Error: assertion violation

+Snapshots6.v1.dfy(20,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

 

diff --git a/Test/dafny0/snapshots/Snapshots7.run.dfy.expect b/Test/dafny0/snapshots/Snapshots7.run.dfy.expect
index 7c073a9a..b90a6034 100644
--- a/Test/dafny0/snapshots/Snapshots7.run.dfy.expect
+++ b/Test/dafny0/snapshots/Snapshots7.run.dfy.expect
@@ -24,7 +24,7 @@ Processing command (at <unknown location>) a##cached##0 := a##cached##0 && ##ext
   >>> AssumeNegationOfAssumptionVariable

 Processing command (at Snapshots7.v1.dfy(19,14)) assert Lit(false);

   >>> MarkAsPartiallyVerified

-Snapshots7.v1.dfy(19,14): Error: assertion violation

+Snapshots7.v1.dfy(19,13): Error: assertion violation

 Execution trace:

     (0,0): anon0