more accessor methods for ClassFile and Type.Class

darcs-hash:20050703045236-5007d-8b01f78c5f32dfad00b6a4306b84eaefdbbb5d4a.gz

diff --git a/src/org/ibex/classgen/ClassFile.java b/src/org/ibex/classgen/ClassFile.java
index 70c447b..036f923 100644 (file)
--- a/src/org/ibex/classgen/ClassFile.java
+++ b/src/org/ibex/classgen/ClassFile.java
@@ -6,13 +6,25 @@ import java.io.*;
 /** Class generation object representing the whole classfile */
 public class ClassFile extends Type.Class.Body {
     private final Type.Class thisType;
-    private final Type.Class superType;
-    private final Type.Class[] interfaces;
+    final Type.Class superType;
+    final Type.Class[] interfaces;
     private final short minor;
     private final short major;
     
     private final Vector fields = new Vector();
-    public final Vector methods = new Vector();
+    private final Vector methods = new Vector();
+
+    public Type.Class.Method.Body[] methods() {
+        Type.Class.Method.Body[] ret = new Type.Class.Method.Body[methods.size()];
+        methods.copyInto(ret);
+        return ret;
+    }
+
+    public Type.Class.Field.Body[] fields() {
+        Type.Class.Field.Body[] ret = new Type.Class.Field.Body[fields.size()];
+        fields.copyInto(ret);
+        return ret;
+    }
     
     static String flagsToString(int flags, boolean isClass) {
         StringBuffer sb = new StringBuffer(32);
@@ -96,8 +108,8 @@ public class ClassFile extends Type.Class.Body {
         @see FieldGen
         @see CGConst
         */  
-    public final FieldGen addField(String name, Type type, int flags) {
-        FieldGen fg = new FieldGen(getType().field(name, type), flags);
+    public final Type.Class.Field.Body addField(Type.Class.Field field, int flags) {
+        FieldGen fg = new FieldGen(field, flags);
         fields.addElement(fg);
         return fg;
     }

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 6e20f67..44e6476 100644 (file)
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -97,9 +97,22 @@ public abstract class Type implements CGConst {
         public boolean isClass() { return true; }
         public static Type.Class instance(String className) {
             return (Type.Class)Type.fromDescriptor("L"+className.replace('.', '/')+";"); }
-        //public boolean extendsOrImplements(Type.Class c, Context cx) { }
+        public boolean extendsOrImplements(Type.Class c, Context cx) {
+            if (this==c) return true;
+            if (this==OBJECT) return false;
+            ClassFile cf = cx.resolve(getName());
+            if (cf==null) {
+                System.err.println("warning: could not resolve class " + getName());
+                return false;
+            }
+            if (cf.superType == c) return true;
+            for(int i=0; i<cf.interfaces.length; i++) if (cf.interfaces[i].extendsOrImplements(c,cx)) return true;
+            if (cf.superType == null) return false;
+            return cf.superType.extendsOrImplements(c, cx);
+        }
         String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
         public String debugToString() { return internalForm().replace('/','.'); }
+        public String getName() { return internalForm().replace('/','.'); }
         public String getShortName() {
             int p = descriptor.lastIndexOf('/');
             return p == -1 ? descriptor.substring(1,descriptor.length()-1) : descriptor.substring(p+1,descriptor.length()-1);
@@ -116,6 +129,9 @@ public abstract class Type implements CGConst {
         }
 
         public abstract class Body extends HasAttributes {
+            public abstract Type.Class.Method.Body[] methods();
+            public abstract Type.Class.Field.Body addField(Type.Class.Field field, int flags);
+            public abstract Type.Class.Field.Body[] fields();
             public Body(int flags, ClassFile.AttrGen attrs) {
                 super(flags, attrs);
                 if ((flags & ~(PUBLIC|FINAL|SUPER|INTERFACE|ABSTRACT)) != 0)
@@ -224,6 +240,7 @@ public abstract class Type implements CGConst {
             public abstract class Body extends HasAttributes {
                 public abstract java.util.Hashtable getThrownExceptions();
                 public abstract void debugBodyToString(StringBuffer sb);
+                public Method getMethod() { return Method.this; }
                 public Body(int flags, ClassFile.AttrGen attrs) {
                     super(flags, attrs);
                     if ((flags & ~VALID_METHOD_FLAGS) != 0) throw new IllegalArgumentException("invalid flags");