Merge branch 'master' of https://github.com/boogie-org/boogie

Conflicts:
	Source/Core/CommandLineOptions.cs
	Source/ExecutionEngine/ExecutionEngine.cs
	Source/ExecutionEngine/VerificationResultCache.cs
	Source/VCGeneration/VC.cs
	Test/snapshots/runtest.snapshot
	Test/snapshots/runtest.snapshot.expect

1 files changed, 26 insertions, 26 deletions

diff --git a/Test/z3api/boog8.bpl b/Test/z3api/boog8.bpl
index 121f27cf..f027e9f6 100644
--- a/Test/z3api/boog8.bpl
+++ b/Test/z3api/boog8.bpl
@@ -1,26 +1,26 @@
-type ref;

-// types

-type Wicket;

-var favorite: Wicket;

-

-

-const myBv: bv5;

-axiom myBv==1bv2++2bv3;

-

-const myBool: bool;

-axiom myBool==true;

-

-

-// procedure

-procedure SetToSeven(p: Wicket);

-  modifies favorite

-;

-

-  ensures favorite==p;

-

-implementation SetToSeven(l: Wicket) {

-  favorite:=favorite;

-}

-

-

-

+type ref;
+// types
+type Wicket;
+var favorite: Wicket;
+
+
+const myBv: bv5;
+axiom myBv==1bv2++2bv3;
+
+const myBool: bool;
+axiom myBool==true;
+
+
+// procedure
+procedure SetToSeven(p: Wicket);
+  modifies favorite
+;
+
+  ensures favorite==p;
+
+implementation SetToSeven(l: Wicket) {
+  favorite:=favorite;
+}
+
+
+