From: brian Date: Sat, 2 Jul 2005 23:34:46 +0000 (+0000) Subject: added Type.Primitive, generate toString() output on demand X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=commitdiff_plain;h=60bace637897ca9710e91707d0bb8d31a420a3a9 added Type.Primitive, generate toString() output on demand darcs-hash:20050702233446-24bed-315315a4af5c26927578d497c63fccd1d2e2c965.gz --- diff --git a/src/org/ibex/classgen/MethodGen.java b/src/org/ibex/classgen/MethodGen.java index c4ebfe9..41335fd 100644 --- a/src/org/ibex/classgen/MethodGen.java +++ b/src/org/ibex/classgen/MethodGen.java @@ -1008,7 +1008,7 @@ public class MethodGen extends Type.Class.Method.Body implements CGConst { sb.append(OP_NAMES[op[i]&0xff]); String s = null; if (arg[i] instanceof Type) s = ((Type)arg[i]).debugToString(); - else if (arg[i] instanceof Type.Class.Member) s = ((Type.Class.Member)arg[i]).toString(); + else if (arg[i] instanceof Type.Class.Member) s = ((Type.Class.Member)arg[i]).debugToString(); else if (arg[i] instanceof String) s = "\"" + s + "\""; else if (arg[i] != null) s = arg[i].toString(); if (s != null) sb.append(" ").append(s); diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java index f136d84..07e8d78 100644 --- a/src/org/ibex/classgen/Type.java +++ b/src/org/ibex/classgen/Type.java @@ -9,15 +9,15 @@ public class Type implements CGConst { // Public API ////////////////////////////////////////////////////////////////////////////// - public static final Type VOID = new Type("V", "void"); - public static final Type INT = new Type("I", "int"); - public static final Type LONG = new Type("J", "long"); - public static final Type BOOLEAN = new Type("Z", "boolean"); - public static final Type DOUBLE = new Type("D", "double"); - public static final Type FLOAT = new Type("F", "float"); - public static final Type BYTE = new Type("B", "byte"); - public static final Type CHAR = new Type("C", "char"); - public static final Type SHORT = new Type("S", "short"); + public static final Type VOID = new Primitive("V", "void"); + public static final Type INT = new Primitive("I", "int"); + public static final Type LONG = new Primitive("J", "long"); + public static final Type BOOLEAN = new Primitive("Z", "boolean"); + public static final Type DOUBLE = new Primitive("D", "double"); + public static final Type FLOAT = new Primitive("F", "float"); + 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.Class OBJECT = new Type.Class("java.lang.Object"); public static final Type.Class STRING = new Type.Class("java.lang.String"); @@ -37,9 +37,12 @@ public class Type implements CGConst { return new Type.Class(d); } - public String toString() { return toString; } - public String debugToString() { return toString; } + public final String toString() { return super.toString(); } + public abstract String debugToString(); + public final String getDescriptor() { return descriptor; } + public int hashCode() { return descriptor.hashCode(); } + public boolean equals(java.lang.Object o) { return this==o; } public Type.Array makeArray() { return (Type.Array)instance("["+descriptor); } public Type.Array makeArray(int i) { return i==0 ? (Type.Array)this : makeArray().makeArray(i-1); } @@ -47,7 +50,7 @@ public class Type implements CGConst { 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 isPrimitive() { return false; } public boolean isRef() { return false; } public boolean isClass() { return false; } public boolean isArray() { return false; } @@ -55,44 +58,53 @@ public class Type implements CGConst { // 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); + + protected Type(String descriptor) { + this.descriptor = descriptor; + instances.put(descriptor, this); } - public static class Ref extends Type { + static class Primitive extends Type { + private String humanReadable; + protected Primitive(String descriptor, String humanReadable) { + super(descriptor); + this.humanReadable = humanReadable; + } + public String debugToString() { return humanReadable; } + public boolean isPrimitive() { return true; } + } + + public abstract static class Ref extends Type { protected Ref(String descriptor) { super(descriptor); } - protected Ref(String descriptor, String humanReadable) { super(descriptor, humanReadable); } + public abstract String debugToString(); public Type.Ref asRef() { return this; } public boolean isRef() { return true; } } public static class Array extends Type.Ref { - protected Array(Type t) { super("[" + t.getDescriptor(), t.toString() + "[]"); } + public final Type base; + protected Array(Type t) { super("[" + t.getDescriptor()); base = t; } public Type.Array asArray() { return this; } public boolean isArray() { return true; } - public int dimension() { return getDescriptor().lastIndexOf('['); } + public String debugToString() { return base.debugToString() + "[]"; } public Type getElementType() { return Type.instance(getDescriptor().substring(0, getDescriptor().length()-1)); } } public static class Class extends Type.Ref { - protected Class(String s) { super(_initHelper(s), _initHelper2(s)); } + protected Class(String s) { super(_initHelper(s)); } public Type.Class asClass() { return this; } public boolean isClass() { return true; } public String getShortName() { return toString.substring(toString.lastIndexOf('.')+1); } - public String getName() { return toString(); } - //public boolean extendsOrImplements(Type.Class c, Context cx) { } String internalForm() { return descriptor.substring(1, descriptor.length()-1); } + public String debugToString() { 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(";")) 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()]; @@ -150,11 +162,6 @@ public class Type implements CGConst { public String getTypeDescriptor() { return type.getDescriptor(); } public Type getType() { return type; } public String debugToString() { return getDeclaringClass()+"."+name+"["+type+"]"; } - public class Body extends HasFlags { - public final int flags; - public Body(int flags) { this.flags = flags; } - public int getFlags() { return flags; } - } } public class Method extends Member { @@ -178,7 +185,7 @@ public class Type implements CGConst { if (name.equals("")) sb.append(Class.this.getShortName()); else - sb.append(returnType).append(" ").append(name); + sb.append(returnType.debugToString()).append(".").append(name); sb.append("("); for(int i=0; i