RCR was only one using Tuple.java so I renamed it to Pair.java. Checked that nothing...

diff --git a/Robust/src/IR/Flat/RuntimeConflictResolver.java b/Robust/src/IR/Flat/RuntimeConflictResolver.java
index 03b16892f42812c239ca9c12e36d18e8bdec1557..6b42247372a73f102a27f0d76fb912895a4b7465 100644 (file)
--- a/Robust/src/IR/Flat/RuntimeConflictResolver.java
+++ b/Robust/src/IR/Flat/RuntimeConflictResolver.java
@@ -8,7 +8,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
-import Util.Tuple;
+import Util.Pair;
 import Analysis.Disjoint.*;
 import Analysis.MLP.CodePlan;
 import IR.State;
@@ -45,8 +45,8 @@ public class RuntimeConflictResolver {
   //This keeps track of taints we've traversed to prevent printing duplicate traverse functions
   //The Integer keeps track of the weakly connected group it's in (used in enumerateHeapRoots)
   private Hashtable<Taint, Integer> doneTaints;
-  private Hashtable<Tuple, Integer> idMap=new Hashtable<Tuple,Integer>();
-  private Hashtable<Tuple, Integer> weakMap=new Hashtable<Tuple,Integer>();
+  private Hashtable<Pair, Integer> idMap=new Hashtable<Pair,Integer>();
+  private Hashtable<Pair, Integer> weakMap=new Hashtable<Pair,Integer>();
   private Hashtable<Taint, Set<Effect>> globalEffects;
   private Hashtable<Taint, Set<Effect>> globalConflicts;
   
@@ -326,11 +326,11 @@ public class RuntimeConflictResolver {
   }
 
   public int getWeakID(TempDescriptor invar, FlatNode fn) {
-    return weakMap.get(new Tuple(invar, fn)).intValue();
+    return weakMap.get(new Pair(invar, fn)).intValue();
   }
 
   public int getTraverserID(TempDescriptor invar, FlatNode fn) {
-    Tuple t=new Tuple(invar, fn);
+    Pair t=new Pair(invar, fn);
     if (idMap.containsKey(t))
       return idMap.get(t).intValue();
     int value=currentID++;
@@ -974,7 +974,7 @@ public class RuntimeConflictResolver {
       
       if(t.isRBlockTaint()) {
         int id=connectedHRHash.get(t).id;
-        Tuple tup=new Tuple(t.getVar(),t.getSESE());
+        Pair tup=new Pair(t.getVar(),t.getSESE());
         if (weakMap.containsKey(tup)) {
           if (weakMap.get(tup).intValue()!=id) 
             throw new Error("Var/SESE not unique for weak component.");

diff --git a/Robust/src/Util/Pair.java b/Robust/src/Util/Pair.java
new file mode 100644 (file)
index 0000000..dea902c
--- /dev/null
+++ b/Robust/src/Util/Pair.java
@@ -0,0 +1,19 @@
+package Util;
+
+public class Pair {
+  private Object a;
+  private Object b;
+  public Pair(Object a, Object b) {
+    this.a=a;
+    this.b=b;
+  }
+  public int hashCode() {
+    return a.hashCode()*31+b.hashCode();
+  }
+  public boolean equals(Object o) {
+    if (!(o instanceof Pair))
+      return false;
+    Pair t=(Pair)o;
+    return a.equals(t.a)&&b.equals(t.b);
+  }
+}
\ No newline at end of file

diff --git a/Robust/src/Util/Tuple.java b/Robust/src/Util/Tuple.java
deleted file mode 100644 (file)
index 2859717..0000000
--- a/Robust/src/Util/Tuple.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package Util;
-
-public class Tuple {
-  private Object a;
-  private Object b;
-  public Tuple(Object a, Object b) {
-    this.a=a;
-    this.b=b;
-  }
-  public int hashCode() {
-    return a.hashCode()*31+b.hashCode();
-  }
-  public boolean equals(Object o) {
-    if (!(o instanceof Tuple))
-      return false;
-    Tuple t=(Tuple)o;
-    return a.equals(t.a)&&b.equals(t.b);
-  }
-}
\ No newline at end of file