From: jjenista <jjenista>
Date: Tue, 13 Jan 2009 18:41:30 +0000 (+0000)
Subject: just a little change to print the full names of methods being analyzed
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe4479e05660283fc6a2daae79de782c7559634a;p=IRC.git

just a little change to print the full names of methods being analyzed
---

diff --git a/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java b/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java
index 19d79922..d4833e6a 100644
--- a/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/MethodContext.java
@@ -67,8 +67,13 @@ public class MethodContext {
   }
 
   public String toString() {
-    return descMethodOrTask.getSymbol()+
-           descMethodOrTask.getNum()+
-           getAliasString();
+    if( descMethodOrTask instanceof TaskDescriptor ) {
+      return descMethodOrTask.getSymbol()+
+	descMethodOrTask.getNum()+
+	getAliasString();
+    } else {
+      MethodDescriptor md = (MethodDescriptor) descMethodOrTask;
+      return md.getClassMethodName();
+    }
   }
 }
diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index 7efe5853..68ec11d1 100644
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -392,7 +392,7 @@ public class OwnershipAnalysis {
       // If there is a change detected, add any methods/tasks
       // that depend on this one to the "to visit" set.
 
-      //System.out.println("Analyzing " + mc);
+      System.out.println("Analyzing " + mc);
 
       Descriptor d = mc.getDescriptor();
       FlatMethod fm;
diff --git a/Robust/src/Benchmarks/Ownership/makefile b/Robust/src/Benchmarks/Ownership/makefile
index 792e4aad..7c6e1803 100644
--- a/Robust/src/Benchmarks/Ownership/makefile
+++ b/Robust/src/Benchmarks/Ownership/makefile
@@ -1,5 +1,5 @@
 BUILDSCRIPT=~/research/Robust/src/buildscript
-BSFLAGS= -recover -ownership -ownaliasfile aliases.txt #-enable-assertions #-ownwritedots final #-flatirtasks
+BSFLAGS= -recover -ownership -ownaliasfile aliases.txt -enable-assertions -ownwritedots final #-flatirtasks
 AD1= -ownallocdepth 1
 AD3= -ownallocdepth 3
 AD5= -ownallocdepth 5