X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=cb5548e12aab813966fa7db69d7f5065477d30c9;hp=1c9d97f26a1b89ea962fc96b4c964f4387c5ddb0;hb=7f1eaf5d7ee54b09ffd9d91a7f8fc23803d9703a;hpb=d4d0c4d937a3c18d559e335a84aed3eb4e406723

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 1c9d97f..cb5548e 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -26,33 +26,34 @@ public class Type {
     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";
+        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) {
-        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;
-        if(descriptor.endsWith("[")) return new Type.Array(fromDescriptor(descriptor.substring(0, descriptor.indexOf('['))),
-                                                           descriptor.length() - descriptor.indexOf('['));
-        return new Type.Object(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 */
@@ -60,29 +61,16 @@ 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; }
 
     /** Class representing Object types (any non-primitive type) */
     public static class Object extends Type {
-        /** Create an Type.Object instance for the specified string. <i>s</i> can be a string in the form
-            "java.lang.String", "java/lang/String", or "Ljava/lang/String;".
-            @param s The type */
         protected Object(String s) { super(_initHelper(s)); }
         public Type.Object asObject() { return this; }
         public boolean isObject() { return true; }
@@ -93,8 +81,7 @@ public class Type {
         }
 
         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;
         }
 
@@ -104,16 +91,13 @@ 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 {
         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; }