changes.

[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 80f678d53b551f8b2aebde08425e925c23b84d02..fb9d4d5c3e54729424f8dd9903d55dc8812d427e 100644 (file)
--- a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
+++ b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java
@@ -138,9 +138,9 @@ public class SSJavaAnalysis {
     doMethodAnnotationCheck();
 
     if (state.SSJAVA && !state.SSJAVAINFER) {
+      init();
       computeLinearTypeCheckMethodSet();
       doLinearTypeCheck();
-      init();
     }
 
     if (state.SSJAVADEBUG) {
@@ -189,7 +189,7 @@ public class SSJavaAnalysis {
   }
 
   private void inference() {
-    LocationInference inferEngine = new LocationInference(this, state);
+    LocationInference inferEngine = new LocationInference(this, state, tu);
     inferEngine.inference();
   }
 
@@ -267,6 +267,8 @@ public class SSJavaAnalysis {
       }
     }
 
+    linearTypeCheckMethodSet.addAll(sortedDescriptors);
+
   }
 
   private void doLinearTypeCheck() {
@@ -348,6 +350,7 @@ public class SSJavaAnalysis {
                 MethodLattice<String> locOrder =
                     new MethodLattice<String>(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM);
                 md2lattice.put(md, locOrder);
+                System.out.println("parsing method lattice=" + md);
                 parseMethodDefaultLatticeDefinition(cd, an.getValue(), locOrder);
                 writeLatticeDotFile(cd, md, locOrder, "");
               } else if (an.getMarker().equals(TERMINATE)) {