Work in progress for import packages. In this versio ONLY SINGLE IMPORTS and package...

[IRC.git] / Robust / src / IR / TypeUtil.java

diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java
index c52679db1a76ef66acfd18b2134be71ff1d5dae9..35ee680beae586f142a95fcdb7f45f8af24f9bb6 100644 (file)
--- a/Robust/src/IR/TypeUtil.java
+++ b/Robust/src/IR/TypeUtil.java
@@ -28,20 +28,21 @@ public class TypeUtil {
   }
 
   public void addNewClass(String cl, Set todo) {
-    for(int i=0;i<state.classpath.size();i++) {
-      String path=(String)state.classpath.get(i);
-      File f=new File(path, cl+".java");
+    for (int i = 0; i < state.classpath.size(); i++) {
+      String path = (String) state.classpath.get(i);
+      //The name has ___________ to separate out packages
+      File f = new File(path, cl.replaceAll("___________", "/") + ".java");
       if (f.exists()) {
-       try {
-         ParseNode pn=Main.readSourceFile(state, f.getCanonicalPath());
-         bir.buildtree(pn, todo,f.getCanonicalPath());
-         return;
-       } catch (Exception e) {
-         throw new Error(e);
-       }
+        try {
+          ParseNode pn = Main.readSourceFile(state, f.getCanonicalPath());
+          bir.buildtree(pn, todo, f.getCanonicalPath());
+          return;
+        } catch (Exception e) {
+          throw new Error(e);
+        }
       }
     }
-    throw new Error("Couldn't find class "+cl);
+    throw new Error("Couldn't find class " + cl);
   }