Changed "for" description.

diff --git a/JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java b/JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java
index fc006f6..9cb8f85 100644 (file)
--- a/JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java
+++ b/JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java
@@ -21,10 +21,10 @@ public class ClassHierarchyPerformance {
                                        MethodInfo[] callees = ch.resolveCall(cs);\r
                                        if (callees.length > 0) {\r
                                                for (MethodInfo callee: callees) {\r
-//                                                     System.out.println(" [inside] " + m.toLongString() + " may call " + callee.toLongString());\r
+                                                       System.out.println(" [inside] " + m.toLongString() + " may call " + callee.toLongString());\r
                                                }\r
                                        } else {\r
-//                                             System.out.println(" [outside] " + m.toString() + " may call " + cs.toString());\r
+                                               System.out.println(" [outside] " + cs.toString());\r
                                        }\r
                                }\r
                        }\r

diff --git a/JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java b/JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java
index 0390cfb..da88cd0 100644 (file)
--- a/JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java
+++ b/JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java
@@ -29,8 +29,7 @@ public class ClassHierarchyPerformance {
                AnalysisOptions options = new AnalysisOptions(scope, entrypoints);\r
                CallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);\r
                CallGraph cg = builder.makeCallGraph(options, null);\r
-               for (Iterator<CGNode> itr = cg.iterator(); itr.hasNext();) {\r
-                       CGNode caller = itr.next();\r
+               for (CGNode caller: cg) {\r
                        for (Iterator<CGNode> callees = cg.getSuccNodes(caller); callees.hasNext();) {\r
                                CGNode callee = callees.next();\r
                                IMethod callerMethod = caller.getMethod();\r
@@ -38,6 +37,7 @@ public class ClassHierarchyPerformance {
 //                             System.out.println(callerMethod.toString() + " -> " + calleeMethod.toString());\r
                        }\r
                }\r
+               \r
                long end = System.currentTimeMillis();\r
 \r
                System.err.println((end - start) + " [ms]");\r

diff --git a/JavaAnalysisToolsDemo/src/demo/wala/ControlAndDataDependencePerformance.java b/JavaAnalysisToolsDemo/src/demo/wala/ControlAndDataDependencePerformance.java
index 8f25c37..f8157a3 100644 (file)
--- a/JavaAnalysisToolsDemo/src/demo/wala/ControlAndDataDependencePerformance.java
+++ b/JavaAnalysisToolsDemo/src/demo/wala/ControlAndDataDependencePerformance.java
@@ -42,8 +42,7 @@ public class ControlAndDataDependencePerformance {
                CallGraph cg = builder.makeCallGraph(options, null);\r
                PointerAnalysis<InstanceKey> pa = null;\r
 \r
-               for (int i = 0; i < cg.getMaxNumber(); i++) {\r
-                       CGNode node = cg.getNode(i);\r
+               for (CGNode node: cg) {\r
                        DataDependenceOptions dOptions = DataDependenceOptions.NO_HEAP_NO_EXCEPTIONS;\r
                        ControlDependenceOptions cOptions = ControlDependenceOptions.NO_EXCEPTIONAL_EDGES;\r
                        ModRef modRef = ModRef.make();\r