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/test2/Implies.bpl | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'Test/test2/Implies.bpl')

diff --git a/Test/test2/Implies.bpl b/Test/test2/Implies.bpl
index 36c4a134..09337d40 100644
--- a/Test/test2/Implies.bpl
+++ b/Test/test2/Implies.bpl
@@ -1,38 +1,38 @@
-// RUN: %boogie -noinfer "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-const a:bool;
-const b:bool;
-const c:bool;
-const d:bool;
-
-function f(int) returns (bool);
-axiom (forall x:int :: f(x) <== x >= 0);
-
-procedure P() {
-  assert (a ==> (b ==> c) ==> d) == (d <== (c <== b) <== a);
-  assert (a ==> b ==> c) == (c <== (a ==> b));     // error
-
-  assert f(23);
-  assert f(-5);                                    // error
-}
-
-procedure Q0(x: int) {
-  assert x == 2;  // error
-  assert x == 2;  // nothing reported for this line, since control cannot reach here
-}
-
-procedure Q1(x: int) {
-  assert {:subsumption 0} x == 2;  // error
-  assert x == 2;  // error (because the subsumption attribute above makes the execution 'forget' the condition)
-}
-
-procedure Q2(x: int) {
-  assert x == 2;  // error
-  assert {:subsumption 0} x == 2;  // nothing reported for this line, since control cannot reach here
-}
-
-procedure Q3(x: int) {
-  assert {:subsumption 0} x == 2;  // error
-  assert {:subsumption 0} x == 2;  // error (because the subsumption attribute above makes the execution 'forget' the condition)
-}
+// RUN: %boogie -noinfer "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+const a:bool;
+const b:bool;
+const c:bool;
+const d:bool;
+
+function f(int) returns (bool);
+axiom (forall x:int :: f(x) <== x >= 0);
+
+procedure P() {
+  assert (a ==> (b ==> c) ==> d) == (d <== (c <== b) <== a);
+  assert (a ==> b ==> c) == (c <== (a ==> b));     // error
+
+  assert f(23);
+  assert f(-5);                                    // error
+}
+
+procedure Q0(x: int) {
+  assert x == 2;  // error
+  assert x == 2;  // nothing reported for this line, since control cannot reach here
+}
+
+procedure Q1(x: int) {
+  assert {:subsumption 0} x == 2;  // error
+  assert x == 2;  // error (because the subsumption attribute above makes the execution 'forget' the condition)
+}
+
+procedure Q2(x: int) {
+  assert x == 2;  // error
+  assert {:subsumption 0} x == 2;  // nothing reported for this line, since control cannot reach here
+}
+
+procedure Q3(x: int) {
+  assert {:subsumption 0} x == 2;  // error
+  assert {:subsumption 0} x == 2;  // error (because the subsumption attribute above makes the execution 'forget' the condition)
+}
-- 
cgit v1.2.3