From 48731a5c9679efa8bcf7920c279108927a85f2f1 Mon Sep 17 00:00:00 2001
From: Ally Donaldson <unknown>
Date: Mon, 22 Jul 2013 22:27:04 +0100
Subject: BlockSeq: farewell

---
 Source/Predication/BlockPredicator.cs      | 10 +++++-----
 Source/Predication/SmartBlockPredicator.cs | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Source/Predication')

diff --git a/Source/Predication/BlockPredicator.cs b/Source/Predication/BlockPredicator.cs
index 771d403b..2174c150 100644
--- a/Source/Predication/BlockPredicator.cs
+++ b/Source/Predication/BlockPredicator.cs
@@ -51,9 +51,9 @@ public class BlockPredicator {
       contBlock.Label = block.Label + ".call.cont";
 
       block.TransferCmd =
-        new GotoCmd(Token.NoToken, new BlockSeq(trueBlock, falseBlock));
+        new GotoCmd(Token.NoToken, new List<Block> { trueBlock, falseBlock });
       trueBlock.TransferCmd = falseBlock.TransferCmd =
-        new GotoCmd(Token.NoToken, new BlockSeq(contBlock));
+        new GotoCmd(Token.NoToken, new List<Block> { contBlock });
       nextBlock = contBlock;
     } else {
       PredicateCmd(block.Cmds, cmd);
@@ -217,7 +217,7 @@ public class BlockPredicator {
           Expr.Eq(cur, blockIds[n.Item1]),
           new QKeyValue(Token.NoToken, "backedge", new List<object>(), null)) };
         backedgeBlock.TransferCmd = new GotoCmd(Token.NoToken,
-                                                new BlockSeq(n.Item1));
+                                                new List<Block> { n.Item1 });
 
         var tailBlock = new Block();
         newBlocks.Add(tailBlock);
@@ -227,7 +227,7 @@ public class BlockPredicator {
                                              Expr.Neq(cur, blockIds[n.Item1])) };
 
         prevBlock.TransferCmd = new GotoCmd(Token.NoToken,
-                                        new BlockSeq(backedgeBlock, tailBlock));
+                                        new List<Block> { backedgeBlock, tailBlock });
         prevBlock = tailBlock;
       } else {
         var runBlock = n.Item1;
@@ -235,7 +235,7 @@ public class BlockPredicator {
         runBlock.Cmds = new List<Cmd>();
         newBlocks.Add(runBlock);
         prevBlock.TransferCmd = new GotoCmd(Token.NoToken,
-                                            new BlockSeq(runBlock));
+                                            new List<Block> { runBlock });
 
         pExpr = Expr.Eq(cur, blockIds[runBlock]);
         if (createCandidateInvariants && blockGraph.Headers.Contains(runBlock)) {
diff --git a/Source/Predication/SmartBlockPredicator.cs b/Source/Predication/SmartBlockPredicator.cs
index 94b47f5e..8e1b960b 100644
--- a/Source/Predication/SmartBlockPredicator.cs
+++ b/Source/Predication/SmartBlockPredicator.cs
@@ -62,9 +62,9 @@ public class SmartBlockPredicator {
       contBlock.Label = block.Label + ".call.cont";
 
       block.TransferCmd =
-        new GotoCmd(Token.NoToken, new BlockSeq(trueBlock, falseBlock));
+        new GotoCmd(Token.NoToken, new List<Block> { trueBlock, falseBlock });
       trueBlock.TransferCmd = falseBlock.TransferCmd =
-        new GotoCmd(Token.NoToken, new BlockSeq(contBlock));
+        new GotoCmd(Token.NoToken, new List<Block> { contBlock });
       nextBlock = contBlock;
     } else {
       PredicateCmd(p, block.Cmds, cmd);
@@ -389,7 +389,7 @@ public class SmartBlockPredicator {
           backedgeBlock.Cmds = new List<Cmd> { new AssumeCmd(Token.NoToken, pExpr,
             new QKeyValue(Token.NoToken, "backedge", new List<object>(), null)) };
           backedgeBlock.TransferCmd = new GotoCmd(Token.NoToken,
-                                                  new BlockSeq(n.Item1));
+                                                  new List<Block> { n.Item1 });
 
           var tailBlock = new Block();
           newBlocks.Add(tailBlock);
@@ -405,7 +405,7 @@ public class SmartBlockPredicator {
 
           if (prevBlock != null)
             prevBlock.TransferCmd = new GotoCmd(Token.NoToken,
-                                          new BlockSeq(backedgeBlock, tailBlock));
+                                          new List<Block> { backedgeBlock, tailBlock });
           prevBlock = tailBlock;
         } else {
           PredicateBlock(pExpr, n.Item1, newBlocks, ref prevBlock);
@@ -430,7 +430,7 @@ public class SmartBlockPredicator {
     block.Cmds = new List<Cmd>();
     newBlocks.Add(block);
     if (prevBlock != null) {
-      prevBlock.TransferCmd = new GotoCmd(Token.NoToken, new BlockSeq(block));
+      prevBlock.TransferCmd = new GotoCmd(Token.NoToken, new List<Block> { block });
     }
 
     if (parentMap.ContainsKey(block)) {
-- 
cgit v1.2.3