public static final Type BYTE = new Primitive("B", "byte");
public static final Type CHAR = new Primitive("C", "char");
public static final Type SHORT = new Primitive("S", "short");
+ public static final Type NULL = new Null();
public static final Type.Class OBJECT = Type.Class.instance("java.lang.Object");
public static final Type.Class STRING = Type.Class.instance("java.lang.String");
return new Type.Class(d);
}
- public final String toString() { return super.toString(); }
- public abstract String debugToString();
-
public final String getDescriptor() { return descriptor; }
public Type.Array makeArray() { return (Type.Array)Type.fromDescriptor("["+descriptor); }
public boolean isClass() { return false; }
public boolean isArray() { return false; }
+ public static Type unify(Type t1, Type t2) {
+ if(t1 == Type.NULL) return t2;
+ if(t2 == Type.NULL) return t1;
+ if((t1 == Type.INT && t2 == Type.BOOLEAN) || (t2 == Type.INT & t1 == Type.BOOLEAN)) return Type.BOOLEAN;
+ if(t1 == t2) return t1;
+ // FIXME: This needs to do a lot more (subclasses, etc)
+ // it probably should be in Context.java
+ return null;
+ }
+
// Protected/Private //////////////////////////////////////////////////////////////////////////////
protected final String descriptor;
this.descriptor = descriptor;
instances.put(descriptor, this);
}
+
+ public static class Null extends Type {
+ protected Null() { super(""); } // not really correct....
+ }
public static class Primitive extends Type {
private String humanReadable;
super(descriptor);
this.humanReadable = humanReadable;
}
- public String debugToString() { return humanReadable; }
+ public String toString() { return humanReadable; }
public boolean isPrimitive() { return true; }
}
public abstract static class Ref extends Type {
protected Ref(String descriptor) { super(descriptor); }
- public abstract String debugToString();
+ public abstract String toString();
public Type.Ref asRef() { return this; }
public boolean isRef() { return true; }
}
protected Array(Type t) { super("[" + t.getDescriptor()); base = t; }
public Type.Array asArray() { return this; }
public boolean isArray() { return true; }
- public String debugToString() { return base.debugToString() + "[]"; }
- public Type getElementType() { return Type.fromDescriptor(getDescriptor().substring(0, getDescriptor().length()-1)); }
+ public String toString() { return base.toString() + "[]"; }
+ public Type getElementType() { return base; }
}
public static class Class extends Type.Ref {
return cf.superType.extendsOrImplements(c, cx);
}
String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
- public String debugToString() { return internalForm().replace('/','.'); }
+ public String toString() { 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);
}
private static String _initHelper(String s) {
- if (!s.startsWith("L") || !s.endsWith(";")) throw new Error("invalid");
+ if (!s.startsWith("L") || !s.endsWith(";")) throw new Error("invalid: " + s);
return s;
}
String[] components() {
return a;
}
+ public Type.Class.Body getBody(Context cx) { return cx.resolve(this.getName()); }
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 Field field(String name, Type type) { return new Field(name, type); }
+ public Field field(String name, String descriptor) { return field(name,Type.fromDescriptor(descriptor)); }
public Method method(String name, Type returnType, Type[] argTypes) { return new Method(name, returnType, argTypes); }
- public Method method(String leftCrap, String rightCrap) { return method(leftCrap+rightCrap); }
/** see JVM Spec section 2.10.2 */
- public Method method(String signature) {
+ public Method method(String name, String descriptor) {
// FEATURE: This parser is ugly but it works (and shouldn't be a problem) might want to clean it up though
- String name = signature.substring(0, signature.indexOf('('));
- String s = signature.substring(signature.indexOf('('));
+ String s = descriptor;
if(!s.startsWith("(")) throw new IllegalArgumentException("invalid method type descriptor");
int p = s.indexOf(')');
if(p == -1) throw new IllegalArgumentException("invalid method type descriptor");
public Type.Class getDeclaringClass() { return Type.Class.this; }
public String getName() { return name; }
public abstract String getTypeDescriptor();
- public abstract String debugToString();
+ public abstract String toString();
}
public class Field extends Member {
private Field(String name, Type t) { super(name); this.type = t; }
public String getTypeDescriptor() { return type.getDescriptor(); }
public Type getType() { return type; }
- public String debugToString() { return getDeclaringClass().debugToString()+"."+name+"["+type.debugToString()+"]"; }
+ public String toString() { return getDeclaringClass().toString()+"."+name+"["+type.toString()+"]"; }
public class Body extends HasAttributes {
public Field getField() { return Field.this; }
public Body(int flags, ClassFile.AttrGen attrs) {
}
public boolean isConstructor() { return getName().equals("<init>"); }
public boolean isClassInitializer() { return getName().equals("<clinit>"); }
- public String debugToString() {
+
+ public String toString() {
StringBuffer sb = new StringBuffer();
if (name.equals("<clinit>")) sb.append("static ");
else {
if (name.equals("<init>"))
sb.append(Class.this.getShortName());
else
- sb.append(returnType.debugToString()).append(".").append(name);
+ sb.append(returnType.toString()).append(" ").append(name);
sb.append("(");
for(int i=0; i<argTypes.length; i++)
- sb.append((i==0?"":", ")+argTypes[i].debugToString());
+ sb.append((i==0?"":", ")+argTypes[i].toString());
sb.append(") ");
}
return sb.toString();
super(flags, attrs);
if ((flags & ~VALID_METHOD_FLAGS) != 0) throw new IllegalArgumentException("invalid flags");
}
- public void debugToString(StringBuffer sb, String constructorName) {
+ public boolean isConcrete() { return !isAbstract() && !isNative() /*FIXME: !inAnInterface*/; }
+ public void toString(StringBuffer sb, String constructorName) {
int flags = getFlags();
sb.append(" ").append(ClassFile.flagsToString(flags,false));
- sb.append(Method.this.debugToString());
+ sb.append(Method.this.toString());
java.util.Hashtable thrownExceptions = getThrownExceptions();
if (thrownExceptions.size() > 0) {
sb.append("throws");
for(java.util.Enumeration e = thrownExceptions.keys();e.hasMoreElements();)
- sb.append(" ").append(((Type.Class)e.nextElement()).debugToString()).append(",");
+ sb.append(" ").append(((Type.Class)e.nextElement()).toString()).append(",");
sb.setLength(sb.length()-1);
sb.append(" ");
}
projects / org.ibex.classgen.git / blobdiff