use binary files as class source if compiling the source file is skipped over

darcs-hash:20041123213820-2eb37-8810478c71328596159b1c06c3f5377a5c4f90e6.gz

diff --git a/src/java/org/ibex/tool/Compiler.java b/src/java/org/ibex/tool/Compiler.java
index a34a735..26a1b4b 100644 (file)
--- a/src/java/org/ibex/tool/Compiler.java
+++ b/src/java/org/ibex/tool/Compiler.java
@@ -123,7 +123,13 @@ public class Compiler {
         if (DEBUG) System.out.println("working with "+s.size() +" sources");
         sources = new Source[s.size()]; s.toArray(sources);
         ICompilationUnit[] units = new ICompilationUnit[s.size()];
-        for (int i=0; i < sources.length; i++) units[i] = sources[i].unit;
+        int u = 0; for (int i=0; i < sources.length; i++)
+            if (sources[i].compiled == null) units[u++] = sources[i].unit;
+        if (u != units.length) {
+            ICompilationUnit[] newu = new ICompilationUnit[u];
+            System.arraycopy(units, 0, newu, 0, u);
+            units = newu;
+        }
 
         hasErrors = false;
 
@@ -146,18 +152,69 @@ public class Compiler {
     private final FileFilter filterDirs = new FileFilter() {
         public boolean accept(File path) { return path.isDirectory(); }
     };
+    private byte[] bytes(File bfile) {
+        byte[] bytes = new byte[2 * 1024];
+        int pos = 0, in = 0;
+        try {
+            InputStream bin = new FileInputStream(bfile);
+            while ((in = bin.read(bytes, pos, bytes.length - pos)) != -1) {
+                pos += in;
+                if (pos == bytes.length) {
+                    byte[] newbytes= new byte[pos * 2];
+                    System.arraycopy(bytes, 0, newbytes, 0, pos);
+                    bytes = newbytes;
+                }
+            }
+            bin.close();
+        } catch (IOException e) {
+            System.out.println("Error reading class file"); // FIXME
+            e.printStackTrace(); return null;
+        }
+
+        if (pos != bytes.length) {
+            byte[] newbytes= new byte[pos * 2];
+            System.arraycopy(bytes, 0, newbytes, 0, pos);
+            bytes = newbytes;
+        }
+
+        return bytes;
+    }
     private void filterSources(List s, File dir, char[][] pack) {
-        // add the java files in this directory
+        List bclasses = new ArrayList();
         File bdir = new File(builddir, str(pack, File.separatorChar));
+
+        // add the java files in this directory
         File[] ja = dir.listFiles(filterSrcs);
         for (int i=0; i < ja.length; i++) {
             char[] n = name(classname(ja[i].getName()));
+            Source src = new Source(ja[i], n, pack);
 
             // skip the file if the build version is newer than the source
-            File bfile = new File(bdir, new String(n) + ".class");
-            if (bfile.lastModified() > ja[i].lastModified()) continue;
+            String bclass = new String(n);
+            File bfile = new File(bdir, bclass + ".class");
+            if (bfile.lastModified() > ja[i].lastModified()) {
+                src.compiled = bytes(bfile);
+                bclasses.add(bclass);
+            }
 
-            s.add(new Source(ja[i], n, pack));
+            s.add(src);
+        }
+
+        // process the inner classes of any binary files
+        for (int i=0; i < bclasses.size(); i++) {
+            final String bc = (String)bclasses.get(i);
+            final FilenameFilter f = new FilenameFilter() {
+                public boolean accept(File dir, String name) {
+                    return name.length() > bc.length() && name.startsWith(bc) &&
+                           name.charAt(bc.length()) == '$' && name.endsWith(".class");
+                }
+            };
+            File[] bfile = bdir.listFiles(f);
+            for (int j=0; j < bfile.length; j++) {
+                Source src = new Source(bfile[j], name(classname(bfile[j].getName())), pack);
+                src.compiled = bytes(bfile[j]);
+                s.add(src);
+            }
         }
 
         // add the subdirectories as packages
@@ -178,6 +235,7 @@ public class Compiler {
         File orig;
         char[] processed = null;
         byte[] compiled = null;
+        ClassFileReader reader = null;
 
         final ICompilationUnit unit = new ICompilationUnit() {
             public char[] getMainTypeName() { return n; }
@@ -390,10 +448,9 @@ public class Compiler {
 
             try {
                 Class c = Class.forName(str(p, '.') + '.' + new String(n));
-                if (DEBUG) System.out.println("found class: "+ c);
+                if (DEBUG) System.out.println("  found in classloader: "+ c);
                 IBinaryType b = (IBinaryType)loaded.get(c);
                 if (b == null) loaded.put(c, b = new LoadedClass(c));
-                if (DEBUG) System.out.println("returning "+b+", name="+new String(b.getName()));
                 return new NameEnvironmentAnswer(b);
             } catch (ClassNotFoundException e) {}
 
@@ -401,12 +458,23 @@ public class Compiler {
             if (p.length > 0 && eq(p[0], "java".toCharArray())) return null;
 
             try {
-                for (int i=0; i < sources.length; i++)
-                    if (eq(n, sources[i].n) && eq(p, sources[i].p))
-                        return sources[i].compiled == null ?
-                               new NameEnvironmentAnswer(sources[i].unit) :
-                               new NameEnvironmentAnswer(new ClassFileReader(sources[i].compiled,
-                                    sources[i].orig.getName().toCharArray(), true));
+                for (int i=0; i < sources.length; i++) {
+                    Source s = sources[i];
+                    if (eq(n, s.n) && eq(p, s.p)) {
+                        if (s.reader != null) {
+                            if (DEBUG) System.out.println("  found reader");
+                            return new NameEnvironmentAnswer(s.reader);
+                        }
+                        if (s.compiled != null) {
+                            if (DEBUG) System.out.println("  found compiled, new reader");
+                            s.reader = new ClassFileReader(s.compiled,
+                                s.orig.getName().toCharArray(), true);
+                            return new NameEnvironmentAnswer(s.reader);
+                        }
+                        if (DEBUG) System.out.println("  found unit");
+                        return new NameEnvironmentAnswer(sources[i].unit);
+                    }
+                }
             } catch (ClassFormatException e) {
                 System.out.println("Unexpected ClassFormatException"); // FIXME
                 e.printStackTrace();
@@ -497,6 +565,7 @@ public class Compiler {
         String delim = name.indexOf('/') == -1 ? "." : "/";
         name = name.trim();
         if (name.endsWith(".java")) name = name.substring(0, name.length() - 5);
+        if (name.endsWith(".class")) name = name.substring(0, name.length() - 6);
         if (name.startsWith(delim)) name = name.substring(1);
 
         StringTokenizer st = new StringTokenizer(name, delim);