X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FFieldGen.java;h=aab5586c11e185bdf456fb3e380c5846f3628edb;hb=42a1bb10686a80875ffc209626fedaec95095d0f;hp=e4f67637dbab660c6e14161c99f3efc97479f680;hpb=cd0ae78576749ddda5d9dfda5b9e88dd78fda0c9;p=org.ibex.classgen.git

diff --git a/src/org/ibex/classgen/FieldGen.java b/src/org/ibex/classgen/FieldGen.java
index e4f6763..aab5586 100644
--- a/src/org/ibex/classgen/FieldGen.java
+++ b/src/org/ibex/classgen/FieldGen.java
@@ -12,9 +12,26 @@ public class FieldGen implements CGConst {
     private final ClassGen.AttrGen attrs;
     
     private Object constantValue;
+
+    public String toString() { StringBuffer sb = new StringBuffer(); toString(sb); return sb.toString(); }
+    public void   toString(StringBuffer sb) {
+        sb.append(ClassGen.flagsToString(flags));
+        sb.append(type.humanReadable());
+        sb.append(" ");
+        sb.append(name);
+        sb.append(";");
+        // FIXME: attrs
+    }
     
-    FieldGen(DataInput in) { throw new Error("Brian is lame"); }
-    FieldGen(ClassGen owner, String name,Type type, int flags) {
+    FieldGen(CPGen cp, DataInput in) throws IOException {
+        this.cp = cp;
+        flags = in.readShort();
+        name = cp.getUtf8ByIndex(in.readShort());
+        type = cp.getType(in.readShort());
+        attrs = new ClassGen.AttrGen(cp, in);
+    }
+
+    FieldGen(ClassGen owner, String name, Type type, int flags) {
         if((flags & ~(ACC_PUBLIC|ACC_PRIVATE|ACC_PROTECTED|ACC_VOLATILE|ACC_TRANSIENT|ACC_STATIC|ACC_FINAL)) != 0)
             throw new IllegalArgumentException("invalid flags");
         this.cp = owner.cp;
@@ -36,7 +53,7 @@ public class FieldGen implements CGConst {
     
     void finish() {
         if(constantValue != null && !attrs.contains("ConstantValue"))
-            attrs.add("ConstantValue",cp.add(constantValue));
+            attrs.add("ConstantValue", cp.add(constantValue));
     }
     
     void dump(DataOutput o) throws IOException {