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/aitest0/constants.bpl | 142 ++++++++++++++++++++++-----------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

(limited to 'Test/aitest0/constants.bpl')

diff --git a/Test/aitest0/constants.bpl b/Test/aitest0/constants.bpl
index a3b82df7..d2075e26 100644
--- a/Test/aitest0/constants.bpl
+++ b/Test/aitest0/constants.bpl
@@ -1,71 +1,71 @@
-// RUN: %boogie -infer:j -instrumentInfer:e -printInstrumented -noVerify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-// Test the constant propagation AI
-
-var GlobalFlag : bool;
-
-const A, B, C:int;		// Consts
-
-procedure Join (b : bool)
-  modifies GlobalFlag;
-{  
-  var x, y, z:int;
-  
-  start:
-    GlobalFlag := true;
-    x := 3;
-    y := 4;
-    z := x + y;
-    goto Then, Else; // if (b)
- 
-  Then:
-    assume b == true;
-    x := x + 1;
-    goto join;
-
-  Else:
-    assume b == false;
-    y := 4;
-    goto join;
-    
-  join:
-    assert y == 4;
-    assert z == 7;
-    assert GlobalFlag == true;
-    return;
-}    
-
-
-procedure Loop ()
-{
-  var c, i: int;
-
-  start:
-    c := 0; i := 0;
-    goto test;
- 
-  test:
-    // if (i < 10);
-    goto Then, Else;
-
-  Then:
-    assume (i < 10);
-    i := i + 1;
-    goto test;
-
-  Else:
-    return;
-}
-
-procedure Evaluate () 
-{
- var i : int;
-
- start:
- i := 5;
- i := 3 * i + 1;
- i := 3 * (i + 1);
- i := 1 + 3 * i;
- i := (i + 1) * 3;
- return;
-}
+// RUN: %boogie -infer:j -instrumentInfer:e -printInstrumented -noVerify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// Test the constant propagation AI
+
+var GlobalFlag : bool;
+
+const A, B, C:int;		// Consts
+
+procedure Join (b : bool)
+  modifies GlobalFlag;
+{  
+  var x, y, z:int;
+  
+  start:
+    GlobalFlag := true;
+    x := 3;
+    y := 4;
+    z := x + y;
+    goto Then, Else; // if (b)
+ 
+  Then:
+    assume b == true;
+    x := x + 1;
+    goto join;
+
+  Else:
+    assume b == false;
+    y := 4;
+    goto join;
+    
+  join:
+    assert y == 4;
+    assert z == 7;
+    assert GlobalFlag == true;
+    return;
+}    
+
+
+procedure Loop ()
+{
+  var c, i: int;
+
+  start:
+    c := 0; i := 0;
+    goto test;
+ 
+  test:
+    // if (i < 10);
+    goto Then, Else;
+
+  Then:
+    assume (i < 10);
+    i := i + 1;
+    goto test;
+
+  Else:
+    return;
+}
+
+procedure Evaluate () 
+{
+ var i : int;
+
+ start:
+ i := 5;
+ i := 3 * i + 1;
+ i := 3 * (i + 1);
+ i := 1 + 3 * i;
+ i := (i + 1) * 3;
+ return;
+}
-- 
cgit v1.2.3