From 48731a5c9679efa8bcf7920c279108927a85f2f1 Mon Sep 17 00:00:00 2001 From: Ally Donaldson Date: Mon, 22 Jul 2013 22:27:04 +0100 Subject: BlockSeq: farewell --- Source/Doomed/DoomedLoopUnrolling.cs | 4 ++-- Source/Doomed/HasseDiagram.cs | 8 ++++---- Source/Doomed/VCDoomed.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Doomed') diff --git a/Source/Doomed/DoomedLoopUnrolling.cs b/Source/Doomed/DoomedLoopUnrolling.cs index 2b83da37..38fa99ac 100644 --- a/Source/Doomed/DoomedLoopUnrolling.cs +++ b/Source/Doomed/DoomedLoopUnrolling.cs @@ -338,11 +338,11 @@ namespace VC Block b = kvp.Key; if (UncheckableNodes.Contains(GraphMap[b])) uncheckables.Add(b); blocks.Add(b); - b.Predecessors = new BlockSeq(); + b.Predecessors = new List(); foreach (GraphNode p in kvp.Value.Pre) b.Predecessors.Add(p.Label); if (kvp.Value.Suc.Count > 0) { - BlockSeq bs = new BlockSeq(); + List bs = new List(); foreach (GraphNode s in kvp.Value.Suc) bs.Add(s.Label); b.TransferCmd = new GotoCmd(b.tok, bs); } diff --git a/Source/Doomed/HasseDiagram.cs b/Source/Doomed/HasseDiagram.cs index b2ece2df..ad3d487e 100644 --- a/Source/Doomed/HasseDiagram.cs +++ b/Source/Doomed/HasseDiagram.cs @@ -335,7 +335,7 @@ namespace VC { current = todo[0]; todo.Remove(current); - BlockSeq pre = m_Predecessors(current, forward); + List pre = m_Predecessors(current, forward); bool ready = true; if (pre != null) { @@ -356,7 +356,7 @@ namespace VC done.Add(current); unavoidableBlocks[current].Add(current); - BlockSeq suc = m_Succecessors(current, forward); + List suc = m_Succecessors(current, forward); if (suc == null) continue; foreach (Block bsuc in suc) { @@ -402,7 +402,7 @@ namespace VC return ret; } - private BlockSeq m_Predecessors(Block b, bool forward) + private List m_Predecessors(Block b, bool forward) { if (forward) return b.Predecessors; GotoCmd gc = b.TransferCmd as GotoCmd; @@ -413,7 +413,7 @@ namespace VC return null; } - private BlockSeq m_Succecessors(Block b, bool forward) + private List m_Succecessors(Block b, bool forward) { return m_Predecessors(b, !forward); } diff --git a/Source/Doomed/VCDoomed.cs b/Source/Doomed/VCDoomed.cs index ca282b0a..9f1d8290 100644 --- a/Source/Doomed/VCDoomed.cs +++ b/Source/Doomed/VCDoomed.cs @@ -791,7 +791,7 @@ namespace VC { // update the successors and predecessors foreach (Block b in lb) { - BlockSeq newpreds = new BlockSeq(); + List newpreds = new List(); foreach (Block b_ in b.Predecessors) { newpreds.Add(clonemap[b_]); @@ -802,7 +802,7 @@ namespace VC { if (gc != null) { List lseq = new List(); - BlockSeq bseq = new BlockSeq(); + List bseq = new List(); foreach (string s in gc.labelNames) lseq.Add(s); foreach (Block b_ in gc.labelTargets) bseq.Add(clonemap[b_]); GotoCmd tcmd = new GotoCmd(gc.tok, lseq, bseq); -- cgit v1.2.3