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=e301414a66d981d4030f4348ce83d5fc29050161;hb=57f8032e5579f575ef526b02957fc937f6efbb62;hpb=2b7157f2b687f5500bf45ab2c9175ef1b33ccc48 diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java index e301414..29301d3 100644 --- a/src/org/ibex/classgen/Type.java +++ b/src/org/ibex/classgen/Type.java @@ -52,7 +52,7 @@ 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 @@ -75,19 +75,19 @@ public class Type { 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(";"); @@ -95,10 +95,12 @@ public class Type { } public static class Array extends Object { - protected Array(Type t, int dim) { super(arrayify(t,dim)); } + protected Array(Type t, int dim) { super(_initHelper(t, dim)); } public Type.Array asArray() { return this; } public boolean isArray() { return true; } - private static String arrayify(Type t, int dim) { + 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