Merging complete. Everything looks good *crosses fingers*

1 files changed, 37 insertions, 37 deletions

diff --git a/Test/AbsHoudini/houd7.bpl b/Test/AbsHoudini/houd7.bpl
index 4035755c..9272fa3c 100644
--- a/Test/AbsHoudini/houd7.bpl
+++ b/Test/AbsHoudini/houd7.bpl
@@ -1,37 +1,37 @@
-// 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;

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

-var myVar: int;

-

-procedure foo(i:int) 

-requires b1() || i>0;

-requires b2() || i==0;

-requires b3() || i<0;

-modifies myVar;

-ensures Assert() || myVar>0;

-{

-  myVar:=5; 

-}

-

-procedure bar(i:int) 

-modifies myVar;

-{

-  call foo(5);

-}

-// expected outcome: Correct

-// expected Assigment: Assert = false, 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;
+function {:existential true} Assert(): bool;
+var myVar: int;
+
+procedure foo(i:int) 
+requires b1() || i>0;
+requires b2() || i==0;
+requires b3() || i<0;
+modifies myVar;
+ensures Assert() || myVar>0;
+{
+  myVar:=5; 
+}
+
+procedure bar(i:int) 
+modifies myVar;
+{
+  call foo(5);
+}
+// expected outcome: Correct
+// expected Assigment: Assert = false, b1->false,b2->true,b3->true
+
+
+
+
+
+
+
+
+
+
+
+