got it to compile

[org.ibex.classgen.git] / src / org / ibex / classgen / ClassGen.java

diff --git a/src/org/ibex/classgen/ClassGen.java b/src/org/ibex/classgen/ClassGen.java
index 1b5e15e..c4b7e77 100644 (file)
--- a/src/org/ibex/classgen/ClassGen.java
+++ b/src/org/ibex/classgen/ClassGen.java
@@ -101,7 +101,9 @@ public class ClassGen implements CGConst {
             }
             f = new File(f,a[i] + ".class");
         }
-        dump(new FileOutputStream(f));
+        OutputStream os = new FileOutputStream(f);
+        dump(os);
+        os.close();
     }
    
     /** Writes the classfile data to the outputstream specified
@@ -117,13 +119,14 @@ public class ClassGen implements CGConst {
     }
     
     private void _dump(DataOutput o) throws IOException {
+        cp.optimize();
+        cp.stable();
+        
         cp.add(thisType);
         cp.add(superType);
         if(interfaces != null) for(int i=0;i<interfaces.length;i++) cp.add(interfaces[i]);
         if(sourceFile != null && !attributes.contains("SourceFile")) attributes.add("SourceFile",cp.addUtf8(sourceFile));
-        
-        cp.stable();
-        
+                
         for(int i=0;i<methods.size();i++) ((MethodGen)methods.elementAt(i)).finish();
         for(int i=0;i<fields.size();i++) ((FieldGen)fields.elementAt(i)).finish();
         
@@ -133,7 +136,6 @@ public class ClassGen implements CGConst {
         o.writeShort(3); // minor_version
         o.writeShort(45); // major_version
         
-        o.writeShort(cp.size()); // constant_pool_count
         cp.dump(o); // constant_pool
         
         o.writeShort(flags);
@@ -153,12 +155,45 @@ public class ClassGen implements CGConst {
         attributes.dump(o); // attributes        
     }
     
+    public ClassGen read(File f) throws ClassReadExn, IOException {
+        InputStream is = new FileInputStream(f);
+        ClassGen ret = read(is);
+        is.close();
+        return ret;
+    }
+    
+    public ClassGen read(InputStream is) throws ClassReadExn, IOException {
+        return new ClassGen(new DataInputStream(new BufferedInputStream(is)));
+    }
+
+    ClassGen(DataInput i) throws ClassReadExn, IOException {
+        if(i.readInt() != 0xcadebabe) throw new ClassReadExn("invalid magic");
+        short minor = (short)i.readInt();
+        if(minor != 3) throw new ClassReadExn("invalid minor version: " + minor);
+        if(i.readInt() != 45) throw new ClassReadExn("invalid major version");
+        cp = new CPGen(i);
+        flags = (short)i.readShort();
+        thisType = cp.getType(i.readShort());
+        superType = cp.getType(i.readShort());
+        interfaces = new Type.Object[i.readShort()];
+        for(int j=0; j<interfaces.length; j++) interfaces[j] = cp.getType(i.readShort());
+        int numFields = i.readShort();
+        for(int j=0; j<numFields; j++) fields.add(new FieldGen(i));
+        int numMethods = i.readShort();
+        for(int j=0; j<numMethods; j++) methods.add(new MethodGen(i));
+        attributes = new AttrGen(i);
+    }
+    
     /** Thrown when class generation fails for a reason not under the control of the user
         (IllegalStateExceptions are thrown in those cases */
     public static class Exn extends RuntimeException {
         public Exn(String s) { super(s); }
     }
     
+    public static class ClassReadExn extends IOException {
+        public ClassReadExn(String s) { super(s); }
+    }
+    
     /** A class representing a field or method reference. This is used as an argument to the INVOKE*, GET*, and PUT* bytecodes
         @see MethodRef
         @see FieldRef
@@ -184,6 +219,9 @@ public class ClassGen implements CGConst {
         private final CPGen cp;
         private final Hashtable ht = new Hashtable();
         
+        public AttrGen(DataInput in) {
+            throw new Error("Brian is superlame");
+        }
         public AttrGen(CPGen cp) {
             this.cp = cp;
         }
@@ -208,7 +246,7 @@ public class ClassGen implements CGConst {
                     o.write(buf);
                 } else if(val instanceof CPGen.Ent) {
                     o.writeInt(2);
-                    o.writeShort(((CPGen.Ent)val).getIndex());
+                    o.writeShort(cp.getIndex((CPGen.Ent)val));
                 } else {
                     throw new Error("should never happen");
                 }