Merge commit 'df5c5f5'

1 files changed, 3 insertions, 6 deletions

diff --git a/Test/dafny4/GHC-MergeSort.dfy b/Test/dafny4/GHC-MergeSort.dfy
index e06773eb..24903d87 100644
--- a/Test/dafny4/GHC-MergeSort.dfy
+++ b/Test/dafny4/GHC-MergeSort.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"

+// RUN: %dafny /compile:0 /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"

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

 

 // Rustan Leino

@@ -412,11 +412,8 @@ lemma sorted_replaceSuffix(xs: List<G>, ys: List<G>, zs: List<G>)
   match xs {

     case Nil =>

     case Cons(c, xs') =>

-      forall a,b | a in multiset_of(xs') && b in multiset_of(Cons(c, zs))

-        ensures Below(a, b);

-      {

-        sorted_reverse(xs', Cons(c, ys));

-      }

+      sorted_reverse(xs, ys);

+      sorted_reverse(xs', Cons(c, ys));

       sorted_replaceSuffix(xs', Cons(c, ys), Cons(c, zs));

   }

 }