From 1e5cf1f9ed3e402ffaa54b87205d76023a1e252d Mon Sep 17 00:00:00 2001
From: t-hatano <tnotawa@gmail.com>
Date: Tue, 24 May 2016 21:34:06 +0900
Subject: [PATCH] Changed "for" description.

---
 JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java    | 4 ++--
 JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java    | 4 ++--
 .../src/demo/wala/ControlAndDataDependencePerformance.java            | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java b/JavaAnalysisToolsDemo/src/demo/soba/ClassHierarchyPerformance.java
index fc006f6..9cb8f85 100644
--- 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);
 					if (callees.length > 0) {
 						for (MethodInfo callee: callees) {
-//							System.out.println(" [inside] " + m.toLongString() + " may call " + callee.toLongString());
+							System.out.println(" [inside] " + m.toLongString() + " may call " + callee.toLongString());
 						}
 					} else {
-//						System.out.println(" [outside] " + m.toString() + " may call " + cs.toString());
+						System.out.println(" [outside] " + cs.toString());
 					}
 				}
 			}
diff --git a/JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java b/JavaAnalysisToolsDemo/src/demo/wala/ClassHierarchyPerformance.java
index 0390cfb..da88cd0 100644
--- 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);
 		CallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);
 		CallGraph cg = builder.makeCallGraph(options, null);
-		for (Iterator<CGNode> itr = cg.iterator(); itr.hasNext();) {
-			CGNode caller = itr.next();
+		for (CGNode caller: cg) {
 			for (Iterator<CGNode> callees = cg.getSuccNodes(caller); callees.hasNext();) {
 				CGNode callee = callees.next();
 				IMethod callerMethod = caller.getMethod();
@@ -38,6 +37,7 @@ public class ClassHierarchyPerformance {
 //				System.out.println(callerMethod.toString() + " -> " + calleeMethod.toString());
 			}
 		}
+		
 		long end = System.currentTimeMillis();
 
 		System.err.println((end - start) + " [ms]");
diff --git a/JavaAnalysisToolsDemo/src/demo/wala/ControlAndDataDependencePerformance.java b/JavaAnalysisToolsDemo/src/demo/wala/ControlAndDataDependencePerformance.java
index 8f25c37..f8157a3 100644
--- 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);
 		PointerAnalysis<InstanceKey> pa = null;
 
-		for (int i = 0; i < cg.getMaxNumber(); i++) {
-			CGNode node = cg.getNode(i);
+		for (CGNode node: cg) {
 			DataDependenceOptions dOptions = DataDependenceOptions.NO_HEAP_NO_EXCEPTIONS;
 			ControlDependenceOptions cOptions = ControlDependenceOptions.NO_EXCEPTIONAL_EDGES;
 			ModRef modRef = ModRef.make();
-- 
2.11.0