classpath progress

classpath/java/lang/Class.java

@@ -1,5 +1,6 @@
 package java.lang;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Field;
 
@@ -29,13 +30,31 @@ public final class Class <T> {
 
   public native boolean isAssignableFrom(Class c);
 
-  public Field getDeclaredField(String name) throws NoSuchFieldException {
+  private Field findField(String name) {
     for (int i = 0; i < fieldTable.length; ++i) {
       if (fieldTable[i].getName().equals(name)) {
         return fieldTable[i];
       }
     }
+    return null;
+  }
 
+  public Field getDeclaredField(String name) throws NoSuchFieldException {
+    Field f = findField(name);
+    if (f == null) {
+      throw new NoSuchFieldException(name);
+    } else {
+      return f;
+    }
+  }
+
+  public Field getField(String name) throws NoSuchFieldException {
+    for (Class c = this; c != null; c = c.super_) {
+      Field f = c.findField(name);
+      if (f != null) {
+        return f;
+      }
+    }
     throw new NoSuchFieldException(name);
   }
 
@@ -52,9 +71,7 @@ public final class Class <T> {
     }
   }
 
-  public Method getDeclaredMethod(String name, Class ... parameterTypes)
-    throws NoSuchMethodException
-  {
+  private Method findMethod(String name, Class[] parameterTypes) {
     for (int i = 0; i < methodTable.length; ++i) {
       if (methodTable[i].getName().equals(name)
           && match(parameterTypes, methodTable[i].getParameterTypes()))
@@ -62,7 +79,123 @@ public final class Class <T> {
         return methodTable[i];
       }
     }
+    return null;
+  }
 
+  public Method getDeclaredMethod(String name, Class ... parameterTypes)
+    throws NoSuchMethodException
+  {
+    Method f = findMethod(name, parameterTypes);
+    if (f == null) {
+      throw new NoSuchMethodException(name);
+    } else {
+      return f;
+    }
+  }
+
+  public Method getMethod(String name, Class ... parameterTypes)
+    throws NoSuchMethodException
+  {
+    for (Class c = this; c != null; c = c.super_) {
+      Method f = c.findMethod(name, parameterTypes);
+      if (f != null) {
+        return f;
+      }
+    }
     throw new NoSuchMethodException(name);
   }
+
+  public Constructor getConstructor(Class ... parameterTypes)
+    throws NoSuchMethodException
+  {
+    return new Constructor(getDeclaredMethod("<init>", parameterTypes));
+  }
+
+  public Constructor[] getConstructors() {
+    int count = 0;
+    for (int i = 0; i < methodTable.length; ++i) {
+      if (methodTable[i].getName().equals("<init>")) {
+        ++ count;
+      }
+    }
+
+    Constructor[] array = new Constructor[count];
+    int index = 0;
+    for (int i = 0; i < methodTable.length; ++i) {
+      if (methodTable[i].getName().equals("<init>")) {
+        array[index++] = new Constructor(methodTable[i]);
+      }
+    }
+
+    return array;
+  }
+
+  public Constructor[] getDeclaredConstructors() {
+    return getConstructors();
+  }
+
+  public Field[] getDeclaredFields() {
+    Field[] array = new Field[fieldTable.length];
+    System.arraycopy(fieldTable, 0, array, 0, fieldTable.length);
+    return array;
+  }
+
+  public Method[] getDeclaredMethods() {
+    int count = 0;
+    for (int i = 0; i < methodTable.length; ++i) {
+      if (! methodTable[i].getName().equals("<init>")) {
+        ++ count;
+      }
+    }
+
+    Method[] array = new Method[count];
+    int index = 0;
+    for (int i = 0; i < methodTable.length; ++i) {
+      if (! methodTable[i].getName().equals("<init>")) {
+        array[index++] = methodTable[i];
+      }
+    }
+
+    return array;
+  }
+
+  public Class[] getInterfaces() {
+    Class[] array = new Class[interfaceTable.length / 2];
+    for (int i = 0; i < array.length; ++i) {
+      array[i] = (Class) interfaceTable[i * 2];
+    }
+    return array;
+  }
+
+  public ClassLoader getClassLoader() {
+    return ClassLoader.getSystemClassLoader();
+  }
+
+  public int getModifiers() {
+    return flags;
+  }
+
+  public Class getSuperclass() {
+    return super_;
+  }
+
+  public boolean isArray() {
+    return arrayElementSize != 0;
+  }
+
+  public boolean isInstance(Object o) {
+    return isAssignableFrom(o.getClass());
+  }
+
+  public boolean isPrimitive() {
+    return equals(boolean.class)
+      || equals(byte.class)
+      || equals(char.class)
+      || equals(short.class)
+      || equals(int.class)
+      || equals(long.class)
+      || equals(float.class)
+      || equals(double.class)
+      || equals(void.class);
+  }
 }