From d652155ae013f36a1ee17653a8e458baad2d9c2c Mon Sep 17 00:00:00 2001
From: Checkmate50 <dgeisler50@gmail.com>
Date: Mon, 6 Jun 2016 23:14:18 -0600
Subject: Merging complete.  Everything looks good *crosses fingers*

---
 Test/houdini/houd6.bpl | 92 +++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

(limited to 'Test/houdini/houd6.bpl')

diff --git a/Test/houdini/houd6.bpl b/Test/houdini/houd6.bpl
index a1dc7220..7b8903a7 100644
--- a/Test/houdini/houd6.bpl
+++ b/Test/houdini/houd6.bpl
@@ -1,46 +1,46 @@
-// RUN: %boogie -noinfer -contractInfer -printAssignment "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-const {:existential true} b1:bool;
-const {:existential true} b2:bool;
-const {:existential true} b3:bool;
-const {:existential true} b4:bool;
-const {:existential true} b5:bool;
-const {:existential true} b6:bool;
-const {:existential true} b7:bool;
-const {:existential true} b8:bool;
-
-var array:[int]int;
-
-procedure foo (i:int)
-requires b6 ==> i < 0;
-requires b5 ==> i == 0;
-requires b2 ==> i > 0;
-ensures b3 ==> array[i] > 0;
-modifies array;
-ensures (forall x:int :: {array[x]} x == i || array[x] == old(array)[x]);
-{
-    array[i] := 2 * i;
-}
-
-procedure bar (j:int) returns (result:int)
-requires b8 ==> j < 0;
-requires b7 ==> j == 0;
-requires b4 ==> j > 0;
-modifies array;
-ensures (forall x:int :: {array[x]} (x == j) || array[x] == old(array)[x]);
-ensures (b1 ==> array[j] == old(array)[j]);
-{
-    call foo(j);
-    result := array[j];	
-}
-
-var p:int;
-
-procedure main() returns (result: int) 
-modifies array;
-{
-  call result:= bar(p);
-}
-
-// expected outcome: Correct
-// expected assigment: bi->False forall i
+// RUN: %boogie -noinfer -contractInfer -printAssignment "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+const {:existential true} b1:bool;
+const {:existential true} b2:bool;
+const {:existential true} b3:bool;
+const {:existential true} b4:bool;
+const {:existential true} b5:bool;
+const {:existential true} b6:bool;
+const {:existential true} b7:bool;
+const {:existential true} b8:bool;
+
+var array:[int]int;
+
+procedure foo (i:int)
+requires b6 ==> i < 0;
+requires b5 ==> i == 0;
+requires b2 ==> i > 0;
+ensures b3 ==> array[i] > 0;
+modifies array;
+ensures (forall x:int :: {array[x]} x == i || array[x] == old(array)[x]);
+{
+    array[i] := 2 * i;
+}
+
+procedure bar (j:int) returns (result:int)
+requires b8 ==> j < 0;
+requires b7 ==> j == 0;
+requires b4 ==> j > 0;
+modifies array;
+ensures (forall x:int :: {array[x]} (x == j) || array[x] == old(array)[x]);
+ensures (b1 ==> array[j] == old(array)[j]);
+{
+    call foo(j);
+    result := array[j];	
+}
+
+var p:int;
+
+procedure main() returns (result: int) 
+modifies array;
+{
+  call result:= bar(p);
+}
+
+// expected outcome: Correct
+// expected assigment: bi->False forall i
-- 
cgit v1.2.3