X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=29301d38b5dddea89e09e6927b8b3279e555c3a1;hp=ec5a30a83363075e43743f2a177293bfe7080108;hb=57f8032e5579f575ef526b02957fc937f6efbb62;hpb=30a333241756f2eb395336ffbdb0038000b0bb56
diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index ec5a30a..29301d3 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -25,7 +25,7 @@ public class Type {
final String descriptor;
- Type(String descriptor) { this.descriptor = descriptor; }
+ protected Type(String descriptor) { this.descriptor = descriptor; }
public static Type fromDescriptor(String descriptor) {
if(descriptor.equals("V")) return VOID;
@@ -37,6 +37,8 @@ public class Type {
if(descriptor.equals("B")) return BYTE;
if(descriptor.equals("C")) return CHAR;
if(descriptor.equals("S")) return SHORT;
+ if(descriptor.endsWith("[")) return new Type.Array(fromDescriptor(descriptor.substring(0, descriptor.indexOf('['))),
+ descriptor.length() - descriptor.indexOf('['));
if(Type.Object.validDescriptorString(descriptor)) return new Type.Object(descriptor);
return null;
}
@@ -50,43 +52,60 @@ public class Type {
@param base The base type
@return A one dimensional array of the base type
*/
- public static Type arrayType(Type base) { return arrayType(base,1); }
+ 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; }
+
private static String _initHelper(String s) {
- if(!s.startsWith("L") || !s.endsWith(";")) s = "L" + s.replace('.','/') + ";";
+ if(!s.startsWith("L") || !s.endsWith(";")) s = "L" + s.replace('.', '/') + ";";
if(!validDescriptorString(s)) throw new IllegalArgumentException("invalid descriptor string");
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); }
+ String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
static boolean validDescriptorString(String s) {
return s.startsWith("L") && s.endsWith(";");
}
}
+
+ public static class Array extends Object {
+ protected Array(Type t, int dim) { super(_initHelper(t, dim)); }
+ public Type.Array asArray() { return this; }
+ public boolean isArray() { return true; }
+ String internalForm() { throw new Error("Type.Array does not have an internalForm()"); }
+ String[] components() { throw new Error("Type.Array does not have components()"); }
+ private static String _initHelper(Type t, int dim) {
+ StringBuffer sb = new StringBuffer(t.descriptor.length() + dim);
+ for(int i=0;i