diff options
| author |  Rustan Leino <leino@microsoft.com> | 2012-10-04 00:41:44 -0700 |
|---|---|---|
| committer | Rustan Leino <leino@microsoft.com> | 2012-10-04 00:41:44 -0700 |
| commit | 2d5a393b81ef2b389278f161460a1f98719c0aa6 (patch) | |
| tree | 128e993567d6f392c11e3ab4f068da5f2a817db3 /Test | |
| parent | 86da04e8be269d13874191c81cee0e2110d6373e (diff) | |
Dafny: fixed merge
Diffstat (limited to 'Test')
| -rw-r--r-- | Test/dafny0/Answer | 15 | ||||
| -rw-r--r-- | Test/dafny1/runtest.bat | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Test/dafny0/Answer b/Test/dafny0/Answer index 140f642f..f586aa8b 100644 --- a/Test/dafny0/Answer +++ b/Test/dafny0/Answer @@ -332,10 +332,10 @@ Execution trace: Definedness.dfy(86,5): Error: possible violation of function precondition
Execution trace:
(0,0): anon0
-Definedness.dfy(86,10): Error: target object may be null
+Definedness.dfy(86,10): Error: assignment may update an object not in the enclosing context's modifies clause
Execution trace:
(0,0): anon0
-Definedness.dfy(86,10): Error: assignment may update an object not in the enclosing context's modifies clause
+Definedness.dfy(86,10): Error: target object may be null
Execution trace:
(0,0): anon0
Definedness.dfy(87,10): Error: possible violation of function precondition
@@ -872,19 +872,19 @@ Execution trace: Dafny program verifier finished with 32 verified, 11 errors
-------------------- ControlStructures.dfy --------------------
-ControlStructures.dfy(5,3): Error: missing case in case statement: Purple
+ControlStructures.dfy(5,3): Error: missing case in case statement: Blue
Execution trace:
(0,0): anon0
(0,0): anon6_Else
(0,0): anon7_Else
- (0,0): anon8_Then
-ControlStructures.dfy(5,3): Error: missing case in case statement: Blue
+ (0,0): anon8_Else
+ (0,0): anon9_Then
+ControlStructures.dfy(5,3): Error: missing case in case statement: Purple
Execution trace:
(0,0): anon0
(0,0): anon6_Else
(0,0): anon7_Else
- (0,0): anon8_Else
- (0,0): anon9_Then
+ (0,0): anon8_Then
ControlStructures.dfy(14,3): Error: missing case in case statement: Purple
Execution trace:
(0,0): anon0
@@ -1649,6 +1649,7 @@ Execution trace: Calculations.dfy(31,2): anon5_Else
Dafny program verifier finished with 4 verified, 4 errors
+
-------------------- IteratorResolution.dfy --------------------
IteratorResolution.dfy(59,11): Error: LHS of assignment does not denote a mutable field
IteratorResolution.dfy(64,18): Error: arguments must have the same type (got _T0 and int)
diff --git a/Test/dafny1/runtest.bat b/Test/dafny1/runtest.bat index fa7f7c70..a49bbf9a 100644 --- a/Test/dafny1/runtest.bat +++ b/Test/dafny1/runtest.bat @@ -19,5 +19,5 @@ for %%f in (Queue.dfy PriorityQueue.dfy UltraFilter.dfy) do (
echo.
echo -------------------- %%f --------------------
- %DAFNY_EXE% /compile:0 /dprint:out.dfy.tmp %* %%f
+ %DAFNY_EXE% /compile:0 /vcsMaxKeepGoingSplits:2 /dprint:out.dfy.tmp %* %%f
)
|