From 893418ca3c6e3ca3e82f52e065c4300f64e365fc Mon Sep 17 00:00:00 2001 From: sjfink Date: Wed, 21 Mar 2007 21:07:42 +0000 Subject: [PATCH] Graph API change: Graph is now an Iterable of Nodes! git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@869 f5eafffb-2e1d-0410-98e4-8ec43c5233c4 --- .../launchers/SWTCallGraph.launch | 4 ++-- .../ibm/wala/core/tests/callGraph/CallGraphTest.java | 12 ++++++------ .../wala/core/tests/callGraph/CompareCDGTest.java | 6 +++--- .../ibm/wala/core/tests/ptrs/MultiDimArrayTest.java | 2 +- .../com/ibm/wala/core/tests/slicer/SlicerTest.java | 2 +- .../ibm/wala/examples/drivers/GVTypeHierarchy.java | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/com.ibm.wala.core.tests/launchers/SWTCallGraph.launch b/com.ibm.wala.core.tests/launchers/SWTCallGraph.launch index daac4b660..e06ef0e49 100644 --- a/com.ibm.wala.core.tests/launchers/SWTCallGraph.launch +++ b/com.ibm.wala.core.tests/launchers/SWTCallGraph.launch @@ -1,12 +1,12 @@ - + - + diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java index b53efbba6..8ee44bebe 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java @@ -442,7 +442,7 @@ public class CallGraphTest extends WalaTestCase { // perform a little icfg exercise int count = 0; - for (Iterator it = icfg.iterateNodes(); it.hasNext();) { + for (Iterator it = icfg.iterator(); it.hasNext();) { IBasicBlock bb = (IBasicBlock) it.next(); if (icfg.hasCall((BasicBlockInContext) bb)) { count++; @@ -476,8 +476,8 @@ public class CallGraphTest extends WalaTestCase { * @param subG */ public static void checkGraphSubset(ECallGraphWrapper superG, ECallGraphWrapper subG) { - Set nodeDiff = Util.setify(subG.iterateNodes()); - nodeDiff.removeAll(Util.setify(superG.iterateNodes())); + Set nodeDiff = Util.setify(subG.iterator()); + nodeDiff.removeAll(Util.setify(superG.iterator())); Set toRemove = HashSetFactory.make(); for (Iterator it = nodeDiff.iterator(); it.hasNext();) { EObject o = it.next(); @@ -543,7 +543,7 @@ public class CallGraphTest extends WalaTestCase { // remove other nodes toRemove = HashSetFactory.make(); - for (Iterator it = G.iterateNodes(); it.hasNext();) { + for (Iterator it = G.iterator(); it.hasNext();) { EObject n = it.next(); if (!c.contains(n)) { toRemove.add(n); @@ -553,7 +553,7 @@ public class CallGraphTest extends WalaTestCase { // remove call site nodes with no targets (these won't appear in the dcg) toRemove = HashSetFactory.make(); - for (Iterator it = G.iterateNodes(); it.hasNext();) { + for (Iterator it = G.iterator(); it.hasNext();) { EObject n = it.next(); if (n instanceof ECallSite) { if (G.getSuccNodeCount(n) == 0) { @@ -585,7 +585,7 @@ public class CallGraphTest extends WalaTestCase { */ private static Set getSyntheticLeaves(CallGraph cg) { HashSet result = HashSetFactory.make(); - for (Iterator it = cg.iterateNodes(); it.hasNext();) { + for (Iterator it = cg.iterator(); it.hasNext();) { CGNode node = (CGNode) it.next(); if (!node.equals(cg.getFakeRootNode())) { if (node.getMethod().isSynthetic()) { diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CompareCDGTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CompareCDGTest.java index 4e247de64..ddf0cf3b1 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CompareCDGTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CompareCDGTest.java @@ -85,7 +85,7 @@ public class CompareCDGTest extends WalaTestCase { long cdgTime = 0; long bvTime = 0; String dotExe = "dot"; - for (Iterator it = g.iterateNodes(); it.hasNext();) { + for (Iterator it = g.iterator(); it.hasNext();) { CGNode n = (CGNode) it.next(); MethodReference mref = n.getMethod().getReference(); Trace.println(mref.toString()); @@ -143,7 +143,7 @@ public class CompareCDGTest extends WalaTestCase { private static boolean compatible(SSACFG cfg, ControlDependenceGraph cdg, BVControlDependenceGraph bv) { boolean ret = true; - for (Iterator it = cfg.iterateNodes(); it.hasNext();) { + for (Iterator it = cfg.iterator(); it.hasNext();) { SSACFG.BasicBlock ibb = (SSACFG.BasicBlock) it.next(); int cCount = cdg.getPredNodeCount(ibb); int bCount = bv.getPredNodeCount(ibb); @@ -338,7 +338,7 @@ public class CompareCDGTest extends WalaTestCase { */ private static Vector checkCFG(SSACFG cfg, MethodReference mref) { Vector vec = new Vector(); - for (Iterator it = cfg.iterateNodes(); it.hasNext();) { + for (Iterator it = cfg.iterator(); it.hasNext();) { SSACFG.BasicBlock bb = (SSACFG.BasicBlock) it.next(); if (cfg.getPredNodeCount(bb) == 0) vec.add(bb); diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java index cb94b715e..ba4f5ed85 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java @@ -76,7 +76,7 @@ public class MultiDimArrayTest extends WalaTestCase { } private final static CGNode findDoNothingNode(CallGraph cg) { - for (Iterator it = cg.iterateNodes(); it.hasNext(); ) { + for (Iterator it = cg.iterator(); it.hasNext(); ) { CGNode n = it.next(); if (n.getMethod().getName().toString().equals("doNothing")) { return n; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java index 910a98ffe..4706854da 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java @@ -509,7 +509,7 @@ public class SlicerTest extends TestCase { public static CGNode findMethod(CallGraph cg, String name) { Atom a = Atom.findOrCreateUnicodeAtom(name); - for (Iterator it = cg.iterateNodes(); it.hasNext();) { + for (Iterator it = cg.iterator(); it.hasNext();) { CGNode n = it.next(); if (n.getMethod().getName().equals(a)) { return n; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/GVTypeHierarchy.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/GVTypeHierarchy.java index 7583f6330..e339ccf59 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/GVTypeHierarchy.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/GVTypeHierarchy.java @@ -102,13 +102,13 @@ public class GVTypeHierarchy { public static Graph typeHierarchy2Graph(ETypeHierarchy et) throws WalaException { ETypeHierarchyWrapper t = new ETypeHierarchyWrapper(et); EObjectGraphImpl dg = new EObjectGraphImpl(); - for (Iterator it = t.getClasses().iterateNodes(); it.hasNext();) { + for (Iterator it = t.getClasses().iterator(); it.hasNext();) { dg.addNode(it.next()); } - for (Iterator it = t.getInterfaces().iterateNodes(); it.hasNext();) { + for (Iterator it = t.getInterfaces().iterator(); it.hasNext();) { dg.addNode(it.next()); } - for (Iterator it = t.getClasses().iterateNodes(); it.hasNext();) { + for (Iterator it = t.getClasses().iterator(); it.hasNext();) { EJavaClass x = (EJavaClass) it.next(); for (Iterator it2 = t.getClasses().getSuccNodes(x); it2.hasNext();) { dg.addEdge(x, it2.next()); @@ -117,7 +117,7 @@ public class GVTypeHierarchy { dg.addEdge(it2.next(), x); } } - for (Iterator it = t.getInterfaces().iterateNodes(); it.hasNext();) { + for (Iterator it = t.getInterfaces().iterator(); it.hasNext();) { EJavaClass x = (EJavaClass) it.next(); for (Iterator it2 = t.getInterfaces().getSuccNodes(x); it2.hasNext();) { dg.addEdge(x, it2.next());