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*

---
 Source/Concurrency/Program.cs | 88 +++++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'Source/Concurrency/Program.cs')

diff --git a/Source/Concurrency/Program.cs b/Source/Concurrency/Program.cs
index 8042476e..1be7cc07 100644
--- a/Source/Concurrency/Program.cs
+++ b/Source/Concurrency/Program.cs
@@ -1,44 +1,44 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Microsoft.Boogie
-{
-    public class Concurrency
-    {
-        public static void Transform(LinearTypeChecker linearTypeChecker, MoverTypeChecker moverTypeChecker)
-        {
-            List<Declaration> originalDecls = new List<Declaration>();
-            Program program = linearTypeChecker.program;
-            foreach (var decl in program.TopLevelDeclarations)
-            {
-                Procedure proc = decl as Procedure;
-                if (proc != null && moverTypeChecker.procToActionInfo.ContainsKey(proc))
-                {
-                    originalDecls.Add(proc);
-                    continue;
-                }
-                Implementation impl = decl as Implementation;
-                if (impl != null && moverTypeChecker.procToActionInfo.ContainsKey(impl.Proc))
-                {
-                    originalDecls.Add(impl);
-                }
-            }
-
-            List<Declaration> decls = new List<Declaration>();
-            if (!CommandLineOptions.Clo.TrustAtomicityTypes)
-            {
-                MoverCheck.AddCheckers(linearTypeChecker, moverTypeChecker, decls);
-            } 
-            OwickiGries.AddCheckers(linearTypeChecker, moverTypeChecker, decls);
-            foreach (Declaration decl in decls)
-            {
-                decl.Attributes = OwickiGries.RemoveYieldsAttribute(decl.Attributes);
-            }
-            program.RemoveTopLevelDeclarations(x => originalDecls.Contains(x));
-            program.AddTopLevelDeclarations(decls);
-        }
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.Boogie
+{
+    public class Concurrency
+    {
+        public static void Transform(LinearTypeChecker linearTypeChecker, CivlTypeChecker civlTypeChecker)
+        {
+            List<Declaration> originalDecls = new List<Declaration>();
+            Program program = linearTypeChecker.program;
+            foreach (var decl in program.TopLevelDeclarations)
+            {
+                Procedure proc = decl as Procedure;
+                if (proc != null && civlTypeChecker.procToActionInfo.ContainsKey(proc))
+                {
+                    originalDecls.Add(proc);
+                    continue;
+                }
+                Implementation impl = decl as Implementation;
+                if (impl != null && civlTypeChecker.procToActionInfo.ContainsKey(impl.Proc))
+                {
+                    originalDecls.Add(impl);
+                }
+            }
+
+            List<Declaration> decls = new List<Declaration>();
+            if (!CommandLineOptions.Clo.TrustAtomicityTypes)
+            {
+                MoverCheck.AddCheckers(linearTypeChecker, civlTypeChecker, decls);
+            } 
+            CivlRefinement.AddCheckers(linearTypeChecker, civlTypeChecker, decls);
+            foreach (Declaration decl in decls)
+            {
+                decl.Attributes = CivlRefinement.RemoveYieldsAttribute(decl.Attributes);
+            }
+            program.RemoveTopLevelDeclarations(x => originalDecls.Contains(x));
+            program.AddTopLevelDeclarations(decls);
+        }
+
+    }
+}
-- 
cgit v1.2.3