X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=ec6d8340be2f6a8ef7ad52beac6be14b8a3dccf7;hb=b0c281117174062552c6470cc78b565163748a4d;hp=dd73d70216cfe1bf9b9bbab2ca47a2b61aba3ff6;hpb=bc9112573cba51be5e7d285ccd3e496be4278c63;p=org.ibex.classgen.git

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index dd73d70..ec6d834 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -9,6 +9,9 @@ public class Type {
     public static final Type BOOLEAN = new Type("Z");
     public static final Type DOUBLE = new Type("D");
     public static final Type FLOAT = new Type("F");
+    public static final Type BYTE = new Type("B");
+    public static final Type CHAR = new Type("C");
+    public static final Type SHORT = new Type("S");
     
     public static final Type.Object OBJECT = new Type.Object("java.lang.Object");
     public static final Type.Object STRING = new Type.Object("java.lang.String");
@@ -17,18 +20,28 @@ public class Type {
     public static final Type.Object DOUBLE_OBJECT = new Type.Object("java.lang.Double");
     public static final Type.Object FLOAT_OBJECT = new Type.Object("java.lang.Float");
     
+    /** A zero element Type[] array (can be passed as the "args" param when a method takes no arguments */
     public static final Type[] NO_ARGS = new Type[0];
     
-    String descriptor;
+    final String descriptor;
     
-    Type() { }
     Type(String descriptor) { this.descriptor = descriptor; }
     
+    /** 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(Object o) { return o instanceof Type && ((Type)o).descriptor.equals(descriptor); }
+    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) {
         StringBuffer sb = new StringBuffer(base.descriptor.length() + dim);
         for(int i=0;i<dim;i++) sb.append("[");
@@ -36,24 +49,30 @@ public class Type {
         return new Type(sb.toString());
     }
     
+    /** Class representing Objec types (any non-primitive type) */
     public static class Object extends Type {
-        public Object(String s) {
+        /** 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 */
+        public Object(String s) { super(_initHelper(s)); }
+        
+        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");
-            descriptor = s;
+            return s;
         }
-        
-        public String[] components() {
+
+        String[] components() {
             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;
         }
         
-        public String internalForm() { return descriptor.substring(1,descriptor.length()-1); }
+        String internalForm() { return descriptor.substring(1,descriptor.length()-1); }
         
         // FEATURE: Do a proper check here (invalid chars, etc)
-        public boolean validDescriptorString(String s) {
+        static boolean validDescriptorString(String s) {
             return s.startsWith("L") && s.endsWith(";");
         }
     }