Fix tabbing.... Please fix your editors so they do tabbing correctly!!! (Spaces...

[IRC.git] / Robust / src / Analysis / Pointer / GraphManip.java

diff --git a/Robust/src/Analysis/Pointer/GraphManip.java b/Robust/src/Analysis/Pointer/GraphManip.java
index d8c66f8a56116d0d0015c8d5ccdc2cf03da58d84..535ca0355bfa2d5f815085f430b8f1b974a16426 100644 (file)
--- a/Robust/src/Analysis/Pointer/GraphManip.java
+++ b/Robust/src/Analysis/Pointer/GraphManip.java
@@ -9,7 +9,7 @@ import Analysis.Disjoint.Taint;
 public class GraphManip {
   static MySet<Edge> genEdges(TempDescriptor tmp, HashSet<AllocNode> dstSet) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(AllocNode node:dstSet) {
+    for(AllocNode node : dstSet) {
       edgeset.add(new Edge(tmp, node));
     }
     return edgeset;
@@ -17,7 +17,7 @@ public class GraphManip {
 
   static MySet<Edge> genEdges(TempDescriptor tmp, MySet<Edge> dstSet) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(Edge e:dstSet) {
+    for(Edge e : dstSet) {
       edgeset.add(e.changeSrcVar(tmp, null));
     }
     return edgeset;
@@ -25,8 +25,8 @@ public class GraphManip {
 
   static MySet<Edge> genEdges(HashSet<AllocNode> srcSet, FieldDescriptor fd, HashSet<AllocNode> dstSet) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(AllocNode srcnode:srcSet) {
-      for(AllocNode dstnode:dstSet) {
+    for(AllocNode srcnode : srcSet) {
+      for(AllocNode dstnode : dstSet) {
        edgeset.add(new Edge(srcnode, fd, dstnode, Edge.NEW));
       }
     }
@@ -35,8 +35,8 @@ public class GraphManip {
 
   static MySet<Edge> genEdges(MySet<Edge> srcSet, FieldDescriptor fd, MySet<Edge> dstSet) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(Edge srcedge:srcSet) {
-      for(Edge dstedge:dstSet) {
+    for(Edge srcedge : srcSet) {
+      for(Edge dstedge : dstSet) {
        edgeset.add(dstedge.changeSrc(fd, srcedge.dst));
       }
     }
@@ -45,8 +45,8 @@ public class GraphManip {
 
   static MySet<Edge> genEdges(HashSet<AllocNode> srcSet, FieldDescriptor fd, MySet<Edge> dstSet) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(AllocNode srcnode:srcSet) {
-      for(Edge dstedge:dstSet) {
+    for(AllocNode srcnode : srcSet) {
+      for(Edge dstedge : dstSet) {
        edgeset.add(dstedge.changeSrc(fd, srcnode));
       }
     }
@@ -56,16 +56,16 @@ public class GraphManip {
   static MySet<Edge> getDiffEdges(Delta delta, TempDescriptor tmp) {
     MySet<Edge> edges=new MySet<Edge>();
     MySet<Edge> removeedges=delta.varedgeremove.get(tmp);
-    
+
     MySet<Edge> baseedges=delta.basevaredge.get(tmp);
     if (baseedges!=null) {
-      for(Edge e:baseedges) {
+      for(Edge e : baseedges) {
        if (removeedges==null||!removeedges.contains(e))
          edges.add(e);
       }
     }
     if (delta.varedgeadd.containsKey(tmp))
-      for(Edge e:delta.varedgeadd.get(tmp)) {
+      for(Edge e : delta.varedgeadd.get(tmp)) {
        edges.add(e);
       }
     return edges;
@@ -75,12 +75,12 @@ public class GraphManip {
     MySet<Edge> edges=new MySet<Edge>();
     MySet<Edge> removeedges=delta.varedgeremove.get(tmp);
 
-    for(Edge e:graph.getEdges(tmp)) {
+    for(Edge e : graph.getEdges(tmp)) {
       if (removeedges==null||!removeedges.contains(e))
        edges.add(e);
     }
     if (delta.varedgeadd.containsKey(tmp))
-      for(Edge e:delta.varedgeadd.get(tmp)) {
+      for(Edge e : delta.varedgeadd.get(tmp)) {
        edges.add(e);
       }
     return edges;
@@ -88,14 +88,14 @@ public class GraphManip {
 
   static MySet<Edge> getEdges(Graph graph, Delta delta, MySet<Edge> srcNodes, FieldDescriptor fd) {
     MySet<Edge> nodes=new MySet<Edge>();
-    for(Edge node:srcNodes) {
+    for(Edge node : srcNodes) {
       MySet<Edge> removeedges=delta.heapedgeremove.get(node.dst);
-      for(Edge e:graph.getEdges(node.dst)) {
+      for(Edge e : graph.getEdges(node.dst)) {
        if (e.fd==fd&&(removeedges==null||!removeedges.contains(e)))
          nodes.add(e);
       }
       if (delta.heapedgeadd.containsKey(node.dst))
-       for(Edge e:delta.heapedgeadd.get(node.dst)) {
+       for(Edge e : delta.heapedgeadd.get(node.dst)) {
          if (e.fd==fd)
            nodes.add(e);
        }
@@ -105,14 +105,14 @@ public class GraphManip {
 
   static MySet<Edge> getEdges(Graph graph, Delta delta, HashSet<AllocNode> srcNodes, FieldDescriptor fd) {
     MySet<Edge> nodes=new MySet<Edge>();
-    for(AllocNode node:srcNodes) {
+    for(AllocNode node : srcNodes) {
       MySet<Edge> removeedges=delta.heapedgeremove.get(node);
-      for(Edge e:graph.getEdges(node)) {
+      for(Edge e : graph.getEdges(node)) {
        if (e.fd==fd&&(removeedges==null||!removeedges.contains(e)))
          nodes.add(e);
       }
       if (delta.heapedgeadd.containsKey(node))
-       for(Edge e:delta.heapedgeadd.get(node)) {
+       for(Edge e : delta.heapedgeadd.get(node)) {
          if (e.fd==fd)
            nodes.add(e);
        }
@@ -123,31 +123,31 @@ public class GraphManip {
   static MySet<Edge> getEdges(Graph graph, Delta delta, AllocNode node) {
     MySet<Edge> nodes=new MySet<Edge>();
     MySet<Edge> removeedges=delta.heapedgeremove.get(node);
-    for(Edge e:graph.getEdges(node)) {
+    for(Edge e : graph.getEdges(node)) {
       if ((removeedges==null||!removeedges.contains(e)))
        nodes.add(e);
     }
     if (delta.heapedgeadd.containsKey(node))
-      for(Edge e:delta.heapedgeadd.get(node)) {
+      for(Edge e : delta.heapedgeadd.get(node)) {
        nodes.add(e);
       }
-    
+
     return nodes;
   }
 
   static HashSet<AllocNode> getDiffNodes(Delta delta, TempDescriptor tmp) {
     HashSet<AllocNode> nodes=new HashSet<AllocNode>();
     MySet<Edge> removeedges=delta.varedgeremove.get(tmp);
-    
+
     MySet<Edge> baseEdges=delta.basevaredge.get(tmp);
 
     if (baseEdges!=null)
-      for(Edge e:baseEdges) {
+      for(Edge e : baseEdges) {
        if (removeedges==null||!removeedges.contains(e))
          nodes.add(e.dst);
       }
     if (delta.varedgeadd.containsKey(tmp))
-      for(Edge e:delta.varedgeadd.get(tmp)) {
+      for(Edge e : delta.varedgeadd.get(tmp)) {
        nodes.add(e.dst);
       }
     return nodes;
@@ -157,12 +157,12 @@ public class GraphManip {
     HashSet<AllocNode> nodes=new HashSet<AllocNode>();
     MySet<Edge> removeedges=delta.varedgeremove.get(tmp);
 
-    for(Edge e:graph.getEdges(tmp)) {
+    for(Edge e : graph.getEdges(tmp)) {
       if (removeedges==null||!removeedges.contains(e))
        nodes.add(e.dst);
     }
     if (delta.varedgeadd.containsKey(tmp))
-      for(Edge e:delta.varedgeadd.get(tmp)) {
+      for(Edge e : delta.varedgeadd.get(tmp)) {
        nodes.add(e.dst);
       }
     return nodes;
@@ -170,16 +170,16 @@ public class GraphManip {
 
   static HashSet<AllocNode> getDiffNodes(Delta delta, HashSet<AllocNode> srcNodes, FieldDescriptor fd) {
     HashSet<AllocNode> nodes=new HashSet<AllocNode>();
-    for(AllocNode node:srcNodes) {
+    for(AllocNode node : srcNodes) {
       MySet<Edge> removeedges=delta.heapedgeremove.get(node);
       MySet<Edge> baseEdges=delta.baseheapedge.get(node);
       if (baseEdges!=null)
-       for(Edge e:baseEdges) {
+       for(Edge e : baseEdges) {
          if (e.fd==fd&&(removeedges==null||!removeedges.contains(e)))
            nodes.add(e.dst);
        }
       if (delta.heapedgeadd.containsKey(node))
-       for(Edge e:delta.heapedgeadd.get(node)) {
+       for(Edge e : delta.heapedgeadd.get(node)) {
          if (e.fd==fd)
            nodes.add(e.dst);
        }
@@ -189,19 +189,19 @@ public class GraphManip {
 
   static MySet<Edge> getDiffEdges(Delta delta, HashSet<AllocNode> srcNodes) {
     MySet<Edge> newedges=new MySet<Edge>();
-    for(Map.Entry<AllocNode, MySet<Edge>> entry:delta.baseheapedge.entrySet()) {
+    for(Map.Entry<AllocNode, MySet<Edge>> entry : delta.baseheapedge.entrySet()) {
       AllocNode node=entry.getKey();
       if (srcNodes.contains(node)) {
        MySet<Edge> edges=entry.getValue();
        MySet<Edge> removeedges=delta.heapedgeremove.get(node);
-       for(Edge e:edges) {
+       for(Edge e : edges) {
          if (removeedges==null||!removeedges.contains(e)) {
            newedges.add(e);
          }
        }
       }
     }
-    for(Map.Entry<AllocNode, MySet<Edge>> entry:delta.heapedgeadd.entrySet()) {
+    for(Map.Entry<AllocNode, MySet<Edge>> entry : delta.heapedgeadd.entrySet()) {
       AllocNode node=entry.getKey();
       if (srcNodes.contains(node)) {
        MySet<Edge> edges=entry.getValue();
@@ -213,23 +213,23 @@ public class GraphManip {
 
   static MySet<Edge> getDiffEdges(Delta delta, HashSet<AllocNode> srcNodes, FieldDescriptor fd) {
     MySet<Edge> newedges=new MySet<Edge>();
-    for(Map.Entry<AllocNode, MySet<Edge>> entry:delta.baseheapedge.entrySet()) {
+    for(Map.Entry<AllocNode, MySet<Edge>> entry : delta.baseheapedge.entrySet()) {
       AllocNode node=entry.getKey();
       if (srcNodes.contains(node)) {
        MySet<Edge> edges=entry.getValue();
        MySet<Edge> removeedges=delta.heapedgeremove.get(node);
-       for(Edge e:edges) {
+       for(Edge e : edges) {
          if ((removeedges==null||!removeedges.contains(e))&&(e.fd==fd)) {
            newedges.add(e);
          }
        }
       }
     }
-    for(Map.Entry<AllocNode, MySet<Edge>> entry:delta.heapedgeadd.entrySet()) {
+    for(Map.Entry<AllocNode, MySet<Edge>> entry : delta.heapedgeadd.entrySet()) {
       AllocNode node=entry.getKey();
       if (srcNodes.contains(node)) {
        MySet<Edge> edges=entry.getValue();
-       for(Edge e:edges) {
+       for(Edge e : edges) {
          if (e.fd==fd)
            newedges.add(e);
        }
@@ -240,7 +240,7 @@ public class GraphManip {
 
   static MySet<Edge> makeOld(MySet<Edge> edgesin) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(Edge e:edgesin) {
+    for(Edge e : edgesin) {
       edgeset.add(e.makeOld());
     }
     return edgeset;
@@ -248,13 +248,13 @@ public class GraphManip {
 
   static MySet<Edge> dereference(Graph graph, Delta delta, TempDescriptor dst, MySet<Edge> srcEdges, FieldDescriptor fd, FlatNode fn) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(Edge edge:srcEdges) {
+    for(Edge edge : srcEdges) {
       TaintSet ts=edge.getTaints();
       if (ts!=null) {
        ts=ts.reTaint(fn);
       }
       MySet<Edge> removeedges=delta.heapedgeremove.get(edge.dst);
-      for(Edge e:graph.getEdges(edge.dst)) {
+      for(Edge e : graph.getEdges(edge.dst)) {
        if (e.fd==fd&&(removeedges==null||!removeedges.contains(e))) {
          e=e.changeSrcVar(dst, ts);
          if (!edgeset.contains(e))
@@ -267,7 +267,7 @@ public class GraphManip {
        }
       }
       if (delta.heapedgeadd.containsKey(edge.dst))
-       for(Edge e:delta.heapedgeadd.get(edge.dst)) {
+       for(Edge e : delta.heapedgeadd.get(edge.dst)) {
          if (e.fd==fd) {
            e=e.changeSrcVar(dst, ts);
            if (!edgeset.contains(e))
@@ -285,14 +285,14 @@ public class GraphManip {
 
   static MySet<Edge> diffDereference(Delta delta, TempDescriptor dst, MySet<Edge> srcEdges, FieldDescriptor fd, FlatNode fn) {
     MySet<Edge> edgeset=new MySet<Edge>();
-    for(Edge edge:srcEdges) {
+    for(Edge edge : srcEdges) {
       TaintSet ts=edge.getTaints();
       if (ts!=null) {
        ts=ts.reTaint(fn);
       }
       MySet<Edge> removeedges=delta.heapedgeremove.get(edge.dst);
       if (delta.baseheapedge.containsKey(edge.dst)) {
-       for(Edge e:delta.baseheapedge.get(edge.dst)) {
+       for(Edge e : delta.baseheapedge.get(edge.dst)) {
          if (e.fd==fd&&(removeedges==null||!removeedges.contains(e))) {
            e=e.changeSrcVar(dst, ts);
            if (!edgeset.contains(e))
@@ -306,7 +306,7 @@ public class GraphManip {
        }
       }
       if (delta.heapedgeadd.containsKey(edge.dst))
-       for(Edge e:delta.heapedgeadd.get(edge.dst)) {
+       for(Edge e : delta.heapedgeadd.get(edge.dst)) {
          if (e.fd==fd) {
            e=e.changeSrcVar(dst, ts);
            if (!edgeset.contains(e))
@@ -324,14 +324,14 @@ public class GraphManip {
 
   static HashSet<AllocNode> getNodes(Graph graph, Delta delta, HashSet<AllocNode> srcNodes, FieldDescriptor fd) {
     HashSet<AllocNode> nodes=new HashSet<AllocNode>();
-    for(AllocNode node:srcNodes) {
+    for(AllocNode node : srcNodes) {
       MySet<Edge> removeedges=delta.heapedgeremove.get(node);
-      for(Edge e:graph.getEdges(node)) {
+      for(Edge e : graph.getEdges(node)) {
        if (e.fd==fd&&(removeedges==null||!removeedges.contains(e)))
          nodes.add(e.dst);
       }
       if (delta.heapedgeadd.containsKey(node))
-       for(Edge e:delta.heapedgeadd.get(node)) {
+       for(Edge e : delta.heapedgeadd.get(node)) {
          if (e.fd==fd)
            nodes.add(e.dst);
        }