X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=07e8d7835eff8c32442ee1898064227dcbbace10;hp=af3da6bf3c353af64dce129060b634ee7da2eb38;hb=60bace637897ca9710e91707d0bb8d31a420a3a9;hpb=7f720b1730277f379d055ac5bcdeb5c86ca05551

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index af3da6b..07e8d78 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -3,21 +3,21 @@ package org.ibex.classgen;
 import java.util.StringTokenizer;
 import java.util.Hashtable;
 
-public class Type {
+public class Type implements CGConst {
 
     private static Hashtable instances = new Hashtable();  // this has to appear at the top of the file
 
     // Public API //////////////////////////////////////////////////////////////////////////////
 
-    public static final Type VOID = new Type("V", "void");
-    public static final Type INT = new Type("I", "int");
-    public static final Type LONG = new Type("J", "long");
-    public static final Type BOOLEAN = new Type("Z", "boolean");
-    public static final Type DOUBLE = new Type("D", "double");
-    public static final Type FLOAT = new Type("F", "float");
-    public static final Type BYTE = new Type("B", "byte");
-    public static final Type CHAR = new Type("C", "char");
-    public static final Type SHORT = new Type("S", "short");
+    public static final Type VOID = new Primitive("V", "void");
+    public static final Type INT = new Primitive("I", "int");
+    public static final Type LONG = new Primitive("J", "long");
+    public static final Type BOOLEAN = new Primitive("Z", "boolean");
+    public static final Type DOUBLE = new Primitive("D", "double");
+    public static final Type FLOAT = new Primitive("F", "float");
+    public static final Type BYTE = new Primitive("B", "byte");
+    public static final Type CHAR = new Primitive("C", "char");
+    public static final Type SHORT = new Primitive("S", "short");
     
     public static final Type.Class OBJECT = new Type.Class("java.lang.Object");
     public static final Type.Class STRING = new Type.Class("java.lang.String");
@@ -37,18 +37,20 @@ public class Type {
         return new Type.Class(d);
     }
 
-    public       String  toString() { return toString; }
-    public       String  debugToString() { return toString; }
+    public final String  toString() { return super.toString(); }
+    public abstract String debugToString();
+    
     public final String  getDescriptor() { return descriptor; }
     public       int     hashCode() { return descriptor.hashCode(); }
     public       boolean equals(java.lang.Object o) { return this==o; }
 
     public Type.Array  makeArray() { return (Type.Array)instance("["+descriptor); }
+    public Type.Array  makeArray(int i) { return i==0 ? (Type.Array)this : makeArray().makeArray(i-1); }
 
     public Type.Ref    asRef()       { throw new RuntimeException("attempted to use "+this+" as a Type.Ref, which it is not"); }
     public Type.Class  asClass()     { throw new RuntimeException("attempted to use "+this+" as a Type.Class, which it is not"); }
     public Type.Array  asArray()     { throw new RuntimeException("attempted to use "+this+" as a Type.Array, which it is not"); }
-    public boolean     isPrimitive() { return !isRef(); }
+    public boolean     isPrimitive() { return false; }
     public boolean     isRef()       { return false; }
     public boolean     isClass()     { return false; }
     public boolean     isArray()     { return false; }
@@ -56,41 +58,53 @@ public class Type {
     // Protected/Private //////////////////////////////////////////////////////////////////////////////
 
     protected final String descriptor;
-    protected final String toString;
-    protected Type(String descriptor) { this(descriptor, descriptor); }
-    protected Type(String descriptor, String humanReadable) {
-        this.toString = humanReadable;
-        instances.put(this.descriptor = descriptor, this);
+    
+    protected Type(String descriptor) {
+        this.descriptor = descriptor;
+        instances.put(descriptor, this);
     }
 
-    public static class Ref extends Type {
+    static class Primitive extends Type {
+        private String humanReadable;
+        protected Primitive(String descriptor, String humanReadable) {
+            super(descriptor);
+            this.humanReadable = humanReadable;
+        }
+        public String debugToString() { return humanReadable; }
+        public boolean     isPrimitive() { return true; }
+    }
+    
+    public abstract static class Ref extends Type {
         protected Ref(String descriptor) { super(descriptor); }
-        protected Ref(String descriptor, String humanReadable) { super(descriptor, humanReadable); }
+        public abstract String debugToString();
         public    Type.Ref asRef() { return this; }
         public    boolean  isRef() { return true; }
     }
 
     public static class Array extends Type.Ref {
-        protected Array(Type t) { super("[" + t.getDescriptor(), t.toString() + "[]"); }
+        public final Type base;
+        protected Array(Type t) { super("[" + t.getDescriptor()); base = t; }
         public Type.Array asArray() { return this; }
         public boolean isArray() { return true; }
-        public int dimension() { return getDescriptor().lastIndexOf('['); }
+        public String debugToString() { return base.debugToString() + "[]"; }
+        public Type getElementType() { return Type.instance(getDescriptor().substring(0, getDescriptor().length()-1)); }
     }
 
     public static class Class extends Type.Ref {
-        protected Class(String s) { super(_initHelper(s), _initHelper2(s)); }
+        protected Class(String s) { super(_initHelper(s)); }
         public Type.Class asClass() { return this; }
         public boolean isClass() { return true; }
         public String getShortName() { return toString.substring(toString.lastIndexOf('.')+1); }
         String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
+        public String debugToString() { return internalForm().replace('/','.'); }
+        public String getShortName() {
+            int p = descriptor.lastIndexOf('/');
+            return p == -1 ? descriptor.substring(1,descriptor.length()-1) : descriptor.substring(p+1,descriptor.length()-1);
+        }
         private static String _initHelper(String s) {
             if (!s.startsWith("L") || !s.endsWith(";")) s = "L" + s.replace('.', '/') + ";";
             return s;
         }
-        private static String _initHelper2(String s) {
-            if (s.startsWith("L") && s.endsWith(";")) s = s.substring(1, s.length()-1);
-            return s.replace('/', '.');
-        }
         String[] components() {
             StringTokenizer st = new StringTokenizer(descriptor.substring(1, descriptor.length()-1), "/");
             String[] a = new String[st.countTokens()];
@@ -100,11 +114,10 @@ public class Type {
 
         public Field  field(String name, Type type) { return new Field(name, type); }
         public Method method(String name, Type returnType, Type[] argTypes) { return new Method(name, returnType, argTypes); }
-        public Method method(String signature) {
+        public Method method(String name, String typeDescriptor) {
             // FEATURE: This parser is ugly but it works (and shouldn't be a problem) might want to clean it up though
-            String s = signature;
-            String name = s.startsWith("(") ? "" : s.substring(0, s.indexOf('('));
-            s = s.substring(s.indexOf('('));
+            String s = typeDescriptor;
+            if(!s.startsWith("(")) throw new IllegalArgumentException("invalid method type descriptor");
             int p = s.indexOf(')');
             if(p == -1) throw new IllegalArgumentException("invalid method type descriptor");
             String argsDesc = s.substring(1,p);
@@ -139,19 +152,47 @@ public class Type {
                     o.getDescriptor().equals(getDescriptor());
             }
             public int hashCode() { return getDeclaringClass().hashCode() ^ name.hashCode() ^ getDescriptor().hashCode(); }
+            public String toString() { return debugToString(); }
+            public abstract String debugToString();
         }
     
         public class Field extends Member {
             public final Type type;
             private Field(String name, Type t) { super(name); this.type = t; }
-            public String getDescriptor() { return name; }
+            public String getTypeDescriptor() { return type.getDescriptor(); }
+            public Type getType() { return type; }
+            public String debugToString() { return getDeclaringClass()+"."+name+"["+type+"]"; }
         }
 
         public class Method extends Member {
             final Type[] argTypes;
             public final Type   returnType;
-            public Type getArgType(int i) { return argTypes[i]; }
+            public Type getReturnType()   { return returnType; }
             public int  getNumArgs()      { return argTypes.length; }
+            public Type getArgType(int i) { return argTypes[i]; }
+            public Type[] getArgTypes()   {
+                Type[] ret = new Type[argTypes.length];
+                System.arraycopy(argTypes, 0, ret, 0, ret.length);
+                return ret;
+            }
+
+            public boolean isConstructor() { return getName().equals("<init>"); }
+            public boolean isClassInitializer() { return getName().equals("<clinit>"); }
+            public String debugToString() {
+                StringBuffer sb = new StringBuffer();
+                if (name.equals("<clinit>")) sb.append("static ");
+                else {
+                    if (name.equals("<init>"))
+                        sb.append(Class.this.getShortName());
+                    else
+                        sb.append(returnType.debugToString()).append(".").append(name);
+                    sb.append("(");
+                    for(int i=0; i<argTypes.length; i++)
+                        sb.append((i==0?"":", ")+argTypes[i].debugToString());
+                    sb.append(") ");
+                }
+                return sb.toString();
+            }
             private Method(String name, Type returnType, Type[] argTypes) {
                 super(name);
                 this.argTypes = argTypes;
@@ -165,6 +206,30 @@ public class Type {
                 sb.append(returnType.getDescriptor());
                 return sb.toString();
             }
+            public abstract class Body extends HasFlags {
+                public abstract java.util.Hashtable getThrownExceptions();
+                public abstract void debugBodyToString(StringBuffer sb);
+                public void debugToString(StringBuffer sb, String constructorName) {
+                    int flags = getFlags();
+                    sb.append("  ").append(ClassFile.flagsToString(flags,false));
+                    sb.append(Method.this.debugToString());
+                    java.util.Hashtable thrownExceptions = getThrownExceptions();
+                    if (thrownExceptions.size() > 0) {
+                        sb.append("throws");
+                        for(java.util.Enumeration e = thrownExceptions.keys();e.hasMoreElements();)
+                            sb.append(" ").append(((Type.Class)e.nextElement()).debugToString()).append(",");
+                        sb.setLength(sb.length()-1);
+                        sb.append(" ");
+                    }
+                    if ((flags & (NATIVE|ABSTRACT))==0) {
+                        sb.append("{\n");
+                        debugBodyToString(sb);
+                        sb.append("  }\n");
+                    } else {
+                        sb.append(";");
+                    }
+                }
+            }
         }
     }