Merge

6 files changed, 122 insertions, 3 deletions

diff --git a/Binaries/DafnyRuntime.cs b/Binaries/DafnyRuntime.cs
index dfb8cf38..d1a3c092 100644
--- a/Binaries/DafnyRuntime.cs
+++ b/Binaries/DafnyRuntime.cs
@@ -72,11 +72,11 @@ namespace Dafny
       }

     }

     public bool Equals(Set<T> other) {

-        return this.setImpl.Equals(other.setImpl);

+        return this.setImpl.SetEquals(other.setImpl);

     }

     public override bool Equals(object other) {

         var otherSet = other as Set<T>;

-        return otherSet != null && Equals(otherSet);

+        return otherSet != null && this.Equals(otherSet);

     }

     public override int GetHashCode() {

       var hashCode = 1;

diff --git a/Test/dafny0/snapshots/Inputs/Snapshots8.v0.dfy b/Test/dafny0/snapshots/Inputs/Snapshots8.v0.dfy
new file mode 100644
index 00000000..97fcfccb
--- /dev/null
+++ b/Test/dafny0/snapshots/Inputs/Snapshots8.v0.dfy
@@ -0,0 +1,29 @@
+method M(x: int)

+{                     assert x < 20 || 10 <= x;  // always true

+  assert x < 10;  // error

+  Other(x);  // error: precondition violation

+}

+

+method Other(y: int)

+  requires 0 <= y

+{

+}

+

+method Posty() returns (z: int)

+  ensures 2 <= z  // error: postcondition violation

+{

+  var t := 20;

+  if t < z {

+  } else {  // the postcondition violation occurs on this 'else' branch

+  }

+}

+

+method NoChangeWhazzoeva(u: int)

+{

+  assert u != 53;  // error

+}

+

+method NoChangeAndCorrect()

+{

+  assert true;

+}

diff --git a/Test/dafny0/snapshots/Inputs/Snapshots8.v1.dfy b/Test/dafny0/snapshots/Inputs/Snapshots8.v1.dfy
new file mode 100644
index 00000000..8d8b215b
--- /dev/null
+++ b/Test/dafny0/snapshots/Inputs/Snapshots8.v1.dfy
@@ -0,0 +1,33 @@
+method M(x: int)

+{

+assert x < 20 || 10 <= x;  // always true

+  

+       assert x < 10;  // error

+  Other(x);  // error: precondition violation

+  assert x == 7;  // error: this is a new error in v1

+}

+

+

+       method Other(y: int)

+         requires 0 <= y

+       {

+       }

+

+

+

+method Posty() returns (z: int)

+  ensures 2 <= z  // error: postcondition violation

+{

+  var t := 20;

+  if t < z {

+    assert true;  // this is a new assert

+  } else {  // the postcondition violation occurs on this 'else' branch

+  }

+}

+

+  method       NoChangeWhazzoeva(u: int)

+  {

+       assert u != 53;  // error

+  }

+

+method NoChangeAndCorrect() { assert true; }

diff --git a/Test/dafny0/snapshots/Snapshots8.run.dfy b/Test/dafny0/snapshots/Snapshots8.run.dfy
new file mode 100644
index 00000000..00d20f91
--- /dev/null
+++ b/Test/dafny0/snapshots/Snapshots8.run.dfy
@@ -0,0 +1,2 @@
+// RUN: %dafny /compile:0 /verifySnapshots:3 /traceCaching:1 /errorTrace:0 "%S/Inputs/Snapshots8.dfy" > "%t"

+// RUN: %diff "%s.expect" "%t"

diff --git a/Test/dafny0/snapshots/Snapshots8.run.dfy.expect b/Test/dafny0/snapshots/Snapshots8.run.dfy.expect
new file mode 100644
index 00000000..625b71b4
--- /dev/null
+++ b/Test/dafny0/snapshots/Snapshots8.run.dfy.expect
@@ -0,0 +1,55 @@
+Processing command (at Snapshots8.v0.dfy(2,37)) assert x#0 < 20 || LitInt(10) <= x#0;

+  >>> DoNothingToAssert

+Processing command (at Snapshots8.v0.dfy(3,12)) assert x#0 < 10;

+  >>> DoNothingToAssert

+Processing command (at Snapshots8.v0.dfy(4,9)) assert true;

+  >>> DoNothingToAssert

+Processing command (at Snapshots8.v0.dfy(4,8)) assert (forall<alpha> $o: ref, $f: Field alpha :: false ==> $_Frame[$o, $f]);

+  >>> DoNothingToAssert

+Processing command (at Snapshots8.v0.dfy(4,8)) assert LitInt(0) <= call0formal#AT#y#0;

+  >>> DoNothingToAssert

+Snapshots8.v0.dfy(3,11): Error: assertion violation

+Snapshots8.v0.dfy(4,7): Error BP5002: A precondition for this call might not hold.

+Snapshots8.v0.dfy(8,13): Related location: This is the precondition that might not hold.

+Processing command (at Snapshots8.v0.dfy(15,12)) assert true;

+  >>> DoNothingToAssert

+Processing command (at Snapshots8.v0.dfy(13,13)) assert LitInt(2) <= z#0;

+  >>> DoNothingToAssert

+Snapshots8.v0.dfy(17,9): Error BP5003: A postcondition might not hold on this return path.

+Snapshots8.v0.dfy(13,12): Related location: This is the postcondition that might not hold.

+Processing command (at Snapshots8.v0.dfy(23,12)) assert u#0 != 53;

+  >>> DoNothingToAssert

+Snapshots8.v0.dfy(23,11): Error: assertion violation

+Processing command (at Snapshots8.v0.dfy(28,10)) assert Lit(true);

+  >>> DoNothingToAssert

+

+Dafny program verifier finished with 7 verified, 4 errors

+Processing command (at Snapshots8.v1.dfy(30,17)) assert u#0 != 53;

+  >>> RecycleError

+Snapshots8.v1.dfy(30,16): Error: assertion violation

+Processing command (at Snapshots8.v1.dfy(3,15)) assert x#0 < 20 || LitInt(10) <= x#0;

+  >>> MarkAsFullyVerified

+Processing command (at Snapshots8.v1.dfy(5,17)) assert x#0 < 10;

+  >>> RecycleError

+Processing command (at Snapshots8.v1.dfy(6,9)) assert true;

+  >>> MarkAsFullyVerified

+Processing command (at Snapshots8.v1.dfy(6,8)) assert (forall<alpha> $o: ref, $f: Field alpha :: false ==> $_Frame[$o, $f]);

+  >>> MarkAsFullyVerified

+Processing command (at Snapshots8.v1.dfy(6,8)) assert LitInt(0) <= call0formal#AT#y#0;

+  >>> RecycleError

+Processing command (at Snapshots8.v1.dfy(7,12)) assert x#0 == LitInt(7);

+  >>> DoNothingToAssert

+Snapshots8.v1.dfy(5,16): Error: assertion violation

+Snapshots8.v1.dfy(6,7): Error BP5002: A precondition for this call might not hold.

+Snapshots8.v1.dfy(12,20): Related location: This is the precondition that might not hold.

+Snapshots8.v1.dfy(7,11): Error: assertion violation

+Processing command (at Snapshots8.v1.dfy(21,12)) assert true;

+  >>> MarkAsFullyVerified

+Processing command (at Snapshots8.v1.dfy(23,12)) assert Lit(true);

+  >>> DoNothingToAssert

+Processing command (at Snapshots8.v1.dfy(19,13)) assert LitInt(2) <= z#0;

+  >>> DoNothingToAssert

+Snapshots8.v1.dfy(24,9): Error BP5003: A postcondition might not hold on this return path.

+Snapshots8.v1.dfy(19,12): Related location: This is the postcondition that might not hold.

+

+Dafny program verifier finished with 7 verified, 5 errors

diff --git a/Test/dafny3/Dijkstra.dfy b/Test/dafny3/Dijkstra.dfy
index 42aa3b9e..56719180 100644
--- a/Test/dafny3/Dijkstra.dfy
+++ b/Test/dafny3/Dijkstra.dfy
@@ -56,7 +56,7 @@ lemma lemma_ping(j: nat, n: nat)
   }

 }

 

-// The other directorion: f(n) <= n

+// The other direction: f(n) <= n

 lemma lemma_pong(n: nat)

   requires P()

   ensures f(n) <= n