From: adam Date: Fri, 3 Jun 2005 03:59:04 +0000 (+0000) Subject: massive cleanup of Type.java; introduced human-readable toString() and one-instance... X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=commitdiff_plain;h=be231cfa8ce0eac52873b9f0f82b8aecca9c458a massive cleanup of Type.java; introduced human-readable toString() and one-instance-per-descriptor darcs-hash:20050603035904-5007d-efd375ef1d7a3408750d0d4f403f41d1f8e39755.gz --- diff --git a/src/org/ibex/classgen/ClassGen.java b/src/org/ibex/classgen/ClassGen.java index f4c1a03..7ddd161 100644 --- a/src/org/ibex/classgen/ClassGen.java +++ b/src/org/ibex/classgen/ClassGen.java @@ -39,10 +39,10 @@ public class ClassGen implements CGConst { public void toString(StringBuffer sb) { sb.append(flagsToString(flags)); sb.append((flags & ACC_INTERFACE) != 0 ? "interface " : "class "); - sb.append(thisType.humanReadable()); - if (superType != null) sb.append(" extends " + superType.humanReadable()); + sb.append(thisType); + if (superType != null) sb.append(" extends " + superType); if (interfaces != null && interfaces.length > 0) sb.append(" implements"); - for(int i=0; i"); return sb.toString(); } public void toString(StringBuffer sb, String constructorName) { sb.append(ClassGen.flagsToString(flags)); - sb.append(ret.humanReadable()); + sb.append(ret); sb.append(" "); if (name.equals("")) sb.append("static "); @@ -41,7 +41,7 @@ public class MethodGen implements CGConst { else sb.append(name); sb.append("("); for(int i=0; i equals() and == are interchangeable */ public static Type fromDescriptor(String d) { - if (d.equals("V")) return VOID; - if (d.equals("I")) return INT; - if (d.equals("J")) return LONG; - if (d.equals("Z")) return BOOLEAN; - if (d.equals("D")) return DOUBLE; - if (d.equals("F")) return FLOAT; - if (d.equals("B")) return BYTE; - if (d.equals("C")) return CHAR; - if (d.equals("S")) return SHORT; - if (d.endsWith("[")) - return new Type.Array(fromDescriptor(d.substring(0, d.indexOf('['))), - d.length() - d.indexOf('[')); + 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); } - - /** Returns the Java descriptor string for this object ("I", or "Ljava/lang/String", "[[J", etc */ - public final String getDescriptor() { return descriptor; } - public int hashCode() { return descriptor.hashCode(); } - public boolean equals(java.lang.Object o) { return o instanceof Type && ((Type)o).descriptor.equals(descriptor); } - - public String toString() { return getDescriptor(); } + + public String toString() { return toString; } + public final String getDescriptor() { return descriptor; } + 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 Type.Array makeArray(int dim) { return new Type.Array(this, dim); } - public boolean isObject() { return false; } - public boolean isArray() { return false; } + 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; } + + // Protected/Private ////////////////////////////////////////////////////////////////////////////// + + protected final String descriptor; + protected final String toString; + protected Type(String descriptor) { this(descriptor, descriptor); } + protected Type(String descriptor, String humanReadable) { + this.toString = humanReadable; + 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)); } + 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 String humanReadable() { return internalForm().replace('/', '.'); } - public String getShortName() { - String hr = humanReadable(); - return hr.substring(hr.lastIndexOf('.')+1); - } - + public String getShortName() { return toString.substring(toString.lastIndexOf('.')+1); } + String internalForm() { return descriptor.substring(1, descriptor.length()-1); } private static String _initHelper(String s) { if (!s.startsWith("L") || !s.endsWith(";")) s = "L" + s.replace('.', '/') + ";"; return s; } - + private static String _initHelper2(String s) { + if (s.startsWith("L") && s.endsWith(";")) s = s.substring(1, s.length()-1); + return s.replace('/', '.'); + } String[] components() { StringTokenizer st = new StringTokenizer(descriptor.substring(1, descriptor.length()-1), "/"); String[] a = new String[st.countTokens()]; for(int i=0;st.hasMoreTokens();i++) a[i] = st.nextToken(); return a; } - - String internalForm() { return descriptor.substring(1, descriptor.length()-1); } } - public static class Array extends Object { - private int dim; - protected Array(Type t) { super(_initHelper(t, 1)); this.dim = 1; } - protected Array(Type t, int dim) { super(_initHelper(t, dim)); this.dim = dim; } + public static class Array extends Type.Object { + protected Array(Type t) { super(t.getDescriptor() + "[", t.toString() + "[]"); } public Type.Array asArray() { return this; } public boolean isArray() { return true; } - public String humanReadable() { - String ret = super.internalForm().replace('/', '.'); - for(int i=0; i