X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=491cc1227a2194dee33741d1f7e929f441d684ae;hb=69b2d27ebab56f1b0e4df2a3a301f4d852439e8e;hp=0a35c653fecb9e72fbe8c6093ec8e62325f06c66;hpb=be231cfa8ce0eac52873b9f0f82b8aecca9c458a;p=org.ibex.classgen.git
diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 0a35c65..491cc12 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -19,22 +19,22 @@ public class Type {
public static final Type CHAR = new Type("C", "char");
public static final Type SHORT = new Type("S", "short");
- public static final Type.Object OBJECT = new Type.Object("java.lang.Object");
- public static final Type.Object STRING = new Type.Object("java.lang.String");
- public static final Type.Object STRINGBUFFER = new Type.Object("java.lang.StringBuffer");
- public static final Type.Object INTEGER_OBJECT = new Type.Object("java.lang.Integer");
- public static final Type.Object DOUBLE_OBJECT = new Type.Object("java.lang.Double");
- public static final Type.Object FLOAT_OBJECT = new Type.Object("java.lang.Float");
+ public static final Type.Class OBJECT = new Type.Class("java.lang.Object");
+ public static final Type.Class STRING = new Type.Class("java.lang.String");
+ public static final Type.Class STRINGBUFFER = new Type.Class("java.lang.StringBuffer");
+ public static final Type.Class INTEGER_OBJECT = new Type.Class("java.lang.Integer");
+ public static final Type.Class DOUBLE_OBJECT = new Type.Class("java.lang.Double");
+ public static final Type.Class FLOAT_OBJECT = new Type.Class("java.lang.Float");
/** A zero element Type[] array (can be passed as the "args" param when a method takes no arguments */
public static final Type[] NO_ARGS = new Type[0];
/** guarantee: there will only be one instance of Type for a given descriptor ==> equals() and == are interchangeable */
- public static Type fromDescriptor(String d) {
+ public static Type instance(String d) {
Type ret = (Type)instances.get(d);
if (ret != null) return ret;
- if (d.endsWith("[")) return new Type.Array(fromDescriptor(d.substring(d.length()-1)));
- return new Type.Object(d);
+ if (d.startsWith("[")) return new Type.Array(instance(d.substring(1)));
+ return new Type.Class(d);
}
public String toString() { return toString; }
@@ -42,11 +42,15 @@ public class Type {
public int hashCode() { return descriptor.hashCode(); }
public boolean equals(java.lang.Object o) { return this==o; }
- public Type.Object asObject() { throw new RuntimeException("attempted to use "+this+" as a Type.Object, which it is not"); }
- public Type.Array asArray() { throw new RuntimeException("attempted to use "+this+" as a Type.Array, which it is not"); }
- public Type.Array makeArray() { return new Type.Array(this); }
- public boolean isObject() { return false; }
- public boolean isArray() { return false; }
+ public Type.Array makeArray() { return (Type.Array)instance("["+descriptor); }
+
+ public Type.Ref asRef() { throw new RuntimeException("attempted to use "+this+" as a Type.Ref, which it is not"); }
+ public Type.Class asClass() { throw new RuntimeException("attempted to use "+this+" as a Type.Class, which it is not"); }
+ public Type.Array asArray() { throw new RuntimeException("attempted to use "+this+" as a Type.Array, which it is not"); }
+ public boolean isPrimitive() { return !isRef(); }
+ public boolean isRef() { return false; }
+ public boolean isClass() { return false; }
+ public boolean isArray() { return false; }
// Protected/Private //////////////////////////////////////////////////////////////////////////////
@@ -58,12 +62,17 @@ public class Type {
instances.put(this.descriptor = descriptor, this);
}
- /** Class representing Object types (any non-primitive type) */
- public static class Object extends Type {
- protected Object(String s) { super(_initHelper(s), _initHelper2(s)); }
- protected Object(String descriptor, String hr) { super(_initHelper(descriptor), _initHelper2(hr)); }
- public Type.Object asObject() { return this; }
- public boolean isObject() { return true; }
+ public static class Ref extends Type {
+ protected Ref(String descriptor) { super(descriptor); }
+ protected Ref(String descriptor, String humanReadable) { super(descriptor, humanReadable); }
+ public Type.Ref asRef() { return this; }
+ public boolean isRef() { return true; }
+ }
+
+ public static class Class extends Type.Ref {
+ protected Class(String s) { super(_initHelper(s), _initHelper2(s)); }
+ public Type.Class asClass() { return this; }
+ public boolean isClass() { return true; }
public String getShortName() { return toString.substring(toString.lastIndexOf('.')+1); }
String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
private static String _initHelper(String s) {
@@ -80,14 +89,57 @@ public class Type {
for(int i=0;st.hasMoreTokens();i++) a[i] = st.nextToken();
return a;
}
+
+ public Method method(String name, Type returnType, Type[] argTypes) { return new Method(name, returnType, argTypes); }
+ public Field field(String name, Type type) { return new Field(name, type); }
+
+ public abstract class Member {
+ public final String name;
+ private Member(String name) { this.name = name; }
+ public Type.Class getDeclaringClass() { return Type.Class.this; }
+ public abstract String getDescriptor();
+ public boolean equals(Object o_) {
+ if(!(o_ instanceof Member)) return false;
+ Member o = (Member) o_;
+ return o.getDeclaringClass().equals(getDeclaringClass()) &&
+ o.name.equals(name) &&
+ o.getDescriptor().equals(getDescriptor());
+ }
+ public int hashCode() { return getDeclaringClass().hashCode() ^ name.hashCode() ^ getDescriptor().hashCode(); }
+ }
+
+ public class Field extends Member {
+ /** Create a reference to field name of class c with the type t */
+ public final Type type;
+ private Field(String name, Type t) { super(name); this.type = t; }
+ public String getDescriptor() { return name; }
+ }
+
+ public class Method extends Member {
+ final Type[] argTypes;
+ final Type returnType;
+ private Method(String name, Type returnType, Type[] argTypes) {
+ super(name);
+ this.argTypes = argTypes;
+ this.returnType = returnType;
+ }
+ public String getDescriptor() {
+ StringBuffer sb = new StringBuffer(argTypes.length*4);
+ sb.append("(");
+ for(int i=0;i