X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=cb5548e12aab813966fa7db69d7f5065477d30c9;hb=7f1eaf5d7ee54b09ffd9d91a7f8fc23803d9703a;hp=ec6d8340be2f6a8ef7ad52beac6be14b8a3dccf7;hpb=94cebd4c12247ae7fd0a4b0cc66609fead0efece;p=org.ibex.classgen.git
diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index ec6d834..cb5548e 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -24,56 +24,96 @@ public class Type {
public static final Type[] NO_ARGS = new Type[0];
final String descriptor;
+
+ public String humanReadable() {
+ if (descriptor.equals("V")) return "void";
+ if (descriptor.equals("I")) return "int";
+ if (descriptor.equals("J")) return "long";
+ if (descriptor.equals("Z")) return "boolean";
+ if (descriptor.equals("D")) return "double";
+ if (descriptor.equals("F")) return "float";
+ if (descriptor.equals("B")) return "byte";
+ if (descriptor.equals("C")) return "char";
+ if (descriptor.equals("S")) return "short";
+ throw new Error("confounded by Type("+descriptor+")");
+ }
+
+ protected Type(String descriptor) { this.descriptor = descriptor; }
- Type(String descriptor) { this.descriptor = descriptor; }
-
+ 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('['));
+ 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); }
- /** Returns a one dimensional array type for the base type base
- @param base The base type
- @return A one dimensional array of the base type
- */
- public static Type arrayType(Type base) { return arrayType(base,1); }
- /** Returns a dim dimensional array type for the base type base
- @param base The base type
- @param dim Number if dimensions
- @return A one dimensional array of the base type
- */
- public static Type arrayType(Type base, int dim) {
- StringBuffer sb = new StringBuffer(base.descriptor.length() + dim);
- for(int i=0;is can be a string in the form
- "java.lang.String", "java/lang/String", or "Ljava/lang/String;".
- @param s The type */
- public Object(String s) { super(_initHelper(s)); }
-
+ protected Object(String s) { super(_initHelper(s)); }
+ 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);
+ }
+
private static String _initHelper(String s) {
- if(!s.startsWith("L") || !s.endsWith(";")) s = "L" + s.replace('.','/') + ";";
- if(!validDescriptorString(s)) throw new IllegalArgumentException("invalid descriptor string");
+ if (!s.startsWith("L") || !s.endsWith(";")) s = "L" + s.replace('.', '/') + ";";
return s;
}
String[] components() {
- StringTokenizer st = new StringTokenizer(descriptor.substring(1,descriptor.length()-1),"/");
+ 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); }
-
- // FEATURE: Do a proper check here (invalid chars, etc)
- static boolean validDescriptorString(String s) {
- return s.startsWith("L") && s.endsWith(";");
- }
+
+ 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 Type.Array asArray() { return this; }
+ public boolean isArray() { return true; }
+ public String humanReadable() {
+ String ret = super.internalForm().replace('/', '.');
+ for(int i=0; i