move field type descriptor parsing to Type.java, like method()

darcs-hash:20050702230111-24bed-392ba5f9860b67792048d0598ca4b52d0ce95174.gz

diff --git a/src/org/ibex/classgen/ConstantPool.java b/src/org/ibex/classgen/ConstantPool.java
index 17ea634..dbd958c 100644 (file)
--- a/src/org/ibex/classgen/ConstantPool.java
+++ b/src/org/ibex/classgen/ConstantPool.java
@@ -123,7 +123,7 @@ class ConstantPool implements CGConst {
             if(member.name == null) throw new Error("should never happen");
             switch(tag) {
                 case CONSTANT_FIELDREF:
-                    return klass.getTypeClass().field(member.name.s, Type.instance(member.type.s));
+                    return klass.getTypeClass().field(member.name.s, member.type.s);
                 case CONSTANT_METHODREF:
                 case CONSTANT_INTERFACEMETHODREF:
                     Type.Class.Method m = klass.getTypeClass().method(member.name.s,member.type.s);

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 2faa590..1a6ac97 100644 (file)
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -100,9 +100,6 @@ public class Type implements CGConst {
             return a;
         }
 
-        public abstract class Body extends HasFlags {
-        }
-
         public Field  field(String name, Type type) { return new Field(name, type); }
         public Method method(String name, Type returnType, Type[] argTypes) { return new Method(name, returnType, argTypes); }
         public Method method(String name, String typeDescriptor) {