X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=85ff1696c48a31bb3bcded2aa72afdd68d2127b9;hb=ce71fa77f336c3aa7b254dbf18811372e446bd37;hp=58622ec95e2fb1c935a43322408d4903595968f1;hpb=e33a20a95b926b2e75f07564d672b3a42a6a180a;p=org.ibex.classgen.git diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java index 58622ec..85ff169 100644 --- a/src/org/ibex/classgen/Type.java +++ b/src/org/ibex/classgen/Type.java @@ -18,6 +18,7 @@ public abstract class Type implements CGConst { 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"); @@ -40,9 +41,6 @@ public abstract class Type implements CGConst { 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); } @@ -56,6 +54,16 @@ public abstract class Type implements CGConst { 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; @@ -64,6 +72,10 @@ public abstract class Type implements CGConst { 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; @@ -71,13 +83,13 @@ public abstract class Type implements CGConst { 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; } } @@ -87,8 +99,8 @@ public abstract class Type implements CGConst { 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 { @@ -111,14 +123,14 @@ public abstract class Type implements CGConst { 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() { @@ -131,7 +143,6 @@ public abstract class Type implements CGConst { 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 abstract Type.Class.Field.Body[] fields(); public Body(int flags, ClassFile.AttrGen attrs) { super(flags, attrs); @@ -141,15 +152,14 @@ public abstract class Type implements CGConst { } 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"); @@ -178,7 +188,7 @@ public abstract class Type implements CGConst { 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 { @@ -186,7 +196,7 @@ public abstract class Type implements CGConst { 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) { @@ -209,17 +219,18 @@ public abstract class Type implements CGConst { } public boolean isConstructor() { return getName().equals(""); } public boolean isClassInitializer() { return getName().equals(""); } - public String debugToString() { + + public String toString() { StringBuffer sb = new StringBuffer(); if (name.equals("")) sb.append("static "); else { if (name.equals("")) 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 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(" "); }