Large refactoring of Hashtable to Dictionary.

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/Doomed/VCDoomed.cs b/Source/Doomed/VCDoomed.cs
index 413cbf5b..341644ca 100644
--- a/Source/Doomed/VCDoomed.cs
+++ b/Source/Doomed/VCDoomed.cs
@@ -584,7 +584,7 @@ namespace VC {
     #region Program Passification

     private void GenerateHelperBlocks(Implementation impl) {

       Contract.Requires(impl != null);

-      Hashtable gotoCmdOrigins = new Hashtable();

+      Dictionary<TransferCmd, ReturnCmd> gotoCmdOrigins = new Dictionary<TransferCmd, ReturnCmd>();

       exitBlock = GenerateUnifiedExit(impl, gotoCmdOrigins);

       Contract.Assert(exitBlock != null);

 

@@ -622,7 +622,7 @@ namespace VC {
     }

 

 

-    private Hashtable/*TransferCmd->ReturnCmd*/ PassifyProgram(Implementation impl, ModelViewInfo mvInfo) {

+    private Dictionary<Variable, Expr> PassifyProgram(Implementation impl, ModelViewInfo mvInfo) {

       Contract.Requires(impl != null);

       Contract.Requires(mvInfo != null);

       Contract.Requires(this.exitBlock != null);

@@ -744,14 +744,14 @@ namespace VC {
         ResetPredecessors(impl.Blocks);

         //EmitImpl(impl,false);

 

-        Hashtable/*Variable->Expr*/ htbl = PassifyProgram(impl, new ModelViewInfo(program, impl));

+        Dictionary<Variable, Expr> var2Expr = PassifyProgram(impl, new ModelViewInfo(program, impl));

 

         // Collect the last incarnation of each reachability variable in the passive program

         foreach (KeyValuePair<Block, Variable> kvp in m_BlockReachabilityMap)

         {

-            if (htbl.ContainsKey(kvp.Value))

+            if (var2Expr.ContainsKey(kvp.Value))

             {

-                m_LastReachVarIncarnation[kvp.Value] = (Expr)htbl[kvp.Value];

+                m_LastReachVarIncarnation[kvp.Value] = (Expr)var2Expr[kvp.Value];

             }

         }

     }