implemented PCLOC annotation.

[IRC.git] / Robust / src / Analysis / SSJava / SSJavaAnalysis.java

diff --git a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
index c0fa9b3f5bceaef18dbc2420c86e180ac5d497cb..121e4cb5fb135c56122f1f6dfbf25f0fbf72f017 100644 (file)
--- a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
+++ b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
@@ -41,6 +41,7 @@ public class SSJavaAnalysis {
   public static final String THISLOC = "THISLOC";
   public static final String GLOBALLOC = "GLOBALLOC";
   public static final String RETURNLOC = "RETURNLOC";
+  public static final String PCLOC = "PCLOC";
   public static final String LOC = "LOC";
   public static final String DELTA = "DELTA";
   public static final String TERMINATE = "TERMINATE";
@@ -133,7 +134,7 @@ public class SSJavaAnalysis {
     init();
 
     if (state.SSJAVADEBUG) {
-      // debugPrint();
+      debug_printAnnotationRequiredSet();
     }
     if (state.SSJAVAINFER) {
       inference();
@@ -243,11 +244,11 @@ public class SSJavaAnalysis {
     checker.linearTypeCheck();
   }
 
-  public void debugPrint() {
+  public void debug_printAnnotationRequiredSet() {
     System.out.println("SSJAVA: SSJava is checking the following methods:");
     for (Iterator<MethodDescriptor> iterator = annotationRequireSet.iterator(); iterator.hasNext();) {
       MethodDescriptor md = iterator.next();
-      System.out.print(" " + md);
+      System.out.println(md);
     }
     System.out.println();
   }
@@ -406,6 +407,9 @@ public class SSJavaAnalysis {
       } else if (orderElement.startsWith(RETURNLOC + "=")) {
         String returnLoc = orderElement.substring(10);
         locOrder.setReturnLoc(returnLoc);
+      } else if (orderElement.startsWith(PCLOC + "=")) {
+        String pcLoc = orderElement.substring(6);
+        locOrder.setPCLoc(pcLoc);
       } else if (orderElement.endsWith("*")) {
         // spin loc definition
         locOrder.addSharedLoc(orderElement.substring(0, orderElement.length() - 1));