to get eaiser debugging, make the ssjava checking have deterministic ordering of...

[IRC.git] / Robust / src / Analysis / SSJava / CompositeLocation.java

diff --git a/Robust/src/Analysis/SSJava/CompositeLocation.java b/Robust/src/Analysis/SSJava/CompositeLocation.java
index dac3471ea169713e404d5b0d81993bb6862d1c9c..23982187337f057d6806bf3498e30f38b8ba87f1 100644 (file)
--- a/Robust/src/Analysis/SSJava/CompositeLocation.java
+++ b/Robust/src/Analysis/SSJava/CompositeLocation.java
@@ -1,141 +1,47 @@
 package Analysis.SSJava;
 
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import IR.TypeExtension;
 
-import IR.ClassDescriptor;
-
-public class CompositeLocation extends Location {
+public class CompositeLocation implements TypeExtension {
 
   protected NTuple<Location> locTuple;
 
-  public CompositeLocation(ClassDescriptor cd) {
-    super(cd);
+  public CompositeLocation() {
+    locTuple = new NTuple<Location>();
+  }
+
+  public CompositeLocation(Location loc) {
     locTuple = new NTuple<Location>();
+    locTuple.add(loc);
   }
 
   public NTuple<Location> getTuple() {
     return locTuple;
   }
 
-  public int getBaseLocationSize() {
-    return getBaseLocationSet().size();
+  public int getSize() {
+    return locTuple.size();
   }
 
   public void addLocation(Location loc) {
-
-    if (loc instanceof DeltaLocation) {
-      type = Location.DELTA;
-    }
-
-    locTuple.addElement(loc);
-
+    locTuple.add(loc);
   }
 
-  public void addLocationSet(Set<Location> set) {
-
-    for (Iterator iterator = set.iterator(); iterator.hasNext();) {
-      Location location = (Location) iterator.next();
-      locTuple.addElement(location);
-    }
-
+  public Location get(int idx) {
+    return locTuple.get(idx);
   }
 
-  public Location getLocation(ClassDescriptor cd) {
-
-    // need to get more optimization version later
-    Set<Location> locSet = getBaseLocationSet();
-    for (Iterator iterator = locSet.iterator(); iterator.hasNext();) {
-      Location location = (Location) iterator.next();
-      if (location.getClassDescriptor().equals(cd)) {
-        return location;
-      }
-    }
-
-    return null;
-
-  }
-
-  public Map<ClassDescriptor, Location> getCd2Loc() {
-
-    Map<ClassDescriptor, Location> cd2loc = new Hashtable<ClassDescriptor, Location>();
-
-    Set<Location> baseLocSet = getBaseLocationSet();
-    for (Iterator iterator = baseLocSet.iterator(); iterator.hasNext();) {
-      Location location = (Location) iterator.next();
-      cd2loc.put(location.getClassDescriptor(), location);
-    }
-
-    return cd2loc;
-
-  }
-
-  public Set<Location> getBaseLocationSet() {
-
-    Set<Location> baseLocationSet = new HashSet<Location>();
-    int tupleSize = locTuple.size();
-    for (int i = 0; i < tupleSize; i++) {
-      Location locElement = locTuple.at(i);
-
-      if (locElement instanceof DeltaLocation) {
-        // baseLocationSet.addAll(((DeltaLocation)
-        // locElement).getDeltaOperandLocationVec());
-        baseLocationSet.addAll(((DeltaLocation) locElement).getBaseLocationSet());
-      } else {
-        baseLocationSet.add(locElement);
-      }
-    }
-    return baseLocationSet;
-  }
-
-  public int getNumofDelta() {
-
-    int result = 0;
-
-    if (locTuple.size() == 1) {
-      Location locElement = locTuple.at(0);
-      if (locElement instanceof DeltaLocation) {
-        result++;
-        result += getNumofDelta((DeltaLocation) locElement);
-      }
-    }
-    return result;
-  }
-
-  public int getNumofDelta(DeltaLocation delta) {
-    int result = 0;
-
-    if (delta.getDeltaOperandLocationVec().size() == 1) {
-      Location locElement = delta.getDeltaOperandLocationVec().at(0);
-      if (locElement instanceof DeltaLocation) {
-        result++;
-        result += getNumofDelta((DeltaLocation) locElement);
-      }
-    }
-
-    return result;
+  public boolean isEmpty() {
+    return locTuple.size() == 0;
   }
 
   public String toString() {
 
-    // for better representation
-    // if compositeLoc has only one single location,
-    // just print out single location
-    // if(locTuple.size()==1){
-    // Location locElement=locTuple.at(0);
-    // if(locElement instanceof Location){
-    // return locElement.toString();
-    // }
-    // }
-
     String rtr = "CompLoc[";
 
     int tupleSize = locTuple.size();
     for (int i = 0; i < tupleSize; i++) {
-      Location locElement = locTuple.at(i);
+      Location locElement = locTuple.get(i);
       if (i != 0) {
         rtr += ",";
       }
@@ -154,8 +60,7 @@ public class CompositeLocation extends Location {
 
     CompositeLocation compLoc = (CompositeLocation) o;
 
-    if (compLoc.getClassDescriptor().equals(getClassDescriptor())
-        && compLoc.getTuple().equals(getTuple())) {
+    if (compLoc.getTuple().equals(getTuple())) {
       return true;
     } else {
       return false;
@@ -165,9 +70,14 @@ public class CompositeLocation extends Location {
 
   public int hashCode() {
 
-    int hashCode = getClassDescriptor().hashCode();
-    return hashCode + locTuple.hashCode();
+    return locTuple.hashCode();
+
+  }
 
+  public CompositeLocation clone() {
+    CompositeLocation clone = new CompositeLocation();
+    clone.getTuple().addAll(locTuple);
+    return clone;
   }
 
 }