bugfix; removed isValidDescriptorName(); it wasn't doing anything

[org.ibex.classgen.git] / src / org / ibex / classgen / Type.java

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 01276db..8d91aeb 100644 (file)
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -24,7 +24,20 @@ 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; }
     
     public static Type fromDescriptor(String descriptor) {
@@ -39,8 +52,7 @@ public class Type {
         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;
+        return new Type.Object(descriptor);
     }
         
     /** Returns the Java descriptor string for this object ("I", or "Ljava/lang/String", "[[J", etc */
@@ -48,20 +60,11 @@ public class Type {
     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 <i>base</i>
-        @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 <i>dim</i> dimensional array type for the base type <i>base</i>
-        @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) { return new Type.Array(base, dim); }
-
+    public String toString() { return getDescriptor(); }
     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; }
 
@@ -73,10 +76,14 @@ public class Type {
         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");
             return s;
         }
 
@@ -86,19 +93,24 @@ public class Type {
             for(int i=0;st.hasMoreTokens();i++) a[i] = st.nextToken();
             return a;
         }
-        
+       
         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(arrayify(t, dim)); }
+        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; }
-        private static String arrayify(Type t, int dim) {
+        public String humanReadable() { 
+            String ret = super.internalForm().replace('/', '.');
+            for(int i=0; i<dim; i++) ret += "[]";
+            return ret;
+        }
+        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<dim;i++) sb.append("[");
             sb.append(t.descriptor);