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, 22 insertions, 22 deletions

diff --git a/Test/dafny0/Iterators.dfy.expect b/Test/dafny0/Iterators.dfy.expect
index f0c6e400..d9129e3e 100644
--- a/Test/dafny0/Iterators.dfy.expect
+++ b/Test/dafny0/Iterators.dfy.expect
@@ -1,55 +1,55 @@
-Iterators.dfy(251,10): Error: failure to decrease termination measure

+Iterators.dfy(251,9): Error: failure to decrease termination measure

 Execution trace:

     (0,0): anon0

     (0,0): anon5_Else

     (0,0): anon6_Else

-Iterators.dfy(274,10): Error: failure to decrease termination measure

+Iterators.dfy(274,9): Error: failure to decrease termination measure

 Execution trace:

     (0,0): anon0

     (0,0): anon5_Else

     (0,0): anon6_Else

-Iterators.dfy(284,32): Error: failure to decrease termination measure

+Iterators.dfy(284,31): Error: failure to decrease termination measure

 Execution trace:

     (0,0): anon0

-Iterators.dfy(296,10): Error: cannot prove termination; try supplying a decreases clause

+Iterators.dfy(296,9): Error: cannot prove termination; try supplying a decreases clause

 Execution trace:

     (0,0): anon0

     (0,0): anon5_Else

     (0,0): anon6_Else

-Iterators.dfy(317,10): Error: cannot prove termination; try supplying a decreases clause

+Iterators.dfy(317,9): Error: cannot prove termination; try supplying a decreases clause

 Execution trace:

     (0,0): anon0

     (0,0): anon5_Else

     (0,0): anon6_Else

-Iterators.dfy(326,32): Error: cannot prove termination; try supplying a decreases clause

+Iterators.dfy(326,31): Error: cannot prove termination; try supplying a decreases clause

 Execution trace:

     (0,0): anon0

-Iterators.dfy(343,10): Error: failure to decrease termination measure

+Iterators.dfy(343,9): Error: failure to decrease termination measure

 Execution trace:

     (0,0): anon0

     (0,0): anon5_Else

     (0,0): anon6_Else

-Iterators.dfy(353,32): Error: cannot prove termination; try supplying a decreases clause

+Iterators.dfy(353,31): Error: cannot prove termination; try supplying a decreases clause

 Execution trace:

     (0,0): anon0

-Iterators.dfy(370,10): Error: failure to decrease termination measure

+Iterators.dfy(370,9): Error: failure to decrease termination measure

 Execution trace:

     (0,0): anon0

     (0,0): anon5_Else

     (0,0): anon6_Else

-Iterators.dfy(103,22): Error: assertion violation

+Iterators.dfy(103,21): Error: assertion violation

 Execution trace:

     (0,0): anon0

-Iterators.dfy(106,14): Error: assertion violation

+Iterators.dfy(106,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon4_Then

     (0,0): anon3

-Iterators.dfy(177,28): Error: assertion violation

+Iterators.dfy(177,27): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon15_Then

-Iterators.dfy(208,7): Error: an assignment to _new is only allowed to shrink the set

+Iterators.dfy(208,6): Error: an assignment to _new is only allowed to shrink the set

 Execution trace:

     (0,0): anon0

     Iterators.dfy(197,3): anon16_LoopHead

@@ -57,7 +57,7 @@ Execution trace:
     Iterators.dfy(197,3): anon17_Else

     Iterators.dfy(197,3): anon19_Else

     (0,0): anon20_Then

-Iterators.dfy(212,21): Error: assertion violation

+Iterators.dfy(212,20): Error: assertion violation

 Execution trace:

     (0,0): anon0

     Iterators.dfy(197,3): anon16_LoopHead

@@ -65,8 +65,8 @@ Execution trace:
     Iterators.dfy(197,3): anon17_Else

     Iterators.dfy(197,3): anon19_Else

     (0,0): anon21_Then

-Iterators.dfy(40,22): Error BP5002: A precondition for this call might not hold.

-Iterators.dfy(4,10): Related location: This is the precondition that might not hold.

+Iterators.dfy(40,21): Error BP5002: A precondition for this call might not hold.

+Iterators.dfy(4,9): Related location: This is the precondition that might not hold.

 Execution trace:

     (0,0): anon0

     (0,0): anon35_Then

@@ -74,24 +74,24 @@ Execution trace:
     (0,0): anon36_Then

     (0,0): anon5

     (0,0): anon37_Then

-Iterators.dfy(89,14): Error: assertion violation

+Iterators.dfy(89,13): Error: assertion violation

 Execution trace:

     (0,0): anon0

-Iterators.dfy(119,16): Error: assertion violation

+Iterators.dfy(119,15): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon3_Else

-Iterators.dfy(150,16): Error: assertion violation

+Iterators.dfy(150,15): Error: assertion violation

 Execution trace:

     (0,0): anon0

     (0,0): anon4_Else

-Iterators.dfy(155,24): Error BP5002: A precondition for this call might not hold.

-Iterators.dfy(125,10): Related location: This is the precondition that might not hold.

+Iterators.dfy(155,23): Error BP5002: A precondition for this call might not hold.

+Iterators.dfy(125,9): Related location: This is the precondition that might not hold.

 Execution trace:

     (0,0): anon0

     (0,0): anon4_Then

     (0,0): anon3

-Iterators.dfy(234,21): Error: assertion violation

+Iterators.dfy(234,20): Error: assertion violation

 Execution trace:

     (0,0): anon0

     Iterators.dfy(225,3): anon14_LoopHead