Merging complete. Everything looks good *crosses fingers*

1 files changed, 31 insertions, 31 deletions

diff --git a/Test/AbsHoudini/houd8.bpl b/Test/AbsHoudini/houd8.bpl
index dff155aa..7fdf514e 100644
--- a/Test/AbsHoudini/houd8.bpl
+++ b/Test/AbsHoudini/houd8.bpl
@@ -1,31 +1,31 @@
-// RUN: %boogie -noinfer -contractInfer -printAssignment -abstractHoudini:IA[ConstantProp] "%s" > "%t"

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

-function {:existential true} b1():bool;

-function {:existential true} b2():bool;

-function {:existential true} b3():bool;

-

-var myVar: int;

-

-procedure foo(i:int) 

-modifies myVar;

-ensures b1() || myVar>0;

-ensures b2() || myVar==0;

-ensures b3() || myVar<0;

-{

-  myVar:=5; 

-}

-

-// expected assigment: b1->false,b2->true,b3->true

-

-

-

-

-

-

-

-

-

-

-

-

-

+// RUN: %boogie -noinfer -contractInfer -printAssignment -abstractHoudini:IA[ConstantProp] "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+function {:existential true} b1():bool;
+function {:existential true} b2():bool;
+function {:existential true} b3():bool;
+
+var myVar: int;
+
+procedure foo(i:int) 
+modifies myVar;
+ensures b1() || myVar>0;
+ensures b2() || myVar==0;
+ensures b3() || myVar<0;
+{
+  myVar:=5; 
+}
+
+// expected assigment: b1->false,b2->true,b3->true
+
+
+
+
+
+
+
+
+
+
+
+
+